consolidate linking a user to an OpenID

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

diff --git a/actions/showstream.php b/actions/showstream.php
index 73258cd9a2b70c60986a3786f000eaa47b5489f8..a9073df86a95b68ab3c4bed266ea1ce323ef3dde 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -52,13 +52,9 @@ class ShowstreamAction extends StreamAction {
                header('X-XRDS-Location: '. common_local_url('xrds', array('nickname' =>
                                                                                                                                   $user->nickname)));
 
-               common_show_header($profile->nickname, array($this, 'show_header'), $user);
-
-               $cur = common_current_user();
-
-               if ($cur && $profile->id == $cur->id) {
-                       common_notice_form();
-               }
+               common_show_header($profile->nickname, 
+                                                  array($this, 'show_header'), $user,
+                                                  array($this, 'show_top'));
 
                $this->show_profile($profile);
 
@@ -67,6 +63,17 @@ class ShowstreamAction extends StreamAction {
                common_show_footer();
        }
 
+       function show_top($user) {
+               
+               $cur = common_current_user();
+               
+               if ($cur && $cur->id == $user->id) {
+                       common_notice_form();
+               }
+               
+               $this->views_menu();
+       }
+       
        function show_header($user) {
                common_element('link', array('rel' => 'alternate',
                                                                         'href' => common_local_url('userrss', array('nickname' =>
@@ -106,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) {
@@ -139,7 +145,10 @@ class ShowstreamAction extends StreamAction {
                        common_element('p', 'description', htmlspecialchars($profile->bio));
                }
                if ($profile->homepage) {
-                       common_element('p', 'website', $profile->homepage);
+                       common_element_start('p', 'website');
+                       common_element('a', array('href' => $profile->homepage),
+                                                  $profile->homepage);
+                       common_element_end('p');
                }
                
                $this->show_statistics($profile);
@@ -165,9 +174,9 @@ class ShowstreamAction extends StreamAction {
                                                                                   'method' => 'POST',
                                                                                   'action' => common_local_url('remotesubscribe')));
                common_hidden('nickname', $profile->nickname);
-               common_element('input', array('name' => 'profile',
+               common_element('input', array('name' => 'profile_url',
                                                                          'type' => 'text',
-                                                                         'id' => 'profile',
+                                                                         'id' => 'profile_url',
                                                                          'size' => '15'));
                common_element('input', array('type' => 'submit',
                                                                          'id' => 'submit',
@@ -193,13 +202,12 @@ class ShowstreamAction extends StreamAction {
        function show_subscriptions($profile) {
                global $config;
 
-               # XXX: add a limit
                $subs = DB_DataObject::factory('subscription');
                $subs->subscriber = $profile->id;
 
                # 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();
 
@@ -211,7 +219,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);
 
@@ -232,17 +245,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');
        }
@@ -267,9 +282,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('subscribed',
+                                                                                                                        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);