FIX: Adminクラスにおいて自身のメンバーへのアクセスにselfを使っていないものを修正

diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php
index 09ea2d6..ac0168e 100644 (file)
--- a/nucleus/libs/ADMIN.php
+++ b/nucleus/libs/ADMIN.php
@@ -1245,7 +1245,7 @@ class Admin
                $comment = COMMENT::getComment($commentid);\r
                $manager->notify('PrepareCommentForEdit', array('comment' => &$comment));\r
                \r
-               Admin::$contents = $comment;\r
+               self::$contents = $comment;\r
                self::$skin->parse('commentedit');\r
                return;\r
        }\r
@@ -1461,7 +1461,7 @@ class Admin
                // check if allowed\r
                ($member->getID() == $memberid) or $member->isAdmin() or self::disallow();\r
                \r
-               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
+               self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
                \r
                self::$skin->parse('editmembersettings');\r
                return;\r
@@ -2079,7 +2079,7 @@ class Admin
                \r
                $blog =& $manager->getBlog($blogid);\r
                \r
-               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
+               self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
                \r
                self::$skin->parse('blogsettings');\r
                return;\r
@@ -2157,7 +2157,7 @@ class Admin
                $_REQUEST['desturl']    = $desturl;\r
                $member->blogAdminRights($blogid) or self::disallow();\r
                \r
-               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
+               self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
                \r
                self::$skin->parse('categoryedit');\r
                return;\r
@@ -3008,8 +3008,8 @@ class Admin
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(javascript/templateEdit.js)%>\"></script>\n";\r
-               Admin::$extrahead .= "<script type=\"text/javascript\">setTemplateEditText('" . Entity::hsc(_EDITTEMPLATE_EMPTY) . "');</script>\n";\r
+               self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(javascript/templateEdit.js)%>\"></script>\n";\r
+               self::$extrahead .= "<script type=\"text/javascript\">setTemplateEditText('" . Entity::hsc(_EDITTEMPLATE_EMPTY) . "');</script>\n";\r
                \r
                self::$skin->parse('templateedit');\r
                return;\r
@@ -3293,8 +3293,8 @@ class Admin
                }\r
                $member->isAdmin() or self::disallow();\r
                \r
-               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(javascript/templateEdit.js)%>\"></script>\n";\r
-               Admin::$extrahead .= '<script type="text/javascript">setTemplateEditText("' . Entity::hsc(_EDITTEMPLATE_EMPTY) . '");</script>' . "\n";\r
+               self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(javascript/templateEdit.js)%>\"></script>\n";\r
+               self::$extrahead .= '<script type="text/javascript">setTemplateEditText("' . Entity::hsc(_EDITTEMPLATE_EMPTY) . '");</script>' . "\n";\r
                \r
                self::$skin->parse('admintemplateedit');\r
                return;\r
@@ -4992,10 +4992,11 @@ class Admin
        }\r
        \r
        /**\r
-        * Admin::\r
+        * Admin::deleteOnePlugin()\r
         * \r
-        * @param       void\r
-        * @return      void\r
+        * @param       integer $pid\r
+        * @param       boolean $callUninstall\r
+        * @return      string  empty or message if failed\r
         */\r
        static public function deleteOnePlugin($pid, $callUninstall = 0)\r
        {\r
@@ -5182,7 +5183,7 @@ class Admin
                }\r
                $plugname       = $manager->getPluginNameFromPid($pid);\r
                $plugin         = $manager->getPlugin($plugname);\r
-               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
+               self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
                \r
                self::$skin->parse('pluginoptions');\r
                return;\r
@@ -5438,20 +5439,20 @@ class Admin
                        return $error;\r
                }\r
                \r
-               Admin::$contents['mode']                = $mode;\r
-               Admin::$contents['skinfile']    = $skinFileRaw;\r
-               Admin::$contents['skininfo']    = $importer->getInfo();\r
-               Admin::$contents['skinnames']   = $importer->getSkinNames();\r
-               Admin::$contents['tpltnames']   = $importer->getTemplateNames();\r
+               self::$contents['mode']         = $mode;\r
+               self::$contents['skinfile']     = $skinFileRaw;\r
+               self::$contents['skininfo']     = $importer->getInfo();\r
+               self::$contents['skinnames']    = $importer->getSkinNames();\r
+               self::$contents['tpltnames']    = $importer->getTemplateNames();\r
                \r
                // clashes\r
                $skinNameClashes                = $importer->checkSkinNameClashes();\r
                $templateNameClashes    = $importer->checkTemplateNameClashes();\r
                $hasNameClashes                 = (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0);\r
                \r
-               Admin::$contents['skinclashes'] = $skinNameClashes;\r
-               Admin::$contents['tpltclashes'] = $templateNameClashes;\r
-               Admin::$contents['nameclashes'] = $hasNameClashes ? 1 : 0;\r
+               self::$contents['skinclashes'] = $skinNameClashes;\r
+               self::$contents['tpltclashes'] = $templateNameClashes;\r
+               self::$contents['nameclashes'] = $hasNameClashes ? 1 : 0;\r
                \r
                unset($importer);\r
                return '';\r
@@ -5498,11 +5499,11 @@ class Admin
                        return $error;\r
                }\r
                \r
-               Admin::$contents['mode']                = $mode;\r
-               Admin::$contents['skinfile']    = $skinFileRaw;\r
-               Admin::$contents['skininfo']    = $importer->getInfo();\r
-               Admin::$contents['skinnames']   = $importer->getSkinNames();\r
-               Admin::$contents['tpltnames']   = $importer->getTemplateNames();\r
+               self::$contents['mode']         = $mode;\r
+               self::$contents['skinfile']     = $skinFileRaw;\r
+               self::$contents['skininfo']     = $importer->getInfo();\r
+               self::$contents['skinnames']    = $importer->getSkinNames();\r
+               self::$contents['tpltnames']    = $importer->getTemplateNames();\r
                \r
                unset($importer);\r
                return '';\r