fix content check so it shows zeros

[quix0rs-gnu-social.git] / lib / stream.php

diff --git a/lib/stream.php b/lib/stream.php
index e29b64c60742b25df8a8c003cce5f59e6c14a433..a595958e44e27a8e806a49f205064b8917bdfd8f 100644 (file)
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -19,8 +19,6 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-define('NOTICES_PER_PAGE', 20);
-
 class StreamAction extends Action {
 
        function handle($args) {
@@ -41,17 +39,17 @@ class StreamAction extends Action {
 
                common_menu_item(common_local_url('all', array('nickname' =>
                                                                                                           $nickname)),
-                                                _t('Personal'),
-                                                (($user && $user->fullname) ? $user->fullname : $nickname) . _t(' and friends'),
+                                                _('Personal'),
+                                                sprintf(_('%s and friends'), (($user && $user->fullname) ? $user->fullname : $nickname)),
                                                 $action == 'all');
                common_menu_item(common_local_url('replies', array('nickname' =>
                                                                                                                          $nickname)),
-                                                _t('Replies'),  
-                                                _t('Replies to ') . (($user && $user->fullname) ? $user->fullname : $nickname),
+                                                _('Replies'),
+                                                sprintf(_('Replies to %s'), (($user && $user->fullname) ? $user->fullname : $nickname)),
                                                 $action == 'replies');
                common_menu_item(common_local_url('showstream', array('nickname' =>
                                                                                                                          $nickname)),
-                                                _t('Profile'),
+                                                _('Profile'),
                                                 ($user && $user->fullname) ? $user->fullname : $nickname,
                                                 $action == 'showstream');
                common_element_end('ul');
@@ -78,52 +76,37 @@ class StreamAction extends Action {
                                           $profile->nickname);
                # FIXME: URL, image, video, audio
                common_element_start('p', array('class' => 'content'));
-               common_raw(common_render_content($notice->content, $notice));
+               if ($notice->rendered) {
+                       common_raw($notice->rendered);
+               } else {
+                       # XXX: may be some uncooked notices in the DB,
+                       # we cook them right now. This should probably disappear in future
+                       # versions (>> 0.4.x)
+                       common_raw(common_render_content($notice->content, $notice));
+               }
                common_element_end('p');
                $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
                common_element_start('p', 'time');
-               common_element('a', array('class' => 'notice',
+               common_element('a', array('class' => 'permalink',
                                                                  'href' => $noticeurl,
                                                                  'title' => common_exact_date($notice->created)),
                                           common_date_string($notice->created));
-               common_element_end('p');
-               common_element_end('li');
-       }
-
-       # XXX: these are almost identical functions!
-       
-       function show_reply($notice, $replied_id) {
-               global $config;
-               $profile = $notice->getProfile();
-               # XXX: RDFa
-               common_element_start('li', array('class' => 'notice_single',
-                                                                                 'id' => 'notice-' . $notice->id));
-               $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
-               common_element_start('a', array('href' => $profile->profileurl));
-               common_element('img', array('src' => ($avatar) ? $avatar->url : common_default_avatar(AVATAR_STREAM_SIZE),
-                                                                       'class' => 'avatar stream',
-                                                                       'width' => AVATAR_STREAM_SIZE,
-                                                                       'height' => AVATAR_STREAM_SIZE,
-                                                                       'alt' =>
-                                                                       ($profile->fullname) ? $profile->fullname :
-                                                                       $profile->nickname));
+               if ($notice->reply_to) {
+                       $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
+                       common_text(' (');
+                       common_element('a', array('class' => 'inreplyto',
+                                                                         'href' => $replyurl),
+                                                  _('in reply to...'));
+                       common_text(')');
+               }
+               common_element_start('a',
+                                                        array('href' => common_local_url('newnotice',
+                                                                                                                         array('replyto' => $profile->nickname)),
+                                                                  'onclick' => 'doreply("'.$profile->nickname.'"); return false',
+                                                                  'title' => _('reply'),
+                                                                  'class' => 'replybutton'));
+               common_raw('→');
                common_element_end('a');
-               common_element('a', array('href' => $profile->profileurl,
-                                                                 'class' => 'nickname'),
-                                          $profile->nickname);
-               # FIXME: URL, image, video, audio
-               common_element_start('p', array('class' => 'content'));
-               common_raw(common_render_content($notice->content, $notice));
-               common_element_end('p');
-               $replyurl = common_local_url('shownotice', array('notice' => $replied_id));
-               $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
-               common_element_start('p', 'time');
-               common_element('a', array('class' => 'notice',
-                                                                 'href' => $noticeurl),
-                                          common_date_string($notice->created));
-               common_element('a', array('class' => 'inreplyto',
-                                                                 'href' => $replyurl),
-                                          " in reply to ".$profile->nickname );
                common_element_end('p');
                common_element_end('li');
        }