Merge branch 'skinnable-master' of ssh://shizuki@git.sourceforge.jp/gitroot/nucleus...

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

diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php
index 5aaf0e9..e249ebf 100644 (file)
--- a/nucleus/libs/ADMIN.php
+++ b/nucleus/libs/ADMIN.php
@@ -145,7 +145,7 @@ class Admin
        \r
        static public function initialize()\r
        {\r
-               global $CONF;\r
+               global $CONF, $DIR_LIBS;\r
                \r
                /* NOTE: 1. decide which skinid to use */\r
                $skinid = $CONF['DefaultAdminSkin'];\r
@@ -168,7 +168,7 @@ class Admin
                }\r
                \r
                /* NOTE: 3. initializing each members */\r
-               self::$skin                     = new Skin($skinid, 'Skin', 'AdminSkin');\r
+               self::$skin                     = new Skin($skinid, 'AdminActions', 'AdminSkin');\r
                self::$action           = '';\r
                self::$extrahead        = '';\r
                self::$passvar          = '';\r
@@ -226,15 +226,15 @@ class Admin
                                self::error(_ERROR_BADTICKET);\r
                        }\r
                }\r
-               \r
+\r
                /* 3. parse according to the action */\r
-               if ( !method_exists(self, $methodName) && !in_array(self::$action, $allowActions) && self::existsSkinContents($action) )\r
+               if ( !method_exists('Admin', $methodName) && !in_array(self::$action, $allowActions) && self::existsSkinContents($action) )\r
                {\r
                        /* TODO: what is this?\r
                        self::action_parseSpecialskin();\r
                        */\r
                }\r
-               elseif ( method_exists(self, $methodName) )\r
+               elseif ( method_exists('Admin', $methodName) )\r
                {\r
                        call_user_func(array(self, $methodName));\r
                }\r
@@ -278,11 +278,12 @@ class Admin
                        /* TODO: skinid should be a default */\r
                        if ( !is_object(self::$skin) )\r
                        {\r
-                               return quickQuery(sprintf($query, 1, sql_real_escape_string($action)));\r
+                               global $CONF;\r
+                               return quickQuery(sprintf($query, sql_table('skin'), $CONF['DefaultAdminSkin'], sql_real_escape_string($action)));\r
                        }\r
                        else\r
                        {\r
-                               return quickQuery(sprintf($query, self::$skin->id, sql_real_escape_string($action)));\r
+                               return quickQuery(sprintf($query, sql_table('skin'), self::$skin->getID(), sql_real_escape_string($action)));\r
                        }\r
                }\r
                return;\r
@@ -311,7 +312,7 @@ class Admin
        static private function action_showlogin()\r
        {\r
                global $error;\r
-               self::$action_login($error);\r
+               self::action_login($error);\r
                return;\r
        }\r
        \r
@@ -909,7 +910,7 @@ class Admin
                }\r
                \r
                // create new category if needed\r
-               if ( strstr($catid,'newcat') )\r
+               if ( i18n::strpos($catid,'newcat') === 0 )\r
                {\r
                        // get blogid\r
                        list($blogid) = sscanf($catid,"newcat-%d");\r
@@ -1126,7 +1127,7 @@ class Admin
                $catid = requestVar('catid');\r
                \r
                // create new category if needed\r
-               if ( strstr($catid,'newcat') )\r
+               if ( i18n::strpos($catid,'newcat') === 0 )\r
                {\r
                        // get blogid\r
                        list($blogid) = sscanf($catid,'newcat-%d');\r
@@ -3281,7 +3282,7 @@ class Admin
                global $member, $manager;\r
                $member->isAdmin() or self::disallow();\r
                self::pagehead();\r
-               self::$skin->parse('admintemplateoverview');\r
+               self::$skin->parse('admntemplateoverview');\r
                self::pagefoot();\r
                return;\r
        }\r
@@ -4695,7 +4696,7 @@ class Admin
        static private function error($msg)\r
        {\r
                self::pagehead();\r
-               self::parse('adminerrorpage');\r
+               self::$skin->parse('adminerrorpage');\r
                self::pagefoot();\r
                return;\r
        }\r
@@ -4724,14 +4725,14 @@ class Admin
        static private function pagehead($extrahead = '')\r
        {\r
                global $member, $nucleus, $CONF, $manager;\r
-               \r
+\r
                if ( self::existsSkinContents('pagehead') )\r
                {\r
                        if ( isset($extrahead) && !empty($extrahead) )\r
                        {\r
                        self::$extrahead = $extrahead;\r
                        }\r
-                       self::parse('pagehead');\r
+                       self::$skin->parse('pagehead');\r
                }\r
                else\r
                {\r
@@ -4742,7 +4743,7 @@ class Admin
                        \r
                        $manager->notify('AdminPrePageHead', $data);\r
                        \r
-                       $baseUrl = Entity::hsc($CONF['AdminURL']);\r
+                       $baseUrl = Entity::hsc($CONF['SkinsURL']);\r
                        \r
                        /*\r
                         * TODO: obsoleted\r
@@ -4772,9 +4773,9 @@ class Admin
                        echo '<title>' . Entity::hsc($CONF['SiteName']) . " - Admin</title>\n";\r
                        /*\r
                         * TODO: obsoleted\r
-                       echo "<link rel=\"stylesheet\" title=\"Nucleus Admin Default\" type=\"text/css\" href=\"{$baseUrl}styles/admin_{$CONF["AdminCSS"]}.css\" />\n";\r
+                       echo "<link rel=\"stylesheet\" title=\"Nucleus Admin Default\" type=\"text/css\" href=\"{$baseUrl}admin/defaultadmin/styles/admin_{$CONF["AdminCSS"]}.css\" />\n";\r
                        */\r
-                       echo "<link rel=\"stylesheet\" title=\"Nucleus Admin Default\" type=\"text/css\" href=\"{$baseUrl}styles/addedit.css\" />\n";\r
+                       echo "<link rel=\"stylesheet\" title=\"Nucleus Admin Default\" type=\"text/css\" href=\"{$baseUrl}admin/defaultadmin/styles/addedit.css\" />\n";\r
                        echo "<script type=\"text/javascript\" src=\"{$baseUrl}javascript/edit.js\"></script>\n";\r
                        echo "<script type=\"text/javascript\" src=\"{$baseUrl}javascript/admin.js\"></script>\n";\r
                        echo "<script type=\"text/javascript\" src=\"{$baseUrl}javascript/compatibility.js\"></script>\n";\r
@@ -4849,7 +4850,7 @@ class Admin
                \r
                if ( self::existsSkinContents('pagefoot') )\r
                {\r
-                       self::parse('pagefoot');\r
+                       self::$skin->parse('pagefoot');\r
                        exit;\r
                }\r
                else\r
@@ -5960,6 +5961,30 @@ class Admin
        }\r
        \r
        /**\r
+        * Admin::getAdminextrahead()\r
+        */\r
+       static function getAdminextrahead()\r
+       {\r
+               return self::$extrahead;\r
+       }\r
+       \r
+       /**\r
+        * Admin::getAdminAction()\r
+        */\r
+       static function getAdminAction()\r
+       {\r
+               return self::$action;\r
+       }\r
+       \r
+       /**\r
+        * Admin::getAdminaOption()\r
+        */\r
+       static function getAdminaOption()\r
+       {\r
+               return self::$aOptions;\r
+       }\r
+       \r
+       /**\r
         * Admin::action_importAdmin()\r
         * \r
         * @param       void\r