Adminクラスをstaticに変更したことに伴うPLUNINADMIN.phpの修正

・PLUNINADMINクラス内でのAdminクラスを初期化処理の追加。
・Admin::PluginAdminPagehead及びAdmin::PluginAdminPagefootメソッドのpubricでの追加

diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php
index 6915dcd..26f0fe2 100644 (file)
--- a/nucleus/libs/ADMIN.php
+++ b/nucleus/libs/ADMIN.php
@@ -483,6 +483,18 @@ class Admin
        }\r
        \r
        /**\r
+        * Admin::setAdminAction()\r
+        *\r
+        * @param       string  $action\r
+        * @return      void\r
+        */\r
+       static public function setAdminAction($action)\r
+       {\r
+               self::$action = $action;\r
+               return;\r
+       }\r
+       \r
+       /**\r
         * Admin::action_batchmember()\r
         * \r
         * @param       void\r
@@ -4723,10 +4735,36 @@ class Admin
        }\r
        \r
        /**\r
+        * Admin::PluninAdminPagehead()\r
+        * Output pluginadmin page head\r
+        *\r
+        * @param       string  $extrahead\r
+        * @return      void\r
+        */\r
+       static public function PluninAdminPagehead($extrahead = '')\r
+       {\r
+               self::pagehead();\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Admin::PluninAdminPagefoot()\r
+        * Output pluginadmin page foot\r
+        *\r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       static public function PluninAdminPagefoot()\r
+       {\r
+               self::pagefoot();\r
+               return;\r
+       }\r
+       \r
+       /**\r
         * Admin::pagehead()\r
         * Output admin page head\r
         * \r
-        * @param       void\r
+        * @param       string  PluninAdminPagehead\r
         * @return      void\r
         */\r
        static private function pagehead($extrahead = '')\r

diff --git a/nucleus/libs/PLUGINADMIN.php b/nucleus/libs/PLUGINADMIN.php
index 1ce74b8..ba547b5 100644 (file)
--- a/nucleus/libs/PLUGINADMIN.php
+++ b/nucleus/libs/PLUGINADMIN.php
@@ -50,8 +50,10 @@ class PluginAdmin
                        doError(_ERROR_INVALID_PLUGIN);\r
                }\r
                \r
-               $this->admin = new Admin();\r
-               $this->admin->action = "plugin_{$pluginName}";\r
+               /*$this->admin = new Admin();\r
+               $this->admin->action = "plugin_{$pluginName}";*/\r
+               Admin::initialize();\r
+               Admin::setAdminAction("plugin_{$pluginName}");\r
                return;\r
        }\r
        \r
@@ -67,7 +69,8 @@ class PluginAdmin
                $strBaseHref  = '<base href="' . Entity::hsc($CONF['AdminURL']) . '" />';\r
                $extraHead .= $strBaseHref;\r
                \r
-               $this->admin->pagehead($extraHead);\r
+               //$this->admin->pagehead($extraHead);\r
+               Admin::PluninAdminPagehead($extraHead);\r
                return;\r
        }\r
        \r
@@ -80,7 +83,8 @@ class PluginAdmin
        public function end()\r
        {\r
                $this->_AddTicketByJS();\r
-               $this->admin->pagefoot();\r
+               //$this->admin->pagefoot();\r
+               Admin::PluninAdminPagefoot();\r
                return;\r
        }\r
        \r