Merge branch 'master' of /var/www/trunk

9 files changed, 230 insertions, 61 deletions

diff --git a/lib/featureduserssection.php b/lib/featureduserssection.php
new file mode 100644
index 000000000..2935d8363
--- /dev/null
+++ b/lib/featureduserssection.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Section for featured users
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Widget
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Section for featured users
+ *
+ * @category Widget
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class FeaturedUsersSection extends ProfileSection
+{
+    function getProfiles()
+    {
+        $featured_nicks = common_config('nickname', 'featured');
+
+        if (!$featured_nicks) {
+            return null;
+        }
+
+        $quoted = array();
+
+        foreach ($featured_nicks as $nick) {
+            $quoted[] = "'$nick'";
+        }
+
+        $qry = 'SELECT profile.* ' .
+          'FROM profile JOIN user on profile.id = user.id ' .
+          'WHERE user.nickname in (' . implode(',', $quoted) . ') ' .
+          'ORDER BY profile.created DESC ';
+
+        $limit = PROFILES_PER_SECTION + 1;
+        $offset = 0;
+
+        if (common_config('db','type') == 'pgsql') {
+            $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
+        } else {
+            $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+        }
+
+        $profile = Memcached_DataObject::cachedQuery('Profile',
+                                                     $qry,
+                                                     6 * 3600);
+        return $profile;
+    }
+
+    function title()
+    {
+        return _('Featured users');
+    }
+
+    function divId()
+    {
+        return 'featured_users';
+    }
+}
diff --git a/lib/galleryaction.php b/lib/galleryaction.php
index a277762a6..25a5e3fd5 100644
--- a/lib/galleryaction.php
+++ b/lib/galleryaction.php
@@ -32,6 +32,7 @@ class GalleryAction extends Action
     var $profile = null;
     var $user = null;
     var $page = null;
+    var $tag = null;
 
     function prepare($args)
     {
@@ -69,6 +70,8 @@ class GalleryAction extends Action
 
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
+        $this->tag = $this->trimmed('tag');
+
         return true;
     }
 
@@ -84,7 +87,7 @@ class GalleryAction extends Action
 		# Post from the tag dropdown; redirect to a GET
 
 		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-		    common_redirect($this->self_url(), 307);
+		    common_redirect($this->selfUrl(), 307);
             return;
 		}
 
@@ -124,7 +127,7 @@ class GalleryAction extends Action
                            array('href' =>
                                  common_local_url($this->trimmed('action'),
                                                   array('nickname' =>
-                                                        $profile->nickname))),
+                                                        $this->user->nickname))),
                            _('All'));
             $this->elementEnd('li');
             $this->elementStart('li', array('id'=>'filter_tags_item'));
diff --git a/lib/groupsection.php b/lib/groupsection.php
index bf26ab48c..c19299493 100644
--- a/lib/groupsection.php
+++ b/lib/groupsection.php
@@ -58,13 +58,13 @@ class GroupSection extends Section
 
         $cnt = 0;
 
-        $this->out->elementStart('ul', 'entities group xoxo');
+        $this->out->elementStart('table');
 
         while ($profiles->fetch() && ++$cnt <= GROUPS_PER_SECTION) {
             $this->showGroup($profiles);
         }
 
-        $this->out->elementEnd('ul');
+        $this->out->elementEnd('table');
 
         return ($cnt > GROUPS_PER_SECTION);
     }
@@ -76,7 +76,9 @@ class GroupSection extends Section
 
     function showGroup($group)
     {
-        $this->out->elementStart('li', 'vcard');
+        $this->out->elementStart('tr');
+        $this->out->elementStart('td');
+        $this->out->elementStart('span', 'vcard');
         $this->out->elementStart('a', array('title' => ($group->fullname) ?
                                             $group->fullname :
                                             $group->nickname,
@@ -95,9 +97,11 @@ class GroupSection extends Section
                                          $group->nickname));
         $this->out->element('span', 'fn org nickname', $group->nickname);
         $this->out->elementEnd('a');
+        $this->out->elementEnd('span');
+        $this->out->elementEnd('td');
         if ($group->value) {
-            $this->out->element('span', 'value', $group->value);
+            $this->out->element('td', 'value', $group->value);
         }
-        $this->out->elementEnd('li');
+        $this->out->elementEnd('tr');
     }
 }
diff --git a/lib/grouptagcloudsection.php b/lib/grouptagcloudsection.php
new file mode 100644
index 000000000..f05be85cb
--- /dev/null
+++ b/lib/grouptagcloudsection.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Personal tag cloud section
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Widget
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Personal tag cloud section
+ *
+ * @category Widget
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class GroupTagCloudSection extends TagCloudSection
+{
+    var $group = null;
+
+    function __construct($out=null, $group=null)
+    {
+        parent::__construct($out);
+        $this->group = $group;
+    }
+
+    function title()
+    {
+        return sprintf(_('Tags in %s group\'s notices'), $this->group->nickname);
+    }
+
+    function getTags()
+    {
+        $qry = 'SELECT notice_tag.tag, '.
+          'sum(exp(-(now() - notice_tag.created)/%s)) as weight ' .
+          'FROM notice_tag JOIN notice ' .
+          'ON notice_tag.notice_id = notice.id ' .
+          'JOIN group_inbox on group_inbox.notice_id = notice.id ' .
+          'WHERE group_inbox.group_id = %d ' .
+          'GROUP BY notice_tag.tag ' .
+          'ORDER BY weight DESC ';
+
+        $limit = TAGS_PER_SECTION;
+        $offset = 0;
+
+        if (common_config('db','type') == 'pgsql') {
+            $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
+        } else {
+            $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+        }
+
+        $tag = Memcached_DataObject::cachedQuery('Notice_tag',
+                                                 sprintf($qry,
+                                                         common_config('tag', 'dropoff'),
+                                                         $this->group->id),
+                                                 3600);
+        return $tag;
+    }
+
+}
diff --git a/lib/noticesection.php b/lib/noticesection.php
index 9d1079070..7dfa0472d 100644
--- a/lib/noticesection.php
+++ b/lib/noticesection.php
@@ -54,13 +54,13 @@ class NoticeSection extends Section
 
         $cnt = 0;
 
-        $this->out->elementStart('table', 'notices');
+        $this->out->elementStart('ul', 'notices');
 
         while ($notices->fetch() && ++$cnt <= NOTICES_PER_SECTION) {
             $this->showNotice($notices);
         }
 
-        $this->out->elementEnd('table');
+        $this->out->elementEnd('ul');
 
         return ($cnt > NOTICES_PER_SECTION);
     }
@@ -73,9 +73,15 @@ class NoticeSection extends Section
     function showNotice($notice)
     {
         $profile = $notice->getProfile();
-        $this->out->elementStart('tr');
-        $this->out->elementStart('td');
+        $this->out->elementStart('li', 'hentry notice');
+        $this->out->elementStart('div', 'entry-title');
         $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
+        $this->out->elementStart('span', 'vcard author');
+        $this->out->elementStart('a', array('title' => ($profile->fullname) ?
+                                            $profile->fullname :
+                                            $profile->nickname,
+                                            'href' => $profile->noticeurl,
+                                            'class' => 'url'));
         $this->out->element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) :  common_default_avatar(AVATAR_MINI_SIZE)),
                                          'width' => AVATAR_MINI_SIZE,
                                          'height' => AVATAR_MINI_SIZE,
@@ -83,25 +89,19 @@ class NoticeSection extends Section
                                          'alt' =>  ($profile->fullname) ?
                                          $profile->fullname :
                                          $profile->nickname));
-        $this->out->elementEnd('a');
-        $this->out->elementEnd('td');
-        $this->out->elementStart('td');
-        $this->out->elementStart('a', array('title' => ($profile->fullname) ?
-                                            $profile->fullname :
-                                            $profile->nickname,
-                                            'href' => $profile->noticeurl,
-                                            'rel' => 'contact member',
-                                            'class' => 'url'));
         $this->out->element('span', 'fn nickname', $profile->nickname);
-        $this->out->elementEnd('td');
-        $this->out->elementStart('td');
+        $this->out->elementEnd('a');
+        $this->out->elementEnd('span');
+
+        $this->out->elementStart('p', 'entry-content');
         $this->out->raw($notice->rendered);
-        $this->out->elementEnd('td');
+        $this->out->elementEnd('p');
         if ($notice->value) {
-            $this->out->elementStart('td');
+            $this->out->elementStart('p');
             $this->out->text($notice->value);
-            $this->out->elementEnd('td');
+            $this->out->elementEnd('p');
         }
-        $this->out->elementEnd('tr');
+        $this->out->elementEnd('div');
+        $this->out->elementEnd('li');
     }
 }
diff --git a/lib/profilelist.php b/lib/profilelist.php
index a510c518c..499d74f7b 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -169,9 +169,9 @@ class ProfileList extends Widget
                 $this->out->elementStart('ul', 'tags xoxo');
                 foreach ($tags as $tag) {
                     $this->out->elementStart('li');
-                    $this->element('span', 'mark_hash', '#');
+                    $this->out->element('span', 'mark_hash', '#');
                     $this->out->element('a', array('rel' => 'tag',
-                                                   'href' => common_local_url($this->action,
+                                                   'href' => common_local_url($this->action->trimmed('action'),
                                                                               array('nickname' => $this->owner->nickname,
                                                                                     'tag' => $tag))),
                                         $tag);
diff --git a/lib/profilesection.php b/lib/profilesection.php
index 91a3dfa34..3642ae164 100644
--- a/lib/profilesection.php
+++ b/lib/profilesection.php
@@ -76,7 +76,9 @@ class ProfileSection extends Section
 
     function showProfile($profile)
     {
-        $this->out->elementStart('li', 'vcard');
+        $this->out->elementStart('tr');
+        $this->out->elementStart('td');
+        $this->out->elementStart('span', 'vcard');
         $this->out->elementStart('a', array('title' => ($profile->fullname) ?
                                        $profile->fullname :
                                        $profile->nickname,
@@ -92,10 +94,13 @@ class ProfileSection extends Section
                                     $profile->fullname :
                                     $profile->nickname));
         $this->out->element('span', 'fn nickname', $profile->nickname);
+        $this->out->elementEnd('span');
         $this->out->elementEnd('a');
+        $this->out->elementEnd('td');
         if ($profile->value) {
-            $this->out->element('span', 'value', $profile->value);
+            $this->out->element('td', 'value', $profile->value);
         }
-        $this->out->elementEnd('li');
+
+        $this->out->elementEnd('tr');
     }
 }
diff --git a/lib/tagcloudsection.php b/lib/tagcloudsection.php
index 121dfc499..178dd88ca 100644
--- a/lib/tagcloudsection.php
+++ b/lib/tagcloudsection.php
@@ -53,6 +53,7 @@ class TagCloudSection extends Section
         $tags = $this->getTags();
 
         if (!$tags) {
+            $this->out->element('p', null, _('None'));
             return false;
         }
 
@@ -66,6 +67,11 @@ class TagCloudSection extends Section
             $sum += $tags->weight;
         }
 
+        if ($cnt == 0) {
+            $this->out->element('p', null, _('(None)'));
+            return false;
+        }
+
         ksort($tw);
 
         $this->out->elementStart('ul', 'tags xoxo tag-cloud');
@@ -110,4 +116,9 @@ class TagCloudSection extends Section
     {
         return common_local_url('tag', array('tag' => $tag));
     }
+
+    function divId()
+    {
+        return 'tagcloud';
+    }
 }
diff --git a/lib/topposterssection.php b/lib/topposterssection.php
index 4701ca83f..4bd59ac79 100644
--- a/lib/topposterssection.php
+++ b/lib/topposterssection.php
@@ -69,36 +69,6 @@ class TopPostersSection extends ProfileSection
         return $profile;
     }
 
-    function showProfile($profile)
-    {
-        $this->out->elementStart('tr');
-        $this->out->elementStart('td');
-        $this->out->elementStart('span', 'vcard');        
-        $this->out->elementStart('a', array('title' => ($profile->fullname) ?
-                                       $profile->fullname :
-                                       $profile->nickname,
-                                       'href' => $profile->profileurl,
-                                       'rel' => 'contact member',
-                                       'class' => 'url'));
-        $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
-        $this->out->element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) :  common_default_avatar(AVATAR_MINI_SIZE)),
-                                    'width' => AVATAR_MINI_SIZE,
-                                    'height' => AVATAR_MINI_SIZE,
-                                    'class' => 'avatar photo',
-                                    'alt' =>  ($profile->fullname) ?
-                                    $profile->fullname :
-                                    $profile->nickname));
-        $this->out->element('span', 'fn nickname', $profile->nickname);
-        $this->out->elementEnd('span');        
-        $this->out->elementEnd('a');
-        $this->out->elementEnd('td');
-        if ($profile->value) {
-            $this->out->element('td', 'value', $profile->value);
-        }
-
-        $this->out->elementEnd('tr');
-    }
-
     function title()
     {
         return _('Top posters');