]> git.mxchange.org Git - quix0rs-gnu-social.git/blobdiff - actions/showstream.php
correct order of params in get_token
[quix0rs-gnu-social.git] / actions / showstream.php
index bf9df04a3488fdf66a2168e4b24c36485ca6738e..86c3c76a430ea858e57045df0f529648c9fb9f9c 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 {
@@ -45,7 +45,12 @@ class ShowstreamAction extends StreamAction {
                        return;
                }
 
-               # Looks like we're good; show the header
+               # Looks like we're good; start output
+               
+               # For YADIS discovery, we also have a <meta> tag
+
+               header('X-XRDS-Location: '. common_local_url('xrds', array('nickname' =>
+                                                                                                                                  $user->nickname)));
 
                common_show_header($profile->nickname, array($this, 'show_header'), $user);
 
@@ -64,10 +69,14 @@ class ShowstreamAction extends StreamAction {
 
        function show_header($user) {
                common_element('link', array('rel' => 'alternate',
-                                                                        'href' => common_local_url('rss10', array('nickname' =>
+                                                                        'href' => common_local_url('userrss', array('nickname' =>
                                                                                                                                                           $user->nickname)),
                                                                         'type' => 'application/rss+xml',
                                                                         'title' => _t('Notice feed for ') . $user->nickname));
+               # 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() {
@@ -84,12 +93,16 @@ class ShowstreamAction extends StreamAction {
 
                $cur = common_current_user();
 
-               if ($cur && $cur->id != $profile->id) {
-                       if ($cur->isSubscribed($profile)) {
-                               $this->show_unsubscribe_form($profile);
-                       } else {
-                               $this->show_subscribe_form($profile);
+               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);
                }
 
                $this->show_statistics($profile);
@@ -142,6 +155,15 @@ class ShowstreamAction extends StreamAction {
                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_input('profile', _t('Profile'));
+               common_submit('submit',_t('Subscribe'));
+               common_element_end('form');
+       }
+       
        function show_unsubscribe_form($profile) {
                common_element_start('form', array('id' => 'unsubscribe', 'method' => 'POST',
                                                                                   'action' => common_local_url('unsubscribe')));
@@ -159,46 +181,58 @@ class ShowstreamAction extends StreamAction {
                global $config;
                
                # XXX: add a limit
-               $subs = $profile->getLink('id', 'subscription', 'subscriber');
+               $subs = DB_DataObject::factory('subscription');
+               $subs->subscriber = $profile->id;
 
-               common_element_start('div', 'subscriptions');
+               # We ask for an extra one to know if we need to do another page
 
-               common_element('h2', 'subscriptions', _t('Subscriptions'));
+               $subs->limit(0, SUBSCRIPTIONS);
 
-               $cnt = 0;
+               $subs_count = $subs->find();
 
-               if ($subs) {
-                       while ($subs->fetch()) {
-                               $cnt++;
-                               if ($cnt % SUBSCRIPTIONS_PER_ROW == 1) {
-                                       common_element_start('div', 'row');
-                               }
+               common_element_start('div', 'subscriptions');
 
-                               common_element_start('a', array('title' => ($subs->fullname) ?
-                                                                                               $subs->fullname :
-                                                                                               $subs->nickname,
-                                                                                               'href' => $subs->profileurl,
-                                                                                               'class' => 'subscription'));
-                               $avatar = $subs->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',
-                                                                                       'alt' =>  ($subs->fullname) ?
-                                                                                               $subs->fullname :
-                                                                                               $subs->nickname));
-                               common_element_end('a');
-
-                               if ($cnt % SUBSCRIPTIONS_PER_ROW == 0) {
-                                       common_element_end('div');
-                               }
+               common_element('h2', 'subscriptions', _t('Subscriptions'));
 
-                               if ($cnt == SUBSCRIPTIONS) {
-                                       break;
-                               }
+               $idx = 0;
+
+               while ($subs->fetch()) {
+                       $idx++;
+                       if ($idx % SUBSCRIPTIONS_PER_ROW == 1) {
+                               common_element_start('div', 'row');
+                       }
+                       
+                       $other = Profile::staticGet($subs->subscribed);
+                       
+                       common_element_start('a', array('title' => ($other->fullname) ?
+                                                                                       $other->fullname :
+                                                                                       $other->nickname,
+                                                                                       'href' => $other->profileurl,
+                                                                                       'class' => 'subscription'));
+                       $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',
+                                                                               'alt' =>  ($other->fullname) ?
+                                                                               $other->fullname :
+                                                                               $other->nickname));
+                       common_element_end('a');
+                       
+                       if ($idx % SUBSCRIPTIONS_PER_ROW == 0) {
+                               common_element_end('div');
+                       }
+                       
+                       if ($idx == SUBSCRIPTIONS) {
+                               break;
                        }
                }
 
+               # close any unclosed row
+               if ($idx % SUBSCRIPTIONS_PER_ROW != 0) {
+                       common_element_end('div');
+               }
+
                common_element('a', array('href' => common_local_url('subscriptions',
                                                                                                                         array('nickname' => $profile->nickname)),
                                                                  'class' => 'moresubscriptions'),
@@ -212,27 +246,15 @@ class ShowstreamAction extends StreamAction {
                // XXX: WORM cache this
                $subs = DB_DataObject::factory('subscription');
                $subs->subscriber = $profile->id;
-               $subs_count = $subs->count();
-
-               if (!$subs_count) {
-                       $subs_count = 0;
-               }
+               $subs_count = (int) $subs->count();
 
                $subbed = DB_DataObject::factory('subscription');
                $subbed->subscribed = $profile->id;
-               $subbed_count = $subbed->count();
-
-               if (!$subbed_count) {
-                       $subbed_count = 0;
-               }
+               $subbed_count = (int) $subbed->count();
 
                $notices = DB_DataObject::factory('notice');
                $notices->profile_id = $profile->id;
-               $notice_count = $notices->count();
-
-               if (!$notice_count) {
-                       $notice_count = 0;
-               }
+               $notice_count = (int) $notices->count();
 
                common_element_start('div', 'statistics');
                common_element('h2', 'statistics', _t('Statistics'));
@@ -257,21 +279,42 @@ class ShowstreamAction extends StreamAction {
 
                $notice->orderBy('created DESC');
 
-               $page = $this->arg('page') || 1;
+               $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
-               $notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE);
+               $notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
 
-               $notice->find();
+               $cnt = $notice->find();
 
                common_element_start('div', 'notices width66 floatLeft');
 
-               common_element_start('ul', 'bigLinks');
-               
-               while ($notice->fetch()) {
-                       $this->show_notice($notice);
+               for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
+                       if ($notice->fetch()) {
+                               $this->show_notice($notice);
+                       } else {
+                               // shouldn't happen!
+                               break;
+                       }
+               }
+
+               if ($page > 1) {
+                       common_element_start('span', 'floatLeft width25');
+                       common_element('a', array('href' => common_local_url('showstream', 
+                                                                                                                                array('nickname' => $profile->nickname,
+                                                                                                                                          'page' => $page-1)),
+                                                                         'class' => 'newer'),
+                                                  _t('Newer'));
+                       common_element_end('span');
                }
                
-               common_element_end('ul');
+               if ($cnt > NOTICES_PER_PAGE) {
+                       common_element_start('span', 'floatRight width25');
+                       common_element('a', array('href' => common_local_url('showstream', 
+                                                                                                                                array('nickname' => $profile->nickname,
+                                                                                                                                          'page' => $page+1)),
+                                                                         'class' => 'older'),
+                                                  _t('Older'));
+                       common_element_end('span');
+               }
                
                # XXX: show a link for the next page
                common_element_end('div');
@@ -289,8 +332,9 @@ class ShowstreamAction extends StreamAction {
 
                if ($notice->find(true)) {
                        # FIXME: URL, image, video, audio
-                       common_element('span', array('class' => 'content'),
-                                                  $notice->content);
+                       common_element_start('span', array('class' => 'content'));
+                       common_raw(common_render_content($notice->content, $notice));
+                       common_element_end('span');
                }
 
                common_element_end('div');
@@ -299,15 +343,16 @@ class ShowstreamAction extends StreamAction {
        function show_notice($notice) {
                $profile = $notice->getProfile();
                # XXX: RDFa
-               common_element_start('li', array('class' => 'notice',
-                                                                                'id' => 'notice-' . $notice->id));
+               common_element_start('div', array('class' => 'notice',
+                                                                                 'id' => 'notice-' . $notice->id));
                $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
                # FIXME: URL, image, video, audio
-               common_element_start('a', array('class' => 'notice',
-                                                                 'href' => $noticeurl));
-               common_element('span', 'title', common_date_string($notice->created));
-               common_element('span', 'desc', $notice->content);
-               common_element_end('a');
-               common_element_end('li');
+               common_element_start('span', array('class' => 'content'));
+               common_raw(common_render_content($notice->content, $notice));
+               common_element_end('span');
+               common_element('a', array('class' => 'notice',
+                                                                 'href' => $noticeurl),
+                                          common_date_string($notice->created));
+               common_element_end('div');
        }
 }