need a profileurl for new users

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

diff --git a/actions/showstream.php b/actions/showstream.php
index 56572a8e1cbbb5341ef3f05477f557b5b2803288..d9637c377520da50621b0780c6395405ceaac8d9 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -113,27 +113,26 @@ class ShowstreamAction extends StreamAction {
        function show_personal($profile) {
 
                $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
-               if ($avatar) {
-                       common_element_start('div', array('id' => 'profile_avatar'));
-                       common_element('img', array('src' => $avatar->url,
-                                                                               'class' => 'avatar profile',
-                                                                               'width' => AVATAR_PROFILE_SIZE,
-                                                                               'height' => AVATAR_PROFILE_SIZE,
-                                                                               'alt' => $profile->nickname));
-                       $cur = common_current_user();
-                       if ($cur) {
-                               if ($cur->id != $profile->id) {
-                                       if ($cur->isSubscribed($profile)) {
-                                               $this->show_unsubscribe_form($profile);
-                                       } else {
-                                               $this->show_subscribe_form($profile);
-                                       }
+               common_element_start('div', array('id' => 'profile_avatar'));
+               common_element('img', array('src' => ($avatar) ? $avatar->url : common_default_avatar(AVATAR_PROFILE_SIZE),
+                                                                       'class' => 'avatar profile',
+                                                                       'width' => AVATAR_PROFILE_SIZE,
+                                                                       'height' => AVATAR_PROFILE_SIZE,
+                                                                       'alt' => $profile->nickname));
+               $cur = common_current_user();
+               if ($cur) {
+                       if ($cur->id != $profile->id) {
+                               if ($cur->isSubscribed($profile)) {
+                                       $this->show_unsubscribe_form($profile);
+                               } else {
+                                       $this->show_subscribe_form($profile);
                                }
-                       } else {
-                               $this->show_remote_subscribe_form($profile);
                        }
-                       common_element_end('div');
+               } else {
+                       $this->show_remote_subscribe_form($profile);
                }
+               common_element_end('div');
+
                common_element_start('div', array('id' => 'profile_information'));
                
                if ($profile->fullname) {
@@ -165,7 +164,7 @@ class ShowstreamAction extends StreamAction {
                                                                          'type' => 'hidden',
                                                                          'value' => $profile->nickname));
                common_element('input', array('type' => 'submit',
-                                                                         'class' => 'button',
+                                                                         'class' => 'submit',
                                                                          'value' => _t('Subscribe')));
                common_element_end('form');
        }
@@ -183,7 +182,7 @@ class ShowstreamAction extends StreamAction {
                                                                          'id' => 'submit',
                                                                          'name' => 'submit',
                                                                          'value' => _t('Subscribe'),
-                                                                         'class' => 'button'));
+                                                                         'class' => 'submit'));
                common_element_end('form');
        }
 
@@ -195,7 +194,7 @@ class ShowstreamAction extends StreamAction {
                                                                          'type' => 'hidden',
                                                                          'value' => $profile->nickname));
                common_element('input', array('type' => 'submit',
-                                                                         'class' => 'button',
+                                                                         'class' => 'submit',
                                                                          'value' => _t('Unsubscribe')));
                common_element_end('form');
        }
@@ -203,13 +202,13 @@ class ShowstreamAction extends StreamAction {
        function show_subscriptions($profile) {
                global $config;
 
-               # XXX: add a limit
                $subs = DB_DataObject::factory('subscription');
                $subs->subscriber = $profile->id;
-
+               $subs->orderBy('created DESC');
+               
                # We ask for an extra one to know if we need to do another page
 
-               $subs->limit(0, SUBSCRIPTIONS);
+               $subs->limit(0, SUBSCRIPTIONS + 1);
 
                $subs_count = $subs->find();
 
@@ -221,7 +220,12 @@ class ShowstreamAction extends StreamAction {
                        
                        common_element_start('ul', array('id' => 'subscriptions_avatars'));
                        
-                       while ($subs->fetch()) {
+                       for ($i = 0; $i < min($subs_count, SUBSCRIPTIONS); $i++) {
+                               
+                               if (!$subs->fetch()) {
+                                       common_debug('Weirdly, broke out of subscriptions loop early', __FILE__);
+                                       break;
+                               }
 
                                $other = Profile::staticGet($subs->subscribed);
 
@@ -242,17 +246,19 @@ class ShowstreamAction extends StreamAction {
                                common_element_end('a');
                                common_element_end('li');
                        }
+                       
                        common_element_end('ul');
                }
 
-               common_element_start('p', array('id' => 'subscriptions_viewall'));
-               
-               common_element('a', array('href' => common_local_url('subscriptions',
-                                                                                                                        array('nickname' => $profile->nickname)),
-                                                                 'class' => 'moresubscriptions'),
-                                          _t('All subscriptions'));
-
-               common_element_end('p');
+               if ($subs_count > SUBSCRIPTIONS) {
+                       common_element_start('p', array('id' => 'subscriptions_viewall'));
+                       
+                       common_element('a', array('href' => common_local_url('subscriptions',
+                                                                                                                                array('nickname' => $profile->nickname)),
+                                                                         'class' => 'moresubscriptions'),
+                                                  _t('All subscriptions'));
+                       common_element_end('p');
+               }
                
                common_element_end('div');
        }
@@ -277,9 +283,17 @@ class ShowstreamAction extends StreamAction {
 
                # Other stats...?
                common_element_start('dl', 'statistics');
-               common_element('dt', 'subscriptions', _t('Subscriptions'));
+               common_element_start('dt', 'subscriptions');
+               common_element('a', array('href' => common_local_url('subscriptions',
+                                                                                                                        array('nickname' => $profile->nickname))),
+                                          _t('Subscriptions'));
+               common_element_end('dt');
                common_element('dd', 'subscriptions', $subs_count);
-               common_element('dt', 'subscribers', _t('Subscribers'));
+               common_element_start('dt', 'subscribers');
+               common_element('a', array('href' => common_local_url('subscribers',
+                                                                                                                        array('nickname' => $profile->nickname))),
+                                          _t('Subscribers'));
+               common_element_end('dt');
                common_element('dd', 'subscribers', $subbed_count);
                common_element('dt', 'notices', _t('Notices'));
                common_element('dd', 'notices', $notice_count);