auto-load OAuthRequest

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

diff --git a/lib/stream.php b/lib/stream.php
index 91829d83578eba3d3843a97c4551dd9a5ad62e88..64dbcbce3665da592b6a555e98a6de3a40d3821c 100644 (file)
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -66,12 +66,7 @@ class StreamAction extends Action {
        function show_notice($notice) {
                global $config;
                $profile = $notice->getProfile();
-               if (common_logged_in()) {
-                       $user = common_current_user();
-                       $user_profile = $user->getProfile();
-               } else {
-                       $user_profile = false;
-               }
+               $user = common_current_user();
 
                # XXX: RDFa
                common_element_start('li', array('class' => 'notice_single',
@@ -106,6 +101,10 @@ class StreamAction extends Action {
                                                                  'href' => $noticeurl,
                                                                  'title' => common_exact_date($notice->created)),
                                           common_date_string($notice->created));
+               if ($notice->source) {
+                       common_text(_(' from '));
+                       $this->source_link($notice->source);
+               }
                if ($notice->reply_to) {
                        $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
                        common_text(' (');
@@ -122,13 +121,38 @@ class StreamAction extends Action {
                                                                   'class' => 'replybutton'));
                common_raw('→');
                common_element_end('a');
-               common_element_end('p');
-               if ($user_profile && $notice->profile_id == $user_profile->id) {
+               if ($user && $notice->profile_id == $user->id) {
                        $deleteurl = common_local_url('deletenotice', array('notice' => $notice->id));
-                       common_element('a', array('class' => 'deletenotice',
-                                                                        'href' => $deleteurl),
-                                                  _('delete'));
+                       common_element_start('a', array('class' => 'deletenotice',
+                                                                                       'href' => $deleteurl,
+                                                                                       'title' => _('delete')));
+                       common_raw('×');
+                       common_element_end('a');
                }
+               common_element_end('p');
                common_element_end('li');
        }
+       
+       function source_link($source) {
+               $source_name = _($source);
+               switch ($source) {
+                case 'web':
+                case 'xmpp':
+                case 'mail':
+                case 'omb':
+                case 'api':
+                       common_element('span', 'noticesource', $source_name);
+                       break;
+                default:
+                       $ns = Notice_source::staticGet($source);
+                       if ($ns) {
+                               common_element('a', array('href' => $ns->url),
+                                                          $ns->name);
+                       } else {
+                               common_element('span', 'noticesource', $source_name);
+                       }
+                       break;
+               }
+               return;
+       }
 }