FIX:緊急時スキンインポート専用画面の修正

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

diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php
index 9149b36..011785b 100644 (file)
--- a/nucleus/libs/ADMIN.php
+++ b/nucleus/libs/ADMIN.php
@@ -31,10 +31,10 @@ class Admin
 \r
        static private $action;\r
        static private $skin;\r
-       static private $extrahead;\r
        static private $passvar;\r
        static private $aOptions;\r
        \r
+       static public $extrahead;\r
        static public $blog;\r
        static public $contents;\r
        \r
@@ -106,7 +106,8 @@ class Admin
                'createaccount',\r
                'deleteblog',\r
                'editmembersettings',\r
-               'browseownitems',\r
+               'createaccount',\r
+               'forgotpassword',\r
                'browseowncomments',\r
                'createitem',\r
                'itemedit',\r
@@ -973,7 +974,7 @@ class Admin
                else\r
                {\r
                        // TODO: set start item correctly for itemlist\r
-                       $item = Item::getItem($itemid, 0, 0);\r
+                       $item =& $manager->getitem($itemid, 0, 0);\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
@@ -1490,7 +1491,7 @@ class Admin
                $notes          = strip_tags(postVar('notes'));\r
                $locale         = postVar('locale');\r
                \r
-               $mem = Member::createFromID($memberid);\r
+               $mem =& $manager->getMember($memberid);\r
                \r
                if ( $CONF['AllowLoginEdit'] || $member->isAdmin() )\r
                {\r
@@ -1681,6 +1682,18 @@ class Admin
        }\r
        \r
        /**\r
+        * Admin::action_forgotpassword()\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       static private function action_forgotpassword()\r
+       {\r
+               self::$skin->parse('forgotpassword');\r
+               return;\r
+       }\r
+       \r
+       /**\r
         * Admin::action_activate()\r
         * Account activation\r
         * \r
@@ -1715,7 +1728,7 @@ class Admin
                        self::error(_ERROR_ACTIVATE);\r
                }\r
                \r
-               $mem = Member::createFromId($info->vmember);\r
+               $mem =& $manager->getMember($info->vmember);\r
                \r
                if ( !$mem )\r
                {\r
@@ -1754,7 +1767,7 @@ class Admin
                        return self::showActivationPage($key, _ERROR_ACTIVATE);\r
                }\r
                \r
-               $mem = Member::createFromId($info->vmember);\r
+               $mem =& $manager->getMember($info->vmember);\r
                \r
                if ( !$mem )\r
                {\r
@@ -1879,7 +1892,7 @@ class Admin
                // check if allowed\r
                $member->blogAdminRights($blogid) or self::disallow();\r
                \r
-               $teammem =  Member::createFromID($memberid);\r
+               $teammem =& $manager->getMember($memberid);\r
                $blog =& $manager->getBlog($blogid);\r
                \r
                self::$skin->parse('teamdelete');\r
@@ -1929,7 +1942,7 @@ class Admin
                \r
                // check if: - there remains at least one blog admin\r
                //           - (there remains at least one team member)\r
-               $tmem = Member::createFromID($memberid);\r
+               $tmem =& $manager->getMember($memberid);\r
                \r
                \r
                $data = array(\r
@@ -1972,7 +1985,7 @@ class Admin
         */\r
        static private function action_teamchangeadmin()\r
        {\r
-               global $member;\r
+               global $manager, $member;\r
                \r
                $blogid         = intRequestVar('blogid');\r
                $memberid       = intRequestVar('memberid');\r
@@ -1980,7 +1993,7 @@ class Admin
                // check if allowed\r
                $member->blogAdminRights($blogid) or self::disallow();\r
                \r
-               $mem = Member::createFromID($memberid);\r
+               $mem =& $manager->getMember($memberid);\r
                \r
                // don't allow when there is only one admin at this moment\r
                if ( $mem->isBlogAdmin($blogid) )\r
@@ -2589,7 +2602,7 @@ class Admin
                \r
                ($member->getID() == $memberid) or $member->isAdmin() or self::disallow();\r
                \r
-               $mem = Member::createFromID($memberid);\r
+               $mem =& $manager->getMember($memberid);\r
                \r
                self::$skin->parse('memberdelete');\r
                return;\r
@@ -2639,7 +2652,7 @@ class Admin
                global $manager;\r
                \r
                $memberid = intval($memberid);\r
-               $mem = Member::createFromID($memberid);\r
+               $mem =& $manager->getMember($memberid);\r
                \r
                if ( !$mem->canBeDeleted() )\r
                {\r
@@ -3489,7 +3502,7 @@ class Admin
                self::addToAdminTemplate($templateid, 'PLUGIN_QUICKMENU_FOOT',                                  postVar('PLUGIN_QUICKMENU_FOOT'));\r
                \r
                $data = array('fields' => array());\r
-               $manager->notify('TemplateExtraFields', $data);\r
+               $manager->notify('AdminTemplateExtraFields', $data);\r
                foreach ( $data['fields'] as $pfkey => $pfvalue )\r
                {\r
                        foreach ( $pfvalue as $pffield => $pfdesc )\r
@@ -4255,7 +4268,7 @@ class Admin
                {\r
                        if ( $skinid == $adminskin )\r
                        {\r
-                               $mem = MEMBER::createFromID($memID);\r
+                               $mem =& $manager->getMember($memID);\r
                                self::error(_ERROR_SKINDEFDELETE . $mem->displayname);\r
                        }\r
                }\r
@@ -4491,8 +4504,15 @@ class Admin
                $_REQUEST['skinclashes']        = $skinNameClashes;\r
                $_REQUEST['tpltclashes']        = $templateNameClashes;\r
                $_REQUEST['nameclashes']        = $hasNameClashes ? 1 : 0;\r
-               \r
-               self::$skin->parse('adminskinieimport');\r
+\r
+               if ( !is_object(self::$skin) )\r
+               {\r
+                       self::action_adminskiniedoimport();\r
+               }\r
+               else\r
+               {\r
+                       self::$skin->parse('adminskinieimport');\r
+               }\r
                return;\r
        }\r
        \r
@@ -4549,7 +4569,22 @@ class Admin
                $_REQUEST['skinnames']  = $importer->getSkinNames();\r
                $_REQUEST['tpltnames']  = $importer->getTemplateNames();\r
                \r
-               self::$skin->parse('adminskiniedoimport');\r
+               if ( !is_object(self::$skin) )\r
+               {\r
+                       global $DIR_SKINS;\r
+                       $query  = "SELECT min(sdnumber) FROM %s WHERE sdname != 'bookmarklet' AND sdincmode = 'admin'";\r
+                       $query  = sprintf($query, sql_table('skin_desc'));\r
+                       $res    = intval(DB::getValue($query));\r
+                       $query  = "UPDATE %s SET value = %d WHERE name = 'AdminSkin'";\r
+                       $query  = sprintf($query, sql_table('config'), $res);\r
+                       DB::execute($query);\r
+                       $skin   = new Skin(0, 'AdminActions', 'AdminSkin');\r
+                       $skin->parse('importAdmin', $DIR_SKINS . 'admin/defaultimporter.skn');\r
+               }\r
+               else\r
+               {\r
+                       self::$skin->parse('adminskiniedoimport');\r
+               }\r
                return;\r
        }\r
 \r
@@ -4734,31 +4769,19 @@ class Admin
                self::error(_ERROR_DISALLOWED);\r
                return;\r
        }\r
-       \r
+\r
        /**\r
-        * Admin::PluninAdminPagehead()\r
-        * Output pluginadmin page head\r
+        * Admin::action_PluginAdmin()\r
+        * Output pluginadmin\r
         *\r
+        * @param       string  $skinContents\r
         * @param       string  $extrahead\r
         * @return      void\r
         */\r
-       static public function PluninAdminPagehead($extrahead = '')\r
+       static public function action_PluginAdmin($skinContents, $extrahead = '')\r
        {\r
                self::$extrahead .= $extrahead;\r
-               self::$skin->parse('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::$skin->parse('pagefoot');\r
+               self::$skin->parse('pluginadmin', $skinContents);\r
                return;\r
        }\r
        \r