Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

EVENTS.txt

@@ -100,6 +100,12 @@ StartPublicGroupNav: Showing the public group nav menu
 EndPublicGroupNav: At the end of the public group nav menu
 - $action: the current action
 
+StartSubGroupNav: Showing the subscriptions group nav menu
+- $action: the current action
+
+EndSubGroupNav: At the end of the subscriptions group nav menu
+- $action: the current action
+
 RouterInitialized: After the router instance has been initialized
 - $m: the Net_URL_Mapper that has just been set up
 
@@ -109,3 +115,5 @@ StartLogout: Before logging out
 EndLogout: After logging out
 - $action: the logout action
 
+ArgsInitialized: After the argument array has been initialized
+- $args: associative array of arguments, can be modified

actions/showstream.php

@@ -113,6 +113,15 @@ class ShowstreamAction extends ProfileAction
 
     function getFeeds()
     {
+        if (!empty($this->tag)) {
+            return array(new Feed(Feed::RSS1,
+                common_local_url('userrss',
+                    array('nickname' => $this->user->nickname,
+                        'tag' => $this->tag)),
+                sprintf(_('Notice feed for %s tagged %s (RSS 1.0)'),
+                    $this->user->nickname, $this->tag)));
+        }
+
         return array(new Feed(Feed::RSS1,
                               common_local_url('userrss',
                                                array('nickname' => $this->user->nickname)),

actions/userrss.php

@@ -25,14 +25,15 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 class UserrssAction extends Rss10Action
 {
-
     var $user = null;
+    var $tag  = null;
 
     function prepare($args)
     {
         parent::prepare($args);
         $nickname   = $this->trimmed('nickname');
         $this->user = User::staticGet('nickname', $nickname);
+        $this->tag  = $this->trimmed('tag');
 
         if (!$this->user) {
             $this->clientError(_('No such user.'));
@@ -42,6 +43,25 @@ class UserrssAction extends Rss10Action
         }
     }
 
+    function getTaggedNotices($tag = null, $limit=0)
+    {
+        $user = $this->user;
+
+        if (is_null($user)) {
+            return null;
+        }
+
+        $notice = $user->getTaggedNotices(0, ($limit == 0) ? NOTICES_PER_PAGE : $limit, 0, 0, null, $tag);
+
+        $notices = array();
+        while ($notice->fetch()) {
+            $notices[] = clone($notice);
+        }
+
+        return $notices;
+    }
+
+
     function getNotices($limit=0)
     {
 

classes/File_redirection.php

@@ -201,7 +201,6 @@ class File_redirection extends Memcached_DataObject
 
         if ($short_url) {
             $short_url = (string)$short_url;
-if(1) {
             // store it
             $file = File::staticGet('url', $long_url);
             if (empty($file)) {
@@ -221,7 +220,6 @@ if(1) {
                 $file_redir->file_id = $file_id;
                 $file_redir->insert();
             }
-}
             return $short_url;
         }
         return $long_url;

index.php

@@ -105,6 +105,8 @@ function main()
 
     $args = array_merge($args, $_REQUEST);
 
+    Event::handle('ArgsInitialize', array(&$args));
+
     $action = $args['action'];
 
     if (!$action || !preg_match('/^[a-zA-Z0-9_-]*$/', $action)) {

lib/action.php

@@ -597,7 +597,10 @@ class Action extends HTMLOutputter // lawsuit
                                         'class' => 'system_notice'));
         $this->element('dt', null, _('Page notice'));
         $this->elementStart('dd');
+        if (Event::handle('StartShowPageNotice', array($this))) {
             $this->showPageNotice();
+            Event::handle('EndShowPageNotice', array($this));
+        }
         $this->elementEnd('dd');
         $this->elementEnd('dl');
     }

lib/router.php

@@ -426,6 +426,11 @@ class Router
                     array('size' => '(original|96|48|24)',
                           'nickname' => '[a-zA-Z0-9]{1,64}'));
 
+        $m->connect(':nickname/tag/:tag/rss',
+            array('action' => 'userrss'),
+            array('nickname' => '[a-zA-Z0-9]{1,64}'),
+            array('tag' => '[a-zA-Z0-9]+'));
+
         $m->connect(':nickname/tag/:tag',
                     array('action' => 'showstream'),
                     array('nickname' => '[a-zA-Z0-9]{1,64}'),

lib/rssaction.php

@@ -97,7 +97,11 @@ class Rss10Action extends Action
         // Parent handling, including cache check
         parent::handle($args);
         // Get the list of notices
+        if (empty($this->tag)) {
             $this->notices = $this->getNotices($this->limit);
+        } else {
+            $this->notices = $this->getTaggedNotices($this->tag, $this->limit);
+        }
         $this->showRss();
     }
 

lib/subgroupnav.php

@@ -74,6 +74,8 @@ class SubGroupNav extends Widget
 
         $this->out->elementStart('ul', array('class' => 'nav'));
 
+        if (Event::handle('StartSubGroupNav', array($this))) {
+
             $this->out->menuItem(common_local_url('subscriptions',
                                                   array('nickname' =>
                                                         $this->user->nickname)),
@@ -106,6 +108,10 @@ class SubGroupNav extends Widget
                                      $action == 'invite',
                                      'nav_invite');
             }
+
+            Event::handle('EndSubGroupNav', array($this));
+        }
+
         $this->out->elementEnd('ul');
     }
 }

lib/util.php

@@ -496,11 +496,6 @@ function common_linkify($url) {
     }
 
     $attrs = array('href' => $longurl, 'rel' => 'external');
-if(0){
-    if ($longurl !== $url) {
-        $attrs['title'] = $longurl;
-    }
-}
     return XMLStringer::estring('a', $attrs, $display);
 }
 

theme/base/css/display.css

@@ -495,7 +495,7 @@ line-height:1.618;
 /* entity_profile */
 .entity_profile {
 position:relative;
-width:67.702%;
+width:74.702%;
 min-height:123px;
 float:left;
 margin-bottom:18px;
@@ -531,12 +531,15 @@ margin-bottom:4px;
 .entity_profile .entity_nickname {
 margin-left:11px;
 display:inline;
-font-weight:bold;
 }
 .entity_profile .entity_nickname {
 margin-left:0;
 }
-
+.entity_profile .fn,
+.entity_profile .nickname {
+font-size:1.1em;
+font-weight:bold;
+}
 .entity_profile .entity_fn dd:before {
 content: "(";
 font-weight:normal;
@@ -558,7 +561,7 @@ display:none;
 /*entity_actions*/
 .entity_actions {
 float:right;
-margin-left:4.35%;
+margin-left:2.35%;
 max-width:25%;
 }
 .entity_actions h2 {
@@ -636,6 +639,7 @@ margin-bottom:29px;
 clear:both;
 float:left;
 width:100%;
+list-style-position:inside;
 }
 .aside .section h2 {
 text-transform:uppercase;
@@ -659,6 +663,7 @@ list-style-type:none;
 float:left;
 margin-right:7px;
 margin-bottom:7px;
+display:inline;
 }
 .section .entities li .photo {
 margin-right:0;
@@ -1039,7 +1044,7 @@ margin-left:18px;
 
 /* TOP_POSTERS */
 .section tbody td {
-padding-right:11px;
+padding-right:18px;
 padding-bottom:11px;
 }
 .section .vcard .photo {

theme/identica/css/display.css

@@ -72,13 +72,6 @@ border-top-color:#CEE1E9;
 border-top-color:#87B4C8;
 }
 
-#content .notice p.entry-content a:visited {
-background-color:#fcfcfc;
-}
-#content .notice p.entry-content .vcard a {
-background-color:#fcfffc;
-}
-
 #aside_primary {
 background-color:#CEE1E9;
 }