diff options
| -rw-r--r-- | actions/all.php | 30 | ||||
| -rw-r--r-- | actions/public.php | 2 | ||||
| -rw-r--r-- | actions/replies.php | 13 | ||||
| -rw-r--r-- | actions/showfavorites.php | 44 | ||||
| -rw-r--r-- | actions/tag.php | 13 |
5 files changed, 37 insertions, 65 deletions
diff --git a/actions/all.php b/actions/all.php index 38aee65b6..5db09a0e6 100644 --- a/actions/all.php +++ b/actions/all.php @@ -25,31 +25,11 @@ require_once INSTALLDIR.'/lib/feedlist.php'; class AllAction extends ProfileAction { - var $notice; - function isReadOnly($args) { return true; } - function prepare($args) - { - parent::prepare($args); - $cur = common_current_user(); - - if (!empty($cur) && $cur->id == $this->user->id) { - $this->notice = $this->user->noticeInbox(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); - } else { - $this->notice = $this->user->noticesWithFriends(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); - } - - if($this->page > 1 && $this->notice->N == 0){ - $this->serverError(_('No such page'),$code=404); - } - - return true; - } - function handle($args) { parent::handle($args); @@ -120,7 +100,15 @@ class AllAction extends ProfileAction function showContent() { - $nl = new NoticeList($this->notice, $this); + $cur = common_current_user(); + + if (!empty($cur) && $cur->id == $this->user->id) { + $notice = $this->user->noticeInbox(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); + } else { + $notice = $this->user->noticesWithFriends(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); + } + + $nl = new NoticeList($notice, $this); $cnt = $nl->show(); diff --git a/actions/public.php b/actions/public.php index 2cf2e96e6..ca352faf8 100644 --- a/actions/public.php +++ b/actions/public.php @@ -93,7 +93,7 @@ class PublicAction extends Action return; } - if($this->page > 1 && $this->notice->N == 0){ + if($this->page > 0 && $this->notice->N == 0){ $this->serverError(_('No such page'),$code=404); } diff --git a/actions/replies.php b/actions/replies.php index fcfc3a272..f14383d33 100644 --- a/actions/replies.php +++ b/actions/replies.php @@ -48,7 +48,6 @@ require_once INSTALLDIR.'/lib/feedlist.php'; class RepliesAction extends OwnerDesignAction { var $page = null; - var $notice; /** * Prepare the object @@ -85,13 +84,6 @@ class RepliesAction extends OwnerDesignAction common_set_returnto($this->selfUrl()); - $this->notice = $this->user->getReplies(($this->page-1) * NOTICES_PER_PAGE, - NOTICES_PER_PAGE + 1); - - if($this->page > 1 && $this->notice->N == 0){ - $this->serverError(_('No such page'),$code=404); - } - return true; } @@ -167,7 +159,10 @@ class RepliesAction extends OwnerDesignAction function showContent() { - $nl = new NoticeList($this->notice, $this); + $notice = $this->user->getReplies(($this->page-1) * NOTICES_PER_PAGE, + NOTICES_PER_PAGE + 1); + + $nl = new NoticeList($notice, $this); $cnt = $nl->show(); if (0 === $cnt) { diff --git a/actions/showfavorites.php b/actions/showfavorites.php index 91287cc96..9f549baf2 100644 --- a/actions/showfavorites.php +++ b/actions/showfavorites.php @@ -114,29 +114,6 @@ class ShowfavoritesAction extends OwnerDesignAction common_set_returnto($this->selfUrl()); - $cur = common_current_user(); - - if (!empty($cur) && $cur->id == $this->user->id) { - - // Show imported/gateway notices as well as local if - // the user is looking at his own favorites - - $this->notice = $this->user->favoriteNotices(($this->page-1)*NOTICES_PER_PAGE, - NOTICES_PER_PAGE + 1, true); - } else { - $this->notice = $this->user->favoriteNotices(($this->page-1)*NOTICES_PER_PAGE, - NOTICES_PER_PAGE + 1, false); - } - - if (empty($this->notice)) { - $this->serverError(_('Could not retrieve favorite notices.')); - return; - } - - if($this->page > 1 && $this->notice->N == 0){ - $this->serverError(_('No such page'),$code=404); - } - return true; } @@ -216,7 +193,26 @@ class ShowfavoritesAction extends OwnerDesignAction function showContent() { - $nl = new NoticeList($this->notice, $this); + $cur = common_current_user(); + + if (!empty($cur) && $cur->id == $this->user->id) { + + // Show imported/gateway notices as well as local if + // the user is looking at his own favorites + + $notice = $this->user->favoriteNotices(($this->page-1)*NOTICES_PER_PAGE, + NOTICES_PER_PAGE + 1, true); + } else { + $notice = $this->user->favoriteNotices(($this->page-1)*NOTICES_PER_PAGE, + NOTICES_PER_PAGE + 1, false); + } + + if (empty($notice)) { + $this->serverError(_('Could not retrieve favorite notices.')); + return; + } + + $nl = new NoticeList($notice, $this); $cnt = $nl->show(); if (0 == $cnt) { diff --git a/actions/tag.php b/actions/tag.php index 771eb2861..020399d9e 100644 --- a/actions/tag.php +++ b/actions/tag.php @@ -21,9 +21,6 @@ if (!defined('LACONICA')) { exit(1); } class TagAction extends Action { - - var $notice; - function prepare($args) { parent::prepare($args); @@ -45,12 +42,6 @@ class TagAction extends Action common_set_returnto($this->selfUrl()); - $this->notice = Notice_tag::getStream($this->tag, (($this->page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1); - - if($this->page > 1 && $this->notice->N == 0){ - $this->serverError(_('No such page'),$code=404); - } - return true; } @@ -103,7 +94,9 @@ class TagAction extends Action function showContent() { - $nl = new NoticeList($this->notice, $this); + $notice = Notice_tag::getStream($this->tag, (($this->page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1); + + $nl = new NoticeList($notice, $this); $cnt = $nl->show(); |