OSDN Git Service

CHANGE: 管理画面用スキンに<%pagehead%><%pagefoot%>を追加。
[nucleus-jp/nucleus-next.git] / nucleus / libs / ADMIN.php
index 38a4339..24148f8 100644 (file)
@@ -26,15 +26,15 @@ class Admin
        static private $formal_public_identifier        = '-//W3C//DTD XHTML 1.0 Strict//EN';\r
        static private $system_identifier                       = 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd';\r
        static private $xhtml_namespace                 = 'http://www.w3.org/1999/xhtml';\r
-       \r
+\r
        static public $headMess;\r
-       \r
+\r
        static private $action;\r
        static private $skin;\r
        static private $extrahead;\r
        static private $passvar;\r
        static private $aOptions;\r
-       \r
+\r
        /**\r
         * Admin::$edit_actions\r
         */\r
@@ -50,12 +50,12 @@ class Admin
                'admintemplateedit',\r
                'admintemplateoverview',\r
                'admintemplatedelete'\r
-       );\r
-       \r
-       /**\r
-        * Admin::$skinless_actions\r
-        */\r
-       static private $skinless_actions = array(\r
+               );\r
+\r
+               /**\r
+                * Admin::$skinless_actions\r
+                */\r
+               static private $skinless_actions = array(\r
                'plugindeleteconfirm',\r
                'pluginoptionsupdate',\r
                'skinremovetypeconfirm',\r
@@ -89,9 +89,9 @@ class Admin
                'changemembersettings',\r
                'clearactionlog',\r
                'memberedit'\r
-       );\r
-       \r
-       static private $actions_needless_to_check = array(\r
+               );\r
+\r
+               static private $actions_needless_to_check = array(\r
                'showlogin',\r
                'login',\r
                'overview',\r
@@ -341,9 +341,7 @@ class Admin
                        self::$headMess = $msg;\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('showlogin');\r
-               self::pagefoot();\r
        }\r
        \r
        /**\r
@@ -360,9 +358,7 @@ class Admin
                        self::$headMess = $msg;\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('overview');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -382,9 +378,7 @@ class Admin
                }\r
                $member->isAdmin() or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('manage');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -405,9 +399,7 @@ class Admin
                \r
                $member->teamRights($blogid) or $member->isAdmin() or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('itemlist');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -444,9 +436,7 @@ class Admin
                        self::batchAskDeleteConfirmation('item', $selected);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('batchitem');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -477,9 +467,7 @@ class Admin
                        self::batchAskDeleteConfirmation('comment', $selected);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('batchcomment');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -522,9 +510,7 @@ class Admin
                        self::batchAskDeleteConfirmation('member',$selected);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('batchmember');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -556,9 +542,7 @@ class Admin
                        self::batchAskDeleteConfirmation('team',$selected);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('batchteam');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -595,9 +579,7 @@ class Admin
                        self::batchAskDeleteConfirmation('category', $selected);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('batchcategory');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -613,9 +595,7 @@ class Admin
        static private function batchMoveSelectDestination($type, $ids)\r
        {\r
                $_POST['batchmove'] = $type;\r
-               self::pagehead();\r
                self::$skin->parse('batchmove');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -632,9 +612,7 @@ class Admin
        {\r
                $_POST['batchmove'] = $type;\r
                global $manager;\r
-               self::pagehead();\r
                self::$skin->parse('batchmovecat');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -649,9 +627,7 @@ class Admin
         */\r
        static private function batchAskDeleteConfirmation($type, $ids)\r
        {\r
-               self::pagehead();\r
                self::$skin->parse('batchdelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -752,9 +728,7 @@ class Admin
        {\r
                global $member, $manager, $CONF;\r
                \r
-               self::pagehead();\r
                self::$skin->parse('browseownitems');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -783,9 +757,7 @@ class Admin
                \r
                $blogid = getBlogIdFromItemId($itemid);\r
                \r
-               self::pagehead();\r
                self::$skin->parse('itemcommentlist');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -798,9 +770,7 @@ class Admin
         */\r
        static private function action_browseowncomments()\r
        {\r
-               self::pagehead();\r
                self::$skin->parse('browseowncomments');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -829,9 +799,7 @@ class Admin
                /* TODO: we consider to use the other way insterad of this */\r
                $_REQUEST['blogid'] = $blogid;\r
                \r
-               self::pagehead();\r
                self::$skin->parse('blogcommentlist');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -855,9 +823,7 @@ class Admin
                \r
                $blog =& $manager->getBlog($blogid);\r
                \r
-               self::pagehead();\r
                self::$skin->parse('createitem');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -886,9 +852,7 @@ class Admin
                                )\r
                );\r
                \r
-               self::pagehead();\r
                self::$skin->parse('itemedit');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1026,9 +990,7 @@ class Admin
                        self::error(_ERROR_NOSUCHITEM);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('itemdelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1129,9 +1091,7 @@ class Admin
                \r
                $member->canAlterItem($itemid) or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('itemmove');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1264,9 +1224,7 @@ class Admin
                \r
                $member->canAlterComment($commentid) or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('commentedit');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1349,9 +1307,7 @@ class Admin
                $commentid = intRequestVar('commentid');\r
                $member->canAlterComment($commentid) or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('commentdelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1441,9 +1397,7 @@ class Admin
                // check if allowed\r
                $member->isAdmin() or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('usermanagement');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1482,10 +1436,9 @@ class Admin
                // check if allowed\r
                ($member->getID() == $memberid) or $member->isAdmin() or self::disallow();\r
                \r
-               $extrahead = '<script type="text/javascript" src="javascript/numbercheck.js"></script>';\r
-               self::pagehead($extrahead);\r
+               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";\r
+               \r
                self::$skin->parse('editmembersettings');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1760,9 +1713,7 @@ class Admin
                $_POST['bNeedsPasswordChange']  = TRUE;\r
                \r
                self::$headMess = $message;\r
-               self::pagehead();\r
                self::$skin->parse('activate');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1846,9 +1797,7 @@ class Admin
                // do the activation\r
                Member::activate($key);\r
                \r
-               self::pagehead();\r
                self::$skin->parse('activatesetpwd');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1868,9 +1817,7 @@ class Admin
                // check if allowed\r
                $member->blogAdminRights($blogid) or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('manageteam');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1921,9 +1868,7 @@ class Admin
                $teammem =  Member::createFromID($memberid);\r
                $blog =& $manager->getBlog($blogid);\r
                \r
-               self::pagehead();\r
                self::$skin->parse('teamdelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2077,10 +2022,9 @@ class Admin
                \r
                $blog =& $manager->getBlog($blogid);\r
                \r
-               $extrahead = '<script type="text/javascript" src="javascript/numbercheck.js"></script>';\r
-               self::pagehead($extrahead);\r
+               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";\r
+               \r
                self::$skin->parse('blogsettings');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2154,10 +2098,9 @@ class Admin
                $_REQUEST['desturl']    = $desturl;\r
                $member->blogAdminRights($blogid) or self::disallow();\r
                \r
-               $extrahead = '<script type="text/javascript" src="javascript/numbercheck.js"></script>';\r
-               self::pagehead($extrahead);\r
+               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";\r
+               \r
                self::$skin->parse('categoryedit');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2255,9 +2198,7 @@ class Admin
                        self::error(_ERROR_DELETELASTCATEGORY);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('categorydelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2558,9 +2499,7 @@ class Admin
                \r
                $blog =& $manager->getBlog($blogid);\r
                \r
-               self::pagehead();\r
                self::$skin->parse('deleteblog');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2638,9 +2577,7 @@ class Admin
                \r
                $mem = Member::createFromID($memberid);\r
                \r
-               self::pagehead();\r
                self::$skin->parse('memberdelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2737,9 +2674,7 @@ class Admin
                // Only Super-Admins can do this\r
                $member->isAdmin() or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('createnewlog');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2842,9 +2777,7 @@ class Admin
                /* TODO: we should consider to use the other way insterad of this */\r
                $_REQUEST['blogid'] = $blogid;\r
                $_REQUEST['catid']  = $catid;\r
-               self::pagehead();\r
                self::$skin->parse('addnewlog');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2885,9 +2818,7 @@ class Admin
                \r
                include_once($DIR_LIBS . 'skinie.php');\r
                \r
-               self::pagehead();\r
                self::$skin->parse('skinieoverview');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2952,9 +2883,7 @@ class Admin
                        self::error($error);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('skinieimport');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -3017,9 +2946,7 @@ class Admin
                $_REQUEST['skinnames'] = $importer->getSkinNames();\r
                $_REQUEST['tpltnames'] = $importer->getTemplateNames();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('skiniedoimport');\r
-               self::pagefoot();\r
                return;\r
        }\r
 \r
@@ -3082,9 +3009,7 @@ class Admin
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('templateoverview');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -3106,12 +3031,10 @@ class Admin
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               $extrahead  = "<script type=\"text/javascript\" src=\"javascript/templateEdit.js\"></script>\n";\r
-               $extrahead .= '<script type=\"text/javascript">setTemplateEditText("' . Entity::hsc(_EDITTEMPLATE_EMPTY) . "\");</script>\n";\r
+               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/templateEdit.js\"></script>\n";\r
+               Admin::$extrahead .= '<script type=\"text/javascript">setTemplateEditText("' . Entity::hsc(_EDITTEMPLATE_EMPTY) . "\");</script>\n";\r
                \r
-               self::pagehead($extrahead);\r
                self::$skin->parse('templateedit');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -3259,9 +3182,7 @@ class Admin
                $templateid = intRequestVar('templateid');\r
                // TODO: check if template can be deleted\r
                \r
-               self::pagehead();\r
                self::$skin->parse('templatedelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -3386,9 +3307,7 @@ class Admin
        {\r
                global $member, $manager;\r
                $member->isAdmin() or self::disallow();\r
-               self::pagehead();\r
                self::$skin->parse('admntemplateoverview');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -3406,11 +3325,11 @@ class Admin
                        self::$headMess = $msg;\r
                }\r
                $member->isAdmin() or self::disallow();\r
-               $extrahead  = "<script type=\"text/javascript\" src=\"javascript/templateEdit.js\"></script>\n";\r
-               $extrahead .= '<script type="text/javascript">setTemplateEditText("' . Entity::hsc(_EDITTEMPLATE_EMPTY) . '");</script>' . "\n";\r
-               self::pagehead($extrahead);\r
+               \r
+               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/templateEdit.js\"></script>\n";\r
+               Admin::$extrahead .= '<script type="text/javascript">setTemplateEditText("' . Entity::hsc(_EDITTEMPLATE_EMPTY) . '");</script>' . "\n";\r
+               \r
                self::$skin->parse('admintemplateedit');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -3608,9 +3527,7 @@ class Admin
                $member->isAdmin() or self::disallow();\r
                \r
                // TODO: check if template can be deleted\r
-               self::pagehead();\r
                self::$skin->parse('admintemplatedelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -3737,9 +3654,7 @@ class Admin
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('skinoverview');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -3786,9 +3701,7 @@ class Admin
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('skinedit');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -3862,9 +3775,7 @@ class Admin
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('skinedittype');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -3921,9 +3832,7 @@ class Admin
                        self::error(_ERROR_SKINDEFDELETE . Entity::hsc($name));\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('skindelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -4004,9 +3913,7 @@ class Admin
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('skinremovetype');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -4145,9 +4052,7 @@ class Admin
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('adminskinoverview');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -4193,9 +4098,7 @@ class Admin
                global $member, $manager;\r
                \r
                $member->isAdmin() or self::disallow();\r
-               self::pagehead();\r
                self::$skin->parse('adminskinedit');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -4269,9 +4172,7 @@ class Admin
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('adminskinedittype');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -4309,9 +4210,7 @@ class Admin
                \r
                /* TODO: needless variable $skinid... */\r
                $skinid = intRequestVar('skinid');\r
-               self::pagehead();\r
                self::$skin->parse('adminskindelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
 \r
@@ -4386,9 +4285,7 @@ class Admin
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('adminskinremovetype');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -4520,9 +4417,7 @@ class Admin
                // load skinie class\r
                include_once($DIR_LIBS . 'skinie.php');\r
                \r
-               self::pagehead();\r
                self::$skin->parse('adminskinieoverview');\r
-               self::pagefoot();\r
                return;\r
        }\r
 \r
@@ -4583,9 +4478,7 @@ class Admin
                $_REQUEST['tpltclashes']        = $templateNameClashes;\r
                $_REQUEST['nameclashes']        = $hasNameClashes ? 1 : 0;\r
                \r
-               self::pagehead();\r
                self::$skin->parse('adminskinieimport');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -4642,9 +4535,7 @@ class Admin
                $_REQUEST['skinnames']  = $importer->getSkinNames();\r
                $_REQUEST['tpltnames']  = $importer->getTemplateNames();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('adminskiniedoimport');\r
-               self::pagefoot();\r
                return;\r
        }\r
 \r
@@ -4703,9 +4594,7 @@ class Admin
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('settingsedit');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -4781,9 +4670,7 @@ class Admin
         */\r
        static private function action_systemoverview()\r
        {\r
-               self::pagehead();\r
                self::$skin->parse('systemoverview');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -4816,9 +4703,7 @@ class Admin
        static public function error($msg)\r
        {\r
                self::$headMess = $msg;\r
-               self::pagehead();\r
                self::$skin->parse('adminerrorpage');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -4845,7 +4730,8 @@ class Admin
         */\r
        static public function PluninAdminPagehead($extrahead = '')\r
        {\r
-               self::pagehead();\r
+               self::$extrahead .= $extrahead;\r
+               self::$skin->parse('pagehead');\r
                return;\r
        }\r
        \r
@@ -4858,277 +4744,7 @@ class Admin
         */\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       string  PluninAdminPagehead\r
-        * @return      void\r
-        */\r
-       static private function pagehead($extrahead = '')\r
-       {\r
-               global $member, $nucleus, $CONF, $manager;\r
-\r
-               if ( self::existsSkinContents('pagehead') )\r
-               {\r
-                       if ( isset($extrahead) && !empty($extrahead) )\r
-                       {\r
-                               self::$extrahead = $extrahead;\r
-                       }\r
-                       self::$skin->parse('pagehead');\r
-               }\r
-               else\r
-               {\r
-                       $data = array(\r
-                               'extrahead'     => &$extrahead,\r
-                               'action'        => self::$action\r
-                       );\r
-                       \r
-                       $manager->notify('AdminPrePageHead', $data);\r
-                       \r
-                       $baseUrl = Entity::hsc($CONF['SkinsURL']);\r
-                       \r
-                       /*\r
-                        * TODO: obsoleted\r
-                       if ( !array_key_exists('AdminCSS', $CONF) )\r
-                       {\r
-                               DB::execute("INSERT INTO " . sql_table('config') . " VALUES ('AdminCSS', 'original')");\r
-                               $CONF['AdminCSS'] = 'original';\r
-                       }\r
-                       */\r
-                       \r
-                       /* HTTP 1.1 application for no caching */\r
-                       header("Cache-Control: no-cache, must-revalidate");\r
-                       header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");\r
-                       \r
-                       $root_element = 'html';\r
-                       $charset = i18n::get_current_charset();\r
-                       $locale = preg_replace('#_#', '-', i18n::get_current_locale());\r
-                       $xml_version_info = self::$xml_version_info;\r
-                       $formal_public_identifier = self::$formal_public_identifier;\r
-                       $system_identifier = self::$system_identifier;\r
-                       $xhtml_namespace = self::$xhtml_namespace;\r
-                       \r
-                       echo "<?xml version=\"{$xml_version_info}\" encoding=\"{$charset}\" ?>\n";\r
-                       echo "<!DOCTYPE {$root_element} PUBLIC \"{$formal_public_identifier}\" \"{$system_identifier}\">\n";\r
-                       echo "<{$root_element} xmlns=\"{$xhtml_namespace}\" xml:lang=\"{$locale}\" lang=\"{$locale}\">\n";\r
-                       echo "<head>\n";\r
-                       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}admin/defaultadmin/styles/admin_{$CONF["AdminCSS"]}.css\" />\n";\r
-                       */\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}javascripts/edit.js\"></script>\n";\r
-                       echo "<script type=\"text/javascript\" src=\"{$baseUrl}javascripts/admin.js\"></script>\n";\r
-                       echo "<script type=\"text/javascript\" src=\"{$baseUrl}javascripts/compatibility.js\"></script>\n";\r
-                       echo "{$extrahead}\n";\r
-                       echo "</head>\n\n";\r
-                       echo "<body>\n";\r
-                       echo "<div id=\"adminwrapper\">\n";\r
-                       echo "<div class=\"header\">\n";\r
-                       echo '<h1>' . Entity::hsc($CONF['SiteName']) . "</h1>\n";\r
-                       echo "</div>\n";\r
-                       echo "<div id=\"container\">\n";\r
-                       echo "<div id=\"content\">\n";\r
-                       echo "<div class=\"loginname\">\n";\r
-                       if ( $member->isLoggedIn() )\r
-                       {\r
-                               echo _LOGGEDINAS . ' ' . $member->getDisplayName() ." - <a href='index.php?action=logout'>" . _LOGOUT. "</a><br />\n";\r
-                               echo "<a href='index.php?action=overview'>" . _ADMINHOME . "</a> - ";\r
-                       }\r
-                       else\r
-                       {\r
-                               echo '<a href="index.php?action=showlogin" title="Log in">' . _NOTLOGGEDIN . "</a><br />\n";\r
-                       }\r
-                       echo "<a href='".$CONF['IndexURL']."'>"._YOURSITE."</a><br />\n";\r
-                       echo '(';\r
-                       \r
-                       if (array_key_exists('codename', $nucleus) && $nucleus['codename'] != '' )\r
-                       {\r
-                               $codenamestring = ' &quot;' . $nucleus['codename'].'&quot;';\r
-                       }\r
-                       else\r
-                       {\r
-                               $codenamestring = '';\r
-                       }\r
-                       \r
-                       if ( $member->isLoggedIn() && $member->isAdmin() )\r
-                       {\r
-                               $checkURL = sprintf(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_URL, getNucleusVersion(), getNucleusPatchLevel());\r
-                               echo '<a href="' . $checkURL . '" title="' . _ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE . '">Nucleus CMS ' . $nucleus['version'] . $codenamestring . '</a>';\r
-                               \r
-                               $newestVersion = getLatestVersion();\r
-                               $newestCompare = str_replace('/', '.', $newestVersion);\r
-                               $currentVersion = str_replace(array('/','v'), array('.',''), $nucleus['version']);\r
-                               \r
-                               if ( $newestVersion && version_compare($newestCompare, $currentVersion) > 0 )\r
-                               {\r
-                                       echo "<br />\n";\r
-                                       echo '<a style="color:red" href="http://nucleuscms.org/upgrade.php" title="' . _ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TITLE . '">';\r
-                                       echo _ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TEXT . $newestVersion;\r
-                                       echo "</a>";\r
-                               }\r
-                       }\r
-                       else\r
-                       {\r
-                               echo "Nucleus CMS {$nucleus['version']}{$codenamestring}";\r
-                       }\r
-                       echo ')';\r
-                       echo '</div>';\r
-               }\r
-               return;\r
-       }\r
-       \r
-       /**\r
-        * Admin::pagefoot()\r
-        * Output admin page foot include quickmenu\r
-        * \r
-        * @param       void\r
-        * @return      void\r
-        */\r
-       static private function pagefoot()\r
-       {\r
-               global $action, $member, $manager;\r
-               \r
-               if ( self::existsSkinContents('pagefoot') )\r
-               {\r
-                       self::$skin->parse('pagefoot');\r
-                       exit;\r
-               }\r
-               else\r
-               {\r
-                       $data = array(\r
-                               'action' => self::$action\r
-                       );\r
-                       \r
-                       $manager->notify('AdminPrePageFoot', $data);\r
-                       \r
-                       if ( $member->isLoggedIn() && ($action != 'showlogin') )\r
-                       {\r
-                               echo '<h2>' . _LOGOUT . "</h2>\n";\r
-                               echo "<ul>\n";\r
-                               echo '<li><a href="index.php?action=overview">' . _BACKHOME . "</a></li>\n";\r
-                               echo '<li><a href="index.php?action=logout">' .  _LOGOUT . "</a></li>\n";\r
-                               echo "</ul>\n";\r
-                       }\r
-                       \r
-                       echo "<div class=\"foot\">\n";\r
-                       echo '<a href="' . _ADMINPAGEFOOT_OFFICIALURL . '">Nucleus CMS</a> &copy; 2002-' . date('Y') . ' ' . _ADMINPAGEFOOT_COPYRIGHT;\r
-                       echo '-';\r
-                       echo '<a href="' . _ADMINPAGEFOOT_DONATEURL . '">' . _ADMINPAGEFOOT_DONATE . "</a>\n";\r
-                       echo "</div>\n";\r
-                       \r
-                       echo "<div id=\"quickmenu\">\n";\r
-                       \r
-                       if ( ($action != 'showlogin') && ($member->isLoggedIn()) )\r
-                       {\r
-                               echo "<ul>\n";\r
-                               echo '<li><a href="index.php?action=overview">' . _QMENU_HOME . "</a></li>\n";\r
-                               echo "</ul>\n";\r
-                               \r
-                               echo '<h2>' . _QMENU_ADD . "</h2>\n";\r
-                               echo "<form method=\"get\" action=\"index.php\">\n";\r
-                               echo "<p>\n";\r
-                               echo "<input type=\"hidden\" name=\"action\" value=\"createitem\" />\n";\r
-                               \r
-                               $showAll = requestVar('showall');\r
-                               \r
-                               if ( ($member->isAdmin()) && ($showAll == 'yes') )\r
-                               {\r
-                                       // Super-Admins have access to all blogs! (no add item support though)\r
-                                       $query = "SELECT bnumber as value, bname as text FROM %s ORDER BY bname;";\r
-                                       $query = sprintf($query, sql_table('blog'));\r
-                               }\r
-                               else\r
-                               {\r
-                                       $query = "SELECT bnumber as value, bname as text FROM %s, %s WHERE tblog=bnumber and tmember=%d ORDER BY bname;";\r
-                                       $query = sprintf($query, sql_table('blog'), sql_table('team'), (integer) $member->getID());\r
-                               }\r
-                               $template['name']               = 'blogid';\r
-                               $template['tabindex']   = 15000;\r
-                               $template['extra']              = _QMENU_ADD_SELECT;\r
-                               $template['selected']   = -1;\r
-                               $template['shorten']    = 10;\r
-                               $template['shortenel']  = '';\r
-                               $template['javascript'] = 'onchange="return form.submit()"';\r
-                               showlist($query, 'select', $template);\r
-                               \r
-                               echo "</p>\n";\r
-                               echo "</form>\n";\r
-                               \r
-                               echo "<h2>{$member->getDisplayName()}</h2>\n";\r
-                               echo "<ul>\n";\r
-                               echo '<li><a href="index.php?action=editmembersettings">' . _QMENU_USER_SETTINGS . "</a></li>\n";\r
-                               echo '<li><a href="index.php?action=browseownitems">' . _QMENU_USER_ITEMS . "</a></li>\n";\r
-                               echo '<li><a href="index.php?action=browseowncomments">' . _QMENU_USER_COMMENTS . "</a></li>\n";\r
-                               echo "</ul>\n";\r
-                               \r
-                               if ( $member->isAdmin() )\r
-                               {\r
-                                       echo '<h2>' . _QMENU_MANAGE . "</h2>\n";\r
-                                       echo "<ul>\n";\r
-                                       echo '<li><a href="index.php?action=actionlog">' . _QMENU_MANAGE_LOG . "</a></li>\n";\r
-                                       echo '<li><a href="index.php?action=settingsedit">' . _QMENU_MANAGE_SETTINGS . "</a></li>\n";\r
-                                       echo '<li><a href="index.php?action=systemoverview">' . _QMENU_MANAGE_SYSTEM . "</a></li>\n";\r
-                                       echo '<li><a href="index.php?action=usermanagement">' . _QMENU_MANAGE_MEMBERS . "</a></li>\n";\r
-                                       echo '<li><a href="index.php?action=createnewlog">' . _QMENU_MANAGE_NEWBLOG . "</a></li>\n";\r
-                                       echo '<li><a href="index.php?action=backupoverview">' . _QMENU_MANAGE_BACKUPS . "</a></li>\n";\r
-                                       echo '<li><a href="index.php?action=pluginlist">' . _QMENU_MANAGE_PLUGINS . "</a></li>\n";\r
-                                       echo "</ul>\n";\r
-                                       \r
-                                       echo "<h2>" . _QMENU_LAYOUT . "</h2>\n";\r
-                                       echo "<ul>\n";\r
-                                       echo '<li><a href="index.php?action=skinoverview">' . _QMENU_LAYOUT_SKINS . "</a></li>\n";\r
-                                       echo '<li><a href="index.php?action=templateoverview">' . _QMENU_LAYOUT_TEMPL . "</a></li>\n";\r
-                                       echo '<li><a href="index.php?action=skinieoverview">' . _QMENU_LAYOUT_IEXPORT . "</a></li>\n";\r
-                                       echo "</ul>\n";\r
-                               }\r
-                               \r
-                               $data = array('options' => array());\r
-                               \r
-                               $manager->notify('QuickMenu', $data);\r
-                               \r
-                               if ( count($data['options']) > 0 )\r
-                               {\r
-                                       echo "<h2>" . _QMENU_PLUGINS . "</h2>\n";\r
-                                       echo "<ul>\n";\r
-                                       foreach ( $data['options'] as $option )\r
-                                       {\r
-                                               echo '<li><a href="' . Entity::hsc($option['url']) . '" title="' . Entity::hsc($option['tooltip']) . '">' . Entity::hsc($option['title']) . "</a></li>\n";\r
-                                       }\r
-                                       echo "</ul>\n";\r
-                               }\r
-                       }\r
-                       else if ( ($action == 'activate') || ($action == 'activatesetpwd') )\r
-                       {\r
-                       \r
-                               echo '<h2>' . _QMENU_ACTIVATE . '</h2>' . _QMENU_ACTIVATE_TEXT;\r
-                       }\r
-                       else\r
-                       {\r
-                               echo '<h2>' . _QMENU_INTRO . '</h2>' . _QMENU_INTRO_TEXT;\r
-                       }\r
-                       \r
-                       echo "<!-- quickmenu -->\n";\r
-                       echo "</div>\n";\r
-                       \r
-                       echo "<!-- content -->\n";\r
-                       echo "</div>\n";\r
-                       \r
-                       echo "<!-- container -->\n";\r
-                       echo "</div>\n";\r
-                       \r
-                       echo "<!-- adminwrapper -->\n";\r
-                       echo "</div>\n";\r
-                       \r
-                       echo "</body>\n";\r
-                       echo "</html>\n";\r
-               }\r
+               self::$skin->parse('pagefoot');\r
                return;\r
        }\r
        \r
@@ -5145,9 +4761,7 @@ class Admin
                $blogid = intRequestVar('blogid');\r
                $member->teamRights($blogid) or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('bookmarklet');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -5163,9 +4777,7 @@ class Admin
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('actionlog');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -5182,9 +4794,7 @@ class Admin
                $blogid = intRequestVar('blogid');\r
                $member->blogAdminRights($blogid) or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('banlist');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -5201,9 +4811,7 @@ class Admin
                $blogid = intRequestVar('blogid');\r
                $member->blogAdminRights($blogid) or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('banlistdelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -5253,9 +4861,7 @@ class Admin
                /* TODO: we should use other ways */\r
                $_REQUEST['delblogs'] = $deleted;\r
                \r
-               self::pagehead();\r
                self::$skin->parse('banlistdeleteconfirm');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -5293,9 +4899,7 @@ class Admin
                /* TODO: we should consider to use the other way instead of this */\r
                $_REQUEST['blogid'] = $blogid;          \r
                \r
-               self::pagehead();\r
                self::$skin->parse('banlistnew');\r
-               self::pagefoot();\r
                \r
                return;\r
        }\r
@@ -5382,9 +4986,7 @@ class Admin
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('backupoverview');\r
-               self::pagefoot();\r
                return;\r
        }\r
 \r
@@ -5444,9 +5046,7 @@ class Admin
                {\r
                        self::error($message);\r
                }\r
-               self::pagehead();\r
                self::$skin->parse('backuprestore');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -5465,9 +5065,7 @@ class Admin
                // check if allowed\r
                $member->isAdmin() or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('pluginlist');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -5491,9 +5089,7 @@ class Admin
                        self::error(_ERROR_NOSUCHPLUGIN);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('pluginhelp');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -5657,9 +5253,7 @@ class Admin
                        self::error(_ERROR_NOSUCHPLUGIN);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('plugindelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
 \r
@@ -5874,10 +5468,9 @@ class Admin
                {\r
                        self::$headMess = $message;\r
                }\r
-               $extrahead = "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";\r
-               self::pagehead($extrahead);\r
+               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";\r
+               \r
                self::$skin->parse('pluginoptions');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -5975,9 +5568,7 @@ class Admin
         */\r
        static private function action_parseSpecialskin()\r
        {\r
-               self::pagehead();\r
                self::$skin->parse(self::$action);\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -6077,9 +5668,9 @@ class Admin
                \r
                self::$skin                             = (object) $skn;\r
                $handler = new AdminActions($actnName, self::$skin, $this);\r
-               $handler->setSkin(self::$skin);\r
                \r
                $parser = new PARSER($handler);\r
+               $parser->setSkin(self::$skin);\r
                $parser->parse($contents);\r
                \r
                return;\r