More info for a proper, fancy-url lighttpd setup

[quix0rs-gnu-social.git] / plugins / Bookmark / showbookmark.php

diff --git a/plugins/Bookmark/showbookmark.php b/plugins/Bookmark/showbookmark.php
index 9eb5778b2cdb453b50d97bc95c91e9bad838893e..1c562d52a8503e28e3f00aee9aec05ea4e455375 100644 (file)
--- a/plugins/Bookmark/showbookmark.php
+++ b/plugins/Bookmark/showbookmark.php
@@ -48,62 +48,26 @@ class ShowbookmarkAction extends ShownoticeAction
 {
     protected $bookmark = null;
 
-    /**
-     * For initializing members of the class.
-     *
-     * @param array $argarray misc. arguments
-     *
-     * @return boolean true
-     */
-    function prepare($argarray)
+    function getNotice()
     {
-        OwnerDesignAction::prepare($argarray);
-
         $this->id = $this->trimmed('id');
 
-        $this->bookmark = Bookmark::staticGet('id', $this->id);
+        $this->bookmark = Bookmark::getKV('id', $this->id);
 
         if (empty($this->bookmark)) {
             // TRANS: Client exception thrown when referring to a non-existing bookmark.
             throw new ClientException(_m('No such bookmark.'), 404);
         }
 
-        $this->notice = Notice::staticGet('uri', $this->bookmark->uri);
+        $notice = Notice::getKV('uri', $this->bookmark->uri);
 
-        if (empty($this->notice)) {
+        if (empty($notice)) {
             // Did we used to have it, and it got deleted?
             // TRANS: Client exception thrown when referring to a non-existing bookmark.
             throw new ClientException(_m('No such bookmark.'), 404);
         }
 
-        if (!empty($cur)) {
-            $curProfile = $cur->getProfile();
-        } else {
-            $curProfile = null;
-        }
-
-        if (!$this->notice->inScope($curProfile)) {
-            // TRANS: Client exception thrown when referring to a bookmark the user has no access to.
-            throw new ClientException(_m('Not available.'), 403);
-        }
-
-        $this->user = User::staticGet('id', $this->bookmark->profile_id);
-
-        if (empty($this->user)) {
-            // TRANS: Client exception thrown when referring to a bookmark for a non-existing user.
-            throw new ClientException(_m('No such user.'), 404);
-        }
-
-        $this->profile = $this->user->getProfile();
-
-        if (empty($this->profile)) {
-            // TRANS: Client exception thrown when referring to a bookmark for a non-existing profile.
-            throw new ServerException(_m('User without a profile.'));
-        }
-
-        $this->avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
-
-        return true;
+        return $notice;
     }
 
     /**
@@ -117,7 +81,7 @@ class ShowbookmarkAction extends ShownoticeAction
     {
         // TRANS: Title for bookmark.
         // TRANS: %1$s is a user nickname, %2$s is a bookmark title.
-        return sprintf(_('%1s$\'s bookmark for "%2$s"'),
+        return sprintf(_m('%1$s\'s bookmark for "%2$s"'),
                        $this->user->nickname,
                        $this->bookmark->title);
     }