OSDN Git Service

Merge branch 'skinnable-master' of ssh://shizuki@git.sourceforge.jp/gitroot/nucleus...
[nucleus-jp/nucleus-next.git] / nucleus / libs / ADMIN.php
index 6e4c1db..09ed8c4 100644 (file)
@@ -26,15 +26,18 @@ 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
+       static public $extrahead;\r
+       static public $blog;\r
+       static public $contents;\r
+       \r
        /**\r
         * Admin::$edit_actions\r
         */\r
@@ -89,9 +92,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
@@ -100,9 +103,11 @@ class Admin
                'bookmarklet',\r
                'blogsettings',\r
                'banlist',\r
+               'createaccount',\r
                'deleteblog',\r
                'editmembersettings',\r
-               'browseownitems',\r
+               'createaccount',\r
+               'forgotpassword',\r
                'browseowncomments',\r
                'createitem',\r
                'itemedit',\r
@@ -146,7 +151,7 @@ class Admin
        \r
        static public function initialize()\r
        {\r
-               global $CONF, $DIR_LIBS;\r
+               global $CONF, $DIR_LIBS, $manager;\r
                \r
                /* NOTE: 1. decide which skinid to use */\r
                $skinid = $CONF['AdminSkin'];\r
@@ -169,7 +174,7 @@ class Admin
                }\r
                \r
                /* NOTE: 3. initializing each members */\r
-               self::$skin                     = new Skin($skinid, 'AdminActions', 'AdminSkin');\r
+               self::$skin                     =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin');\r
                self::$action           = '';\r
                self::$extrahead        = '';\r
                self::$passvar          = '';\r
@@ -202,7 +207,7 @@ class Admin
                {\r
                        $alias = array(\r
                                'login' => 'overview',\r
-                               ''              => 'overview'\r
+                               ''              => 'overview',\r
                        );\r
                }\r
                if ( array_key_exists($action, $alias) && isset($alias[$action]) )\r
@@ -227,7 +232,7 @@ class Admin
                                self::error(_ERROR_BADTICKET);\r
                        }\r
                }\r
-\r
+               \r
                /* 3. parse according to the action */\r
                if ( !method_exists('Admin', $methodName) && !in_array(self::$action, $allowActions) && self::existsSkinContents($action) )\r
                {\r
@@ -245,7 +250,7 @@ class Admin
                }\r
                elseif ( $id != $CONF['AdminSkin'] )\r
                {\r
-                       self::$skin = new Skin($CONF['AdminSkin']);\r
+                       self::$skin =& $manager->getSkin($CONF['AdminSkin'], 'AdminActions');\r
                        if ( self::$skin && self::existsSkinContents('adminerrorpage') )\r
                        {\r
                                self::error(_BADACTION . ENTITY::hsc($action));\r
@@ -341,9 +346,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 +363,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 +383,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 +404,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 +441,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
@@ -474,12 +469,10 @@ class Admin
                // On delete: check if confirmation has been given\r
                if ( ($action == 'delete') && (requestVar('confirmation') != 'yes') )\r
                {\r
-                       self::batchAskDeleteConfirmation('comment',$selected);\r
+                       self::batchAskDeleteConfirmation('comment', $selected);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('batchcomment');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -522,9 +515,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 +547,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 +584,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 +600,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 +617,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,96 +632,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
-       /**\r
-        * Admin::selectBlogCategory()\r
-        * Inserts a HTML select element with choices for all categories to which the current\r
-        * member has access\r
-        *\r
-        * @see function selectBlog\r
-        * @param       string  $name                           name of weblod\r
-        * @param       integer $selected                       \r
-        * @param       integer $tabindex                       \r
-        * @param       integer $showNewCat                     \r
-        * @param       integer $iForcedBlogInclude     ID for weblog always included\r
-        * @return      void\r
-        *\r
-        * NOTE: callback from AdminAction\r
-        */\r
-       static public function selectBlogCategory($name, $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1)\r
-       {\r
-               Admin::selectBlog($name, 'category', $selected, $tabindex, $showNewCat, $iForcedBlogInclude);\r
-               return;\r
-       }\r
-       \r
-       /**\r
-        * Admin::selectBlog()\r
-        * Inserts a HTML select element with choices for all blogs to which the user has access\r
-        *      mode = 'blog' => shows blognames and values are blogids\r
-        *      mode = 'category' => show category names and values are catids\r
-        *\r
-        * @param       string  $name                           name of weblod\r
-        * @param       string  $mode                           \r
-        * @param       integer $selected                       \r
-        * @param       integer $tabindex                       \r
-        * @param       integer $showNewCat                     \r
-        * @param       integer $iForcedBlogInclude     ID for weblog always included\r
-        * @param $iForcedBlogInclude\r
-        *      ID of a blog that always needs to be included, without checking if the\r
-        *      member is on the blog team (-1 = none)\r
-        * @return      void\r
-        */\r
-       static private function selectBlog($name, $mode='blog', $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1)\r
-       {\r
-               global $member, $CONF;\r
-               \r
-               // 0. get IDs of blogs to which member can post items (+ forced blog)\r
-               $aBlogIds = array();\r
-               if ( $iForcedBlogInclude != -1 )\r
-               {\r
-                       $aBlogIds[] = intval($iForcedBlogInclude);\r
-               }\r
-               \r
-               if ( $member->isAdmin() && array_key_exists('ShowAllBlogs', $CONF) && $CONF['ShowAllBlogs'] )\r
-               {\r
-                       $query =  "SELECT bnumber FROM %s ORDER BY bname;";\r
-                       $query = sprintf($query, sql_table('blog'));\r
-               }\r
-               else\r
-               {\r
-                       $query =  "SELECT bnumber FROM %s, %s WHERE tblog=bnumber AND tmember=%d;";\r
-                       $query = sprintf($query, sql_table('blog'), sql_table('team'), (integer) $member->getID());\r
-               }\r
-               \r
-               $rblogids = DB::getResult($query);\r
-               foreach ( $rblogids as $row )\r
-               {\r
-                       if ( $row['bnumber'] != $iForcedBlogInclude )\r
-                       {\r
-                               $aBlogIds[] = intval($row['bnumber']);\r
-                       }\r
-               }\r
-               \r
-               if ( count($aBlogIds) == 0 )\r
-               {\r
-                       return;\r
-               }\r
-               \r
-               /* TODO: we should consider to use the other way instead of this */\r
-               $_REQUEST['selectData'] = array(\r
-                       'name'                  => $name,\r
-                       'tabindex'              => $tabindex,\r
-                       'mode'                  => $mode,\r
-                       'selected'              => $selected,\r
-                       'showNewCat'    => $showNewCat,\r
-                       'aBlogIds'              => $aBlogIds,\r
-               );\r
-               self::$skin->parse('blogselectbox');\r
                return;\r
        }\r
        \r
@@ -752,9 +646,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
@@ -774,18 +666,14 @@ class Admin
                        $itemid = intRequestVar('itemid');\r
                }\r
                \r
-               /* TODO: we consider to use the other way insterad of this */\r
-               $_REQUEST['itemid'] = $itemid;\r
-               $_REQUEST['blogid'] = getBlogIdFromItemId($itemid);\r
-               \r
                // only allow if user is allowed to alter item\r
                $member->canAlterItem($itemid) or self::disallow();\r
                \r
-               $blogid = getBlogIdFromItemId($itemid);\r
+               $item =& $manager->getItem($itemid, 1, 1);\r
+               $_REQUEST['itemid'] = $item['itemid'];\r
+               $_REQUEST['blogid'] = $item['blogid'];\r
                \r
-               self::pagehead();\r
                self::$skin->parse('itemcommentlist');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -798,9 +686,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 +715,72 @@ 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
+       /**\r
+        * Admin::action_createaccount()\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       static private function action_createaccount()\r
+       {\r
+               global $CONF;\r
+               \r
+               if ( $CONF['AllowMemberCreate'] != 1 )\r
+               {\r
+                       self::$skin->parse('createaccountdisable');\r
+                       return;\r
+               }\r
+               \r
+               $name = '';\r
+               $realname ='';\r
+               $email = '';\r
+               $url = '';\r
+               \r
+               $contents = array(\r
+                       'name'          => '',\r
+                       'realname'      => '',\r
+                       'email'         => '',\r
+                       'url'           => ''\r
+               );\r
+               \r
+               if ( array_key_exists('showform', $_POST) && $_POST['showform'] == 1 )\r
+               {\r
+                       $action = new Action();\r
+                       $message = $action->createAccount();\r
+                       if ( $message === 1 )\r
+                       {\r
+                               self::$headMess = $message;\r
+                               self::$skin->parse('createaccountsuccess');\r
+                               return;\r
+                       }\r
+                       \r
+                       /* TODO: validation */\r
+                       if ( array_key_exists('name', $_POST) )\r
+                       {\r
+                               $contents['name'] = $_POST['name'];\r
+                       }\r
+                       if ( array_key_exists('realname', $_POST) )\r
+                       {\r
+                               $contents['realname'] = $_POST['realname'];\r
+                       }\r
+                       if ( array_key_exists('email', $_POST) )\r
+                       {\r
+                               $contents['email'] = $_POST['email'];\r
+                       }\r
+                       if ( array_key_exists('url', $_POST) )\r
+                       {\r
+                               $contents['url'] = $_POST['url'];\r
+                       }\r
+                       \r
+                       self::$contents = $contents;\r
+                       \r
+               }\r
+               \r
+               self::$skin->parse('createaccountinput');\r
                return;\r
        }\r
        \r
@@ -851,13 +800,31 @@ class Admin
                // check if allowed\r
                $member->teamRights($blogid) or self::disallow();\r
                \r
-               $memberid = $member->getID();\r
-               \r
                $blog =& $manager->getBlog($blogid);\r
+               $contents = array();\r
+               \r
+               $data = array(\r
+                       'blog'          => &$blog,\r
+                       'contents'      => &$contents\r
+               );\r
+               $manager->notify('PreAddItemForm', $data);\r
+               \r
+               if ( $blog->convertBreaks() )\r
+               {\r
+                       if ( array_key_exists('body', $contents) && !empty($contents['body']) )\r
+                       {\r
+                               $contents['body'] = removeBreaks($contents['body']);\r
+                       }\r
+                       if ( array_key_exists('more', $contents) && !empty($contents['more']) )\r
+                       {\r
+                               $contents['more'] = removeBreaks($contents['more']);\r
+                       }\r
+               }\r
+               \r
+               self::$blog = &$blog;\r
+               self::$contents = &$contents;\r
                \r
-               self::pagehead();\r
                self::$skin->parse('createitem');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -876,19 +843,26 @@ class Admin
                // only allow if user is allowed to alter item\r
                $member->canAlterItem($itemid) or self::disallow();\r
                \r
-               $itemid = intRequestVar('itemid');\r
-               $blogid = getBlogIDFromItemID($itemid);\r
-               $item   =& $manager->getItem($itemid, 1, 1);\r
-               $manager->notify(\r
-                               'PrepareItemForEdit',\r
-                               array(\r
-                                               'item' => &$item\r
-                               )\r
-               );\r
+               $item =& $manager->getItem($itemid, 1, 1);\r
+               $blog =& $manager->getBlog($item['blogid']);\r
+               $manager->notify('PrepareItemForEdit', array('blog'=> &$blog, 'item' => &$item));\r
+               \r
+               if ( $blog->convertBreaks() )\r
+               {\r
+                       if ( array_key_exists('body', $item) && !empty($item['body']) )\r
+                       {\r
+                               $item['body'] = removeBreaks($item['body']);\r
+                       }\r
+                       if ( array_key_exists('more', $item) && !empty($item['more']) )\r
+                       {\r
+                               $item['more'] = removeBreaks($item['more']);\r
+                       }\r
+               }\r
+               \r
+               self::$blog = &$blog;\r
+               self::$contents = &$item;\r
                \r
-               self::pagehead();\r
                self::$skin->parse('itemedit');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -946,20 +920,20 @@ class Admin
                        }\r
                }\r
                \r
-               /*\r
-                       set some variables based on actiontype\r
-\r
-                       actiontypes:\r
-                               draft items -> addnow, addfuture, adddraft, delete\r
-                               non-draft items -> edit, changedate, delete\r
-\r
-                       variables set:\r
-                               $timestamp: set to a nonzero value for future dates or date changes\r
-                               $wasdraft: set to 1 when the item used to be a draft item\r
-                               $publish: set to 1 when the edited item is not a draft\r
-        */\r
+               /**\r
+                * set some variables based on actiontype\r
+                * \r
+                * actiontypes:\r
+                *      draft items -> addnow, addfuture, adddraft, delete\r
+                *      non-draft items -> edit, changedate, delete\r
+                * \r
+                * variables set:\r
+                *      $timestamp: set to a nonzero value for future dates or date changes\r
+                *      $wasdraft: set to 1 when the item used to be a draft item\r
+                *      $publish: set to 1 when the edited item is not a draft\r
+                */\r
                $blogid =  getBlogIDFromItemID($itemid);\r
-               $blog   =& $manager->getBlog($blogid);\r
+               $blog =& $manager->getBlog($blogid);\r
                \r
                $wasdrafts = array('adddraft', 'addfuture', 'addnow');\r
                $wasdraft  = in_array($actiontype, $wasdrafts) ? 1 : 0;\r
@@ -995,7 +969,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, 1, 1);\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
@@ -1026,9 +1000,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
@@ -1040,20 +1012,20 @@ class Admin
         */\r
        static private function action_itemdeleteconfirm()\r
        {\r
-               global $member;\r
+               global $member, $manager;\r
                \r
                $itemid = intRequestVar('itemid');\r
                \r
                // only allow if user is allowed to alter item\r
                $member->canAlterItem($itemid) or self::disallow();\r
                \r
-               // get blogid first\r
-               $blogid = getBlogIdFromItemId($itemid);\r
+               // get item first\r
+               $item =& $manager->getItem($itemid, 1, 1);\r
                \r
                // delete item (note: some checks will be performed twice)\r
-               self::deleteOneItem($itemid);\r
+               self::deleteOneItem($item['itemid']);\r
                \r
-               self::action_itemlist($blogid);\r
+               self::action_itemlist($item['blogid']);\r
                return;\r
        }\r
        \r
@@ -1064,7 +1036,7 @@ class Admin
         * @param       integer $itemid ID for item\r
         * @return      void\r
         */\r
-       static private function deleteOneItem($itemid)\r
+       static public function deleteOneItem($itemid)\r
        {\r
                global $member, $manager;\r
                \r
@@ -1075,13 +1047,13 @@ class Admin
                }\r
                \r
                // need to get blogid before the item is deleted\r
-               $blogid = getBlogIDFromItemId($itemid);\r
+               $item =& $manager->getItem($itemid, 1, 1);\r
                \r
                $manager->loadClass('ITEM');\r
-               Item::delete($itemid);\r
+               Item::delete($item['itemid']);\r
                \r
                // update blog's futureposted\r
-               self::updateFuturePosted($blogid);\r
+               self::updateFuturePosted($item['itemid']);\r
                return;\r
        }\r
        \r
@@ -1129,9 +1101,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
@@ -1198,7 +1168,7 @@ class Admin
         * @param       integer $destCatid      ID for category to which the item will be moved\r
         * @return      void\r
         */\r
-       static private function moveOneItem($itemid, $destCatid)\r
+       static public function moveOneItem($itemid, $destCatid)\r
        {\r
                global $member;\r
                \r
@@ -1232,19 +1202,17 @@ class Admin
                        self::error($result['message']);\r
                }\r
                \r
-               $itemid = (integer) $result['itemid'];\r
-               \r
-               $blogid         =  (integer) getBlogIDFromItemID($itemid);\r
+               $item =& $manager->getItem($result['itemid'], 0, 0);\r
                \r
                if ( $result['status'] == 'newcategory' )\r
                {\r
-                       $distURI = $manager->addTicketToUrl($CONF['AdminURL'] . 'index.php?action=itemList&blogid=' . $blogid);\r
-                       self::action_categoryedit($result['catid'], $blogid, $distURI);\r
+                       $distURI = $manager->addTicketToUrl($CONF['AdminURL'] . 'index.php?action=itemList&blogid=' . $item['blogid']);\r
+                       self::action_categoryedit($result['catid'], $item['blogid'], $distURI);\r
                }\r
                else\r
                {\r
                        $methodName = 'action_itemlist';\r
-                       self::action_itemlist($blogid);\r
+                       self::action_itemlist($item['blogid']);\r
                }\r
                return;\r
        }\r
@@ -1264,9 +1232,11 @@ class Admin
                \r
                $member->canAlterComment($commentid) or self::disallow();\r
                \r
-               self::pagehead();\r
+               $comment = COMMENT::getComment($commentid);\r
+               $manager->notify('PrepareCommentForEdit', array('comment' => &$comment));\r
+               \r
+               Admin::$contents = $comment;\r
                self::$skin->parse('commentedit');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1349,9 +1319,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
@@ -1396,7 +1364,7 @@ class Admin
         * @param       integer $commentid      ID for comment\r
         * @return      void\r
         */\r
-       static private function deleteOneComment($commentid)\r
+       static public function deleteOneComment($commentid)\r
        {\r
                global $member, $manager;\r
                \r
@@ -1441,9 +1409,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 +1448,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=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
+               \r
                self::$skin->parse('editmembersettings');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1511,6 +1476,7 @@ class Admin
                $email                  = strip_tags(postVar('email'));\r
                $url                    = strip_tags(postVar('url'));\r
                $adminskin              = intPostVar('adminskin');\r
+               $bookmarklet    = intPostVar('bookmarklet');\r
                \r
                // begin if: sometimes user didn't prefix the URL with http:// or https://, this cause a malformed URL. Let's fix it.\r
                if ( !preg_match('#^https?://#', $url) )\r
@@ -1523,7 +1489,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
@@ -1608,7 +1574,9 @@ class Admin
                $mem->setURL($url);\r
                $mem->setNotes($notes);\r
                $mem->setLocale($locale);\r
-               \r
+               $mem->setAdminSkin($adminskin);\r
+               $mem->setBookmarklet($bookmarklet);\r
+\r
                // only allow super-admins to make changes to the admin status\r
                if ( $member->isAdmin() )\r
                {\r
@@ -1714,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
@@ -1748,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
@@ -1760,9 +1740,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
@@ -1789,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
@@ -1846,9 +1824,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 +1844,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
@@ -1918,12 +1892,10 @@ 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::pagehead();\r
                self::$skin->parse('teamdelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1955,7 +1927,7 @@ class Admin
         * @param       void\r
         * @return      void\r
         */\r
-       static private function deleteOneTeamMember($blogid, $memberid)\r
+       static public function deleteOneTeamMember($blogid, $memberid)\r
        {\r
                global $member, $manager;\r
                \r
@@ -1970,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
@@ -2013,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
@@ -2021,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
@@ -2077,10 +2049,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=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
+               \r
                self::$skin->parse('blogsettings');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2154,10 +2125,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=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
+               \r
                self::$skin->parse('categoryedit');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2255,9 +2225,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
@@ -2293,7 +2261,7 @@ class Admin
         * @param       String  $catid  category id for deleting\r
         * @return      Void\r
         */\r
-       static private function deleteOneCategory($catid)\r
+       static public function deleteOneCategory($catid)\r
        {\r
                global $manager, $member;\r
                \r
@@ -2354,6 +2322,96 @@ class Admin
        }\r
        \r
        /**\r
+        * Admin::moveOneCategory()\r
+        * Delete a category by its id\r
+        * \r
+        * @param       int     $catid          category id for move\r
+        * @param       int     $destblogid     blog id for destination\r
+        * @return      void\r
+        */\r
+       static public function moveOneCategory($catid, $destblogid)\r
+       {\r
+               global $manager, $member;\r
+               $catid      = intval($catid);\r
+               $destblogid = intval($destblogid);\r
+               $blogid     = getBlogIDFromCatID($catid);\r
+               // mover should have admin rights on both blogs\r
+               if (!$member->blogAdminRights($blogid)) {\r
+                       return _ERROR_DISALLOWED;\r
+               }\r
+               if (!$member->blogAdminRights($destblogid)) {\r
+                       return _ERROR_DISALLOWED;\r
+               }\r
+               // cannot move to self\r
+               if ($blogid == $destblogid) {\r
+                       return _ERROR_MOVETOSELF;\r
+               }\r
+               // get blogs\r
+               $blog     =& $manager->getBlog($blogid);\r
+               $destblog =& $manager->getBlog($destblogid);\r
+               // check if the category is valid\r
+               if (!$blog || !$blog->isValidCategory($catid)) {\r
+                       return _ERROR_NOSUCHCATEGORY;\r
+               }\r
+               // don't allow default category to be moved\r
+               if ($blog->getDefaultCategory() == $catid) {\r
+                       return _ERROR_MOVEDEFCATEGORY;\r
+               }\r
+               $manager->notify(\r
+                               'PreMoveCategory',\r
+                               array(\r
+                                               'catid'      => &$catid,\r
+                                               'sourceblog' => &$blog,\r
+                                               'destblog'   => &$destblog\r
+                               )\r
+               );\r
+               // update comments table (cblog)\r
+               $query = 'SELECT '\r
+               . '    inumber '\r
+               . 'FROM '\r
+               .      sql_table('item') . ' '\r
+               . 'WHERE '\r
+               . '    icat = %d';\r
+               $items = sql_query(sprintf($query, $catid));\r
+               while ($oItem = sql_fetch_object($items)) {\r
+                       $query = 'UPDATE '\r
+                       .      sql_table('comment') . ' '\r
+                       . 'SET '\r
+                       . '    cblog = %d' . ' '\r
+                       . 'WHERE '\r
+                       . '    citem = %d';\r
+                       sql_query(sprintf($query, $destblogid, $oItem->inumber));\r
+               }\r
+       \r
+               // update items (iblog)\r
+               $query = 'UPDATE '\r
+               .      sql_table('item') . ' '\r
+               . 'SET '\r
+               . '    iblog = %d '\r
+               . 'WHERE '\r
+               . '    icat = %d';\r
+               sql_query(sprintf($query, $destblogid, $catid));\r
+       \r
+               // move category\r
+               $query = 'UPDATE '\r
+               .      sql_table('category') . ' '\r
+               . 'SET '\r
+               . '    cblog = %d' . ' '\r
+               . 'WHERE '\r
+               . '    catid = %d';\r
+               sql_query(sprintf($query, $destblogid, $catid));\r
+               $manager->notify(\r
+                               'PostMoveCategory',\r
+                               array(\r
+                                               'catid'      => &$catid,\r
+                                               'sourceblog' => &$blog,\r
+                                               'destblog'   => $destblog\r
+                               )\r
+               );\r
+               return;\r
+       }\r
+\r
+       /**\r
         * Admin::action_blogsettingsupdate\r
         * Updating blog settings\r
         * \r
@@ -2468,9 +2526,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
@@ -2546,11 +2602,9 @@ 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::pagehead();\r
                self::$skin->parse('memberdelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2593,12 +2647,12 @@ class Admin
         * @params      Integer $memberid       member id\r
         * @return      String  null string or error messages\r
         */\r
-       static private function deleteOneMember($memberid)\r
+       static public function deleteOneMember($memberid)\r
        {\r
                global $manager;\r
                \r
                $memberid = intval($memberid);\r
-               $mem = Member::createFromID($memberid);\r
+               $mem =& $manager->getMember($memberid);\r
                \r
                if ( !$mem->canBeDeleted() )\r
                {\r
@@ -2647,9 +2701,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
@@ -2752,9 +2804,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
@@ -2795,9 +2845,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
@@ -2862,9 +2910,7 @@ class Admin
                        self::error($error);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('skinieimport');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2927,9 +2973,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
@@ -2992,9 +3036,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
@@ -3016,30 +3058,14 @@ 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=\"<%skinfile(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
        /**\r
-        * TODO: remove this\r
-        *\r
-       static private function _templateEditRow(&$template, $description, $name, $help = '', $tabindex = 0, $big = 0) {\r
-               static $count = 1;\r
-               if (!isset($template[$name])) $template[$name] = '';\r
-       ?>\r
-               </tr><tr>\r
-                       <td><?php echo $description?> <?php if ($help) help('template'.$help); ?></td>\r
-                       <td id="td<?php echo $count?>"><textarea class="templateedit" name="<?php echo $name?>" tabindex="<?php echo $tabindex?>" cols="50" rows="<?php echo $big?10:5?>" id="textarea<?php echo $count?>"><?php echo  Entity::hsc($template[$name]); ?></textarea></td>\r
-       <?php       $count++;\r
-       }\r
-       */\r
-       \r
-       /**\r
         * Admin::action_templateupdate()\r
         * \r
         * @param       void\r
@@ -3169,9 +3195,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
@@ -3294,11 +3318,9 @@ class Admin
         */\r
        static private function action_admintemplateoverview()\r
        {\r
-               global $member, $manager;\r
+               global $member;\r
                $member->isAdmin() or self::disallow();\r
-               self::pagehead();\r
                self::$skin->parse('admntemplateoverview');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -3316,11 +3338,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=\"<%skinfile(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
@@ -3359,9 +3381,9 @@ class Admin
                DB::execute($query);\r
                \r
                // 3. Add non-empty template parts\r
-               self::addToAdminTemplate($templateid, 'ADMINSKINTYPELIST_HEAD',                                 postVar('ADMINSKINTYPELIST_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'ADMINSKINTYPELIST_BODY',                                 postVar('ADMINSKINTYPELIST_BODY'));\r
-               self::addToAdminTemplate($templateid, 'ADMINSKINTYPELIST_FOOT',                                 postVar('ADMINSKINTYPELIST_FOOT'));\r
+               self::addToAdminTemplate($templateid, 'NORMALSKINLIST_HEAD',                                    postVar('NORMALSKINLIST_HEAD'));\r
+               self::addToAdminTemplate($templateid, 'NORMALSKINLIST_BODY',                                    postVar('NORMALSKINLIST_BODY'));\r
+               self::addToAdminTemplate($templateid, 'NORMALSKINLIST_FOOT',                                    postVar('NORMALSKINLIST_FOOT'));\r
                self::addToAdminTemplate($templateid, 'ADMIN_CUSTOMHELPLINK_ICON',                              postVar('ADMIN_CUSTOMHELPLINK_ICON'));\r
                self::addToAdminTemplate($templateid, 'ADMIN_CUSTOMHELPLINK_ANCHOR',                    postVar('ADMIN_CUSTOMHELPLINK_ANCHOR'));\r
                self::addToAdminTemplate($templateid, 'ADMIN_BLOGLINK',                                                 postVar('ADMIN_BLOGLINK'));\r
@@ -3466,7 +3488,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
@@ -3518,9 +3540,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
@@ -3647,9 +3667,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
@@ -3696,9 +3714,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
@@ -3710,7 +3726,7 @@ class Admin
         */\r
        static private function action_skineditgeneral()\r
        {\r
-               global $member;\r
+               global $manager, $member;\r
                \r
                $skinid = intRequestVar('skinid');\r
                \r
@@ -3722,7 +3738,7 @@ class Admin
                $inc_mode       = postVar('inc_mode');\r
                $inc_prefix     = postVar('inc_prefix');\r
                \r
-               $skin = new Skin($skinid);\r
+               $skin =& $manager->getSkin($skinid);\r
                \r
                // 1. Some checks\r
                if ( !isValidSkinName($name) )\r
@@ -3772,9 +3788,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
@@ -3786,7 +3800,7 @@ class Admin
         */\r
        static private function action_skinupdate()\r
        {\r
-               global $member;\r
+               global $manager, $member;\r
                \r
                $skinid = intRequestVar('skinid');\r
                $content = trim(postVar('content'));\r
@@ -3794,7 +3808,7 @@ class Admin
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               $skin = new SKIN($skinid);\r
+               $skin =& $manager->getSKIN($skinid);\r
                $skin->update($type, $content);\r
                \r
                self::action_skinedittype(_SKIN_UPDATED);\r
@@ -3809,7 +3823,7 @@ class Admin
         */\r
        static private function action_skindelete()\r
        {\r
-               global $member, $manager, $CONF;\r
+               global $manager, $member, $CONF;\r
                \r
                $skinid = intRequestVar('skinid');\r
                \r
@@ -3831,9 +3845,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
@@ -3914,9 +3926,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
@@ -3952,10 +3962,9 @@ class Admin
                        'skintype' => $skintype\r
                );\r
                $manager->notify('PreDeleteSkinPart', $data);\r
-               \r
                // delete part\r
-               $query = "DELETE FROM %s WHERE sdesc=%d AND stype='%s';";\r
-               $query = sprintf($query, sql_table('skin'), (integer) $skinid, (integer) $skintype);\r
+               $query = "DELETE FROM %s WHERE sdesc=%d AND stype=%s;";\r
+               $query = sprintf($query, sql_table('skin'), (integer) $skinid, DB::quoteValue($skintype) );\r
                DB::execute($query);\r
                \r
                $data = array(\r
@@ -3976,14 +3985,14 @@ class Admin
         */\r
        static private function action_skinclone()\r
        {\r
-               global $member;\r
+               global $manager, $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
                $skinid = intRequestVar('skinid');\r
                \r
                // 1. read skin to clone\r
-               $skin = new Skin($skinid);\r
+               $skin =& $manager->getSkin($skinid);\r
                \r
                $name = "{$skin->getName()}_clone";\r
                \r
@@ -4055,9 +4064,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
@@ -4103,9 +4110,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
@@ -4117,7 +4122,7 @@ class Admin
         */\r
        static private function action_adminskineditgeneral()\r
        {\r
-               global $member;\r
+               global $manager, $member;\r
                \r
                $skinid = intRequestVar('skinid');\r
                \r
@@ -4129,7 +4134,7 @@ class Admin
                $inc_mode       = postVar('inc_mode');\r
                $inc_prefix     = postVar('inc_prefix');\r
                \r
-               $skin = new Skin($skinid, 'AdminActions', 'AdminSkin');\r
+               $skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin');\r
                \r
                // 1. Some checks\r
                if ( !isValidSkinName($name) )\r
@@ -4179,9 +4184,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
@@ -4193,14 +4196,15 @@ class Admin
         */\r
        static private function action_adminskinupdate()\r
        {\r
-               global $member;\r
-               $skinid         = intRequestVar('skinid');\r
-               $content        = trim(postVar('content'));\r
-               $type           = postVar('type');\r
+               global $manager, $member;\r
+               \r
+               $skinid = intRequestVar('skinid');\r
+               $content = trim(postVar('content'));\r
+               $type = postVar('type');\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               $skin = new Skin($skinid, 'Admin', 'AdminSkin');\r
+               $skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin');\r
                $skin->update($type, $content);\r
                self::action_adminskinedittype(_SKIN_UPDATED);\r
                return;\r
@@ -4219,9 +4223,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
@@ -4252,7 +4254,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
@@ -4296,9 +4298,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
@@ -4327,10 +4327,10 @@ class Admin
                        'skintype'      => $skintype\r
                );\r
                $manager->notify('PreDeleteAdminSkinPart', $data);\r
-               \r
+\r
                // delete part\r
-               $query = 'DELETE FROM %s WHERE sdesc = %d AND stype ="%s"';\r
-               $query = sprintf($query, sql_table('skin'), (integer) $skinid, $skintype);\r
+               $query = 'DELETE FROM %s WHERE sdesc = %d AND stype = %s ;';\r
+               $query = sprintf($query, sql_table('skin'), (integer) $skinid, DB::quoteValue($skintype) );\r
                DB::execute($query);\r
                \r
                $data = array(\r
@@ -4351,14 +4351,14 @@ class Admin
         */\r
        static private function action_adminskinclone()\r
        {\r
-               global $member;\r
+               global $manager, $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
                $skinid = intRequestVar('skinid');\r
                \r
                // 1. read skin to clone\r
-               $skin = new Skin($skinid, 'Admin', 'AdminSkin');\r
+               $skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin');\r
                $name = "{$skin->getName()}_clone";\r
                \r
                // if a skin with that name already exists:\r
@@ -4430,13 +4430,12 @@ 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
        /**\r
+        * FIXME: DUPLICATION, NO NEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEED!!!!!!\r
         * Admin::action_adminskinieimport()\r
         * \r
         * @param       void\r
@@ -4492,14 +4491,20 @@ class Admin
                $_REQUEST['skinclashes']        = $skinNameClashes;\r
                $_REQUEST['tpltclashes']        = $templateNameClashes;\r
                $_REQUEST['nameclashes']        = $hasNameClashes ? 1 : 0;\r
-               \r
-               self::pagehead();\r
-               self::$skin->parse('adminskinieimport');\r
-               self::pagefoot();\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
        /**\r
+        * FIXME: DUPLICATION, NO NEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEED!!!!!!\r
         * Admin::action_adminskiniedoimport()\r
         * \r
         * @param       void\r
@@ -4507,7 +4512,7 @@ class Admin
         */\r
        static private function action_adminskiniedoimport()\r
        {\r
-               global $DIR_LIBS, $DIR_SKINS, $member;\r
+               global $DIR_LIBS, $DIR_SKINS, $manager, $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
@@ -4552,9 +4557,22 @@ class Admin
                $_REQUEST['skinnames']  = $importer->getSkinNames();\r
                $_REQUEST['tpltnames']  = $importer->getTemplateNames();\r
                \r
-               self::pagehead();\r
-               self::$skin->parse('adminskiniedoimport');\r
-               self::pagefoot();\r
+               if ( !is_object(self::$skin) )\r
+               {\r
+                       global $DIR_SKINS;\r
+                       $query  = "SELECT min(sdnumber) FROM %s WHERE sdname != 'admin/bookmarklet' AND sdname LIKE '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   =& $manager->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
@@ -4613,9 +4631,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
@@ -4673,7 +4689,9 @@ class Admin
                self::updateConfig('DebugVars',                 postVar('DebugVars'));\r
                self::updateConfig('DefaultListSize',   postVar('DefaultListSize'));\r
                self::updateConfig('AdminCSS',                  postVar('AdminCSS'));\r
-               \r
+               self::updateConfig('AdminSkin',                 postVar('adminskin'));\r
+               self::updateConfig('BookmarkletSkin',   postVar('bookmarklet'));\r
+\r
                // load new config and redirect (this way, the new locale will be used is necessary)\r
                // note that when changing cookie settings, this redirect might cause the user\r
                // to have to log in again.\r
@@ -4691,9 +4709,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
@@ -4723,12 +4739,10 @@ class Admin
         * @param       string  $msg    message that will be shown\r
         * @return      void\r
         */\r
-       static private function error($msg)\r
+       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
@@ -4739,306 +4753,25 @@ class Admin
         * @param       void\r
         * @return      void\r
         */\r
-       static private function disallow()\r
+       static public function disallow()\r
        {\r
                ActionLog::add(WARNING, _ACTIONLOG_DISALLOWED . serverVar('REQUEST_URI'));\r
                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
-       {\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       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
+       static public function action_PluginAdmin($skinContents, $extrahead = '')\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::$extrahead .= $extrahead;\r
+               self::$skin->parse('pluginadmin', $skinContents);\r
                return;\r
        }\r
        \r
@@ -5055,9 +4788,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
@@ -5073,9 +4804,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
@@ -5092,9 +4821,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
@@ -5111,9 +4838,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
@@ -5163,9 +4888,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
@@ -5177,7 +4900,11 @@ class Admin
         */\r
        static private function action_banlistnewfromitem()\r
        {\r
-               self::action_banlistnew(getBlogIDFromItemID(intRequestVar('itemid')));\r
+               global $manager;\r
+               \r
+               $itemid = intRequestVar('itemid');\r
+               $item =& $manager->getItem($itemid, 1, 1);\r
+               self::action_banlistnew($item['blogid']);\r
                return;\r
        }\r
        \r
@@ -5203,9 +4930,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
@@ -5292,9 +5017,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
@@ -5354,9 +5077,7 @@ class Admin
                {\r
                        self::error($message);\r
                }\r
-               self::pagehead();\r
                self::$skin->parse('backuprestore');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -5375,9 +5096,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
@@ -5401,9 +5120,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
@@ -5567,9 +5284,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
@@ -5604,7 +5319,7 @@ class Admin
         * @param       void\r
         * @return      void\r
         */\r
-       static private function deleteOnePlugin($pid, $callUninstall = 0)\r
+       static public function deleteOnePlugin($pid, $callUninstall = 0)\r
        {\r
                global $manager;\r
                \r
@@ -5784,10 +5499,11 @@ class Admin
                {\r
                        self::$headMess = $message;\r
                }\r
-               $extrahead = "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";\r
-               self::pagehead($extrahead);\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
+               \r
                self::$skin->parse('pluginoptions');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -5828,79 +5544,6 @@ class Admin
        }\r
        \r
        /**\r
-        * Admin::insertPluginOptions()\r
-        * \r
-        * Output plugin option field\r
-        * \r
-        * @access      public\r
-        * @param string        $context        plugin option context\r
-        * @param integer       $contextid      plugin option context id\r
-        * @return      void\r
-        */\r
-       static public function insertPluginOptions($context, $contextid = 0)\r
-       {\r
-               global $manager;\r
-               \r
-               // get all current values for this contextid\r
-               // (note: this might contain doubles for overlapping contextids)\r
-               $aIdToValue = array();\r
-               \r
-               $query = "SELECT oid, ovalue FROM %s WHERE ocontextid=%d;";\r
-               $query = sprintf($query, sql_table('plugin_option'), (integer) $contextid);\r
-               \r
-               $res = DB::getResult($query);\r
-               foreach ( $res as $row )\r
-               {\r
-                       $aIdToValue[$row['oid']] = $row['ovalue'];\r
-               }\r
-               \r
-               // get list of oids per pid\r
-               $query  = "SELECT * FROM %s, %s WHERE opid=pid and ocontext= %s ORDER BY porder, oid ASC;";\r
-               $query  = sprintf($query, sql_table('plugin_option_desc'), sql_table('plugin'), DB::quoteValue($context));\r
-               $res    = DB::getResult($query);\r
-               \r
-               $aOptions = array();\r
-               foreach ($res as $row )\r
-               {\r
-                       if ( !in_array($row['oid'], array_keys($aIdToValue)) )\r
-                       {\r
-                               $value = $row['odef'];\r
-                       }\r
-                       else\r
-                       {\r
-                               $value = $aIdToValue[$row['oid']];\r
-                       }\r
-                       \r
-                       array_push(\r
-                               $aOptions,\r
-                               array(\r
-                                       'pid'                   => $row['pid'],\r
-                                       'pfile'                 => $row['pfile'],\r
-                                       'oid'                   => $row['oid'],\r
-                                       'value'                 => $value,\r
-                                       'name'                  => $row['oname'],\r
-                                       'description'   => $row['odesc'],\r
-                                       'type'                  => $row['otype'],\r
-                                       'typeinfo'              => $row['oextra'],\r
-                                       'contextid'             => $contextid,\r
-                                       'extra'                 => ''\r
-                               )\r
-                       );\r
-               }\r
-               \r
-               $data = array(\r
-                       'context'       =>  $context,\r
-                       'contextid'     =>  $contextid,\r
-                       'options'       =>& $aOptions\r
-               );\r
-               $manager->notify('PrePluginOptionsEdit', $data);\r
-               \r
-               self::$aOptions = $aOptions;\r
-               self::$skin->parse('insertpluginoptions');\r
-               return;\r
-       }\r
-       \r
-       /**\r
         * Admin::action_parseSpecialskin()\r
         * \r
         * @param       void\r
@@ -5908,9 +5551,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
@@ -5945,7 +5586,7 @@ class Admin
        /**\r
         * Admin::getAdminextrahead()\r
         */\r
-       static function getAdminextrahead()\r
+       static public function getAdminextrahead()\r
        {\r
                return self::$extrahead;\r
        }\r
@@ -5953,7 +5594,7 @@ class Admin
        /**\r
         * Admin::getAdminpassvar()\r
         */\r
-       static function getAdminpassvar()\r
+       static public function getAdminpassvar()\r
        {\r
                return self::$passvar;\r
        }\r
@@ -5961,7 +5602,7 @@ class Admin
        /**\r
         * Admin::getAdminAction()\r
         */\r
-       static function getAdminAction()\r
+       static public function getAdminAction()\r
        {\r
                return self::$action;\r
        }\r
@@ -5969,7 +5610,7 @@ class Admin
        /**\r
         * Admin::getAdminaOption()\r
         */\r
-       static function getAdminaOption()\r
+       static public function getAdminaOption()\r
        {\r
                return self::$aOptions;\r
        }\r
@@ -6010,9 +5651,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