OSDN Git Service

FIX: Admin::action_akiniedoimport()のパースエラーの修正
[nucleus-jp/nucleus-next.git] / nucleus / libs / ADMIN.php
index e11b6d8..c0c8d76 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,21 +151,20 @@ class Admin
        \r
        static public function initialize()\r
        {\r
-               global $CONF, $DIR_LIBS;\r
+               global $CONF, $DIR_LIBS, $manager, $member;\r
                \r
                /* NOTE: 1. decide which skinid to use */\r
                $skinid = $CONF['AdminSkin'];\r
                /*\r
-                * NOTE: this is temporary escaped because not implemented yet\r
+                * NOTE: this is temporary escaped because not implemented yet*/\r
                if (isset($member) && $member->isLoggedIn())\r
                {\r
                        $memskin = $member->getAdminSkin();\r
-                       if ( $memskin )\r
+                       if ( $memskin && Skin::existsID($memskin))\r
                        {\r
                                $skinid = $memskin;\r
                        }\r
                }\r
-               */\r
                \r
                /* NOTE: 2. make an instance of skin object */\r
                if ( !Skin::existsID($skinid) )\r
@@ -169,7 +173,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 +206,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
@@ -225,9 +229,10 @@ class Admin
                        if (!$manager->checkTicket())\r
                        {\r
                                self::error(_ERROR_BADTICKET);\r
+                               return;\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
@@ -242,20 +247,23 @@ class Admin
                else if ( self::existsSkinContents('adminerrorpage') )\r
                {\r
                        self::error(_BADACTION . ENTITY::hsc($action));\r
+                       return;\r
                }\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
+                               return;\r
                        }\r
                }\r
                else\r
                {\r
                        self::error(_BADACTION . ENTITY::hsc($action));\r
+                       return;\r
                }\r
-               exit;\r
+               return;\r
        }\r
        \r
        /**\r
@@ -331,7 +339,7 @@ class Admin
                if ( $member->isLoggedIn() && $member->canLogin() )\r
                {\r
                        self::action_overview();\r
-                       exit;\r
+                       return;\r
                }\r
                \r
                /* TODO: needless variable??? */\r
@@ -341,9 +349,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 +366,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 +386,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 +407,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
@@ -429,6 +429,7 @@ class Admin
                if ( !is_array($selected) || sizeof($selected) == 0 )\r
                {\r
                        self::error(_BATCH_NOSELECTION);\r
+                       return;\r
                }\r
                \r
                // On move: when no destination blog/category chosen, show choice now\r
@@ -444,9 +445,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
@@ -469,6 +468,7 @@ class Admin
                if ( !is_array($selected) || sizeof($selected) == 0 )\r
                {\r
                        self::error(_BATCH_NOSELECTION);\r
+                       return;\r
                }\r
                \r
                // On delete: check if confirmation has been given\r
@@ -477,9 +477,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
@@ -514,6 +512,7 @@ class Admin
                if ( !is_array($selected) || sizeof($selected) == 0 )\r
                {\r
                        self::error(_BATCH_NOSELECTION);\r
+                       return;\r
                }\r
                \r
                // On delete: check if confirmation has been given\r
@@ -522,9 +521,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
@@ -548,6 +545,7 @@ class Admin
                if ( !is_array($selected) || sizeof($selected) == 0 )\r
                {\r
                        self::error(_BATCH_NOSELECTION);\r
+                       return;\r
                }\r
                \r
                // On delete: check if confirmation has been given\r
@@ -556,9 +554,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
@@ -580,6 +576,7 @@ class Admin
                if ( !is_array($selected) || sizeof($selected) == 0 )\r
                {\r
                        self::error(_BATCH_NOSELECTION);\r
+                       return;\r
                }\r
                \r
                // On move: when no destination blog chosen, show choice now\r
@@ -595,9 +592,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 +608,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 +625,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 +640,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 public 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 +654,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 +674,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 +694,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 +723,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 +808,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 +851,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 +928,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 +977,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
@@ -1024,11 +1006,10 @@ class Admin
                if ( !$manager->existsItem($itemid,1,1) )\r
                {\r
                        self::error(_ERROR_NOSUCHITEM);\r
+                       return;\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('itemdelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1040,20 +1021,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
@@ -1075,13 +1056,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 +1110,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 +1177,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
@@ -1230,21 +1209,20 @@ class Admin
                if ( $result['status'] == 'error' )\r
                {\r
                        self::error($result['message']);\r
+                       return;\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 +1242,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
@@ -1292,17 +1272,20 @@ class Admin
                if (preg_match('#[a-zA-Z0-9|\.,;:!\?=\/\\\\]{90,90}#', $body) != FALSE)\r
                {\r
                        self::error(_ERROR_COMMENT_LONGWORD);\r
+                       return;\r
                }\r
                \r
                // check length\r
                if ( i18n::strlen($body) < 3 )\r
                {\r
                        self::error(_ERROR_COMMENT_NOCOMMENT);\r
+                       return;\r
                }\r
                \r
                if ( i18n::strlen($body) > 5000 )\r
                {\r
                        self::error(_ERROR_COMMENT_TOOLONG);\r
+                       return;\r
                }\r
                \r
                // prepare body\r
@@ -1349,9 +1332,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 +1422,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 +1461,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 +1489,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,28 +1502,32 @@ 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
                        if ( !isValidDisplayName($name) )\r
                        {\r
                                self::error(_ERROR_BADNAME);\r
+                               return;\r
                        }\r
                        \r
                        if ( ($name != $mem->getDisplayName()) && Member::exists($name) )\r
                        {\r
                                self::error(_ERROR_NICKNAMEINUSE);\r
+                               return;\r
                        }\r
                        \r
                        if ( $password != $repeatpassword )\r
                        {\r
                                self::error(_ERROR_PASSWORDMISMATCH);\r
+                               return;\r
                        }\r
                        \r
                        if ( $password && (i18n::strlen($password) < 6) )\r
                        {\r
                                self::error(_ERROR_PASSWORDTOOSHORT);\r
+                               return;\r
                        }\r
                                \r
                        if ( $password )\r
@@ -1562,6 +1545,7 @@ class Admin
                                if ( !$pwdvalid )\r
                                {\r
                                        self::error($pwderror);\r
+                                       return;\r
                                }\r
                        }\r
                }\r
@@ -1569,14 +1553,17 @@ class Admin
                if ( !NOTIFICATION::address_validation($email) )\r
                {\r
                        self::error(_ERROR_BADMAILADDRESS);\r
+                       return;\r
                }\r
                if ( !$realname )\r
                {\r
                        self::error(_ERROR_REALNAMEMISSING);\r
+                       return;\r
                }\r
                if ( ($locale != '') && (!in_array($locale, i18n::get_available_locale_list())) )\r
                {\r
                        self::error(_ERROR_NOSUCHTRANSLATION);\r
+                       return;\r
                }\r
                \r
                // check if there will remain at least one site member with both the logon and admin rights\r
@@ -1589,6 +1576,7 @@ class Admin
                        if ( $r->rowCount() < 2 )\r
                        {\r
                                self::error(_ERROR_ATLEASTONEADMIN);\r
+                               return;\r
                        }\r
                }\r
                \r
@@ -1608,7 +1596,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
@@ -1678,11 +1668,13 @@ class Admin
                if ( postVar('password') != postVar('repeatpassword') )\r
                {\r
                        self::error(_ERROR_PASSWORDMISMATCH);\r
+                       return;\r
                }\r
                \r
                if ( i18n::strlen(postVar('password')) < 6 )\r
                {\r
                        self::error(_ERROR_PASSWORDTOOSHORT);\r
+                       return;\r
                }\r
                \r
                $res = Member::create(\r
@@ -1699,6 +1691,7 @@ class Admin
                if ( $res != 1 )\r
                {\r
                        self::error($res);\r
+                       return;\r
                }\r
                \r
                // fire PostRegister event\r
@@ -1714,6 +1707,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
@@ -1746,13 +1751,15 @@ class Admin
                if ( !$info )\r
                {\r
                        self::error(_ERROR_ACTIVATE);\r
+                       return;\r
                }\r
                \r
-               $mem = Member::createFromId($info->vmember);\r
+               $mem =& $manager->getMember($info->vmember);\r
                \r
                if ( !$mem )\r
                {\r
                        self::error(_ERROR_ACTIVATE);\r
+                       return;\r
                }\r
                \r
                /* TODO: we should consider to use the other way insterad of this */\r
@@ -1760,9 +1767,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 +1794,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 +1851,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 +1871,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
@@ -1896,6 +1897,7 @@ class Admin
                if ( !$blog->addTeamMember($memberid, $admin) )\r
                {\r
                        self::error(_ERROR_ALREADYONTEAM);\r
+                       return;\r
                }\r
                \r
                self::action_manageteam();\r
@@ -1918,12 +1920,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
@@ -1944,6 +1944,7 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                self::action_manageteam();\r
                return;\r
@@ -1970,7 +1971,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 +2014,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 +2022,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
@@ -2032,6 +2033,7 @@ class Admin
                        if ( $r->rowCount() == 1 )\r
                        {\r
                                self::error(_ERROR_ATLEASTONEBLOGADMIN);\r
+                               return;\r
                        }\r
                }\r
                \r
@@ -2077,10 +2079,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
@@ -2104,6 +2105,7 @@ class Admin
                if ( !isValidCategoryName($cname) )\r
                {\r
                        self::error(_ERROR_BADCATEGORYNAME);\r
+                       return;\r
                }\r
                \r
                $query = "SELECT * FROM %s WHERE cname=%s AND cblog=%d;";\r
@@ -2112,6 +2114,7 @@ class Admin
                if ( $res->rowCount() > 0 )\r
                {\r
                        self::error(_ERROR_DUPCATEGORYNAME);\r
+                       return;\r
                }\r
                \r
                $blog           =& $manager->getBlog($blogid);\r
@@ -2154,10 +2157,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
@@ -2182,6 +2184,7 @@ class Admin
                if ( !isValidCategoryName($cname) )\r
                {\r
                        self::error(_ERROR_BADCATEGORYNAME);\r
+                       return;\r
                }\r
                \r
                $query  = "SELECT * FROM %s WHERE cname=%s AND cblog=%d AND not(catid=%d);";\r
@@ -2190,6 +2193,7 @@ class Admin
                if ( $res->rowCount() > 0 )\r
                {\r
                        self::error(_ERROR_DUPCATEGORYNAME);\r
+                       return;\r
                }\r
                \r
                $query =  "UPDATE %s SET cname=%s, cdesc=%s WHERE catid=%d;";\r
@@ -2208,12 +2212,11 @@ class Admin
                if ( $desturl )\r
                {\r
                        redirect($desturl);\r
-                       exit;\r
-               }\r
-               else\r
-               {\r
-                       self::action_blogsettings();\r
+                       return;\r
                }\r
+               \r
+               self::action_blogsettings();\r
+               \r
                return;\r
        }\r
        \r
@@ -2238,12 +2241,14 @@ class Admin
                if ( !$blog->isValidCategory($catid) )\r
                {\r
                        self::error(_ERROR_NOSUCHCATEGORY);\r
+                       return;\r
                }\r
                \r
                // don't allow deletion of default category\r
                if ( $blog->getDefaultCategory() == $catid )\r
                {\r
                        self::error(_ERROR_DELETEDEFCATEGORY);\r
+                       return;\r
                }\r
                \r
                // check if catid is the only category left for blogid\r
@@ -2253,11 +2258,10 @@ class Admin
                if ( $res->rowCount() == 1 )\r
                {\r
                        self::error(_ERROR_DELETELASTCATEGORY);\r
+                       return;\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('categorydelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2280,6 +2284,7 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
                self::action_blogsettings();\r
@@ -2485,21 +2490,25 @@ class Admin
                if ( $notify_address && !NOTIFICATION::address_validation($notify_address) )\r
                {\r
                        self::error(_ERROR_BADNOTIFY);\r
+                       return;\r
                }\r
                \r
                if ( !isValidShortName($shortname) )\r
                {\r
                        self::error(_ERROR_BADSHORTBLOGNAME);\r
+                       return;\r
                }\r
                \r
                if ( ($blog->getShortName() != $shortname) && $manager->existsBlog($shortname) )\r
                {\r
                        self::error(_ERROR_DUPSHORTBLOGNAME);\r
+                       return;\r
                }\r
                // check if update file is writable\r
                if ( $updatefile && !is_writeable($updatefile) )\r
                {\r
                        self::error(_ERROR_UPDATEFILE);\r
+                       return;\r
                }\r
                \r
                $blog->setName(trim(postVar('name')));\r
@@ -2554,13 +2563,12 @@ class Admin
                if ( $CONF['DefaultBlog'] == $blogid )\r
                {\r
                        self::error(_ERROR_DELDEFBLOG);\r
+                       return;\r
                }\r
                \r
                $blog =& $manager->getBlog($blogid);\r
                \r
-               self::pagehead();\r
                self::$skin->parse('deleteblog');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2586,6 +2594,7 @@ class Admin
                if ( $CONF['DefaultBlog'] == $blogid )\r
                {\r
                        self::error(_ERROR_DELDEFBLOG);\r
+                       return;\r
                }\r
                \r
                // delete all comments\r
@@ -2636,11 +2645,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
@@ -2662,15 +2669,18 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
                if ( $member->isAdmin() )\r
                {\r
                        self::action_usermanagement();\r
+                       return;\r
                }\r
                else\r
                {\r
                        self::action_overview(_DELETED_MEMBER);\r
+                       return;\r
                }\r
                return;\r
        }\r
@@ -2688,7 +2698,7 @@ class Admin
                global $manager;\r
                \r
                $memberid = intval($memberid);\r
-               $mem = Member::createFromID($memberid);\r
+               $mem =& $manager->getMember($memberid);\r
                \r
                if ( !$mem->canBeDeleted() )\r
                {\r
@@ -2737,9 +2747,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
@@ -2765,11 +2773,13 @@ class Admin
                if ( !isValidShortName($bshortname) )\r
                {\r
                        self::error(_ERROR_BADSHORTBLOGNAME);\r
+                       return;\r
                }\r
                \r
                if ( $manager->existsBlog($bshortname) )\r
                {\r
                        self::error(_ERROR_DUPSHORTBLOGNAME);\r
+                       return;\r
                }\r
                \r
                $data = array(\r
@@ -2842,9 +2852,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 +2893,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
@@ -2899,62 +2905,21 @@ class Admin
         */\r
        static private function action_skinieimport()\r
        {\r
-               global $member, $DIR_LIBS, $DIR_SKINS, $manager;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               // load skinie class\r
-               include_once($DIR_LIBS . 'skinie.php');\r
-               \r
-               $skinFileRaw    = postVar('skinfile');\r
-               $mode                   = postVar('mode');\r
-               \r
-               $importer = new SkinImport();\r
-               \r
-               // get full filename\r
-               if ( $mode == 'file' )\r
-               {\r
-                       $skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml';\r
-                       \r
-                       /* TODO: remove this\r
-                       // backwards compatibilty (in v2.0, exports were saved as skindata.xml)\r
-                       if ( !file_exists($skinFile) )\r
-                       {\r
-                               $skinFile = $DIR_SKINS . $skinFileRaw . '/skindata.xml';\r
-                       }\r
-                        */\r
-               }\r
-               else\r
-               {\r
-                       $skinFile = $skinFileRaw;\r
-               }\r
-               \r
-               // read only metadata\r
-               $error = $importer->readFile($skinFile, 1);\r
-               \r
-               /* TODO: we should consider to use the other way insterad of this */\r
-               $_REQUEST['skininfo']   = $importer->getInfo();\r
-               $_REQUEST['skinnames']  = $importer->getSkinNames();\r
-               $_REQUEST['tpltnames']  = $importer->getTemplateNames();\r
-               \r
-               // clashes\r
-               $skinNameClashes                = $importer->checkSkinNameClashes();\r
-               $templateNameClashes    = $importer->checkTemplateNameClashes();\r
-               $hasNameClashes                 = (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0);\r
-               \r
-               /* TODO: we should consider to use the other way insterad of this */\r
-               $_REQUEST['skinclashes'] = $skinNameClashes;\r
-               $_REQUEST['tpltclashes'] = $templateNameClashes;\r
-               $_REQUEST['nameclashes'] = $hasNameClashes ? 1 : 0;\r
+               $skinFileRaw = postVar('skinfile');\r
+               $mode = postVar('mode');\r
                \r
+               $error = self::skinieimport($mode, $skinFileRaw);\r
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('skinieimport');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2973,100 +2938,39 @@ class Admin
                // load skinie class\r
                include_once($DIR_LIBS . 'skinie.php');\r
                \r
-               $skinFileRaw    = postVar('skinfile');\r
-               $mode                   = postVar('mode');\r
-               \r
+               $mode = postVar('mode');\r
+               $skinFileRaw = postVar('skinfile');\r
                $allowOverwrite = intPostVar('overwrite');\r
                \r
-               // get full filename\r
-               if ( $mode == 'file' )\r
-               {\r
-                       $skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml';\r
-                       \r
-                       /* TODO: remove this\r
-                       // backwards compatibilty (in v2.0, exports were saved as skindata.xml)\r
-                       if ( !file_exists($skinFile) )\r
-                       {\r
-                               $skinFile = $DIR_SKINS . $skinFileRaw . '/skindata.xml';\r
-                       }\r
-                       */\r
-               }\r
-               else\r
+               $error = self::skiniedoimport($mode, $skinFileRaw, $allowOverwrite);\r
+               if ( $error )\r
                {\r
-                       $skinFile = $skinFileRaw;\r
+                       self::error($msg);\r
+                       return;\r
                }\r
                \r
-               $importer = new SkinImport();\r
+               self::$skin->parse('skiniedoimport');\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Admin::action_skinieexport()\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       static private function action_skinieexport()\r
+       {\r
+               global $member;\r
                \r
-               $error = $importer->readFile($skinFile);\r
-               \r
-               if ( $error )\r
-               {\r
-                       self::error($error);\r
-               }\r
-               \r
-               $error = $importer->writeToDatabase($allowOverwrite);\r
-               \r
-               if ( $error )\r
-               {\r
-                       self::error($error);\r
-               }\r
-               \r
-               /* TODO: we should consider to use the other way insterad of this */\r
-               $_REQUEST['skininfo']  = $importer->getInfo();\r
-               $_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
-       /**\r
-        * Admin::action_skinieexport()\r
-        * \r
-        * @param       void\r
-        * @return      void\r
-        */\r
-       static private function action_skinieexport()\r
-       {\r
-               global $member, $DIR_LIBS;\r
-               \r
-               $member->isAdmin() or self::disallow();\r
-               \r
-               // load skinie class\r
-               include_once($DIR_LIBS . 'skinie.php');\r
-               \r
-               $aSkins         = requestIntArray('skin');\r
-               $aTemplates     = requestIntArray('template');\r
-               \r
-               if ( !is_array($aTemplates) )\r
-               {\r
-                       $aTemplates = array();\r
-               }\r
-               if ( !is_array($aSkins) )\r
-               {\r
-                       $aSkins = array();\r
-               }\r
-               \r
-               $skinList               = array_keys($aSkins);\r
-               $templateList   = array_keys($aTemplates);\r
+               $member->isAdmin() or self::disallow();\r
                \r
+               $aSkins = requestIntArray('skin');\r
+               $aTemplates = requestIntArray('template');\r
                $info = postVar('info');\r
                \r
-               $exporter = new SkinExport();\r
-               foreach ( $skinList as $skinId )\r
-               {\r
-                       $exporter->addSkin($skinId);\r
-               }\r
-               foreach ($templateList as $templateId)\r
-               {\r
-                       $exporter->addTemplate($templateId);\r
-               }\r
-               $exporter->setInfo($info);\r
+               self::skinieexport($aSkins, $aTemplates, $info);\r
                \r
-               $exporter->export();\r
                return;\r
        }\r
        \r
@@ -3082,9 +2986,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,30 +3008,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
@@ -3149,11 +3035,13 @@ class Admin
                if ( !isValidTemplateName($name) )\r
                {\r
                        self::error(_ERROR_BADTEMPLATENAME);\r
+                       return;\r
                }\r
                \r
                if ( (Template::getNameFromId($templateid) != $name) && Template::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPTEMPLATENAME);\r
+                       return;\r
                }\r
                \r
                // 1. Remove all template parts\r
@@ -3259,9 +3147,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
@@ -3314,11 +3200,13 @@ class Admin
                if ( !isValidTemplateName($name) )\r
                {\r
                        self::error(_ERROR_BADTEMPLATENAME);\r
+                       return;\r
                }\r
                \r
                if ( Template::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPTEMPLATENAME);\r
+                       return;\r
                }\r
                \r
                $newTemplateId = Template::createNew($name, $desc);\r
@@ -3384,11 +3272,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
@@ -3406,11 +3292,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
@@ -3431,11 +3317,13 @@ class Admin
                if ( !isValidTemplateName($name) )\r
                {\r
                        self::error(_ERROR_BADTEMPLATENAME);\r
+                       return;\r
                }\r
                \r
                if ( (Template::getNameFromId($templateid) != $name) && Template::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPTEMPLATENAME);\r
+                       return;\r
                }\r
                \r
                // 1. Remove all template parts\r
@@ -3449,9 +3337,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
@@ -3556,7 +3444,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
@@ -3608,9 +3496,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
@@ -3663,14 +3549,17 @@ class Admin
                if ( !isValidTemplateName($name) )\r
                {\r
                        self::error(_ERROR_BADTEMPLATENAME);\r
+                       return;\r
                }\r
                else if ( !preg_match('#^admin/#', $name) )\r
                {\r
                        self::error(_ERROR_BADADMINTEMPLATENAME);\r
+                       return;\r
                }\r
                else if ( Template::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPTEMPLATENAME);\r
+                       return;\r
                }\r
                \r
                $newTemplateId = Template::createNew($name, $desc);\r
@@ -3737,9 +3626,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
@@ -3761,14 +3648,15 @@ class Admin
                if ( !isValidSkinName($name) )\r
                {\r
                        self::error(_ERROR_BADSKINNAME);\r
+                       return;\r
                }\r
-               \r
-               if ( SKIN::exists($name) )\r
+               else if ( SKIN::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPSKINNAME);\r
+                       return;\r
                }\r
                \r
-               $newId = SKIN::createNew($name, $desc);\r
+               SKIN::createNew($name, $desc);\r
                \r
                self::action_skinoverview();\r
                return;\r
@@ -3782,13 +3670,11 @@ class Admin
         */\r
        static private function action_skinedit()\r
        {\r
-               global $member, $manager;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('skinedit');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -3806,44 +3692,20 @@ class Admin
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               $name           = postVar('name');\r
-               $desc           = postVar('desc');\r
-               $type           = postVar('type');\r
-               $inc_mode       = postVar('inc_mode');\r
-               $inc_prefix     = postVar('inc_prefix');\r
-               \r
-               $skin = new Skin($skinid);\r
-               \r
-               // 1. Some checks\r
-               if ( !isValidSkinName($name) )\r
-               {\r
-                       self::error(_ERROR_BADSKINNAME);\r
-               }\r
-               \r
-               if ( ($skin->getName() != $name) && SKIN::exists($name) )\r
-               {\r
-                       self::error(_ERROR_DUPSKINNAME);\r
-               }\r
-               \r
-               if ( !$type )\r
-               {\r
-                       $type = 'text/html';\r
-               }\r
-               if ( !$inc_mode )\r
+               $error = self::skineditgeneral($skinid);\r
+               if ( $error )\r
                {\r
-                       $inc_mode = 'normal';\r
+                       self::error($error);\r
+                       return;\r
                }\r
                \r
-               // 2. Update description\r
-               $skin->updateGeneralInfo($name, $desc, $type, $inc_mode, $inc_prefix);\r
-               \r
                self::action_skinedit();\r
                return;\r
        }\r
        \r
        static private function action_skinedittype($msg = '')\r
        {\r
-               global $member, $manager;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
@@ -3852,19 +3714,17 @@ class Admin
                        self::$headMess = $msg;\r
                }\r
                \r
-               $skinid = intRequestVar('skinid');\r
-               $type   = requestVar('type');\r
-               $type   = trim($type);\r
-               $type   = strtolower($type);\r
+               $type = requestVar('type');\r
+               $type = trim($type);\r
+               $type = strtolower($type);\r
                \r
                if ( !isValidShortName($type) )\r
                {\r
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT);\r
+                       return;\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('skinedittype');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -3876,7 +3736,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
@@ -3884,7 +3744,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
@@ -3899,16 +3759,17 @@ class Admin
         */\r
        static private function action_skindelete()\r
        {\r
-               global $member, $manager, $CONF;\r
-               \r
-               $skinid = intRequestVar('skinid');\r
+               global $CONF, $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
+               $skinid = intRequestVar('skinid');\r
+               \r
                // don't allow default skin to be deleted\r
                if ( $skinid == $CONF['BaseSkin'] )\r
                {\r
                        self::error(_ERROR_DEFAULTSKIN);\r
+                       return;\r
                }\r
                \r
                // don't allow deletion of default skins for blogs\r
@@ -3919,11 +3780,10 @@ class Admin
                if ( $name )\r
                {\r
                        self::error(_ERROR_SKINDEFDELETE . Entity::hsc($name));\r
+                       return;\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('skindelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -3935,16 +3795,17 @@ class Admin
         */\r
        static private function action_skindeleteconfirm()\r
        {\r
-               global $member, $CONF, $manager;\r
-               \r
-               $skinid = intRequestVar('skinid');\r
+               global $member, $CONF;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
+               $skinid = intRequestVar('skinid');\r
+               \r
                // don't allow default skin to be deleted\r
                if ( $skinid == $CONF['BaseSkin'] )\r
                {\r
                        self::error(_ERROR_DEFAULTSKIN);\r
+                       return;\r
                }\r
                \r
                // don't allow deletion of default skins for blogs\r
@@ -3955,23 +3816,10 @@ class Admin
                if ( $name )\r
                                {\r
                        self::error(_ERROR_SKINDEFDELETE . Entity::hsc($name));\r
+                       return;\r
                }\r
                \r
-               $data = array('skinid' => $skinid);\r
-               $manager->notify('PreDeleteSkin', $data);\r
-               \r
-               // 1. delete description\r
-               $query = "DELETE FROM %s WHERE sdnumber=%d;";\r
-               $query = sprintf($query, sql_table('skin_desc'), (integer) $skinid);\r
-               DB::execute($query);\r
-               \r
-               // 2. delete parts\r
-               $query = "DELETE FROM %s WHERE sdesc=%d;";\r
-               $query = sprintf($query, sql_table('skin'), (integer) $skinid);\r
-               DB::execute($query);\r
-               \r
-               $data = array('skinid' => $skinid);\r
-               $manager->notify('PostDeleteSkin', $data);\r
+               self::skindeleteconfirm($skinid);\r
                \r
                self::action_skinoverview();\r
                return;\r
@@ -3985,7 +3833,7 @@ class Admin
         */\r
        static private function action_skinremovetype()\r
        {\r
-               global $member, $manager, $CONF;\r
+               global $member, $CONF;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
@@ -3995,18 +3843,10 @@ class Admin
                if ( !isValidShortName($skintype) )\r
                {\r
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
+                       return;\r
                }\r
                \r
-               // don't allow default skinparts to be deleted\r
-               /* TODO: this array should be retrieved from Action class */\r
-               if ( in_array($skintype, array('index', 'item', 'archivelist', 'archive', 'search', 'error', 'member', 'imagepopup')) )\r
-               {\r
-                       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
@@ -4018,46 +3858,24 @@ class Admin
         */\r
        static private function action_skinremovetypeconfirm()\r
        {\r
-               global $member, $CONF, $manager;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
                $skinid = intRequestVar('skinid');\r
                $skintype = requestVar('type');\r
                \r
-               if ( !isValidShortName($skintype) )\r
-               {\r
-                       self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
-               }\r
-               \r
-               // don't allow default skinparts to be deleted\r
-               /* TODO: this array should be retrieved from Action class */\r
-               if ( in_array($skintype, array('index', 'item', 'archivelist', 'archive', 'search', 'error', 'member', 'imagepopup')) )\r
+               $error = self::skinremovetypeconfirm($skinid, $skintype);\r
+               if ( $error )\r
                {\r
-                       self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
+                       self::error($error);\r
+                       return;\r
                }\r
                \r
-               $data = array(\r
-                       'skinid'   => $skinid,\r
-                       '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
-               DB::execute($query);\r
-               \r
-               $data = array(\r
-                       'skinid'   => $skinid,\r
-                       'skintype' => $skintype\r
-               );\r
-               $manager->notify('PostDeleteSkinPart', $data);\r
-               \r
                self::action_skinedit();\r
                return;\r
        }\r
-\r
+       \r
        /**\r
         * Admin::action_skinclone()\r
         * \r
@@ -4072,68 +3890,13 @@ class Admin
                \r
                $skinid = intRequestVar('skinid');\r
                \r
-               // 1. read skin to clone\r
-               $skin = new Skin($skinid);\r
-               \r
-               $name = "{$skin->getName()}_clone";\r
-               \r
-               // if a skin with that name already exists:\r
-               if ( Skin::exists($name) )\r
-               {\r
-                       $i = 1;\r
-                       while ( Skin::exists($name . $i) )\r
-                       {\r
-                               $i++;\r
-                       }\r
-                       $name .= $i;\r
-               }\r
-               \r
-               // 2. create skin desc\r
-               $newid = Skin::createNew(\r
-                       $name,\r
-                       $skin->getDescription(),\r
-                       $skin->getContentType(),\r
-                       $skin->getIncludeMode(),\r
-                       $skin->getIncludePrefix()\r
-               );\r
-               \r
-               // 3. clone\r
-               $query = "SELECT stype FROM %s WHERE sdesc=%d;";\r
-               $query = sprintf($query, sql_table('skin'), (integer) $skinid);\r
-               \r
-               $res = DB::getResult($query);\r
-               foreach ( $res as $row )\r
-               {\r
-                       self::skinclonetype($skin, $newid, $row['stype']);\r
-               }\r
+               self::skinclone($skinid);\r
                \r
                self::action_skinoverview();\r
                return;\r
        }\r
        \r
        /**\r
-        * Admin::skinclonetype()\r
-        * \r
-        * @param       String  $skin   Skin object\r
-        * @param       Integer $newid  ID for this clone\r
-        * @param       String  $type   type of skin\r
-        * @return      Void\r
-        */\r
-       static private function skinclonetype($skin, $newid, $type)\r
-       {\r
-               $newid = intval($newid);\r
-               $content = $skin->getContentFromDB($type);\r
-               \r
-               if ( $content )\r
-               {\r
-                       $query = "INSERT INTO %s (sdesc, scontent, stype) VALUES (%d, %s, %s)";\r
-                       $query = sprintf($query, sql_table('skin'), (integer) $newid, DB::quoteValue($content), DB::quoteValue($type));\r
-                       DB::execute($query);\r
-               }\r
-               return;\r
-       }\r
-       \r
-       /**\r
         * Admin::action_adminskinoverview()\r
         * \r
         * @param       void\r
@@ -4141,13 +3904,11 @@ class Admin
         */\r
        static private function action_adminskinoverview()\r
        {\r
-               global $member, $manager;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('adminskinoverview');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -4160,24 +3921,30 @@ class Admin
        static private function action_adminskinnew()\r
        {\r
                global $member;\r
+               \r
                $member->isAdmin() or self::disallow();\r
+               \r
                $name = trim(postVar('name'));\r
                $desc = trim(postVar('desc'));\r
                \r
                if ( !isValidSkinName($name) )\r
                {\r
                        self::error(_ERROR_BADSKINNAME);\r
+                       return;\r
                }\r
                else if ( !preg_match('#^admin/#', $name) )\r
                {\r
                        self::error(_ERROR_BADADMINSKINNAME);\r
+                       return;\r
                }\r
                else if ( Skin::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPSKINNAME);\r
+                       return;\r
                }\r
-               /* TODO: $newId is not reused... */\r
-               $newId = Skin::createNew($name, $desc);\r
+               \r
+               Skin::createNew($name, $desc);\r
+               \r
                self::action_adminskinoverview();\r
                return;\r
        }\r
@@ -4190,12 +3957,12 @@ class Admin
         */\r
        static private function action_adminskinedit()\r
        {\r
-               global $member, $manager;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
-               self::pagehead();\r
+               \r
                self::$skin->parse('adminskinedit');\r
-               self::pagefoot();\r
+               \r
                return;\r
        }\r
        \r
@@ -4213,33 +3980,13 @@ class Admin
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               $name           = postVar('name');\r
-               $desc           = postVar('desc');\r
-               $type           = postVar('type');\r
-               $inc_mode       = postVar('inc_mode');\r
-               $inc_prefix     = postVar('inc_prefix');\r
-               \r
-               $skin = new Skin($skinid, 'AdminActions', 'AdminSkin');\r
-               \r
-               // 1. Some checks\r
-               if ( !isValidSkinName($name) )\r
-               {\r
-                       self::error(_ERROR_BADSKINNAME);\r
-               }\r
-               if ( ($skin->getName() != $name) && Skin::exists($name) )\r
-               {\r
-                       self::error(_ERROR_DUPSKINNAME);\r
-               }\r
-               if ( !$type )\r
-               {\r
-                       $type = 'text/html';\r
-               }\r
-               if ( !$inc_mode )\r
+               $error = self::skineditgeneral($skinid, 'AdminActions');\r
+               if ( $error )\r
                {\r
-                       $inc_mode = 'normal';\r
+                       self::error($error);\r
+                       return;\r
                }\r
-               // 2. Update description\r
-               $skin->updateGeneralInfo($name, $desc, $type, $inc_mode, $inc_prefix);\r
+               \r
                self::action_adminskinedit();\r
                return;\r
        }\r
@@ -4252,7 +3999,7 @@ class Admin
         */\r
        static private function action_adminskinedittype($msg = '')\r
        {\r
-               global $member, $manager;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
@@ -4267,11 +4014,10 @@ class Admin
                if ( !isValidShortName($type) )\r
                {\r
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT);\r
+                       return;\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('adminskinedittype');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -4283,15 +4029,17 @@ 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
-               \r
-               $member->isAdmin() or self::disallow();\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 =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin');\r
+               $skin->update($type, $content);\r
                \r
-               $skin = new Skin($skinid, 'Admin', 'AdminSkin');\r
-               $skin->update($type, $content);\r
                self::action_adminskinedittype(_SKIN_UPDATED);\r
                return;\r
        }\r
@@ -4304,14 +4052,34 @@ class Admin
         */\r
        static private function action_adminskindelete()\r
        {\r
-               global $member, $manager, $CONF;\r
+               global $CONF, $member;\r
+               \r
                $member->isAdmin() or self::disallow();\r
                \r
-               /* TODO: needless variable $skinid... */\r
                $skinid = intRequestVar('skinid');\r
-               self::pagehead();\r
+               \r
+               // don't allow default skin to be deleted\r
+               if ( $skinid == $CONF['AdminSkin'] || $skinid == $CONF['BookmarkletSkin'] )\r
+               {\r
+                       self::error(_ERROR_DEFAULTSKIN);\r
+                       return;\r
+               }\r
+               \r
+               /* don't allow if someone use it as a default*/\r
+               $query = 'SELECT * FROM %s WHERE madminskin = %d or mbkmklt = %d;';\r
+               $res = DB::getResult(sprintf($query, sql_table('member'), $skinid, $skinid));\r
+               \r
+               $members = array();\r
+               while ( $row = $res->fetch() ) {\r
+                       $members[] = $row['mrealname'];\r
+               }\r
+               if ( count($members) )\r
+               {\r
+                       self::error(_ERROR_SKINDEFDELETE . implode(' ' . _AND . ' ', $members));\r
+                       return;\r
+               }\r
+               \r
                self::$skin->parse('adminskindelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
 \r
@@ -4323,45 +4091,35 @@ class Admin
         */\r
        static private function action_adminskindeleteconfirm()\r
        {\r
-               global $member, $CONF, $manager;\r
+               global $member, $CONF;\r
                \r
                $member->isAdmin() or self::disallow();\r
+               \r
                $skinid = intRequestVar('skinid');\r
                \r
                // don't allow default skin to be deleted\r
-               if ( $skinid == $CONF['AdminSkin'] )\r
+               if ( $skinid == $CONF['AdminSkin'] || $skinid == $CONF['BookmarkletSkin'] )\r
                {\r
                        self::error(_ERROR_DEFAULTSKIN);\r
+                       return;\r
                }\r
                \r
-               /*\r
-                * TODO: NOT Implemented\r
-                *  don't allow deletion of default skins for members\r
-               $memberDefaults =  $member->getAdminSkin();\r
-               foreach ( $memberDefaults as $memID => $adminskin )\r
+               /* don't allow if someone use it as a default*/\r
+               $query = 'SELECT * FROM %s WHERE madminskin = %d or mbkmklt = %d;';\r
+               $res = DB::getResult(sprintf($query, sql_table('member'), $skinid, $skinid));\r
+               \r
+               $members = array();\r
+               while ( $row = $res->fetch() ) {\r
+                       $members[] = $row['mrealname'];\r
+               }\r
+               if ( count($members) )\r
                {\r
-                       if ( $skinid == $adminskin )\r
-                       {\r
-                               $mem = MEMBER::createFromID($memID);\r
-                               self::error(_ERROR_SKINDEFDELETE . $mem->displayname);\r
-                       }\r
+                       self::error(_ERROR_SKINDEFDELETE . implode(' ' . _AND . ' ', $members));\r
+                       return;\r
                }\r
-               */\r
-               \r
-               $manager->notify('PreDeleteAdminSkin', array('skinid' => (integer) $skinid));\r
-               \r
-               // 1. delete description\r
-               $query = "DELETE FROM %s WHERE sdnumber=%d;";\r
-               $query = sprintf($query, sql_table('skin_desc'), (integer) $skinid);\r
-               DB::execute($query);\r
                \r
-               // 2. delete parts\r
-               $query = "DELETE FROM %s WHERE sdesc=%d;";\r
-               $query = sprintf($query, sql_table('skin'), (integer) $skinid);\r
+               self::skindeleteconfirm($skinid);\r
                \r
-               DB::execute($query);\r
-               \r
-               $manager->notify('PostDeleteAdminSkin', array('skinid' => (integer) $skinid));\r
                self::action_adminskinoverview();\r
                return;\r
        }\r
@@ -4374,21 +4132,20 @@ class Admin
         */\r
        static private function action_adminskinremovetype()\r
        {\r
-               global $member, $manager, $CONF;\r
+               global $member, $CONF;\r
 \r
                $member->isAdmin() or self::disallow();\r
                \r
-               $skinid         = intRequestVar('skinid');\r
-               $skintype       = requestVar('type');\r
+               $skinid = intRequestVar('skinid');\r
+               $skintype = requestVar('type');\r
                \r
                if ( !isValidShortName($skintype) )\r
                {\r
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
+                       return;\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('adminskinremovetype');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -4400,35 +4157,20 @@ class Admin
         */\r
        static private function action_adminskinremovetypeconfirm()\r
        {\r
-               global $member, $CONF, $manager;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               $skinid         = intRequestVar('skinid');\r
-               $skintype       = requestVar('type');\r
+               $skinid = intRequestVar('skinid');\r
+               $skintype = requestVar('type');\r
                \r
-               if ( !isValidShortName($skintype) )\r
+               $error = self::skinremovetypeconfirm($skinid, $skintype);\r
+               if ( $error )\r
                {\r
-                       self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
+                       self::error($error);\r
+                       return;\r
                }\r
                \r
-               $data =array(\r
-                       'skinid'        => $skinid,\r
-                       'skintype'      => $skintype\r
-               );\r
-               $manager->notify('PreDeleteAdminSkinPart', $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, $skintype);\r
-               DB::execute($query);\r
-               \r
-               $data = array(\r
-                       'skinid'        => $skinid,\r
-                       'skintype'      => $skintype\r
-               );\r
-               $manager->notify('PostDeleteAdminSkinPart', $data);\r
-               \r
                self::action_adminskinedit();\r
                return;\r
        }\r
@@ -4447,65 +4189,13 @@ class Admin
                \r
                $skinid = intRequestVar('skinid');\r
                \r
-               // 1. read skin to clone\r
-               $skin = new Skin($skinid, 'Admin', 'AdminSkin');\r
-               $name = "{$skin->getName()}_clone";\r
-               \r
-               // if a skin with that name already exists:\r
-               if ( Skin::exists($name) )\r
-               {\r
-                       $i = 1;\r
-                       while ( Skin::exists($name . $i) )\r
-                       {\r
-                               $i++;\r
-                       }\r
-                       $name .= $i;\r
-               }\r
-               \r
-               // 2. create skin desc\r
-               $newid = Skin::createNew(\r
-                       $name,\r
-                       $skin->getDescription(),\r
-                       $skin->getContentType(),\r
-                       $skin->getIncludeMode(),\r
-                       $skin->getIncludePrefix()\r
-               );\r
+               self::skinclone($skinid, 'AdminActions');\r
                \r
-               // 3. clone\r
-               $query = "SELECT stype FROM %s WHERE sdesc=%d;";\r
-               $query = sprintf($query, sql_table('skin'), (integer) $skinid);\r
-               \r
-               $res = DB::getResult($query);\r
-               foreach ( $res as $row )\r
-               {\r
-                       self::skinclonetype($skin, $newid, $row['stype']);\r
-               }\r
                self::action_adminskinoverview();\r
                return;\r
        }\r
        \r
        /**\r
-        * Admin::adminskinclonetype()\r
-        * \r
-        * @param       string  $skin   an instance of Skin class\r
-        * @param       integer $newid  ID for new skin\r
-        * @param       string  $type   skin type\r
-        * @return      void\r
-        */\r
-       static private function adminskinclonetype($skin, $newid, $type)\r
-       {\r
-               $content = $skin->getContentFromDB($type);\r
-               \r
-               if ( $content )\r
-               {\r
-                       $query = "INSERT INTO %s (sdesc, scontent, stype) VALUES (%d, %s, %s)";\r
-                       $query = sprintf($query, sql_table('skin'), (integer) $newid, DB::quoteValue($content), DB::quoteValue($type));\r
-                       DB::execute($query);\r
-               }\r
-               return;\r
-       }\r
-       \r
-       /**\r
         * Admin::action_adminskinieoverview()\r
         * \r
         * @param       void\r
@@ -4513,16 +4203,11 @@ class Admin
         */\r
        static private function action_adminskinieoverview()\r
        {\r
-               global $member, $DIR_LIBS, $manager;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               // 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
@@ -4534,58 +4219,28 @@ class Admin
         */\r
        static private function action_adminskinieimport()\r
        {\r
-               global $DIR_LIBS, $DIR_SKINS, $manager, $member;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               // load skinie class\r
-               include_once($DIR_LIBS . 'skinie.php');\r
-               \r
-               $skinFileRaw    = postVar('skinfile');\r
-               $mode                   = postVar('mode');\r
-               \r
-               $importer = new SKINIMPORT();\r
+               $skinFileRaw = postVar('skinfile');\r
+               $mode = postVar('mode');\r
                \r
-               // get full filename\r
-               if ( $mode == 'file' )\r
+               $error = self::skinieimport($mode, $skinFileRaw);\r
+               if ( $error )\r
                {\r
-                       $skinFile = "{$DIR_SKINS}admin/{$skinFileRaw}/skinbackup.xml";\r
-                       \r
-                       // backwards compatibilty (in v2.0, exports were saved as skindata.xml)\r
-                       if ( !file_exists($skinFile) )\r
-                       {\r
-                               $skinFile = "{$DIR_SKINS}admin/{$skinFileRaw}/skindata.xml";\r
-                       }\r
+                       self::error($error);\r
+                       return;\r
                }\r
-               else\r
+               \r
+               if ( !is_object(self::$skin) )\r
                {\r
-                       $skinFile = $skinFileRaw;\r
+                       self::action_adminskiniedoimport();\r
                }\r
-               \r
-               // read only metadata\r
-               $error = $importer->readFile($skinFile, 1);\r
-               if ( $error )\r
+               else\r
                {\r
-                       self::error($error);\r
+                       self::$skin->parse('adminskinieimport');\r
                }\r
-               \r
-               /* TODO: we should consider to use the other way instead of this */\r
-               $_REQUEST['skininfo']   = $importer->getInfo();\r
-               $_REQUEST['skinnames']  = $importer->getSkinNames();\r
-               $_REQUEST['tpltnames']  = $importer->getTemplateNames();\r
-               \r
-               // clashes\r
-               $skinNameClashes                        = $importer->checkSkinNameClashes();\r
-               $templateNameClashes            = $importer->checkTemplateNameClashes();\r
-               $hasNameClashes                         = (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0);\r
-               /* TODO: we should consider to use the other way instead of this */\r
-               $_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
                return;\r
        }\r
        \r
@@ -4597,54 +4252,37 @@ class Admin
         */\r
        static private function action_adminskiniedoimport()\r
        {\r
-               global $DIR_LIBS, $DIR_SKINS, $member;\r
+               global $DIR_SKINS, $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               // load skinie class\r
-               include_once($DIR_LIBS . 'skinie.php');\r
-               \r
-               $skinFileRaw    = postVar('skinfile');\r
-               $mode                   = postVar('mode');\r
+               $mode = postVar('mode');\r
+               $skinFileRaw = postVar('skinfile');\r
                $allowOverwrite = intPostVar('overwrite');\r
                \r
-               // get full filename\r
-               if ( $mode == 'file' )\r
-               {\r
-                       $skinFile = "{$DIR_SKINS}admin/{$skinFileRaw}/skinbackup.xml";\r
-                       // backwards compatibilty (in v2.0, exports were saved as skindata.xml)\r
-                       if ( !file_exists($skinFile) )\r
-                       {\r
-                               $skinFile = "{$DIR_SKINS}admin/{$skinFileRaw}/skindata.xml";\r
-                       }\r
-               }\r
-               else\r
-               {\r
-                       $skinFile = $skinFileRaw;\r
-               }\r
-               \r
-               $importer = new SKINIMPORT();\r
-               \r
-               $error = $importer->readFile($skinFile);\r
+               $error = self::skiniedoimport($mode, $skinFileRaw, $allowOverwrite);\r
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
-               $error = $importer->writeToDatabase($allowOverwrite);\r
-               if ( $error )\r
+               if ( !is_object(self::$skin) )\r
                {\r
-                       self::error($error);\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   = new Skin(0, 'AdminActions', 'AdminSkin');\r
+                       $skin->parse('importAdmin', $DIR_SKINS . 'admin/defaultimporter.skn');\r
+               }\r
+               else\r
+               {\r
+                       self::$skin->parse('adminskiniedoimport');\r
                }\r
-               \r
-               /* TODO: we should consider to use the other way instead of this */\r
-               $_REQUEST['skininfo']   = $importer->getInfo();\r
-               $_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
@@ -4656,38 +4294,17 @@ class Admin
         */\r
        static private function action_adminskinieexport()\r
        {\r
-               global $member, $DIR_PLUGINS;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
                // load skinie class\r
                $aSkins = requestIntArray('skin');\r
-               if (!is_array($aSkins)) {\r
-                       $aSkins = array();\r
-               }\r
-               $skinList = array_keys($aSkins);\r
-               \r
                $aTemplates = requestIntArray('template');\r
-               if (!is_array($aTemplates))\r
-               {\r
-                       $aTemplates = array();\r
-               }\r
-               $templateList = array_keys($aTemplates);\r
-               \r
                $info = postVar('info');\r
                \r
-               include_libs('skinie.php');\r
-               $exporter = new SkinExport();\r
-               foreach ( $skinList as $skinId )\r
-               {\r
-                       $exporter->addSkin($skinId);\r
-               }\r
-               foreach ( $templateList as $templateId )\r
-               {\r
-                       $exporter->addTemplate($templateId);\r
-               }\r
-               $exporter->setInfo($info);\r
-               $exporter->export();\r
+               self::skinieexport($aSkins, $aTemplates, $info);\r
+               \r
                return;\r
        }\r
        \r
@@ -4703,9 +4320,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
@@ -4726,6 +4341,7 @@ class Admin
                if ( !NOTIFICATION::address_validation(postVar('AdminEmail')) )\r
                {\r
                        self::error(_ERROR_BADMAILADDRESS);\r
+                       return;\r
                }\r
                \r
                // save settings\r
@@ -4763,7 +4379,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
@@ -4781,9 +4399,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 +4432,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
@@ -4835,300 +4449,19 @@ class Admin
                self::error(_ERROR_DISALLOWED);\r
                return;\r
        }\r
-       \r
+\r
        /**\r
-        * Admin::PluninAdminPagehead()\r
-        * Output pluginadmin page head\r
+        * Admin::action_PluginAdmin()\r
+        * Output pluginadmin\r
         *\r
+        * @param       string  $skinContents\r
         * @param       string  $extrahead\r
         * @return      void\r
         */\r
-       static public function PluninAdminPagehead($extrahead = '')\r
-       {\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
@@ -5145,9 +4478,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 +4494,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 +4511,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 +4528,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
@@ -5248,14 +4573,13 @@ class Admin
                if ( sizeof($deleted) == 0 )\r
                {\r
                        self::error(_ERROR_DELETEBAN);\r
+                       return;\r
                }\r
                \r
                /* 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
@@ -5267,7 +4591,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
@@ -5293,9 +4621,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
@@ -5329,6 +4655,7 @@ class Admin
                        if ( !Ban::addBan($blogid, $iprange, $reason) )\r
                        {\r
                                self::error(_ERROR_ADDBAN);\r
+                               return;\r
                        }\r
                }\r
                else\r
@@ -5346,6 +4673,7 @@ class Admin
                        if ( $failed )\r
                        {\r
                                self::error(_ERROR_ADDBAN);\r
+                               return;\r
                        }\r
                }\r
                self::action_banlist();\r
@@ -5382,9 +4710,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
@@ -5412,7 +4738,7 @@ class Admin
                @set_time_limit(1200);\r
                \r
                Backup::do_backup($useGzip);\r
-               exit;\r
+               return;\r
        }\r
        \r
        /**\r
@@ -5431,6 +4757,7 @@ class Admin
                if ( intPostVar('letsgo') != 1 )\r
                {\r
                        self::error(_ERROR_BACKUP_NOTSURE);\r
+                       return;\r
                }\r
                \r
                include($DIR_LIBS . 'backup.php');\r
@@ -5443,10 +4770,9 @@ class Admin
                if ( $message != '' )\r
                {\r
                        self::error($message);\r
+                       return;\r
                }\r
-               self::pagehead();\r
                self::$skin->parse('backuprestore');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -5465,9 +4791,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
@@ -5489,11 +4813,10 @@ class Admin
                if ( !$manager->pidInstalled($plugid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('pluginhelp');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -5516,11 +4839,13 @@ class Admin
                if ( $manager->pluginInstalled($name) )\r
                {\r
                        self::error(_ERROR_DUPPLUGIN);\r
+                       return;\r
                }\r
                \r
                if ( !checkPlugin($name) )\r
                {\r
                        self::error(_ERROR_PLUGFILEERROR . ' (' . Entity::hsc($name) . ')');\r
+                       return;\r
                }\r
                \r
                // get number of currently installed plugins\r
@@ -5554,6 +4879,7 @@ class Admin
                        \r
                        $manager->clearCachedInfo('installedPlugins');\r
                        self::error(_ERROR_PLUGIN_LOAD);\r
+                       return;\r
                }\r
                \r
                // check if plugin needs a newer Nucleus version\r
@@ -5564,6 +4890,7 @@ class Admin
                        \r
                        // ...and show error\r
                        self::error(_ERROR_NUCLEUSVERSIONREQ . Entity::hsc($plugin->getMinNucleusVersion()));\r
+                       return;\r
                }\r
                \r
                // check if plugin needs a newer Nucleus version\r
@@ -5574,6 +4901,7 @@ class Admin
                        \r
                        // ...and show error\r
                        self::error(_ERROR_NUCLEUSVERSIONREQ . Entity::hsc( $plugin->getMinNucleusVersion() . ' patch ' . $plugin->getMinNucleusPatchLevel() ) );\r
+                       return;\r
                }\r
                \r
                $pluginList = $plugin->getPluginDep();\r
@@ -5585,6 +4913,7 @@ class Admin
                                // uninstall plugin again...\r
                                self::deleteOnePlugin($plugin->getID());\r
                                self::error(sprintf(_ERROR_INSREQPLUGIN, Entity::hsc($pluginName)));\r
+                               return;\r
                        }\r
                }\r
                \r
@@ -5655,11 +4984,10 @@ class Admin
                if ( !$manager->pidInstalled($pid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('plugindelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
 \r
@@ -5682,6 +5010,7 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
                redirect($CONF['AdminURL'] . '?action=pluginlist');\r
@@ -5791,6 +5120,7 @@ class Admin
                if ( !$manager->pidInstalled($plugid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                // 1. get old order number\r
@@ -5826,6 +5156,7 @@ class Admin
                if ( !$manager->pidInstalled($plugid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                // 1. get old order number\r
@@ -5868,16 +5199,18 @@ class Admin
                if ( !$manager->pidInstalled($pid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                if ( isset($message) )\r
                {\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
@@ -5902,6 +5235,7 @@ class Admin
                if ( !$manager->pidInstalled($pid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                $aOptions = requestArray('plugoption');\r
@@ -5918,75 +5252,327 @@ class Admin
        }\r
        \r
        /**\r
-        * Admin::insertPluginOptions()\r
+        * Admin::skineditgeneral()\r
         * \r
-        * Output plugin option field\r
+        * @param       integer $skinid\r
+        * @param       string  $handler\r
+        * @return      string  empty or message if failed\r
+        */\r
+       static private function skineditgeneral($skinid, $handler='')\r
+       {\r
+               global $manager;\r
+               \r
+               $name = postVar('name');\r
+               $desc = postVar('desc');\r
+               $type = postVar('type');\r
+               $inc_mode = postVar('inc_mode');\r
+               $inc_prefix = postVar('inc_prefix');\r
+               \r
+               $skin =& $manager->getSkin($skinid, $handler);\r
+               \r
+               // 1. Some checks\r
+               if ( !isValidSkinName($name) )\r
+               {\r
+                       return _ERROR_BADSKINNAME;\r
+               }\r
+               \r
+               if ( ($skin->getName() != $name) && SKIN::exists($name) )\r
+               {\r
+                       return _ERROR_DUPSKINNAME;\r
+               }\r
+               \r
+               if ( !$type )\r
+               {\r
+                       $type = 'text/html';\r
+               }\r
+               \r
+               if ( !$inc_mode )\r
+               {\r
+                       $inc_mode = 'normal';\r
+               }\r
+               \r
+               // 2. Update description\r
+               $skin->updateGeneralInfo($name, $desc, $type, $inc_mode, $inc_prefix);\r
+               \r
+               return '';\r
+       }\r
+       /**\r
+        * Admin::skindeleteconfirm()\r
         * \r
-        * @access      public\r
-        * @param string        $context        plugin option context\r
-        * @param integer       $contextid      plugin option context id\r
+        * @param       integer $skinid\r
         * @return      void\r
         */\r
-       static public function insertPluginOptions($context, $contextid = 0)\r
+       static private function skindeleteconfirm($skinid)\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
+               if ( !preg_match('#^admin/#', self::$action) )\r
+               {\r
+                       $event_identifier = 'Skin';\r
+               }\r
+               else\r
+               {\r
+                       $event_identifier = 'AdminSkin';\r
+               }\r
+               \r
+               $manager->notify("PreDelete{$event_identifier}", array('skinid' => $skinid));\r
                \r
-               $query = "SELECT oid, ovalue FROM %s WHERE ocontextid=%d;";\r
-               $query = sprintf($query, sql_table('plugin_option'), (integer) $contextid);\r
+               // 1. delete description\r
+               $query = "DELETE FROM %s WHERE sdnumber=%d;";\r
+               $query = sprintf($query, sql_table('skin_desc'), (integer) $skinid);\r
+               DB::execute($query);\r
                \r
-               $res = DB::getResult($query);\r
-               foreach ( $res as $row )\r
+               // 2. delete parts\r
+               $query = "DELETE FROM %s WHERE sdesc=%d;";\r
+               $query = sprintf($query, sql_table('skin'), (integer) $skinid);\r
+               DB::execute($query);\r
+               \r
+               $manager->notify("PostDelete{$event_identifier}", array('skinid' => $skinid));\r
+               \r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Admin::skinremovetypeconfirm()\r
+        * \r
+        * @param       integer $skinid\r
+        * @param       string  $skintype\r
+        * @return      string  empty or message if failed\r
+        */\r
+       static private function skinremovetypeconfirm($skinid, $skintype)\r
+       {\r
+               global $manager;\r
+               \r
+               if ( !preg_match('#^admin/#', self::$action) )\r
+               {\r
+                       $event_identifier = 'Skin';\r
+               }\r
+               else\r
                {\r
-                       $aIdToValue[$row['oid']] = $row['ovalue'];\r
+                       $event_identifier = 'AdminSkin';\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
+               if ( !isValidShortName($skintype) )\r
+               {\r
+                       return _ERROR_SKIN_PARTS_SPECIAL_DELETE;\r
+               }\r
+               \r
+               $data = array(\r
+                       'skinid'        => $skinid,\r
+                       'skintype'      => $skintype\r
+               );\r
+               $manager->notify("PreDelete{$event_identifier}Part", $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, DB::quoteValue($skintype) );\r
+               DB::execute($query);\r
+               \r
+               $data = array(\r
+                       'skinid'        => $skinid,\r
+                       'skintype'      => $skintype\r
+               );\r
+               $manager->notify("PostDelete{$event_identifier}Part", $data);\r
+               \r
+               return '';\r
+       }\r
+       \r
+       /**\r
+        * Admin::skinclone()\r
+        * \r
+        * @param       integer $skinid\r
+        * @param       string  $handler\r
+        * @return      void\r
+        */\r
+       static private function skinclone($skinid, $handler='')\r
+       {\r
+               global $manager;\r
                \r
-               $aOptions = array();\r
-               foreach ($res as $row )\r
+               // 1. read skin to clone\r
+               $skin =& $manager->getSkin($skinid, $handler);\r
+               $name = "{$skin->getName()}_clone";\r
+               \r
+               // if a skin with that name already exists:\r
+               if ( Skin::exists($name) )\r
                {\r
-                       if ( !in_array($row['oid'], array_keys($aIdToValue)) )\r
+                       $i = 1;\r
+                       while ( Skin::exists($name . $i) )\r
                        {\r
-                               $value = $row['odef'];\r
+                               $i++;\r
                        }\r
-                       else\r
+                       $name .= $i;\r
+               }\r
+               \r
+               // 2. create skin desc\r
+               $newid = Skin::createNew(\r
+                       $name,\r
+                       $skin->getDescription(),\r
+                       $skin->getContentType(),\r
+                       $skin->getIncludeMode(),\r
+                       $skin->getIncludePrefix()\r
+               );\r
+               \r
+               // 3. clone\r
+               $query = "SELECT stype FROM %s WHERE sdesc=%d;";\r
+               $query = sprintf($query, sql_table('skin'), (integer) $skinid);\r
+               \r
+               $res = DB::getResult($query);\r
+               foreach ( $res as $row )\r
+               {\r
+                       $content = $skin->getContentFromDB($row['stype']);\r
+                       if ( $content )\r
                        {\r
-                               $value = $aIdToValue[$row['oid']];\r
+                               $query = "INSERT INTO %s (sdesc, scontent, stype) VALUES (%d, %s, %s)";\r
+                               $query = sprintf($query, sql_table('skin'), (integer) $newid, DB::quoteValue($content), DB::quoteValue($row['stype']));\r
+                               DB::execute($query);\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
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Admin::skinieimport()\r
+        * \r
+        * @param       string  $mode\r
+        * @param       string  $skinFileRaw\r
+        * @return      string  empty or message if failed\r
+        */\r
+       static private function skinieimport($mode, $skinFileRaw)\r
+       {\r
+               global $DIR_LIBS, $DIR_SKINS;\r
                \r
-               $data = array(\r
-                       'context'       =>  $context,\r
-                       'contextid'     =>  $contextid,\r
-                       'options'       =>& $aOptions\r
-               );\r
-               $manager->notify('PrePluginOptionsEdit', $data);\r
+               // load skinie class\r
+               include_once($DIR_LIBS . 'skinie.php');\r
+               \r
+               $importer = new SkinImport();\r
+               \r
+               // get full filename\r
+               if ( $mode == 'file' )\r
+               {\r
+                       $skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml';\r
+               }\r
+               else\r
+               {\r
+                       $skinFile = $skinFileRaw;\r
+               }\r
+               \r
+               // read only metadata\r
+               $error = $importer->readFile($skinFile, 1);\r
+               if ( $error )\r
+               {\r
+                       unset($importer);\r
+                       return $error;\r
+               }\r
+               \r
+               /* TODO: we should consider to use the other way insterad of this */\r
+               $_REQUEST['skininfo']   = $importer->getInfo();\r
+               $_REQUEST['skinnames']  = $importer->getSkinNames();\r
+               $_REQUEST['tpltnames']  = $importer->getTemplateNames();\r
+               \r
+               // clashes\r
+               $skinNameClashes                = $importer->checkSkinNameClashes();\r
+               $templateNameClashes    = $importer->checkTemplateNameClashes();\r
+               $hasNameClashes                 = (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0);\r
+               \r
+               /* TODO: we should consider to use the other way insterad of this */\r
+               $_REQUEST['skinclashes'] = $skinNameClashes;\r
+               $_REQUEST['tpltclashes'] = $templateNameClashes;\r
+               $_REQUEST['nameclashes'] = $hasNameClashes ? 1 : 0;\r
+               \r
+               unset($importer);\r
+               return '';\r
+       }\r
+       \r
+       /**\r
+        * Admin::skinieedoimport()\r
+        * \r
+        * @param       string  $mode\r
+        * @param       string  $skinFileRaw\r
+        * @param       boolean $allowOverwrite\r
+        * @return      string  empty   or message if failed\r
+        */\r
+       static private function skiniedoimport($mode, $skinFileRaw, $allowOverwrite)\r
+       {\r
+               global $DIR_LIBS, $DIR_SKINS;\r
+               \r
+               // load skinie class\r
+               include_once($DIR_LIBS . 'skinie.php');\r
+               \r
+               $importer = new SkinImport();\r
+               \r
+               // get full filename\r
+               if ( $mode == 'file' )\r
+               {\r
+                       $skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml';\r
+               }\r
+               else\r
+               {\r
+                       $skinFile = $skinFileRaw;\r
+               }\r
+               \r
+               $error = $importer->readFile($skinFile);\r
+               if ( $error )\r
+               {\r
+                       unset($importer);\r
+                       return $error;\r
+               }\r
+               \r
+               $error = $importer->writeToDatabase($allowOverwrite);\r
+               if ( $error )\r
+               {\r
+                       unset($importer);\r
+                       return $error;\r
+               }\r
+               \r
+               /* TODO: we should consider to use the other way insterad of this */\r
+               $_REQUEST['skininfo']  = $importer->getInfo();\r
+               $_REQUEST['skinnames'] = $importer->getSkinNames();\r
+               $_REQUEST['tpltnames'] = $importer->getTemplateNames();\r
+               \r
+               unset($importer);\r
+               return '';\r
+       }\r
+       \r
+       /**\r
+        * Admin::skinieexport()\r
+        * \r
+        * @param       array   $aSkins\r
+        * @param       array   $aTemplates\r
+        * @param       string  $info\r
+        * @return      void\r
+        */\r
+       static private function skinieexport($aSkins, $aTemplates, $info)\r
+       {\r
+               global $DIR_LIBS;\r
+               \r
+               // load skinie class\r
+               include_once($DIR_LIBS . 'skinie.php');\r
+               \r
+               if ( !is_array($aSkins) )\r
+               {\r
+                       $aSkins = array();\r
+               }\r
+               \r
+               if (!is_array($aTemplates))\r
+               {\r
+                       $aTemplates = array();\r
+               }\r
+               \r
+               $skinList = array_keys($aSkins);\r
+               $templateList = array_keys($aTemplates);\r
+               \r
+               $exporter = new SkinExport();\r
+               foreach ( $skinList as $skinId )\r
+               {\r
+                       $exporter->addSkin($skinId);\r
+               }\r
+               foreach ( $templateList as $templateId )\r
+               {\r
+                       $exporter->addTemplate($templateId);\r
+               }\r
+               $exporter->setInfo($info);\r
+               $exporter->export();\r
                \r
-               self::$aOptions = $aOptions;\r
-               self::$skin->parse('insertpluginoptions');\r
                return;\r
        }\r
        \r
@@ -5998,9 +5584,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
@@ -6100,9 +5684,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
@@ -6121,9 +5705,9 @@ class Admin
                $member->isAdmin() or self::disallow();\r
                \r
                include_once($DIR_LIBS . 'Skinie.php');\r
-               $skinFileRaw    = postVar('skinfile');\r
-               $mode                   = postVar('mode');\r
-               $allowOverwrite = intPostVar('overwrite');\r
+               $skinFileRaw = postVar('skinfile');\r
+               $mode = postVar('mode');\r
+               $allowOverwrite = intPostVar('overwrite');\r
                \r
                if ( $mode == 'file' )\r
                {\r
@@ -6139,11 +5723,13 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                $error = $importer->writeToDatabase($allowOverwrite);\r
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
                $_REQUEST['skininfo']   = $importer->getInfo();\r
@@ -6151,6 +5737,6 @@ class Admin
                $_REQUEST['tpltnames']  = $importer->getTemplateNames();\r
                \r
                header('Location: ' . $CONF['AdminURL']);\r
-               exit;\r
+               return;\r
        }\r
 }\r