Merge branch 'master' into 1.0.x

[quix0rs-gnu-social.git] / actions / shownotice.php

diff --git a/actions/shownotice.php b/actions/shownotice.php
index b6d0625e13ec0f86c43ef11138e7476c54611661..6055184fcdf2ced037e4cf8bde2dee2be15ebad2 100644 (file)
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -22,7 +22,7 @@
  * @category  Personal
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/feedlist.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class ShownoticeAction extends OwnerDesignAction
+class ShownoticeAction extends Action
 {
     /**
      * Notice object to show
@@ -214,7 +214,7 @@ class ShownoticeAction extends OwnerDesignAction
         if ($this->boolean('ajax')) {
             $this->showAjax();
         } else {
-            if ($this->notice->is_local == Notice::REMOTE_OMB) {
+            if ($this->notice->is_local == Notice::REMOTE) {
                 if (!empty($this->notice->url)) {
                     $target = $this->notice->url;
                 } else if (!empty($this->notice->uri) && preg_match('/^https?:/', $this->notice->uri)) {
@@ -233,15 +233,6 @@ class ShownoticeAction extends OwnerDesignAction
         }
     }
 
-    /**
-     * Don't show local navigation
-     *
-     * @return void
-     */
-    function showLocalNavBlock()
-    {
-    }
-
     /**
      * Fill the content area of the page
      *
@@ -342,58 +333,8 @@ class ShownoticeAction extends OwnerDesignAction
 // @todo FIXME: Class documentation missing.
 class SingleNoticeItem extends DoFollowListItem
 {
-    /**
-     * Recipe function for displaying a single notice.
-     *
-     * We overload to show attachments.
-     *
-     * @return void
-     */
-    function show()
-    {
-        $this->showStart();
-        if (Event::handle('StartShowNoticeItem', array($this))) {
-            $this->showNotice();
-            $this->showNoticeAttachments();
-            $this->showNoticeInfo();
-            $this->showNoticeOptions();
-            Event::handle('EndShowNoticeItem', array($this));
-        }
-
-        $this->showEnd();
-    }
-
-    /**
-     * For our zoomed-in special case we'll use a fuller list
-     * for the attachment info.
-     */
-    function showNoticeAttachments() {
-        $al = new AttachmentList($this->notice, $this->out);
-        $al->show();
-    }
-
-    /**
-     * show the avatar of the notice's author
-     *
-     * We use the larger size for single notice page.
-     *
-     * @return void
-     */
-    function showAvatar()
+    function avatarSize()
     {
-       $avatar_size = AVATAR_PROFILE_SIZE;
-
-        $avatar = $this->profile->getAvatar($avatar_size);
-
-        $this->out->element('img', array('src' => ($avatar) ?
-                                         $avatar->displayUrl() :
-                                         Avatar::defaultImage($avatar_size),
-                                         'class' => 'avatar photo',
-                                         'width' => $avatar_size,
-                                         'height' => $avatar_size,
-                                         'alt' =>
-                                         ($this->profile->fullname) ?
-                                         $this->profile->fullname :
-                                         $this->profile->nickname));
+        return AVATAR_STREAM_SIZE;
     }
 }