OSDN Git Service

CHANGE: getBlogIDFromItemID()を使わずにManager::getItem()を使うよう変更
[nucleus-jp/nucleus-next.git] / nucleus / libs / ADMIN.php
index 6dbf3b3..1800e68 100644 (file)
@@ -666,14 +666,12 @@ class Admin
                        $itemid = intRequestVar('itemid');\r
                }\r
                \r
-               /* TODO: we consider to use the other way insterad of this */\r
-               $_REQUEST['itemid'] = $itemid;\r
-               $_REQUEST['blogid'] = getBlogIdFromItemId($itemid);\r
-               \r
                // only allow if user is allowed to alter item\r
                $member->canAlterItem($itemid) or self::disallow();\r
                \r
-               $blogid = getBlogIdFromItemId($itemid);\r
+               $item =& $manager->getItem($itemid, 1, 1);\r
+               $_REQUEST['itemid'] = $item['itemid'];\r
+               $_REQUEST['blogid'] = $item['blogid'];\r
                \r
                self::$skin->parse('itemcommentlist');\r
                return;\r
@@ -845,26 +843,24 @@ class Admin
                // only allow if user is allowed to alter item\r
                $member->canAlterItem($itemid) or self::disallow();\r
                \r
-               $blogid = getBlogIDFromItemID($itemid);\r
-               $blog =& $manager->getBlog($blogid);\r
-               \r
-               $contents =& $manager->getItem($itemid, 1, 1);\r
-               $manager->notify('PrepareItemForEdit', array('blog'=> &$blog, 'item' => &$contents));\r
+               $item =& $manager->getItem($itemid, 1, 1);\r
+               $blog =& $manager->getBlog($item['blogid']);\r
+               $manager->notify('PrepareItemForEdit', array('blog'=> &$blog, 'item' => &$item));\r
                \r
                if ( $blog->convertBreaks() )\r
                {\r
-                       if ( array_key_exists('body', $contents) && !empty($contents['body']) )\r
+                       if ( array_key_exists('body', $item) && !empty($item['body']) )\r
                        {\r
-                               $contents['body'] = removeBreaks($contents['body']);\r
+                               $item['body'] = removeBreaks($item['body']);\r
                        }\r
-                       if ( array_key_exists('more', $contents) && !empty($contents['more']) )\r
+                       if ( array_key_exists('more', $item) && !empty($item['more']) )\r
                        {\r
-                               $contents['more'] = removeBreaks($contents['more']);\r
+                               $item['more'] = removeBreaks($item['more']);\r
                        }\r
                }\r
                \r
                self::$blog = &$blog;\r
-               self::$contents = &$contents;\r
+               self::$contents = &$item;\r
                \r
                self::$skin->parse('itemedit');\r
                return;\r
@@ -924,20 +920,20 @@ class Admin
                        }\r
                }\r
                \r
-               /*\r
-                       set some variables based on actiontype\r
-\r
-                       actiontypes:\r
-                               draft items -> addnow, addfuture, adddraft, delete\r
-                               non-draft items -> edit, changedate, delete\r
-\r
-                       variables set:\r
-                               $timestamp: set to a nonzero value for future dates or date changes\r
-                               $wasdraft: set to 1 when the item used to be a draft item\r
-                               $publish: set to 1 when the edited item is not a draft\r
-        */\r
+               /**\r
+                * set some variables based on actiontype\r
+                * \r
+                * actiontypes:\r
+                *      draft items -> addnow, addfuture, adddraft, delete\r
+                *      non-draft items -> edit, changedate, delete\r
+                * \r
+                * variables set:\r
+                *      $timestamp: set to a nonzero value for future dates or date changes\r
+                *      $wasdraft: set to 1 when the item used to be a draft item\r
+                *      $publish: set to 1 when the edited item is not a draft\r
+                */\r
                $blogid =  getBlogIDFromItemID($itemid);\r
-               $blog   =& $manager->getBlog($blogid);\r
+               $blog =& $manager->getBlog($blogid);\r
                \r
                $wasdrafts = array('adddraft', 'addfuture', 'addnow');\r
                $wasdraft  = in_array($actiontype, $wasdrafts) ? 1 : 0;\r
@@ -973,7 +969,7 @@ class Admin
                else\r
                {\r
                        // TODO: set start item correctly for itemlist\r
-                       $item =& $manager->getitem($itemid, 0, 0);\r
+                       $item =& $manager->getitem($itemid, 1, 1);\r
                        $query = "SELECT COUNT(*) FROM %s WHERE unix_timestamp(itime) <= '%s';";\r
                        $query = sprintf($query, sql_table('item'), $item['timestamp']);\r
                        $cnt  = DB::getValue($query);\r
@@ -1016,20 +1012,20 @@ class Admin
         */\r
        static private function action_itemdeleteconfirm()\r
        {\r
-               global $member;\r
+               global $member, $manager;\r
                \r
                $itemid = intRequestVar('itemid');\r
                \r
                // only allow if user is allowed to alter item\r
                $member->canAlterItem($itemid) or self::disallow();\r
                \r
-               // get blogid first\r
-               $blogid = getBlogIdFromItemId($itemid);\r
+               // get item first\r
+               $item =& $manager->getItem($itemid, 1, 1);\r
                \r
                // delete item (note: some checks will be performed twice)\r
-               self::deleteOneItem($itemid);\r
+               self::deleteOneItem($item['itemid']);\r
                \r
-               self::action_itemlist($blogid);\r
+               self::action_itemlist($item['blogid']);\r
                return;\r
        }\r
        \r
@@ -1051,13 +1047,13 @@ class Admin
                }\r
                \r
                // need to get blogid before the item is deleted\r
-               $blogid = getBlogIDFromItemId($itemid);\r
+               $item =& $manager->getItem($itemid, 1, 1);\r
                \r
                $manager->loadClass('ITEM');\r
-               Item::delete($itemid);\r
+               Item::delete($item['itemid']);\r
                \r
                // update blog's futureposted\r
-               self::updateFuturePosted($blogid);\r
+               self::updateFuturePosted($item['itemid']);\r
                return;\r
        }\r
        \r
@@ -1206,19 +1202,17 @@ class Admin
                        self::error($result['message']);\r
                }\r
                \r
-               $itemid = (integer) $result['itemid'];\r
-               \r
-               $blogid         =  (integer) getBlogIDFromItemID($itemid);\r
+               $item =& $manager->getItem($result['itemid'], 0, 0);\r
                \r
                if ( $result['status'] == 'newcategory' )\r
                {\r
-                       $distURI = $manager->addTicketToUrl($CONF['AdminURL'] . 'index.php?action=itemList&blogid=' . $blogid);\r
-                       self::action_categoryedit($result['catid'], $blogid, $distURI);\r
+                       $distURI = $manager->addTicketToUrl($CONF['AdminURL'] . 'index.php?action=itemList&blogid=' . $item['blogid']);\r
+                       self::action_categoryedit($result['catid'], $item['blogid'], $distURI);\r
                }\r
                else\r
                {\r
                        $methodName = 'action_itemlist';\r
-                       self::action_itemlist($blogid);\r
+                       self::action_itemlist($item['blogid']);\r
                }\r
                return;\r
        }\r
@@ -4896,7 +4890,11 @@ class Admin
         */\r
        static private function action_banlistnewfromitem()\r
        {\r
-               self::action_banlistnew(getBlogIDFromItemID(intRequestVar('itemid')));\r
+               global $manager;\r
+               \r
+               $itemid = intRequestVar('itemid');\r
+               $item =& $manager->getItem($itemid, 1, 1);\r
+               self::action_banlistnew($item['blogid']);\r
                return;\r
        }\r
        \r