]> git.mxchange.org Git - quix0rs-gnu-social.git/blobdiff - actions/showstream.php
posting from a form takes you back to the same page
[quix0rs-gnu-social.git] / actions / showstream.php
index 81f5a3db391deb51ff415d133f3f5ef950fc97cb..7ccdc894ff82c12e2ce9f09316e83971a89fa989 100644 (file)
@@ -21,7 +21,7 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/stream.php');
 
-define('SUBSCRIPTIONS_PER_ROW', 5);
+define('SUBSCRIPTIONS_PER_ROW', 4);
 define('SUBSCRIPTIONS', 80);
 
 class ShowstreamAction extends StreamAction {
@@ -42,80 +42,118 @@ class ShowstreamAction extends StreamAction {
 
                if (!$profile) {
                        common_server_error(_t('User record exists without profile.'));
-                       return;                 
+                       return;
                }
 
-               # Looks like we're good; show the header
+               # Looks like we're good; start output
 
-               common_show_header($profile->nickname);
+               # For YADIS discovery, we also have a <meta> tag
 
-               $cur = common_current_user();
+               header('X-XRDS-Location: '. common_local_url('xrds', array('nickname' =>
+                                                                                                                                  $user->nickname)));
 
-               if ($cur && $profile->id == $cur->id) {
-                       $this->notice_form();
-               }
+               common_show_header($profile->nickname, 
+                                                  array($this, 'show_header'), $user,
+                                                  array($this, 'show_top'));
 
                $this->show_profile($profile);
 
-               $this->show_last_notice($profile);
-
-               if ($cur && $cur->id != $profile->id) {
-                       if ($cur->isSubscribed($profile)) {
-                               $this->show_unsubscribe_form($profile);
-                       } else {
-                               $this->show_subscribe_form($profile);
-                       }
-               }
-
-               $this->show_statistics($profile);
-
-               $this->show_subscriptions($profile);
-
                $this->show_notices($profile);
 
                common_show_footer();
        }
 
+       function show_top($user) {
+               
+               $cur = common_current_user();
+               
+               if ($cur && $cur->id == $user->id) {
+                       common_notice_form('showstream');
+               }
+               
+               $this->views_menu();
+       }
+       
+       function show_header($user) {
+               common_element('link', array('rel' => 'alternate',
+                                                                        'href' => common_local_url('userrss', array('nickname' =>
+                                                                                                                                                          $user->nickname)),
+                                                                        'type' => 'application/rss+xml',
+                                                                        'title' => _t('Notice feed for ') . $user->nickname));
+               common_element('link', array('rel' => 'meta',
+                                                                        'href' => common_local_url('foaf', array('nickname' =>
+                                                                                                                                                         $user->nickname)),
+                                                                        'type' => 'application/rdf+xml',
+                                                                        'title' => 'FOAF'));
+               # for remote subscriptions etc.
+               common_element('meta', array('http-equiv' => 'X-XRDS-Location',
+                                                                        'content' => common_local_url('xrds', array('nickname' =>
+                                                                                                                                                          $user->nickname))));
+       }
+
        function no_such_user() {
                common_user_error('No such user');
        }
 
-       function notice_form() {
-               common_element_start('form', array('id' => 'newnotice', 'method' => 'POST',
-                                                                                  'action' => common_local_url('newnotice')));
-               common_element('textarea', array('rows' => 4, 'cols' => 80,
-                                                                                'name' => 'content', 
-                                                                                'id' => 'content'));
-               common_element('input', array('type' => 'submit', 'value' => 'Send'));
-               common_element_end('form');
+       function show_profile($profile) {
+
+               common_element_start('div', array('id' => 'profile'));
+
+               $this->show_personal($profile);
+
+               $this->show_last_notice($profile);
+
+               $cur = common_current_user();
+
+               $this->show_subscriptions($profile);
+
+               common_element_end('div');
        }
 
-       function show_profile($profile) {
-               common_element_start('div', 'profile');
+       function show_personal($profile) {
+
                $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
-               if ($avatar) {
-                       common_element('img', array('src' => $avatar->url,
-                                                                               'class' => 'avatar profile',
-                                                                               'width' => AVATAR_PROFILE_SIZE,
-                                                                               'height' => AVATAR_PROFILE_SIZE,
-                                                                               'title' => $profile->nickname));
+               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('span', 'nickname', $profile->nickname);
+               common_element_end('div');
+
+               common_element_start('div', array('id' => 'profile_information'));
+               
                if ($profile->fullname) {
-                       if ($profile->homepage) {
-                               common_element('a', array('href' => $profile->homepage,
-                                                                                 'class' => 'fullname'),
-                                                          $profile->fullname);
-                       } else {
-                               common_element('span', 'fullname', $profile->fullname);
-                       }
+                       common_element('h1', NULL, $profile->fullname);
                }
                if ($profile->location) {
-                       common_element('span', 'location', $profile->location);
+                       common_element('p', 'location', $profile->location);
                }
                if ($profile->bio) {
-                       common_element('div', 'bio', $profile->bio);
+                       common_element('p', 'description', htmlspecialchars($profile->bio));
+               }
+               if ($profile->homepage) {
+                       common_element_start('p', 'website');
+                       common_element('a', array('href' => $profile->homepage),
+                                                  $profile->homepage);
+                       common_element_end('p');
                }
+               
+               $this->show_statistics($profile);
+
+               common_element_end('div');
        }
 
        function show_subscribe_form($profile) {
@@ -125,7 +163,26 @@ class ShowstreamAction extends StreamAction {
                                                                          'name' => 'subscribeto',
                                                                          'type' => 'hidden',
                                                                          'value' => $profile->nickname));
-               common_element('input', array('type' => 'submit', 'value' => _t('Subscribe')));
+               common_element('input', array('type' => 'submit',
+                                                                         'class' => 'submit',
+                                                                         'value' => _t('Subscribe')));
+               common_element_end('form');
+       }
+
+       function show_remote_subscribe_form($profile) {
+               common_element_start('form', array('id' => 'remotesubscribe',
+                                                                                  'method' => 'POST',
+                                                                                  'action' => common_local_url('remotesubscribe')));
+               common_hidden('nickname', $profile->nickname);
+               common_element('input', array('name' => 'profile_url',
+                                                                         'type' => 'text',
+                                                                         'id' => 'profile_url',
+                                                                         'size' => '15'));
+               common_element('input', array('type' => 'submit',
+                                                                         'id' => 'submit',
+                                                                         'name' => 'submit',
+                                                                         'value' => _t('Subscribe'),
+                                                                         'class' => 'submit'));
                common_element_end('form');
        }
 
@@ -136,52 +193,73 @@ class ShowstreamAction extends StreamAction {
                                                                          'name' => 'unsubscribeto',
                                                                          'type' => 'hidden',
                                                                          'value' => $profile->nickname));
-               common_element('input', array('type' => 'submit'), _t('unsubscribe'));
+               common_element('input', array('type' => 'submit',
+                                                                         'class' => 'submit',
+                                                                         'value' => _t('Unsubscribe')));
                common_element_end('form');
        }
 
        function show_subscriptions($profile) {
+               global $config;
+
+               $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 + 1);
 
-               # XXX: add a limit
-               $subs = $profile->getLink('id', 'subscription', 'subscriber');
+               $subs_count = $subs->find();
 
-               common_element_start('div', 'subscriptions');
+               common_element_start('div', array('id' => 'subscriptions'));
 
-               $cnt = 0;
+               common_element('h2', NULL, _t('Subscriptions'));
 
-               if ($subs) {
-                       while ($subs->fetch()) {
-                               $cnt++;
-                               if ($cnt % SUBSCRIPTIONS_PER_ROW == 1) {
-                                       common_element_start('div', 'row');
+               if ($subs_count > 0) {
+                       
+                       common_element_start('ul', array('id' => 'subscriptions_avatars'));
+                       
+                       for ($i = 0; $i < min($subs_count, SUBSCRIPTIONS); $i++) {
+                               
+                               if (!$subs->fetch()) {
+                                       common_debug('Weirdly, broke out of subscriptions loop early', __FILE__);
+                                       break;
                                }
 
-                               common_element_start('a', array('title' => $subs->fullname ||
-                                                                                               $subs->nickname,
-                                                                                               'href' => $subs->profileurl,
+                               $other = Profile::staticGet($subs->subscribed);
+
+                               common_element_start('li');
+                               common_element_start('a', array('title' => ($other->fullname) ?
+                                                                                               $other->fullname :
+                                                                                               $other->nickname,
+                                                                                               'href' => $other->profileurl,
                                                                                                'class' => 'subscription'));
-                               $avatar = $subs->getAvatar(AVATAR_MINI_SIZE);
-                               common_element('img', array('src' => (($avatar) ? $avatar->url : DEFAULT_MINI_AVATAR),
+                               $avatar = $other->getAvatar(AVATAR_MINI_SIZE);
+                               common_element('img', array('src' => (($avatar) ? $avatar->url :  common_default_avatar(AVATAR_MINI_SIZE)),
                                                                                        'width' => AVATAR_MINI_SIZE,
-                                                                               'height' => AVATAR_MINI_SIZE,
-                                                                                       'class' => 'avatar mini'));
+                                                                                       'height' => AVATAR_MINI_SIZE,
+                                                                                       'class' => 'avatar mini',
+                                                                                       'alt' =>  ($other->fullname) ?
+                                                                                       $other->fullname :
+                                                                                       $other->nickname));
                                common_element_end('a');
-
-                               if ($cnt % SUBSCRIPTIONS_PER_ROW == 0) {
-                                       common_element_end('div');
-                               }
-
-                               if ($cnt == SUBSCRIPTIONS) {
-                                       break;
-                               }
+                               common_element_end('li');
                        }
+                       
+                       common_element_end('ul');
                }
 
-               common_element('a', array('href' => common_local_url('subscriptions',
-                                                                                                                        array('nickname' => $profile->nickname)),
-                                                                 'class' => 'moresubscriptions'),
-                                          _t('All subscriptions'));
-
+               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');
        }
 
@@ -190,25 +268,38 @@ class ShowstreamAction extends StreamAction {
                // XXX: WORM cache this
                $subs = DB_DataObject::factory('subscription');
                $subs->subscriber = $profile->id;
-               $subs_count = $subs->count();
+               $subs_count = (int) $subs->count();
 
                $subbed = DB_DataObject::factory('subscription');
                $subbed->subscribed = $profile->id;
-               $subbed_count = $subbed->count();
+               $subbed_count = (int) $subbed->count();
 
                $notices = DB_DataObject::factory('notice');
                $notices->profile_id = $profile->id;
-               $notice_count = $notices->count();
+               $notice_count = (int) $notices->count();
+
+               common_element_start('div', 'statistics');
+               common_element('h2', 'statistics', _t('Statistics'));
 
                # Other stats...?
                common_element_start('dl', 'statistics');
-               common_element('dt', _t('Subscriptions'));
-               common_element('dd', $subs_count);
-               common_element('dt', _t('Subscribers'));
-               common_element('dd', $subbed_count);
-               common_element('dt', _t('Notices'));
-               common_element('dd', $notice_count);
+               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_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);
                common_element_end('dl');
+
+               common_element_end('div');
        }
 
        function show_notices($profile) {
@@ -218,34 +309,62 @@ class ShowstreamAction extends StreamAction {
 
                $notice->orderBy('created DESC');
 
-               $page = $this->arg('page') || 1;
-
-               $notice->limit((($page-1)*NOTICES_PER_PAGE) + 1, NOTICES_PER_PAGE);
+               $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
-               $notice->find();
+               $notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
 
-               common_element_start('div', 'notices');
+               $cnt = $notice->find();
 
-               while ($notice->fetch()) {
-                       $this->show_notice($notice);
+               if ($cnt > 0) {
+                       common_element_start('ul', array('id' => 'notices'));
+                       
+                       for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
+                               if ($notice->fetch()) {
+                                       $this->show_notice($notice);
+                               } else {
+                                       // shouldn't happen!
+                                       break;
+                               }
+                       }
+                       
+                       common_element_end('ul');
                }
-
-               common_element_end('div');
+               common_pagination($page>1, $cnt>NOTICES_PER_PAGE, $page,
+                                                 'showstream', array('nickname' => $profile->nickname));
        }
 
        function show_last_notice($profile) {
+
+               common_element('h2', NULL, _t('Currently'));
+
                $notice = DB_DataObject::factory('notice');
                $notice->profile_id = $profile->id;
                $notice->orderBy('created DESC');
-               $notice->limit(1, 1);
-               $notice->find();
+               $notice->limit(0, 1);
 
-               while ($notice->fetch()) {
+               if ($notice->find(true)) {
                        # FIXME: URL, image, video, audio
-                       common_element('span', array('class' => 'content'),
-                                                  $notice->content);
-                       common_element('span', array('class' => 'date'),
-                                                  common_date_string($notice->created));
+                       common_element_start('p', array('class' => 'notice_current'));
+                       common_raw(common_render_content($notice->content, $notice));
+                       common_element_end('p');
                }
        }
+
+       function show_notice($notice) {
+               $profile = $notice->getProfile();
+               # XXX: RDFa
+               common_element_start('li', array('class' => 'notice_single',
+                                                                                'id' => 'notice-' . $notice->id));
+               $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
+               # FIXME: URL, image, video, audio
+               common_element_start('p');
+               common_raw(common_render_content($notice->content, $notice));
+               common_element_end('p');
+               common_element_start('p', array('class' => 'time'));
+               common_element('a', array('class' => 'notice',
+                                                                 'href' => $noticeurl),
+                                          common_date_string($notice->created));
+               common_element_end('p');
+               common_element_end('li');
+       }
 }