X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshownotice.php;h=b72f39513ed8e11db4c463e5e0ca928bd5b97948;hb=132be9950662ce0d5a1e859a766232cd7fdcb0e1;hp=b6d0625e13ec0f86c43ef11138e7476c54611661;hpb=1e73ba00bdd37f46415eb45b1b904dc894fb801c;p=quix0rs-gnu-social.git diff --git a/actions/shownotice.php b/actions/shownotice.php index b6d0625e13..b72f39513e 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -22,7 +22,7 @@ * @category Personal * @package StatusNet * @author Evan Prodromou - * @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 @@ -70,7 +70,7 @@ class ShownoticeAction extends OwnerDesignAction * * @return success flag */ - function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); if ($this->boolean('ajax')) { @@ -97,12 +97,15 @@ class ShownoticeAction extends OwnerDesignAction if (empty($this->profile)) { // TRANS: Server error displayed trying to show a notice without a connected profile. $this->serverError(_('Notice has no profile.'), 500); - return false; } - $this->user = User::staticGet('id', $this->profile->id); + $this->user = User::getKV('id', $this->profile->id); - $this->avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE); + try { + $this->avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE); + } catch (Exception $e) { + $this->avatar = null; + } return true; } @@ -113,16 +116,16 @@ class ShownoticeAction extends OwnerDesignAction * * @return Notice */ - function getNotice() + protected function getNotice() { $id = $this->arg('notice'); - $notice = Notice::staticGet('id', $id); + $notice = Notice::getKV('id', $id); - if (empty($notice)) { + if (!$notice instanceof Notice) { // Did we used to have it, and it got deleted? - $deleted = Deleted_notice::staticGet($id); - if (!empty($deleted)) { + $deleted = Deleted_notice::getKV($id); + if ($deleted instanceof Deleted_notice) { // TRANS: Client error displayed trying to show a deleted notice. $this->clientError(_('Notice deleted.'), 410); } else { @@ -207,41 +210,27 @@ class ShownoticeAction extends OwnerDesignAction * * @return void */ - function handle($args) + protected function handle() { - parent::handle($args); + parent::handle(); if ($this->boolean('ajax')) { $this->showAjax(); } else { - if ($this->notice->is_local == Notice::REMOTE_OMB) { - if (!empty($this->notice->url)) { - $target = $this->notice->url; - } else if (!empty($this->notice->uri) && preg_match('/^https?:/', $this->notice->uri)) { - // Old OMB posts saved the remote URL only into the URI field. - $target = $this->notice->uri; - } else { - // Shouldn't happen. - $target = false; - } - if ($target && $target != $this->selfUrl()) { - common_redirect($target, 301); - return false; + if ($this->notice->is_local == Notice::REMOTE) { + try { + $target = $this->notice->getUrl() + if ($target != $this->selfUrl()) { + common_redirect($target, 301); + } + } catch (InvalidUrlException $e) { + common_debug('ShownoticeAction could not redirect to remote notice with id='.$this->notice->id . '. Falling back to showPage().'); } } $this->showPage(); } } - /** - * Don't show local navigation - * - * @return void - */ - function showLocalNavBlock() - { - } - /** * Fill the content area of the page * @@ -259,9 +248,7 @@ class ShownoticeAction extends OwnerDesignAction function showAjax() { - header('Content-Type: text/xml;charset=utf-8'); - $this->xw->startDocument('1.0', 'UTF-8'); - $this->elementStart('html'); + $this->startHTML('text/xml;charset=utf-8'); $this->elementStart('head'); // TRANS: Title for page that shows a notice. $this->element('title', null, _m('TITLE','Notice')); @@ -270,7 +257,7 @@ class ShownoticeAction extends OwnerDesignAction $nli = new NoticeListItem($this->notice, $this); $nli->show(); $this->elementEnd('body'); - $this->elementEnd('html'); + $this->endHTML(); } /** @@ -299,7 +286,7 @@ class ShownoticeAction extends OwnerDesignAction */ function extraHead() { - $user = User::staticGet($this->profile->id); + $user = User::getKV($this->profile->id); if (!$user) { return; @@ -328,10 +315,7 @@ class ShownoticeAction extends OwnerDesignAction 'title'=>'oEmbed'),null); // Extras to aid in sharing notices to Facebook - $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE); - $avatarUrl = ($avatar) ? - $avatar->displayUrl() : - Avatar::defaultImage(AVATAR_PROFILE_SIZE); + $avatarUrl = $this->profile->avatarUrl(AVATAR_PROFILE_SIZE); $this->element('meta', array('property' => 'og:image', 'content' => $avatarUrl)); $this->element('meta', array('property' => 'og:description', @@ -342,58 +326,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; } }