correctly show the source of messages in a message list

diff --git a/lib/mailbox.php b/lib/mailbox.php
index bbcf2ef5dd313c84a028272b2bb3c9573e746b6e..7faeb7dba3b0365d0ba856e10e5285c29b52a106 100644 (file)
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -156,44 +156,6 @@ class MailboxAction extends CurrentUserDesignAction
         $this->elementEnd('div');
     }
 
-    /**
-     * Show the source of the message
-     *
-     * Returns either the name (and link) of the API client that posted the notice,
-     * or one of other other channels.
-     *
-     * @param string $source the source of the message
-     *
-     * @return void
-     */
-
-    function showSource($source)
-    {
-        $source_name = _($source);
-        switch ($source) {
-        case 'web':
-        case 'xmpp':
-        case 'mail':
-        case 'omb':
-        case 'api':
-            $this->element('span', 'device', $source_name);
-            break;
-        default:
-            $ns = Notice_source::staticGet($source);
-            if ($ns) {
-                $this->elementStart('span', 'device');
-                $this->element('a', array('href' => $ns->url,
-                                               'rel' => 'external'),
-                                    $ns->name);
-                $this->elementEnd('span');
-            } else {
-                $this->element('span', 'device', $source_name);
-            }
-            break;
-        }
-        return;
-    }
-
     /**
      * Mailbox actions are read only
      *

diff --git a/lib/messagelistitem.php b/lib/messagelistitem.php
index 2907eab2744284a3b5c8e03c6225abb0b0fd7fc8..44e6976454c04339fd9ce61e151442b2d96ef298 100644 (file)
--- a/lib/messagelistitem.php
+++ b/lib/messagelistitem.php
@@ -121,7 +121,7 @@ abstract class MessageListItem extends Widget
             $this->out->elementStart('span', 'source');
             // FIXME: bad i18n. Device should be a parameter (from %s).
             $this->out->text(_('from'));
-            $this->out->element('span', 'device', $this->out->showSource($this->message->source));
+            $this->showSource($this->message->source);
             $this->out->elementEnd('span');
         }
         $this->out->elementEnd('div');
@@ -129,6 +129,44 @@ abstract class MessageListItem extends Widget
         $this->out->elementEnd('li');
     }
 
+
+    /**
+     * Show the source of the message
+     *
+     * Returns either the name (and link) of the API client that posted the notice,
+     * or one of other other channels.
+     *
+     * @param string $source the source of the message
+     *
+     * @return void
+     */
+    function showSource($source)
+    {
+        $source_name = _($source);
+        switch ($source) {
+        case 'web':
+        case 'xmpp':
+        case 'mail':
+        case 'omb':
+        case 'api':
+            $this->out->element('span', 'device', $source_name);
+            break;
+        default:
+            $ns = Notice_source::staticGet($source);
+            if ($ns) {
+                $this->out->elementStart('span', 'device');
+                $this->out->element('a', array('href' => $ns->url,
+                                               'rel' => 'external'),
+                                    $ns->name);
+                $this->out->elementEnd('span');
+            } else {
+                $this->out->element('span', 'device', $source_name);
+            }
+            break;
+        }
+        return;
+    }
+
     /**
      * Return the profile to show in the message item
      *