OSDN Git Service

FIX: Admin::$ticketless_actionsにbrowseownitemsを追加
[nucleus-jp/nucleus-next.git] / nucleus / libs / ADMIN.php
index 6dbf3b3..57e4321 100644 (file)
@@ -22,79 +22,61 @@ require_once dirname(__FILE__) . '/showlist.php';
 \r
 class Admin\r
 {\r
-       static private $xml_version_info                        = '1.0';\r
-       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
-       static public $headMess;\r
-\r
-       static private $action;\r
        static private $skin;\r
-       static private $passvar;\r
-       static private $aOptions;\r
        \r
-       static public $extrahead;\r
+       static public $action;\r
+       static public $aOptions;\r
        static public $blog;\r
        static public $contents;\r
+       static public $extrahead;\r
+       static public $headMess;\r
+       static public $passvar;\r
        \r
-       /**\r
-        * Admin::$edit_actions\r
-        */\r
-       static private $edit_actions = array(\r
-               'adminskinoverview',\r
-               'adminskinieoverview',\r
-               'adminskinedittype',\r
-               'adminskinremovetype',\r
-               'adminskindelete',\r
-               'adminskinedit',\r
-               'adminskinieimport',\r
-               'adminskiniedoimport',\r
-               'admintemplateedit',\r
-               'admintemplateoverview',\r
-               'admintemplatedelete'\r
-       );\r
-       \r
-       /**\r
-        * Admin::$skinless_actions\r
-        */\r
        static private $skinless_actions = array(\r
                'plugindeleteconfirm',\r
                'pluginoptionsupdate',\r
+               'blogsettingsupdate',\r
+               'settingsupdate',\r
+               'addnewlog2',\r
+               'additem',\r
+               'banlistnewfromitem',\r
+               'itemdeleteconfirm',\r
+               'itemupdate',\r
+               'changemembersettings',\r
+               'clearactionlog',\r
+               'memberedit',\r
+               'login',\r
+               \r
                'skinremovetypeconfirm',\r
                'skinclone',\r
                'skindeleteconfirm',\r
                'skinnew',\r
                'skineditgeneral',\r
-               'skinieexport',\r
                'skinupdate',\r
+               \r
+               'skinieexport',\r
+               \r
                'templateupdate',\r
                'templatedeleteconfirm',\r
                'templatenew',\r
                'templateclone',\r
+               \r
                'adminskinremovetypeconfirm',\r
                'adminskinclone',\r
                'adminskindeleteconfirm',\r
                'adminskinnew',\r
                'adminskineditgeneral',\r
-               'adminskinieexport',\r
                'adminskinupdate',\r
+               \r
+               'adminskinieexport',\r
+               \r
                'admintemplateupdate',\r
                'admintemplatedeleteconfirm',\r
                'admintemplatenew',\r
-               'admintemplateclone',\r
-               'blogsettingsupdate',\r
-               'settingsupdate',\r
-               'addnewlog2',\r
-               'additem',\r
-               'itemdeleteconfirm',\r
-               'itemupdate',\r
-               'changemembersettings',\r
-               'clearactionlog',\r
-               'memberedit'\r
-               );\r
-\r
-               static private $actions_needless_to_check = array(\r
+               'admintemplateclone'\r
+       );\r
+       \r
+       static private $ticketless_actions = array(\r
                'showlogin',\r
                'login',\r
                'overview',\r
@@ -110,6 +92,7 @@ class Admin
                'forgotpassword',\r
                'browseowncomments',\r
                'createitem',\r
+               'browseownitems',\r
                'itemedit',\r
                'itemmove',\r
                'categoryedit',\r
@@ -121,9 +104,6 @@ class Admin
                'pluginlist',\r
                'createnewlog',\r
                'usermanagement',\r
-               'skinoverview',\r
-               'templateoverview',\r
-               'skinieoverview',\r
                'itemcommentlist',\r
                'commentedit',\r
                'commentdelete',\r
@@ -138,34 +118,92 @@ class Admin
                'pluginhelp',\r
                'pluginoptions',\r
                'plugindelete',\r
-               'skinedittype',\r
-               'skinremovetype',\r
+               \r
+               'activate',\r
+               'systemoverview',\r
+               'activatesetpwd',\r
+               \r
+               'skinoverview',\r
+               'skinclone',\r
                'skindelete',\r
                'skinedit',\r
+               'skinedittype',\r
+               'skinnew',\r
+               'skinremovetype',\r
+               \r
+               'skinieoverview',\r
+               \r
+               'templateoverview',\r
+               'templateclone',\r
                'templateedit',\r
                'templatedelete',\r
-               'activate',\r
-               'systemoverview',\r
-               'activatesetpwd',\r
+               \r
+               'adminskinoverview',\r
+               'adminskinclone',\r
+               'adminskindelete',\r
+               'adminskinedit',\r
+               'adminskinedittype',\r
+               'adminskinnew',\r
+               'adminskinremovetype',\r
+               \r
+               'adminskinieoverview',\r
+               \r
+               'admintemplateoverview',\r
+               'admintemplateclone',\r
+               'admintemplateedit',\r
+               'admintemplatedelete'\r
+       );\r
+       \r
+       /**\r
+        * NOTE: This is for condition of admin/normal skin actions\r
+        */\r
+       static public $adminskin_actions = array(\r
+               /* ticketless */\r
+               'adminskinoverview',\r
+               'adminskinclone',\r
+               'adminskindelete',\r
+               'adminskinedit',\r
+               'adminskinedittype',\r
+               'adminskinnew',\r
+               'adminskinremovetype',\r
+               \r
+               'adminskinieoverview',\r
+               \r
+               'admintemplateoverview',\r
+               'admintemplateclone',\r
+               'admintemplateedit',\r
+               'admintemplatedelete',\r
+               \r
+               /* ticket needed */\r
+               'adminskineditgeneral',\r
+               'adminskinupdate',\r
+               'adminskindeleteconfirm',\r
+               'adminskinremovetypeconfirm',\r
+               \r
+               'adminskinieoverview',\r
+               'adminskiniedoimport',\r
+               'adminskinieexport',\r
+               'adminskinieimport',\r
+               \r
+               'admintemplatenew',\r
+               'admintemplatedeleteconfirm',\r
+               'admintemplateupdate'\r
        );\r
        \r
        static public function initialize()\r
        {\r
-               global $CONF, $DIR_LIBS;\r
+               global $CONF, $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
-               if (isset($member) && $member->isLoggedIn())\r
+               if ( $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
@@ -174,7 +212,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
@@ -192,124 +230,61 @@ class Admin
         */\r
        static public function action($action)\r
        {\r
-               global $CONF, $DIR_LIBS, $manager, $member;\r
+               global $CONF, $manager, $member;\r
                \r
                /* 1. decide action name */\r
                $customAction = postvar('customaction');\r
-               if ( !empty($customAction) )\r
+               if ( empty($customAction) )\r
                {\r
                        $alias = array(\r
-                               'login' => $customAction,\r
-                               ''              => $customAction\r
+                               'login' => 'overview',\r
+                               ''              => 'overview',\r
                        );\r
                }\r
                else\r
                {\r
                        $alias = array(\r
-                               'login' => 'overview',\r
-                               ''              => 'overview',\r
+                               'login' => $customAction,\r
+                               ''              => $customAction\r
                        );\r
                }\r
                if ( array_key_exists($action, $alias) && isset($alias[$action]) )\r
                {\r
                        $action = $alias[$action];\r
                }\r
-               $methodName = "action_{$action}";\r
+               $method_name = "action_{$action}";\r
                self::$action = strtolower($action);\r
                \r
-               /* 2. check the action */\r
-               $synonimActions = array(\r
-                       'banlistnewfromitem',\r
-                       'memberedit',\r
-                       'login',\r
-               );\r
-               $allowActions           = array_merge($synonimActions, self::$skinless_actions);\r
-               $aActionsNotToCheck     = array_merge(self::$actions_needless_to_check, self::$edit_actions, $allowActions);\r
-               if ( !in_array(self::$action, $aActionsNotToCheck) && !self::existsSkinContents($action) )\r
+               /* 2. check ticket-needed action */\r
+               if ( !in_array(self::$action, self::$ticketless_actions) && !$manager->checkTicket() )\r
                {\r
-                       if (!$manager->checkTicket())\r
-                       {\r
-                               self::error(_ERROR_BADTICKET);\r
-                       }\r
+                       self::error(_ERROR_BADTICKET);\r
+                       return;\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
-                       /* TODO: what is this?\r
-                       self::action_parseSpecialskin();\r
-                       */\r
-               }\r
-               elseif ( method_exists('Admin', $methodName) )\r
-               {\r
-                       call_user_func(array(__CLASS__, $methodName));\r
-               }\r
-               else if ( self::existsSkinContents('adminerrorpage') )\r
+               else if ( method_exists('Admin', $method_name) )\r
                {\r
-                       self::error(_BADACTION . ENTITY::hsc($action));\r
+                       call_user_func(array(__CLASS__, $method_name));\r
+                       return;\r
                }\r
-               elseif ( $id != $CONF['AdminSkin'] )\r
+               /* 4. parse special admin skin */\r
+               elseif ( in_array(self::$action, self::$skinless_actions) )\r
                {\r
-                       self::$skin = new Skin($CONF['AdminSkin'], 'AdminActions');\r
-                       if ( self::$skin && self::existsSkinContents('adminerrorpage') )\r
-                       {\r
-                               self::error(_BADACTION . ENTITY::hsc($action));\r
-                       }\r
+                       /* TODO: need to be implemented or not?\r
+                       self::action_parseSpecialskin();\r
+                       */\r
                }\r
                else\r
                {\r
                        self::error(_BADACTION . ENTITY::hsc($action));\r
+                       return;\r
                }\r
-               exit;\r
-       }\r
-       \r
-       /**\r
-        * Action::existsSkinContents()\r
-        * Check skin contents\r
-        *\r
-        * @param       string  $action action type\r
-        * @return      boolean\r
-        */\r
-       static private function existsSkinContents($action)\r
-       {\r
-               $in_array  = in_array($action, self::$skinless_actions);\r
                \r
-               if ( $in_array )\r
-               {\r
-                       return $in_array;\r
-               }\r
-               else\r
-               {\r
-                       $query = "SELECT scontent as result FROM %s WHERE sdesc=%d AND stype=%s";\r
-                       /* TODO: skinid should be a default */\r
-                       if ( !is_object(self::$skin) )\r
-                       {\r
-                               global $CONF;\r
-                               return DB::getValue(sprintf($query, sql_table('skin'), $CONF['AdminSkin'], DB::quoteValue($action)));\r
-                       }\r
-                       else\r
-                       {\r
-                               return DB::getValue(sprintf($query, sql_table('skin'), self::$skin->getID(), DB::quoteValue($action)));\r
-                       }\r
-               }\r
                return;\r
        }\r
        \r
        /**\r
-        * Action::specialActionsAllow()\r
-        * Check exists specialskinparts\r
-        *\r
-        * @param       string  $action action type\r
-        * @return boolean\r
-        */\r
-       static private function specialActionsAllow($action)\r
-       {\r
-               $query = "SELECT sdesc as result FROM %s WHERE  sdesc = %d AND stype = %s";\r
-               $query = sprintf($query, sql_table('skin'), (integer) self::$skin->id, DB::quoteValue($action));\r
-               return DB::getValue($query);\r
-       }\r
-       \r
-       /**\r
         * Action::action_showlogin()\r
         * \r
         * @param       void\r
@@ -336,7 +311,7 @@ class Admin
                if ( $member->isLoggedIn() && $member->canLogin() )\r
                {\r
                        self::action_overview();\r
-                       exit;\r
+                       return;\r
                }\r
                \r
                /* TODO: needless variable??? */\r
@@ -426,6 +401,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
@@ -464,6 +440,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,18 +454,6 @@ class Admin
        }\r
        \r
        /**\r
-        * Admin::setAdminAction()\r
-        *\r
-        * @param       string  $action\r
-        * @return      void\r
-        */\r
-       static public function setAdminAction($action)\r
-       {\r
-               self::$action = $action;\r
-               return;\r
-       }\r
-       \r
-       /**\r
         * Admin::action_batchmember()\r
         * \r
         * @param       void\r
@@ -507,6 +472,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
@@ -539,6 +505,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
@@ -569,6 +536,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
@@ -666,14 +634,12 @@ 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::$skin->parse('itemcommentlist');\r
                return;\r
@@ -845,26 +811,24 @@ class Admin
                // only allow if user is allowed to alter item\r
                $member->canAlterItem($itemid) or self::disallow();\r
                \r
-               $blogid = getBlogIDFromItemID($itemid);\r
-               $blog =& $manager->getBlog($blogid);\r
-               \r
-               $contents =& $manager->getItem($itemid, 1, 1);\r
-               $manager->notify('PrepareItemForEdit', array('blog'=> &$blog, 'item' => &$contents));\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', $contents) && !empty($contents['body']) )\r
+                       if ( array_key_exists('body', $item) && !empty($item['body']) )\r
                        {\r
-                               $contents['body'] = removeBreaks($contents['body']);\r
+                               $item['body'] = removeBreaks($item['body']);\r
                        }\r
-                       if ( array_key_exists('more', $contents) && !empty($contents['more']) )\r
+                       if ( array_key_exists('more', $item) && !empty($item['more']) )\r
                        {\r
-                               $contents['more'] = removeBreaks($contents['more']);\r
+                               $item['more'] = removeBreaks($item['more']);\r
                        }\r
                }\r
                \r
                self::$blog = &$blog;\r
-               self::$contents = &$contents;\r
+               self::$contents = &$item;\r
                \r
                self::$skin->parse('itemedit');\r
                return;\r
@@ -924,20 +888,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
@@ -973,7 +937,7 @@ class Admin
                else\r
                {\r
                        // TODO: set start item correctly for itemlist\r
-                       $item =& $manager->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
@@ -1002,6 +966,7 @@ class Admin
                if ( !$manager->existsItem($itemid,1,1) )\r
                {\r
                        self::error(_ERROR_NOSUCHITEM);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('itemdelete');\r
@@ -1016,20 +981,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
@@ -1051,13 +1016,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
@@ -1204,21 +1169,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
@@ -1238,6 +1202,10 @@ class Admin
                \r
                $member->canAlterComment($commentid) or self::disallow();\r
                \r
+               $comment = COMMENT::getComment($commentid);\r
+               $manager->notify('PrepareCommentForEdit', array('comment' => &$comment));\r
+               \r
+               self::$contents = $comment;\r
                self::$skin->parse('commentedit');\r
                return;\r
        }\r
@@ -1264,17 +1232,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
@@ -1450,7 +1421,7 @@ class Admin
                // check if allowed\r
                ($member->getID() == $memberid) or $member->isAdmin() or self::disallow();\r
                \r
-               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";\r
+               self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
                \r
                self::$skin->parse('editmembersettings');\r
                return;\r
@@ -1478,6 +1449,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
@@ -1497,21 +1469,25 @@ class Admin
                        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
@@ -1529,6 +1505,7 @@ class Admin
                                if ( !$pwdvalid )\r
                                {\r
                                        self::error($pwderror);\r
+                                       return;\r
                                }\r
                        }\r
                }\r
@@ -1536,14 +1513,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
@@ -1556,6 +1536,7 @@ class Admin
                        if ( $r->rowCount() < 2 )\r
                        {\r
                                self::error(_ERROR_ATLEASTONEADMIN);\r
+                               return;\r
                        }\r
                }\r
                \r
@@ -1575,7 +1556,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
@@ -1645,11 +1628,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
@@ -1666,6 +1651,7 @@ class Admin
                if ( $res != 1 )\r
                {\r
                        self::error($res);\r
+                       return;\r
                }\r
                \r
                // fire PostRegister event\r
@@ -1725,6 +1711,7 @@ class Admin
                if ( !$info )\r
                {\r
                        self::error(_ERROR_ACTIVATE);\r
+                       return;\r
                }\r
                \r
                $mem =& $manager->getMember($info->vmember);\r
@@ -1732,6 +1719,7 @@ class Admin
                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
@@ -1869,6 +1857,7 @@ class Admin
                if ( !$blog->addTeamMember($memberid, $admin) )\r
                {\r
                        self::error(_ERROR_ALREADYONTEAM);\r
+                       return;\r
                }\r
                \r
                self::action_manageteam();\r
@@ -1915,6 +1904,7 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                self::action_manageteam();\r
                return;\r
@@ -1947,7 +1937,8 @@ class Admin
                $data = array(\r
                        'member' => &$tmem,\r
                        'blogid' => $blogid\r
-               );\r             $manager->notify('PreDeleteTeamMember', $data);\r
+               );\r
+               $manager->notify('PreDeleteTeamMember', $data);\r
                \r
                if ( $tmem->isBlogAdmin($blogid) )\r
                {\r
@@ -2003,6 +1994,7 @@ class Admin
                        if ( $r->rowCount() == 1 )\r
                        {\r
                                self::error(_ERROR_ATLEASTONEBLOGADMIN);\r
+                               return;\r
                        }\r
                }\r
                \r
@@ -2048,7 +2040,7 @@ class Admin
                \r
                $blog =& $manager->getBlog($blogid);\r
                \r
-               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";\r
+               self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
                \r
                self::$skin->parse('blogsettings');\r
                return;\r
@@ -2074,6 +2066,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
@@ -2082,6 +2075,7 @@ class Admin
                if ( $res->rowCount() > 0 )\r
                {\r
                        self::error(_ERROR_DUPCATEGORYNAME);\r
+                       return;\r
                }\r
                \r
                $blog           =& $manager->getBlog($blogid);\r
@@ -2124,7 +2118,7 @@ class Admin
                $_REQUEST['desturl']    = $desturl;\r
                $member->blogAdminRights($blogid) or self::disallow();\r
                \r
-               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";\r
+               self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
                \r
                self::$skin->parse('categoryedit');\r
                return;\r
@@ -2151,6 +2145,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
@@ -2159,6 +2154,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
@@ -2177,12 +2173,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
@@ -2207,12 +2202,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
@@ -2222,6 +2219,7 @@ class Admin
                if ( $res->rowCount() == 1 )\r
                {\r
                        self::error(_ERROR_DELETELASTCATEGORY);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('categorydelete');\r
@@ -2247,6 +2245,7 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
                self::action_blogsettings();\r
@@ -2452,21 +2451,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
@@ -2521,6 +2524,7 @@ class Admin
                if ( $CONF['DefaultBlog'] == $blogid )\r
                {\r
                        self::error(_ERROR_DELDEFBLOG);\r
+                       return;\r
                }\r
                \r
                $blog =& $manager->getBlog($blogid);\r
@@ -2551,6 +2555,7 @@ class Admin
                if ( $CONF['DefaultBlog'] == $blogid )\r
                {\r
                        self::error(_ERROR_DELDEFBLOG);\r
+                       return;\r
                }\r
                \r
                // delete all comments\r
@@ -2625,15 +2630,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
@@ -2726,11 +2734,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
@@ -2856,57 +2866,18 @@ 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::$skin->parse('skinieimport');\r
@@ -2928,54 +2899,21 @@ 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
-               {\r
-                       $skinFile = $skinFileRaw;\r
-               }\r
-               \r
-               $importer = new SkinImport();\r
-               \r
-               $error = $importer->readFile($skinFile);\r
-               \r
+               $error = self::skiniedoimport($mode, $skinFileRaw, $allowOverwrite);\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
+                       self::error($msg);\r
+                       return;\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::$skin->parse('skiniedoimport');\r
                return;\r
        }\r
-\r
+       \r
        /**\r
         * Admin::action_skinieexport()\r
         * \r
@@ -2984,42 +2922,16 @@ class Admin
         */\r
        static private function action_skinieexport()\r
        {\r
-               global $member, $DIR_LIBS;\r
+               global $member;\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
-               \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
@@ -3057,8 +2969,8 @@ class Admin
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/templateEdit.js\"></script>\n";\r
-               Admin::$extrahead .= "<script type=\"text/javascript\">setTemplateEditText('" . Entity::hsc(_EDITTEMPLATE_EMPTY) . "');</script>\n";\r
+               self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(javascript/templateEdit.js)%>\"></script>\n";\r
+               self::$extrahead .= "<script type=\"text/javascript\">setTemplateEditText('" . Entity::hsc(_EDITTEMPLATE_EMPTY) . "');</script>\n";\r
                \r
                self::$skin->parse('templateedit');\r
                return;\r
@@ -3084,11 +2996,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
@@ -3247,11 +3161,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
@@ -3338,8 +3254,8 @@ class Admin
                }\r
                $member->isAdmin() or self::disallow();\r
                \r
-               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/templateEdit.js\"></script>\n";\r
-               Admin::$extrahead .= '<script type="text/javascript">setTemplateEditText("' . Entity::hsc(_EDITTEMPLATE_EMPTY) . '");</script>' . "\n";\r
+               self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(javascript/templateEdit.js)%>\"></script>\n";\r
+               self::$extrahead .= '<script type="text/javascript">setTemplateEditText("' . Entity::hsc(_EDITTEMPLATE_EMPTY) . '");</script>' . "\n";\r
                \r
                self::$skin->parse('admintemplateedit');\r
                return;\r
@@ -3362,11 +3278,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
@@ -3380,111 +3298,111 @@ class Admin
                DB::execute($query);\r
                \r
                // 3. Add non-empty template parts\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
-               self::addToAdminTemplate($templateid, 'ADMIN_BATCHLIST',                                                postVar('ADMIN_BATCHLIST'));\r
-               self::addToAdminTemplate($templateid, 'ACTIVATE_FORGOT_TITLE',                                  postVar('ACTIVATE_FORGOT_TITLE'));\r
-               self::addToAdminTemplate($templateid, 'ACTIVATE_FORGOT_TEXT',                                   postVar('ACTIVATE_FORGOT_TEXT'));\r
-               self::addToAdminTemplate($templateid, 'ACTIVATE_REGISTER_TITLE',                                postVar('ACTIVATE_REGISTER_TITLE'));\r
-               self::addToAdminTemplate($templateid, 'ACTIVATE_REGISTER_TEXT',                                 postVar('ACTIVATE_REGISTER_TEXT'));\r
-               self::addToAdminTemplate($templateid, 'ACTIVATE_CHANGE_TITLE',                                  postVar('ACTIVATE_CHANGE_TITLE'));\r
-               self::addToAdminTemplate($templateid, 'ACTIVATE_CHANGE_TEXT',                                   postVar('ACTIVATE_CHANGE_TEXT'));\r
-               self::addToAdminTemplate($templateid, 'TEMPLATE_EDIT_EXPLUGNAME',                               postVar('TEMPLATE_EDIT_EXPLUGNAME'));\r
-               self::addToAdminTemplate($templateid, 'TEMPLATE_EDIT_ROW_HEAD',                                 postVar('TEMPLATE_EDIT_ROW_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'TEMPLATE_EDIT_ROW_TAIL',                                 postVar('TEMPLATE_EDIT_ROW_TAIL'));\r
-               self::addToAdminTemplate($templateid, 'SPECIALSKINLIST_HEAD',                                   postVar('SPECIALSKINLIST_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'SPECIALSKINLIST_BODY',                                   postVar('SPECIALSKINLIST_BODY'));\r
-               self::addToAdminTemplate($templateid, 'SPECIALSKINLIST_FOOT',                                   postVar('SPECIALSKINLIST_FOOT'));\r
-               self::addToAdminTemplate($templateid, 'SYSTEMINFO_GDSETTINGS',                                  postVar('SYSTEMINFO_GDSETTINGS'));\r
-               self::addToAdminTemplate($templateid, 'BANLIST_DELETED_LIST',                                   postVar('BANLIST_DELETED_LIST'));\r
-               self::addToAdminTemplate($templateid, 'INSERT_PLUGOPTION_TITLE',                                postVar('INSERT_PLUGOPTION_TITLE'));\r
-               self::addToAdminTemplate($templateid, 'INSERT_PLUGOPTION_BODY',                                 postVar('INSERT_PLUGOPTION_BODY'));\r
-               self::addToAdminTemplate($templateid, 'INPUTYESNO_TEMPLATE_ADMIN',                              postVar('INPUTYESNO_TEMPLATE_ADMIN'));\r
-               self::addToAdminTemplate($templateid, 'INPUTYESNO_TEMPLATE_NORMAL',                             postVar('INPUTYESNO_TEMPLATE_NORMAL'));\r
-               self::addToAdminTemplate($templateid, 'ADMIN_SPECIALSKINLIST_HEAD',                             postVar('ADMIN_SPECIALSKINLIST_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'ADMIN_SPECIALSKINLIST_BODY',                             postVar('ADMIN_SPECIALSKINLIST_BODY'));\r
-               self::addToAdminTemplate($templateid, 'ADMIN_SPECIALSKINLIST_FOOT',                             postVar('ADMIN_SPECIALSKINLIST_FOOT'));\r
-               self::addToAdminTemplate($templateid, 'SKINIE_EXPORT_LIST',                                             postVar('SKINIE_EXPORT_LIST'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_SELECT_HEAD',                  postVar('SHOWLIST_LISTPLUG_SELECT_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_SELECT_BODY',                  postVar('SHOWLIST_LISTPLUG_SELECT_BODY'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_SELECT_FOOT',                  postVar('SHOWLIST_LISTPLUG_SELECT_FOOT'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_HEAD',                   postVar('SHOWLIST_LISTPLUG_TABLE_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BODY',                   postVar('SHOWLIST_LISTPLUG_TABLE_BODY'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_FOOT',                   postVar('SHOWLIST_LISTPLUG_TABLE_FOOT'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_MEMBLIST_HEAD',  postVar('SHOWLIST_LISTPLUG_TABLE_MEMBLIST_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_MEMBLIST_BODY',  postVar('SHOWLIST_LISTPLUG_TABLE_MEMBLIST_BODY'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_MEMBLIST_FOOT',  postVar('SHOWLIST_LISTPLUG_TABLE_MEMBLIST_FOOT'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TEAMLIST_HEAD',  postVar('SHOWLIST_LISTPLUG_TABLE_TEAMLIST_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TEAMLIST_BODY',  postVar('SHOWLIST_LISTPLUG_TABLE_TEAMLIST_BODY'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TEAMLIST_FOOT',  postVar('SHOWLIST_LISTPLUG_TABLE_TEAMLIST_FOOT'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HEAD',  postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY',  postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  postVar('SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  postVar('SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  postVar('SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  postVar('SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  postVar('SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_FOOT',  postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_FOOT'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_POPTLIST_HEAD',  postVar('SHOWLIST_LISTPLUG_TABLE_POPTLIST_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_POPTLIST_BODY',  postVar('SHOWLIST_LISTPLUG_TABLE_POPTLIST_BODY'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO',  postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD',  postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEP',  postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEP'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEO',  postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEO'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEC',  postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEC'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OTAREA',  postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OTAREA'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OITEXT',  postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OITEXT'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGOPTN_FOOT',  postVar('SHOWLIST_LISTPLUG_TABLE_PLUGOPTN_FOOT'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_POPTLIST_FOOT',  postVar('SHOWLIST_LISTPLUG_TABLE_POPTLIST_FOOT'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ITEMLIST_HEAD',  postVar('SHOWLIST_LISTPLUG_TABLE_ITEMLIST_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY',  postVar('SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ITEMLIST_FOOT',  postVar('SHOWLIST_LISTPLUG_TABLE_ITEMLIST_FOOT'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CMNTLIST_HEAD',  postVar('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY',  postVar('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN',  postVar('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CMNTLIST_FOOT',  postVar('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_FOOT'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGLIST_HEAD',  postVar('SHOWLIST_LISTPLUG_TABLE_BLOGLIST_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY',  postVar('SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  postVar('SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  postVar('SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGLIST_FOOT',  postVar('SHOWLIST_LISTPLUG_TABLE_BLOGLIST_FOOT'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_HEAD',  postVar('SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_BODY',  postVar('SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_BODY'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_FOOT',  postVar('SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_FOOT'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SHORTNAM_HEAD',  postVar('SHOWLIST_LISTPLUG_TABLE_SHORTNAM_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SHORTNAM_BODY',  postVar('SHOWLIST_LISTPLUG_TABLE_SHORTNAM_BODY'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SHORTNAM_FOOT',  postVar('SHOWLIST_LISTPLUG_TABLE_SHORTNAM_FOOT'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CATELIST_HEAD',  postVar('SHOWLIST_LISTPLUG_TABLE_CATELIST_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CATELIST_BODY',  postVar('SHOWLIST_LISTPLUG_TABLE_CATELIST_BODY'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CATELIST_FOOT',  postVar('SHOWLIST_LISTPLUG_TABLE_CATELIST_FOOT'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD',  postVar('SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY',  postVar('SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TPLTLIST_FOOT',  postVar('SHOWLIST_LISTPLUG_TABLE_TPLTLIST_FOOT'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD',  postVar('SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY',  postVar('SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SKINLIST_FOOT',  postVar('SHOWLIST_LISTPLUG_TABLE_SKINLIST_FOOT'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_DRFTLIST_HEAD',  postVar('SHOWLIST_LISTPLUG_TABLE_DRFTLIST_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_DRFTLIST_BODY',  postVar('SHOWLIST_LISTPLUG_TABLE_DRFTLIST_BODY'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_DRFTLIST_FOOT',  postVar('SHOWLIST_LISTPLUG_TABLE_DRFTLIST_FOOT'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD',  postVar('SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ACTNLIST_BODY',  postVar('SHOWLIST_LISTPLUG_TABLE_ACTNLIST_BODY'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ACTNLIST_FOOT',  postVar('SHOWLIST_LISTPLUG_TABLE_ACTNLIST_FOOT'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD',  postVar('SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY',  postVar('SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY'));\r
-               self::addToAdminTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT',  postVar('SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT'));\r
-               self::addToAdminTemplate($templateid, 'PLUGIN_QUICKMENU_TITLE',                                 postVar('PLUGIN_QUICKMENU_TITLE'));\r
-               self::addToAdminTemplate($templateid, 'PLUGIN_QUICKMENU_HEAD',                                  postVar('PLUGIN_QUICKMENU_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'PLUGIN_QUICKMENU_BODY',                                  postVar('PLUGIN_QUICKMENU_BODY'));\r
-               self::addToAdminTemplate($templateid, 'PLUGIN_QUICKMENU_FOOT',                                  postVar('PLUGIN_QUICKMENU_FOOT'));\r
+               self::addToTemplate($templateid, 'NORMALSKINLIST_HEAD',                                         postVar('NORMALSKINLIST_HEAD'));\r
+               self::addToTemplate($templateid, 'NORMALSKINLIST_BODY',                                         postVar('NORMALSKINLIST_BODY'));\r
+               self::addToTemplate($templateid, 'NORMALSKINLIST_FOOT',                                         postVar('NORMALSKINLIST_FOOT'));\r
+               self::addToTemplate($templateid, 'ADMIN_CUSTOMHELPLINK_ICON',                           postVar('ADMIN_CUSTOMHELPLINK_ICON'));\r
+               self::addToTemplate($templateid, 'ADMIN_CUSTOMHELPLINK_ANCHOR',                         postVar('ADMIN_CUSTOMHELPLINK_ANCHOR'));\r
+               self::addToTemplate($templateid, 'ADMIN_BLOGLINK',                                                      postVar('ADMIN_BLOGLINK'));\r
+               self::addToTemplate($templateid, 'ADMIN_BATCHLIST',                                                     postVar('ADMIN_BATCHLIST'));\r
+               self::addToTemplate($templateid, 'ACTIVATE_FORGOT_TITLE',                                       postVar('ACTIVATE_FORGOT_TITLE'));\r
+               self::addToTemplate($templateid, 'ACTIVATE_FORGOT_TEXT',                                        postVar('ACTIVATE_FORGOT_TEXT'));\r
+               self::addToTemplate($templateid, 'ACTIVATE_REGISTER_TITLE',                                     postVar('ACTIVATE_REGISTER_TITLE'));\r
+               self::addToTemplate($templateid, 'ACTIVATE_REGISTER_TEXT',                                      postVar('ACTIVATE_REGISTER_TEXT'));\r
+               self::addToTemplate($templateid, 'ACTIVATE_CHANGE_TITLE',                                       postVar('ACTIVATE_CHANGE_TITLE'));\r
+               self::addToTemplate($templateid, 'ACTIVATE_CHANGE_TEXT',                                        postVar('ACTIVATE_CHANGE_TEXT'));\r
+               self::addToTemplate($templateid, 'TEMPLATE_EDIT_EXPLUGNAME',                            postVar('TEMPLATE_EDIT_EXPLUGNAME'));\r
+               self::addToTemplate($templateid, 'TEMPLATE_EDIT_ROW_HEAD',                                      postVar('TEMPLATE_EDIT_ROW_HEAD'));\r
+               self::addToTemplate($templateid, 'TEMPLATE_EDIT_ROW_TAIL',                                      postVar('TEMPLATE_EDIT_ROW_TAIL'));\r
+               self::addToTemplate($templateid, 'SPECIALSKINLIST_HEAD',                                        postVar('SPECIALSKINLIST_HEAD'));\r
+               self::addToTemplate($templateid, 'SPECIALSKINLIST_BODY',                                        postVar('SPECIALSKINLIST_BODY'));\r
+               self::addToTemplate($templateid, 'SPECIALSKINLIST_FOOT',                                        postVar('SPECIALSKINLIST_FOOT'));\r
+               self::addToTemplate($templateid, 'SYSTEMINFO_GDSETTINGS',                                       postVar('SYSTEMINFO_GDSETTINGS'));\r
+               self::addToTemplate($templateid, 'BANLIST_DELETED_LIST',                                        postVar('BANLIST_DELETED_LIST'));\r
+               self::addToTemplate($templateid, 'INSERT_PLUGOPTION_TITLE',                                     postVar('INSERT_PLUGOPTION_TITLE'));\r
+               self::addToTemplate($templateid, 'INSERT_PLUGOPTION_BODY',                                      postVar('INSERT_PLUGOPTION_BODY'));\r
+               self::addToTemplate($templateid, 'INPUTYESNO_TEMPLATE_ADMIN',                           postVar('INPUTYESNO_TEMPLATE_ADMIN'));\r
+               self::addToTemplate($templateid, 'INPUTYESNO_TEMPLATE_NORMAL',                          postVar('INPUTYESNO_TEMPLATE_NORMAL'));\r
+               self::addToTemplate($templateid, 'ADMIN_SPECIALSKINLIST_HEAD',                          postVar('ADMIN_SPECIALSKINLIST_HEAD'));\r
+               self::addToTemplate($templateid, 'ADMIN_SPECIALSKINLIST_BODY',                          postVar('ADMIN_SPECIALSKINLIST_BODY'));\r
+               self::addToTemplate($templateid, 'ADMIN_SPECIALSKINLIST_FOOT',                          postVar('ADMIN_SPECIALSKINLIST_FOOT'));\r
+               self::addToTemplate($templateid, 'SKINIE_EXPORT_LIST',                                          postVar('SKINIE_EXPORT_LIST'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_SELECT_HEAD',                       postVar('SHOWLIST_LISTPLUG_SELECT_HEAD'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_SELECT_BODY',                       postVar('SHOWLIST_LISTPLUG_SELECT_BODY'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_SELECT_FOOT',                       postVar('SHOWLIST_LISTPLUG_SELECT_FOOT'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_HEAD',                        postVar('SHOWLIST_LISTPLUG_TABLE_HEAD'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BODY',                        postVar('SHOWLIST_LISTPLUG_TABLE_BODY'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_FOOT',                        postVar('SHOWLIST_LISTPLUG_TABLE_FOOT'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_MEMBLIST_HEAD',       postVar('SHOWLIST_LISTPLUG_TABLE_MEMBLIST_HEAD'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_MEMBLIST_BODY',       postVar('SHOWLIST_LISTPLUG_TABLE_MEMBLIST_BODY'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_MEMBLIST_FOOT',       postVar('SHOWLIST_LISTPLUG_TABLE_MEMBLIST_FOOT'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TEAMLIST_HEAD',       postVar('SHOWLIST_LISTPLUG_TABLE_TEAMLIST_HEAD'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TEAMLIST_BODY',       postVar('SHOWLIST_LISTPLUG_TABLE_TEAMLIST_BODY'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TEAMLIST_FOOT',       postVar('SHOWLIST_LISTPLUG_TABLE_TEAMLIST_FOOT'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HEAD',       postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HEAD'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY',       postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',       postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',       postVar('SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',       postVar('SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',       postVar('SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',       postVar('SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',       postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',       postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',       postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',       postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',       postVar('SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_FOOT',       postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_FOOT'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_POPTLIST_HEAD',       postVar('SHOWLIST_LISTPLUG_TABLE_POPTLIST_HEAD'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_POPTLIST_BODY',       postVar('SHOWLIST_LISTPLUG_TABLE_POPTLIST_BODY'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO',       postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD',       postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEP',       postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEP'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEO',       postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEO'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEC',       postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEC'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OTAREA',       postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OTAREA'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OITEXT',       postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OITEXT'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGOPTN_FOOT',       postVar('SHOWLIST_LISTPLUG_TABLE_PLUGOPTN_FOOT'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_POPTLIST_FOOT',       postVar('SHOWLIST_LISTPLUG_TABLE_POPTLIST_FOOT'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ITEMLIST_HEAD',       postVar('SHOWLIST_LISTPLUG_TABLE_ITEMLIST_HEAD'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY',       postVar('SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ITEMLIST_FOOT',       postVar('SHOWLIST_LISTPLUG_TABLE_ITEMLIST_FOOT'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CMNTLIST_HEAD',       postVar('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_HEAD'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY',       postVar('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN',       postVar('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CMNTLIST_FOOT',       postVar('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_FOOT'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGLIST_HEAD',       postVar('SHOWLIST_LISTPLUG_TABLE_BLOGLIST_HEAD'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY',       postVar('SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',       postVar('SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',       postVar('SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGLIST_FOOT',       postVar('SHOWLIST_LISTPLUG_TABLE_BLOGLIST_FOOT'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_HEAD',       postVar('SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_HEAD'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_BODY',       postVar('SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_BODY'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_FOOT',       postVar('SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_FOOT'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SHORTNAM_HEAD',       postVar('SHOWLIST_LISTPLUG_TABLE_SHORTNAM_HEAD'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SHORTNAM_BODY',       postVar('SHOWLIST_LISTPLUG_TABLE_SHORTNAM_BODY'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SHORTNAM_FOOT',       postVar('SHOWLIST_LISTPLUG_TABLE_SHORTNAM_FOOT'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CATELIST_HEAD',       postVar('SHOWLIST_LISTPLUG_TABLE_CATELIST_HEAD'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CATELIST_BODY',       postVar('SHOWLIST_LISTPLUG_TABLE_CATELIST_BODY'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CATELIST_FOOT',       postVar('SHOWLIST_LISTPLUG_TABLE_CATELIST_FOOT'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD',       postVar('SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY',       postVar('SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TPLTLIST_FOOT',       postVar('SHOWLIST_LISTPLUG_TABLE_TPLTLIST_FOOT'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD',       postVar('SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY',       postVar('SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SKINLIST_FOOT',       postVar('SHOWLIST_LISTPLUG_TABLE_SKINLIST_FOOT'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_DRFTLIST_HEAD',       postVar('SHOWLIST_LISTPLUG_TABLE_DRFTLIST_HEAD'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_DRFTLIST_BODY',       postVar('SHOWLIST_LISTPLUG_TABLE_DRFTLIST_BODY'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_DRFTLIST_FOOT',       postVar('SHOWLIST_LISTPLUG_TABLE_DRFTLIST_FOOT'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD',       postVar('SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ACTNLIST_BODY',       postVar('SHOWLIST_LISTPLUG_TABLE_ACTNLIST_BODY'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ACTNLIST_FOOT',       postVar('SHOWLIST_LISTPLUG_TABLE_ACTNLIST_FOOT'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD',       postVar('SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY',       postVar('SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY'));\r
+               self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT',       postVar('SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT'));\r
+               self::addToTemplate($templateid, 'PLUGIN_QUICKMENU_TITLE',                                      postVar('PLUGIN_QUICKMENU_TITLE'));\r
+               self::addToTemplate($templateid, 'PLUGIN_QUICKMENU_HEAD',                                       postVar('PLUGIN_QUICKMENU_HEAD'));\r
+               self::addToTemplate($templateid, 'PLUGIN_QUICKMENU_BODY',                                       postVar('PLUGIN_QUICKMENU_BODY'));\r
+               self::addToTemplate($templateid, 'PLUGIN_QUICKMENU_FOOT',                                       postVar('PLUGIN_QUICKMENU_FOOT'));\r
                \r
                $data = array('fields' => array());\r
                $manager->notify('AdminTemplateExtraFields', $data);\r
@@ -3492,7 +3410,7 @@ class Admin
                {\r
                        foreach ( $pfvalue as $pffield => $pfdesc )\r
                        {\r
-                               self::addToAdminTemplate($templateid, $pffield, postVar($pffield));\r
+                               self::addToTemplate($templateid, $pffield, postVar($pffield));\r
                        }\r
                }\r
                \r
@@ -3502,32 +3420,6 @@ class Admin
        }\r
        \r
        /**\r
-        * Admin::addToAdminTemplate()\r
-        * \r
-        * @param       integer $id                     ID for template\r
-        * @param       string  $partname       name of part for template\r
-        * @param       void    $contents       content for part of template\r
-        * @return      integer ID for newly inserted Template\r
-        */\r
-       static private function addToAdminTemplate($id, $partname, $content)\r
-       {\r
-               // don't add empty parts:\r
-               if ( !trim($content) )\r
-               {\r
-                       return -1;\r
-               }\r
-               \r
-               $query = "INSERT INTO %s (tdesc, tpartname, tcontent ) VALUES (%d, %s, %s);";\r
-               $query = sprintf($query, sql_table('template'), (integer) $id, DB::quoteValue($partname), DB::quoteValue($content));\r
-               if ( DB::execute($query) === FALSE )\r
-               {\r
-                       $err = DB::getError();\r
-                       exit(_ADMIN_SQLDIE_QUERYERROR . $err[2]);\r
-               }\r
-               return DB::getInsertId();\r
-       }\r
-       \r
-       /**\r
         * Admin::action_admintemplatedelete()\r
         * \r
         * @param       void\r
@@ -3592,14 +3484,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
@@ -3647,7 +3542,7 @@ class Admin
                $res = DB::getResult($query);\r
                foreach ( $res as $row )\r
                {\r
-                       self::addToAdminTemplate($newid, $row['tpartname'], $row['tcontent']);\r
+                       self::addToTemplate($newid, $row['tpartname'], $row['tcontent']);\r
                }\r
                \r
                self::action_admintemplateoverview();\r
@@ -3688,14 +3583,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
@@ -3709,7 +3605,7 @@ 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
@@ -3731,44 +3627,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
@@ -3777,14 +3649,14 @@ 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::$skin->parse('skinedittype');\r
@@ -3799,7 +3671,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
@@ -3807,7 +3679,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
@@ -3822,16 +3694,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
@@ -3842,6 +3715,7 @@ class Admin
                if ( $name )\r
                {\r
                        self::error(_ERROR_SKINDEFDELETE . Entity::hsc($name));\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('skindelete');\r
@@ -3856,16 +3730,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
@@ -3876,23 +3751,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
@@ -3906,7 +3768,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
@@ -3916,13 +3778,7 @@ class Admin
                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
-               {\r
-                       self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('skinremovetype');\r
@@ -3937,45 +3793,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
-               // 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('PostDeleteSkinPart', $data);\r
-               \r
                self::action_skinedit();\r
                return;\r
        }\r
-\r
+       \r
        /**\r
         * Admin::action_skinclone()\r
         * \r
@@ -3990,68 +3825,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
@@ -4059,7 +3839,7 @@ 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
@@ -4076,24 +3856,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
@@ -4106,10 +3892,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
+               \r
                self::$skin->parse('adminskinedit');\r
+               \r
                return;\r
        }\r
        \r
@@ -4127,33 +3915,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
@@ -4166,7 +3934,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
@@ -4181,6 +3949,7 @@ class Admin
                if ( !isValidShortName($type) )\r
                {\r
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('adminskinedittype');\r
@@ -4195,15 +3964,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
+               global $manager, $member;\r
+               \r
+               $skinid = intRequestVar('skinid');\r
+               $content = trim(postVar('content'));\r
+               $type = postVar('type');\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               $skin = new Skin($skinid, 'Admin', 'AdminSkin');\r
+               $skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin');\r
                $skin->update($type, $content);\r
+               \r
                self::action_adminskinedittype(_SKIN_UPDATED);\r
                return;\r
        }\r
@@ -4216,11 +3987,33 @@ 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
+               \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
                return;\r
        }\r
@@ -4233,45 +4026,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 =& $manager->getMember($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
                \r
-               DB::execute($query);\r
+               self::skindeleteconfirm($skinid);\r
                \r
-               $manager->notify('PostDeleteAdminSkin', array('skinid' => (integer) $skinid));\r
                self::action_adminskinoverview();\r
                return;\r
        }\r
@@ -4284,16 +4067,17 @@ 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::$skin->parse('adminskinremovetype');\r
@@ -4308,35 +4092,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, DB::quoteValue($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
@@ -4355,65 +4124,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
+               self::skinclone($skinid, 'AdminActions');\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::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
@@ -4421,19 +4138,15 @@ 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::$skin->parse('adminskinieoverview');\r
                return;\r
        }\r
 \r
        /**\r
-        * FIXME: DUPLICATION, NO NEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEED!!!!!!\r
         * Admin::action_adminskinieimport()\r
         * \r
         * @param       void\r
@@ -4441,55 +4154,20 @@ 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
-               {\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
-               }\r
-               else\r
-               {\r
-                       $skinFile = $skinFileRaw;\r
-               }\r
-               \r
-               // read only metadata\r
-               $error = $importer->readFile($skinFile, 1);\r
+               $error = self::skinieimport($mode, $skinFileRaw);\r
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\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
                if ( !is_object(self::$skin) )\r
                {\r
                        self::action_adminskiniedoimport();\r
@@ -4502,7 +4180,6 @@ class Admin
        }\r
        \r
        /**\r
-        * FIXME: DUPLICATION, NO NEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEED!!!!!!\r
         * Admin::action_adminskiniedoimport()\r
         * \r
         * @param       void\r
@@ -4510,51 +4187,21 @@ 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
-               if ( $error )\r
-               {\r
-                       self::error($error);\r
-               }\r
-               \r
-               $error = $importer->writeToDatabase($allowOverwrite);\r
+               $error = self::skiniedoimport($mode, $skinFileRaw, $allowOverwrite);\r
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\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
                if ( !is_object(self::$skin) )\r
                {\r
                        global $DIR_SKINS;\r
@@ -4582,38 +4229,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
+               $info = postVar('info');\r
+               \r
+               self::skinieexport($aSkins, $aTemplates, $info);\r
+               \r
                return;\r
        }\r
        \r
@@ -4650,6 +4276,7 @@ class Admin
                if ( !NOTIFICATION::address_validation(postVar('AdminEmail')) )\r
                {\r
                        self::error(_ERROR_BADMAILADDRESS);\r
+                       return;\r
                }\r
                \r
                // save settings\r
@@ -4687,7 +4314,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
@@ -4879,6 +4508,7 @@ class Admin
                if ( sizeof($deleted) == 0 )\r
                {\r
                        self::error(_ERROR_DELETEBAN);\r
+                       return;\r
                }\r
                \r
                /* TODO: we should use other ways */\r
@@ -4896,7 +4526,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
@@ -4956,6 +4590,7 @@ class Admin
                        if ( !Ban::addBan($blogid, $iprange, $reason) )\r
                        {\r
                                self::error(_ERROR_ADDBAN);\r
+                               return;\r
                        }\r
                }\r
                else\r
@@ -4973,6 +4608,7 @@ class Admin
                        if ( $failed )\r
                        {\r
                                self::error(_ERROR_ADDBAN);\r
+                               return;\r
                        }\r
                }\r
                self::action_banlist();\r
@@ -5037,7 +4673,7 @@ class Admin
                @set_time_limit(1200);\r
                \r
                Backup::do_backup($useGzip);\r
-               exit;\r
+               return;\r
        }\r
        \r
        /**\r
@@ -5056,6 +4692,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
@@ -5068,6 +4705,7 @@ class Admin
                if ( $message != '' )\r
                {\r
                        self::error($message);\r
+                       return;\r
                }\r
                self::$skin->parse('backuprestore');\r
                return;\r
@@ -5110,6 +4748,7 @@ class Admin
                if ( !$manager->pidInstalled($plugid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('pluginhelp');\r
@@ -5135,11 +4774,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
@@ -5173,6 +4814,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
@@ -5183,6 +4825,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
@@ -5193,6 +4836,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
@@ -5204,6 +4848,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
@@ -5274,6 +4919,7 @@ class Admin
                if ( !$manager->pidInstalled($pid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('plugindelete');\r
@@ -5299,6 +4945,7 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
                redirect($CONF['AdminURL'] . '?action=pluginlist');\r
@@ -5306,10 +4953,11 @@ class Admin
        }\r
        \r
        /**\r
-        * Admin::\r
+        * Admin::deleteOnePlugin()\r
         * \r
-        * @param       void\r
-        * @return      void\r
+        * @param       integer $pid\r
+        * @param       boolean $callUninstall\r
+        * @return      string  empty or message if failed\r
         */\r
        static public function deleteOnePlugin($pid, $callUninstall = 0)\r
        {\r
@@ -5408,6 +5056,7 @@ class Admin
                if ( !$manager->pidInstalled($plugid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                // 1. get old order number\r
@@ -5443,6 +5092,7 @@ class Admin
                if ( !$manager->pidInstalled($plugid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                // 1. get old order number\r
@@ -5485,6 +5135,7 @@ class Admin
                if ( !$manager->pidInstalled($pid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                if ( isset($message) )\r
@@ -5493,7 +5144,7 @@ class Admin
                }\r
                $plugname       = $manager->getPluginNameFromPid($pid);\r
                $plugin         = $manager->getPlugin($plugname);\r
-               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";\r
+               self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
                \r
                self::$skin->parse('pluginoptions');\r
                return;\r
@@ -5520,6 +5171,7 @@ class Admin
                if ( !$manager->pidInstalled($pid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                $aOptions = requestArray('plugoption');\r
@@ -5536,164 +5188,340 @@ class Admin
        }\r
        \r
        /**\r
-        * Admin::action_parseSpecialskin()\r
+        * Admin::skineditgeneral()\r
         * \r
-        * @param       void\r
-        * @return      void\r
+        * @param       integer $skinid\r
+        * @param       string  $handler\r
+        * @return      string  empty or message if failed\r
         */\r
-       static private function action_parseSpecialskin()\r
+       static private function skineditgeneral($skinid, $handler='')\r
        {\r
-               self::$skin->parse(self::$action);\r
-               return;\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
        /**\r
-        * Admin::getAdminskinIDFromName()\r
+        * Admin::skindeleteconfirm()\r
         * \r
-        * @param       string  $skinname       name of skin\r
-        * @return      integer ID for skin\r
+        * @param       integer $skinid\r
+        * @return      void\r
         */\r
-       static private function getAdminskinIDFromName($skinname)\r
+       static private function skindeleteconfirm($skinid)\r
        {\r
-               $query          = "SELECT 'sdnumber' as result FROM %s WHERE sdname = %s;";\r
-               $query          = sprintf($query, sql_table('skin_desc'), DB::quoteValue($skinname));\r
-               $admnSknID      = DB::getValue($query);\r
-               return (integer) $adminSkinID;\r
+               global $manager;\r
+               \r
+               if ( !in_array(self::$action, self::$adminskin_actions) )\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
+               // 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
+               $manager->notify("PostDelete{$event_identifier}", array('skinid' => $skinid));\r
+               \r
+               return;\r
        }\r
        \r
        /**\r
-        * Admin::getAdminskinNameFromID()\r
+        * Admin::skinremovetypeconfirm()\r
         * \r
-        * @param       integer $skinid ID for skin\r
-        * @return      integer ID for skin\r
-        */\r
-       static private function getAdminskinNameFromID($skinid)\r
-       {\r
-               $query          = "SELECT sdname as result FROM %s WHERE sdnumber = %d;";\r
-               $query          = sprintf($query, sql_table('skin_desc'), (integer) $skinid);\r
-               $admnSknID      = DB::getValue($query);\r
-               return (integer) $adminSkinID;\r
-       }\r
-       \r
-       /**\r
-        * Admin::getAdminextrahead()\r
-        */\r
-       static public function getAdminextrahead()\r
-       {\r
-               return self::$extrahead;\r
-       }\r
-       \r
-       /**\r
-        * Admin::getAdminpassvar()\r
-        */\r
-       static public function getAdminpassvar()\r
-       {\r
-               return self::$passvar;\r
-       }\r
-       \r
-       /**\r
-        * Admin::getAdminAction()\r
+        * @param       integer $skinid\r
+        * @param       string  $skintype\r
+        * @return      string  empty or message if failed\r
         */\r
-       static public function getAdminAction()\r
+       static private function skinremovetypeconfirm($skinid, $skintype)\r
        {\r
-               return self::$action;\r
+               global $manager;\r
+               \r
+               if ( !in_array(self::$action, self::$adminskin_actions) )\r
+               {\r
+                       $event_identifier = 'Skin';\r
+               }\r
+               else\r
+               {\r
+                       $event_identifier = 'AdminSkin';\r
+               }\r
+               \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::getAdminaOption()\r
+        * Admin::skinclone()\r
+        * \r
+        * @param       integer $skinid\r
+        * @param       string  $handler\r
+        * @return      void\r
         */\r
-       static public function getAdminaOption()\r
+       static private function skinclone($skinid, $handler='')\r
        {\r
-               return self::$aOptions;\r
+               global $manager;\r
+               \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
+                       $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
+                       $content = $skin->getContentFromDB($row['stype']);\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($row['stype']));\r
+                               DB::execute($query);\r
+                       }\r
+               }\r
+               return;\r
        }\r
        \r
        /**\r
-        * Admin::action_importAdmin()\r
+        * Admin::skinieimport()\r
         * \r
-        * @param       void\r
-        * @return      void\r
+        * @param       string  $mode\r
+        * @param       string  $skinFileRaw\r
+        * @return      string  empty or message if failed\r
         */\r
-       static private function action_importAdmin()\r
+       static private function skinieimport($mode, $skinFileRaw)\r
        {\r
-               global $DIR_ADMINSKINS, $action;\r
-               if ( $action == 'adminskinieimport' )\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
-                       self::doAdminskinimport();\r
+                       $skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml';\r
                }\r
-               $skn = array();\r
-               if ( $action == 'showlogin' )\r
+               else\r
                {\r
-                       $skinName = 'showlogin';\r
-                       $actnName = 'showlogin';\r
+                       $skinFile = $skinFileRaw;\r
                }\r
-               else\r
+               \r
+               // read only metadata\r
+               $error = $importer->readFile($skinFile, 1);\r
+               if ( $error )\r
                {\r
-                       $skinName = 'defaultimporter';\r
-                       $actnName = 'importAdmin';\r
+                       unset($importer);\r
+                       return $error;\r
                }\r
                \r
-               /* TODO: why??? */\r
-               $contents                               = file_get_contents($DIR_ADMINSKINS . $skinName . '.skn');\r
-               $skn['id']                              = 0;\r
-               $skn['description']             = $skinName;\r
-               $skn['contentType']             = 'importAdmin';\r
-               $skn['includeMode']             = 'normal';\r
-               $skn['includePrefix']   = '';\r
-               $skn['name']                    = 'defaultinporter';\r
+               self::$contents['mode']         = $mode;\r
+               self::$contents['skinfile']     = $skinFileRaw;\r
+               self::$contents['skininfo']     = $importer->getInfo();\r
+               self::$contents['skinnames']    = $importer->getSkinNames();\r
+               self::$contents['tpltnames']    = $importer->getTemplateNames();\r
                \r
-               self::$skin                             = (object) $skn;\r
-               $handler = new AdminActions($actnName, self::$skin, $this);\r
+               // clashes\r
+               $skinNameClashes                = $importer->checkSkinNameClashes();\r
+               $templateNameClashes    = $importer->checkTemplateNameClashes();\r
+               $hasNameClashes                 = (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0);\r
                \r
-               $parser = new PARSER($handler);\r
-               $parser->setSkin(self::$skin);\r
-               $parser->parse($contents);\r
+               self::$contents['skinclashes'] = $skinNameClashes;\r
+               self::$contents['tpltclashes'] = $templateNameClashes;\r
+               self::$contents['nameclashes'] = $hasNameClashes ? 1 : 0;\r
                \r
-               return;\r
+               unset($importer);\r
+               return '';\r
        }\r
        \r
        /**\r
-        * Admin::doAdminskinimport()\r
+        * Admin::skinieedoimport()\r
         * \r
-        * @param       void\r
-        * @return      void\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 doAdminskinimport()\r
+       static private function skiniedoimport($mode, $skinFileRaw, $allowOverwrite)\r
        {\r
-               global $DIR_LIBS, $DIR_ADMINSKINS, $CONF, $member;\r
+               global $DIR_LIBS, $DIR_SKINS;\r
                \r
-               $member->isAdmin() or self::disallow();\r
+               // load skinie class\r
+               include_once($DIR_LIBS . 'skinie.php');\r
                \r
-               include_once($DIR_LIBS . 'Skinie.php');\r
-               $skinFileRaw    = postVar('skinfile');\r
-               $mode                   = postVar('mode');\r
-               $allowOverwrite = intPostVar('overwrite');\r
+               $importer = new SkinImport();\r
                \r
+               // get full filename\r
                if ( $mode == 'file' )\r
                {\r
-                       $skinFile = $DIR_ADMINSKINS . $skinFileRaw . '/skinbackup.xml';\r
+                       $skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml';\r
                }\r
                else\r
                {\r
                        $skinFile = $skinFileRaw;\r
                }\r
                \r
-               $importer       = new SKINIMPORT();\r
-               $error          = $importer->readFile($skinFile);\r
+               $error = $importer->readFile($skinFile);\r
                if ( $error )\r
                {\r
-                       self::error($error);\r
+                       unset($importer);\r
+                       return $error;\r
                }\r
+               \r
                $error = $importer->writeToDatabase($allowOverwrite);\r
                if ( $error )\r
                {\r
-                       self::error($error);\r
+                       unset($importer);\r
+                       return $error;\r
+               }\r
+               \r
+               self::$contents['mode']         = $mode;\r
+               self::$contents['skinfile']     = $skinFileRaw;\r
+               self::$contents['skininfo']     = $importer->getInfo();\r
+               self::$contents['skinnames']    = $importer->getSkinNames();\r
+               self::$contents['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
-               $_REQUEST['skininfo']   = $importer->getInfo();\r
-               $_REQUEST['skinnames']  = $importer->getSkinNames();\r
-               $_REQUEST['tpltnames']  = $importer->getTemplateNames();\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
-               header('Location: ' . $CONF['AdminURL']);\r
-               exit;\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Admin::action_parseSpecialskin()\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       static private function action_parseSpecialskin()\r
+       {\r
+               self::$skin->parse(self::$action);\r
+               return;\r
        }\r
 }\r