CHANGE: getBlogIDFromItemID()を使わずにManager::getItem()を使うよう変更

[nucleus-jp/nucleus-next.git] / nucleus / libs / COMMENTACTIONS.php

diff --git a/nucleus/libs/COMMENTACTIONS.php b/nucleus/libs/COMMENTACTIONS.php
index 3a54cf6..5dbe28f 100644 (file)
--- a/nucleus/libs/COMMENTACTIONS.php
+++ b/nucleus/libs/COMMENTACTIONS.php
@@ -88,27 +88,14 @@ class CommentActions extends BaseActions
        }\r
        \r
        /**\r
-        * CommentActions::getDefinedActions()\r
+        * CommentActions::getAvailableActions()\r
         * \r
-        * @static
         * @param       void\r
         * @return array        actions array\r
         */\r
-       static public function getDefinedActions()
+       public function getAvailableActions()\r
        {\r
-               return array_merge(self::$defined_actions, parent::getDefinedActions());
-       }\r
-       \r
-       /**\r
-        * CommentActions::setParser()\r
-        * \r
-        * @param       object  $parser instance of Parser class\r
-        * @return      void\r
-        */\r
-       public function setParser(&$parser)\r
-       {\r
-               $this->parser =& $parser;\r
-               return;\r
+               return array_merge(self::$defined_actions, parent::getAvailableActions());\r
        }\r
        \r
        /**\r
@@ -245,8 +232,8 @@ class CommentActions extends BaseActions
        public function parse_blogurl()\r
        {\r
                global $manager;\r
-               $blogid = getBlogIDFromItemID($this->commentsObj->itemid);\r
-               $blog =& $manager->getBlog($blogid);\r
+               $item =& $manager->getItem($this->commentsObj->itemid, 1, 1);\r
+               $blog =& $manager->getBlog($item['blogid']);\r
                echo $blog->getURL();\r
                return;\r
        }\r
@@ -417,8 +404,8 @@ class CommentActions extends BaseActions
        {\r
                $data = array(\r
                        'itemid'        => $this->commentsObj->itemid,\r
-                       'timestamp'     => $this->commentsObj->itemActions->currentItem->timestamp,\r
-                       'title'         => $this->commentsObj->itemActions->currentItem->title,\r
+                       'timestamp'     => $this->commentsObj->itemActions->currentItem['timestamp'],\r
+                       'title'         => $this->commentsObj->itemActions->currentItem['title'],\r
                        'extra'         => $this->commentsObj->itemActions->linkparams\r
                );\r
                \r
@@ -487,7 +474,7 @@ class CommentActions extends BaseActions
         */\r
        public function parse_time($format = '')\r
        {\r
-               if ( $format === '' )\r
+               if ( $format !== '' )
                {\r
                        /* do nothing */\r
                        ;\r
@@ -654,7 +641,7 @@ class CommentActions extends BaseActions
         */\r
        public function parse_userlinkraw()\r
        {\r
-               echo $this->currentComment['userlinkraw'];\r
+               echo (array_key_exists('userlinkraw', $this->currentComment) && !empty($this->currentComment['userlinkraw'])) ? $this->currentComment['userlinkraw'] : '';\r
                return;\r
        }\r
        \r
@@ -695,7 +682,7 @@ class CommentActions extends BaseActions
        }\r
        \r
        /**\r
-        * ItemActions::checkCondition()\r
+        * CommentActions::checkCondition()\r
         * Checks conditions for if statements\r
         *\r
         * @param       string  $field  type of <%if%>\r
@@ -718,8 +705,9 @@ class CommentActions extends BaseActions
                                $condition = ($blog && ($blog->getSetting($name) == $value));\r
                                break;\r
                        case 'itemblogsetting':\r
-                               $b =& $manager->getBlog(getBlogIDFromItemID($this->currentComment['itemid']));\r
-                               $condition = ($b && ($b->getSetting($name) == $value));\r
+                               $item =& $manager->getItem($this->currentComment['itemid'], 1, 1);\r
+                               $blog =& $manager->getBlog($item['blogid']);\r
+                               $condition = ($blog && ($blog->getSetting($name) == $value));\r
                                break;\r
                        case 'loggedin':\r
                                $condition = $member->isLoggedIn();\r
@@ -794,13 +782,13 @@ class CommentActions extends BaseActions
                        return FALSE;\r
                }\r
                \r
-               $mem =& $manager->getMember($this->currentComment['memberid']);\r
-               $b =& $manager->getBlog(getBlogIDFromItemID($this->currentComment['itemid']));\r
-               $citem =& $manager->getItem($this->currentComment['itemid'], 1, 1);\r
+               $member =& $manager->getMember($this->currentComment['memberid']);\r
+               $item =& $manager->getItem($this->currentComment['itemid'], 1, 1);\r
                \r
                // when no parameter is defined, just check if item author is current visitor\r
-               if (($key != 'isadmin' && $key != 'name' && $key != 'isauthor' && $key != 'isonteam')) {\r
-                       return (intval($member->getID()) > 0 && intval($member->getID()) == intval($citem['authorid']));\r
+               if ( ($key != 'isadmin' && $key != 'name' && $key != 'isauthor' && $key != 'isonteam') )\r
+               {\r
+                       return (intval($memberber->getID()) > 0 && intval($memberber->getID()) == (integer) $item['authorid']);\r
                }\r
                \r
                // check comment author name\r
@@ -811,7 +799,7 @@ class CommentActions extends BaseActions
                        {\r
                                return FALSE;\r
                        }\r
-                       if ( $value == strtolower($mem->getDisplayName()) )\r
+                       if ( $value == strtolower($member->getDisplayName()) )\r
                        {\r
                                return TRUE;\r
                        }\r
@@ -820,24 +808,23 @@ class CommentActions extends BaseActions
                // check if comment author is admin\r
                if ( $key == 'isadmin' )\r
                {\r
-                       $blogid = intval($b->getID());\r
-                       if ( $mem->isAdmin() )\r
+                       if ( $member->isAdmin() )\r
                        {\r
                                return TRUE;\r
                        }\r
-                       return $mem->isBlogAdmin($blogid);\r
+                       return $member->isBlogAdmin($item['blogid']);\r
                }\r
                \r
                // check if comment author is item author\r
                if ( $key == 'isauthor' )\r
                {\r
-                       return (intval($citem['authorid']) == intval($this->currentComment['memberid']));\r
+                       return ((integer) $item['authorid'] == (integer) $this->currentComment['memberid']);\r
                }\r
                \r
                // check if comment author is on team\r
                if ( $key == 'isonteam' )\r
                {\r
-                       return $mem->teamRights(intval($b->getID()));\r
+                       return $member->teamRights((integer) $item['blogid']);\r
                }\r
                return FALSE;\r
        }\r
@@ -853,31 +840,30 @@ class CommentActions extends BaseActions
        private function ifItemCategory($key = '', $value = '')\r
        {\r
                global $catid, $manager;\r
-       \r
-               $b =& $manager->getBlog(getBlogIDFromItemID($this->currentComment['itemid']));\r
-               $citem =& $manager->getItem($this->currentComment['itemid'],1,1);\r
-               $icatid = $citem['catid'];\r
-       \r
+               \r
+               $item =& $manager->getItem($this->currentComment['itemid'],1,1);\r
+               $blog =& $manager->getBlog($item['blogid']);\r
+               \r
                // when no parameter is defined, just check if a category is selected\r
                if ( ($key != 'catname' && $key != 'catid') || ($value == '') )\r
                {\r
-                       return $b->isValidCategory($icatid);\r
+                       return $blog->isValidCategory($item['catid']);\r
                }\r
-       \r
+               \r
                // check category name\r
                if ( $key == 'catname' )\r
                {\r
-                       $value = $b->getCategoryIdFromName($value);\r
-                       if ( $value == $icatid )\r
+                       $value = $blog->getCategoryIdFromName($value);\r
+                       if ( $value == $item['catid'] )\r
                        {\r
-                               return $b->isValidCategory($icatid);\r
+                               return $blog->isValidCategory($item['catid']);\r
                        }\r
                }\r
-       \r
+               \r
                // check category id\r
-               if ( ($key == 'catid') && ($value == $icatid) )\r
+               if ( ($key == 'catid') && ($value == $item['catid']) )\r
                {\r
-                       return $b->isValidCategory($icatid);\r
+                       return $blog->isValidCategory($item['catid']);\r
                }\r
                return FALSE;\r
        }\r
@@ -891,12 +877,13 @@ class CommentActions extends BaseActions
         */\r
        private function ifOnTeam($blogName = '')\r
        {\r
-               global $blog, $member, $manager;\r
+               global $member, $manager;\r
                \r
-               $b =& $manager->getBlog(getBlogIDFromItemID($this->currentComment['itemid']));\r
+               $item =& $manager->getItem($this->currentComment['itemid'], 1, 1);\r
+               $blog =& $manager->getBlog($item['blogid']);\r
                \r
                // when no blog found\r
-               if ( ($blogName == '') && (!is_object($b)) )\r
+               if ( ($blogName == '') && !is_object($blog) )\r
                {\r
                        return 0;\r
                }\r
@@ -910,7 +897,7 @@ class CommentActions extends BaseActions
                // use current blog\r
                if ( ($blogName == '') || !$manager->existsBlogID($blogid) )\r
                {\r
-                       $blogid = $b->getID();\r
+                       $blogid = $blog->getID();\r
                }\r
                \r
                return $member->teamRights($blogid);\r
@@ -925,12 +912,13 @@ class CommentActions extends BaseActions
         */\r
        private function ifAdmin($blogName = '')\r
        {\r
-               global $blog, $member, $manager;\r
+               global $member, $manager;\r
                \r
-               $b =& $manager->getBlog(getBlogIDFromItemID($this->currentComment['itemid']));\r
+               $item =& $manager->getItem($this->currentComment['itemid'], 1, 1);\r
+               $blog =& $manager->getBlog($item['blogid']);\r
                \r
                // when no blog found\r
-               if ( ($blogName == '') && (!is_object($b)) )\r
+               if ( ($blogName == '') && !is_object($blog) )\r
                {\r
                        return 0;\r
                }\r
@@ -944,7 +932,7 @@ class CommentActions extends BaseActions
                // use current blog\r
                if ( ($blogName == '') || !$manager->existsBlogID($blogid) )\r
                {\r
-                       $blogid = $b->getID();\r
+                       $blogid = $blog->getID();\r
                }\r
                \r
                return $member->isBlogAdmin($blogid);\r