try to fix updating in profile

[quix0rs-gnu-social.git] / actions / subscriptions.php

diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 88e12f5d56f83739c3b9ad701d3b94134fcdef06..6695029394648268e4feb5e33b09ebafd203de84 100644 (file)
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -1,4 +1,23 @@
 <?php
+/* 
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ * 
+ * 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/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
 
 class SubscriptionsAction extends Action {
        
@@ -14,40 +33,47 @@ class SubscriptionsAction extends Action {
                        $this->no_such_user();
                }
                $page = $this->arg('page') || 1;
+               common_show_header($profile->nickname . ": " . _t('Subscriptions'));
                $this->show_subscriptions($profile, $page);
+               common_show_footer();
        }
 
        function show_subscriptions($profile, $page) {
 
-               $sub = DB_DataObject::factory('subscriptions');
-               $sub->subscriber = $profile->id;
+               $subs = DB_DataObject::factory('subscription');
+               $subs->subscriber = $profile->id;
                
                # We ask for an extra one to know if we need to do another page
                
-               $sub->limit((($page-1)*SUBSCRIPTIONS_PER_PAGE)+1, SUBSCRIPTIONS_PER_PAGE + 1);
+               $subs->limit((($page-1)*SUBSCRIPTIONS_PER_PAGE)+1, SUBSCRIPTIONS_PER_PAGE + 1);
 
                $subs_count = $subs->find();
                
-               common_start_element('div', 'subscriptions');
+               common_element_start('div', 'subscriptions');
                
                $idx = 0;
                
                while ($subs->fetch()) {
                        $idx++;
                        if ($idx % SUBSCRIPTIONS_PER_ROW == 1) {
-                               common_start_element('div', 'row');
+                               common_element_start('div', 'row');
                        }
 
-                       common_start_element('a', array('title' => $subs->fullname ||
+                       common_element_start('a', array('title' => $subs->fullname ||
                                                                                                   $subs->nickname,
                                                                                        'href' => $subs->profileurl,
                                                                                        'class' => 'subscription'));
-                       common_element('img', array('src' => $subs->avatar,
-                                                                               'class' => 'avatar'));
-                       common_end_element('a');
+                       $avatar = $subs->getAvatar(AVATAR_STREAM_SIZE);
+                       common_element('img', array('src' => (($avatar) ? $avatar->url : DEFAULT_STREAM_AVATAR),
+                                                                               'width' => AVATAR_STREAM_SIZE,
+                                                                               'height' => AVATAR_STREAM_SIZE,
+                                                                               'class' => 'avatar stream'));
+                       common_element_end('a');
+
+                       # XXX: subscribe form here
                        
                        if ($idx % SUBSCRIPTIONS_PER_ROW == 0) {
-                               common_end_element('div');
+                               common_element_end('div');
                        }
                        
                        if ($idx == SUBSCRIPTIONS_PER_PAGE) {
@@ -72,6 +98,6 @@ class SubscriptionsAction extends Action {
                                                                          'class' => 'next'),
                                           _t('Next'));
                }
-               common_end_element('div');
+               common_element_end('div');
        }
 }
\ No newline at end of file