OSDN Git Service

Merge branch 'skinnable-master' of ssh://shizuki@git.sourceforge.jp/gitroot/nucleus...
[nucleus-jp/nucleus-next.git] / nucleus / libs / ADMIN.php
index 2adfef1..09ed8c4 100644 (file)
  * @license http://nucleuscms.org/license.txt GNU General Public License\r
  * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
  * @version $Id: ADMIN.php 1661 2012-02-12 11:55:39Z sakamocchi $\r
- *\r
  */\r
 \r
 if ( !function_exists('requestVar') ) exit;\r
 require_once dirname(__FILE__) . '/showlist.php';\r
 \r
-/**\r
- * Builds the admin area and executes admin actions\r
- */\r
 class Admin\r
 {\r
-       private $xml_version_info                       = '1.0';\r
-       private $formal_public_identifier       = '-//W3C//DTD XHTML 1.0 Strict//EN';\r
-       private $system_identifier                      = 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd';\r
-       private $xhtml_namespace                        = 'http://www.w3.org/1999/xhtml';\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 $extrahead;\r
        static private $passvar;\r
-       static private $headMess;\r
        static private $aOptions;\r
        \r
+       static public $extrahead;\r
+       static public $blog;\r
+       static public $contents;\r
+       \r
        /**\r
         * Admin::$edit_actions\r
         */\r
@@ -92,9 +92,9 @@ class Admin
                'changemembersettings',\r
                'clearactionlog',\r
                'memberedit'\r
-       );\r
-       \r
-       static private $actions_needless_to_check = array(\r
+               );\r
+\r
+               static private $actions_needless_to_check = array(\r
                'showlogin',\r
                'login',\r
                'overview',\r
@@ -103,9 +103,11 @@ class Admin
                'bookmarklet',\r
                'blogsettings',\r
                'banlist',\r
+               'createaccount',\r
                'deleteblog',\r
                'editmembersettings',\r
-               'browseownitems',\r
+               'createaccount',\r
+               'forgotpassword',\r
                'browseowncomments',\r
                'createitem',\r
                'itemedit',\r
@@ -147,19 +149,14 @@ class Admin
                'activatesetpwd',\r
        );\r
        \r
-       /**\r
-        * Admin::__construct()\r
-        * Class constructor\r
-        * \r
-        * @param       void\r
-        * @return      void\r
-        */\r
-       static public function __construct()\r
+       static public function initialize()\r
        {\r
-               global $CONF, $member, $DIR_LIBS;\r
+               global $CONF, $DIR_LIBS, $manager;\r
                \r
-               /* 1. decide skinid to use */\r
-               $skinid = $CONF['DefaultAdminSkin'];\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
                {\r
                        $memskin = $member->getAdminSkin();\r
@@ -168,36 +165,36 @@ class Admin
                                $skinid = $memskin;\r
                        }\r
                }\r
+               */\r
                \r
-               /* 2. make an instance of skin object */\r
-               if ( Skin::existsID($skinid) )\r
-               {\r
-                       self::$skin = new Skin($skinid);\r
-               }\r
-               else\r
+               /* NOTE: 2. make an instance of skin object */\r
+               if ( !Skin::existsID($skinid) )\r
                {\r
-                       /* TODO: error */\r
+                       return FALSE;\r
                }\r
-               return;\r
+               \r
+               /* NOTE: 3. initializing each members */\r
+               self::$skin                     =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin');\r
+               self::$action           = '';\r
+               self::$extrahead        = '';\r
+               self::$passvar          = '';\r
+               self::$headMess         = '';\r
+               self::$aOptions         = '';\r
+               return TRUE;\r
        }\r
        \r
        /**\r
         * Admin::action()\r
         * Executes an action\r
         *\r
-        * @param string $action action to be performed\r
+        * @param       string  $action action to be performed\r
+        * @return      void\r
         */\r
        static public function action($action)\r
        {\r
-               global $CONF, $manager;\r
-               $f = FALSE;\r
-               \r
-               // list of action aliases\r
-               $alias = array(\r
-                       'login' => 'overview',\r
-                       ''              => 'overview'\r
-               );\r
+               global $CONF, $DIR_LIBS, $manager, $member;\r
                \r
+               /* 1. decide action name */\r
                $customAction = postvar('customaction');\r
                if ( !empty($customAction) )\r
                {\r
@@ -206,23 +203,28 @@ class Admin
                                ''              => $customAction\r
                        );\r
                }\r
-               if ( isset($alias[$action]) )\r
+               else\r
+               {\r
+                       $alias = array(\r
+                               'login' => 'overview',\r
+                               ''              => 'overview',\r
+                       );\r
+               }\r
+               if ( array_key_exists($action, $alias) && isset($alias[$action]) )\r
                {\r
                        $action = $alias[$action];\r
                }\r
                $methodName = "action_{$action}";\r
-               \r
                self::$action = strtolower($action);\r
                \r
+               /* 2. check the action */\r
                $synonimActions = array(\r
                        'banlistnewfromitem',\r
                        'memberedit',\r
                        'login',\r
                );\r
-               \r
                $allowActions           = array_merge($synonimActions, self::$skinless_actions);\r
                $aActionsNotToCheck     = array_merge(self::$actions_needless_to_check, self::$edit_actions, $allowActions);\r
-               \r
                if ( !in_array(self::$action, $aActionsNotToCheck) && !self::existsSkinContents($action) )\r
                {\r
                        if (!$manager->checkTicket())\r
@@ -231,47 +233,36 @@ class Admin
                        }\r
                }\r
                \r
-               if ( !method_exists(self, $methodName) && !in_array(self::$action, $allowActions) && self::existsSkinContents($action) )\r
-               {\r
-                       self::$action_parseSpecialskin;\r
-                       $f = TRUE;\r
-               }\r
-               elseif ( method_exists(self, $methodName) )\r
+               /* 3. parse according to the action */\r
+               if ( !method_exists('Admin', $methodName) && !in_array(self::$action, $allowActions) && self::existsSkinContents($action) )\r
                {\r
-                       call_user_func(array(self, $methodName));\r
-                       $f = TRUE;\r
+                       /* TODO: what is this?\r
+                       self::action_parseSpecialskin();\r
+                       */\r
                }\r
-               \r
-               if ( $f )\r
+               elseif ( method_exists('Admin', $methodName) )\r
                {\r
-                       exit;\r
+                       call_user_func(array(__CLASS__, $methodName));\r
                }\r
-               \r
-               $id                     = self::getAdminSkinID();\r
-               self::$skin     = new Skin($id);\r
-               \r
-               if ( self::$skin && self::existsSkinContents('adminerrorpage') )\r
+               else if ( self::existsSkinContents('adminerrorpage') )\r
                {\r
                        self::error(_BADACTION . ENTITY::hsc($action));\r
-                       $f = TRUE;\r
                }\r
-               elseif ( $id != $CONF['DefaultAdminSkin'] )\r
+               elseif ( $id != $CONF['AdminSkin'] )\r
                {\r
-                       self::$skin = new Skin($CONF['DefaultAdminSkin']);\r
+                       self::$skin =& $manager->getSkin($CONF['AdminSkin'], 'AdminActions');\r
                        if ( self::$skin && self::existsSkinContents('adminerrorpage') )\r
                        {\r
                                self::error(_BADACTION . ENTITY::hsc($action));\r
-                               $f = TRUE;\r
                        }\r
                }\r
-               if ( $f )\r
+               else\r
                {\r
-                       exit;\r
+                       self::error(_BADACTION . ENTITY::hsc($action));\r
                }\r
-               self::error(_BADACTION . ENTITY::hsc($action));\r
-               return;\r
+               exit;\r
        }\r
-\r
+       \r
        /**\r
         * Action::existsSkinContents()\r
         * Check skin contents\r
@@ -289,15 +280,16 @@ class Admin
                }\r
                else\r
                {\r
-                       $query = "SELECT scontent as result FROM %s WHERE sdesc=%d AND stype='%s';";\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
-                               return quickQuery(sprintf($query, 1, sql_real_escape_string($action)));\r
+                               global $CONF;\r
+                               return DB::getValue(sprintf($query, sql_table('skin'), $CONF['AdminSkin'], DB::quoteValue($action)));\r
                        }\r
                        else\r
                        {\r
-                               return quickQuery(sprintf($query, self::$skin->id, sql_real_escape_string($action)));\r
+                               return DB::getValue(sprintf($query, sql_table('skin'), self::$skin->getID(), DB::quoteValue($action)));\r
                        }\r
                }\r
                return;\r
@@ -312,9 +304,9 @@ class Admin
         */\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('adminskin'), (integer) self::$skin->id, sql_real_escape_string($action));\r
-               return quickQuery($query);\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
@@ -326,7 +318,7 @@ class Admin
        static private function action_showlogin()\r
        {\r
                global $error;\r
-               self::$action_login($error);\r
+               self::action_login($error);\r
                return;\r
        }\r
        \r
@@ -343,7 +335,7 @@ class Admin
                // skip to overview when allowed\r
                if ( $member->isLoggedIn() && $member->canLogin() )\r
                {\r
-                       self::$action_overview();\r
+                       self::action_overview();\r
                        exit;\r
                }\r
                \r
@@ -354,9 +346,7 @@ class Admin
                        self::$headMess = $msg;\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('showlogin');\r
-               self::pagefoot();\r
        }\r
        \r
        /**\r
@@ -373,9 +363,7 @@ class Admin
                        self::$headMess = $msg;\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('overview');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -395,9 +383,7 @@ class Admin
                }\r
                $member->isAdmin() or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('manage');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -418,9 +404,7 @@ class Admin
                \r
                $member->teamRights($blogid) or $member->isAdmin() or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('itemlist');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -457,9 +441,7 @@ class Admin
                        self::batchAskDeleteConfirmation('item', $selected);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('batchitem');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -487,12 +469,22 @@ class Admin
                // On delete: check if confirmation has been given\r
                if ( ($action == 'delete') && (requestVar('confirmation') != 'yes') )\r
                {\r
-                       self::batchAskDeleteConfirmation('comment',$selected);\r
+                       self::batchAskDeleteConfirmation('comment', $selected);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('batchcomment');\r
-               self::pagefoot();\r
+               return;\r
+       }\r
+       \r
+       /**\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
@@ -523,9 +515,7 @@ class Admin
                        self::batchAskDeleteConfirmation('member',$selected);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('batchmember');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -557,9 +547,7 @@ class Admin
                        self::batchAskDeleteConfirmation('team',$selected);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('batchteam');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -596,9 +584,7 @@ class Admin
                        self::batchAskDeleteConfirmation('category', $selected);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('batchcategory');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -614,9 +600,7 @@ class Admin
        static private function batchMoveSelectDestination($type, $ids)\r
        {\r
                $_POST['batchmove'] = $type;\r
-               self::pagehead();\r
                self::$skin->parse('batchmove');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -633,9 +617,7 @@ class Admin
        {\r
                $_POST['batchmove'] = $type;\r
                global $manager;\r
-               self::pagehead();\r
                self::$skin->parse('batchmovecat');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -650,96 +632,7 @@ class Admin
         */\r
        static private function batchAskDeleteConfirmation($type, $ids)\r
        {\r
-               self::pagehead();\r
                self::$skin->parse('batchdelete');\r
-               self::pagefoot();\r
-               return;\r
-       }\r
-       \r
-       /**\r
-        * Admin::selectBlogCategory()\r
-        * Inserts a HTML select element with choices for all categories to which the current\r
-        * member has access\r
-        *\r
-        * @see function selectBlog\r
-        * @param       string  $name                           name of weblod\r
-        * @param       integer $selected                       \r
-        * @param       integer $tabindex                       \r
-        * @param       integer $showNewCat                     \r
-        * @param       integer $iForcedBlogInclude     ID for weblog always included\r
-        * @return      void\r
-        *\r
-        * NOTE: callback from AdminAction\r
-        */\r
-       static private function selectBlogCategory($name, $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1)\r
-       {\r
-               Admin::selectBlog($name, 'category', $selected, $tabindex, $showNewCat, $iForcedBlogInclude);\r
-               return;\r
-       }\r
-       \r
-       /**\r
-        * Admin::selectBlog()\r
-        * Inserts a HTML select element with choices for all blogs to which the user has access\r
-        *      mode = 'blog' => shows blognames and values are blogids\r
-        *      mode = 'category' => show category names and values are catids\r
-        *\r
-        * @param       string  $name                           name of weblod\r
-        * @param       string  $mode                           \r
-        * @param       integer $selected                       \r
-        * @param       integer $tabindex                       \r
-        * @param       integer $showNewCat                     \r
-        * @param       integer $iForcedBlogInclude     ID for weblog always included\r
-        * @param $iForcedBlogInclude\r
-        *      ID of a blog that always needs to be included, without checking if the\r
-        *      member is on the blog team (-1 = none)\r
-        * @return      void\r
-        */\r
-       static private function selectBlog($name, $mode='blog', $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1)\r
-       {\r
-               global $member, $CONF;\r
-               \r
-               // 0. get IDs of blogs to which member can post items (+ forced blog)\r
-               $aBlogIds = array();\r
-               if ( $iForcedBlogInclude != -1 )\r
-               {\r
-                       $aBlogIds[] = intval($iForcedBlogInclude);\r
-               }\r
-               \r
-               if ( ($member->isAdmin()) && ($CONF['ShowAllBlogs']) )\r
-               {\r
-                       $query =  "SELECT bnumber FROM %s ORDER BY bname;";\r
-                       $query = sprintf($query, sql_table('blog'));\r
-               }\r
-               else\r
-               {\r
-                       $query =  "SELECT bnumber FROM %s, %s WHERE tblog=bnumber AND tmember=%d;";\r
-                       $query = sprintf($query, sql_table('blog'), sql_table('team'), (integer) $member->getID());\r
-               }\r
-               \r
-               $rblogids = sql_query($query);\r
-               while ($o = sql_fetch_object($rblogids))\r
-               {\r
-                       if ( $o->bnumber != $iForcedBlogInclude )\r
-                       {\r
-                               $aBlogIds[] = intval($o->bnumber);\r
-                       }\r
-               }\r
-               \r
-               if ( count($aBlogIds) == 0 )\r
-               {\r
-                       return;\r
-               }\r
-               \r
-               /* TODO: we should consider to use the other way instead of this */\r
-               $_REQUEST['selectData'] = array(\r
-                       'name'                  => $name,\r
-                       'tabindex'              => $tabindex,\r
-                       'mode'                  => $mode,\r
-                       'selected'              => $selected,\r
-                       'showNewCat'    => $showNewCat,\r
-                       'aBlogIds'              => $aBlogIds,\r
-               );\r
-               self::$skin->parse('blogselectbox');\r
                return;\r
        }\r
        \r
@@ -753,9 +646,7 @@ class Admin
        {\r
                global $member, $manager, $CONF;\r
                \r
-               self::pagehead();\r
                self::$skin->parse('browseownitems');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -775,18 +666,14 @@ class Admin
                        $itemid = intRequestVar('itemid');\r
                }\r
                \r
-               /* TODO: we consider to use the other way insterad of this */\r
-               $_REQUEST['itemid'] = $itemid;\r
-               $_REQUEST['blogid'] = getBlogIdFromItemId($itemid);\r
-               \r
                // only allow if user is allowed to alter item\r
                $member->canAlterItem($itemid) or self::disallow();\r
                \r
-               $blogid = getBlogIdFromItemId($itemid);\r
+               $item =& $manager->getItem($itemid, 1, 1);\r
+               $_REQUEST['itemid'] = $item['itemid'];\r
+               $_REQUEST['blogid'] = $item['blogid'];\r
                \r
-               self::pagehead();\r
                self::$skin->parse('itemcommentlist');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -799,9 +686,7 @@ class Admin
         */\r
        static private function action_browseowncomments()\r
        {\r
-               self::pagehead();\r
                self::$skin->parse('browseowncomments');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -830,9 +715,72 @@ class Admin
                /* TODO: we consider to use the other way insterad of this */\r
                $_REQUEST['blogid'] = $blogid;\r
                \r
-               self::pagehead();\r
                self::$skin->parse('blogcommentlist');\r
-               self::pagefoot();\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Admin::action_createaccount()\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       static private function action_createaccount()\r
+       {\r
+               global $CONF;\r
+               \r
+               if ( $CONF['AllowMemberCreate'] != 1 )\r
+               {\r
+                       self::$skin->parse('createaccountdisable');\r
+                       return;\r
+               }\r
+               \r
+               $name = '';\r
+               $realname ='';\r
+               $email = '';\r
+               $url = '';\r
+               \r
+               $contents = array(\r
+                       'name'          => '',\r
+                       'realname'      => '',\r
+                       'email'         => '',\r
+                       'url'           => ''\r
+               );\r
+               \r
+               if ( array_key_exists('showform', $_POST) && $_POST['showform'] == 1 )\r
+               {\r
+                       $action = new Action();\r
+                       $message = $action->createAccount();\r
+                       if ( $message === 1 )\r
+                       {\r
+                               self::$headMess = $message;\r
+                               self::$skin->parse('createaccountsuccess');\r
+                               return;\r
+                       }\r
+                       \r
+                       /* TODO: validation */\r
+                       if ( array_key_exists('name', $_POST) )\r
+                       {\r
+                               $contents['name'] = $_POST['name'];\r
+                       }\r
+                       if ( array_key_exists('realname', $_POST) )\r
+                       {\r
+                               $contents['realname'] = $_POST['realname'];\r
+                       }\r
+                       if ( array_key_exists('email', $_POST) )\r
+                       {\r
+                               $contents['email'] = $_POST['email'];\r
+                       }\r
+                       if ( array_key_exists('url', $_POST) )\r
+                       {\r
+                               $contents['url'] = $_POST['url'];\r
+                       }\r
+                       \r
+                       self::$contents = $contents;\r
+                       \r
+               }\r
+               \r
+               self::$skin->parse('createaccountinput');\r
                return;\r
        }\r
        \r
@@ -852,13 +800,31 @@ class Admin
                // check if allowed\r
                $member->teamRights($blogid) or self::disallow();\r
                \r
-               $memberid = $member->getID();\r
-               \r
                $blog =& $manager->getBlog($blogid);\r
+               $contents = array();\r
+               \r
+               $data = array(\r
+                       'blog'          => &$blog,\r
+                       'contents'      => &$contents\r
+               );\r
+               $manager->notify('PreAddItemForm', $data);\r
+               \r
+               if ( $blog->convertBreaks() )\r
+               {\r
+                       if ( array_key_exists('body', $contents) && !empty($contents['body']) )\r
+                       {\r
+                               $contents['body'] = removeBreaks($contents['body']);\r
+                       }\r
+                       if ( array_key_exists('more', $contents) && !empty($contents['more']) )\r
+                       {\r
+                               $contents['more'] = removeBreaks($contents['more']);\r
+                       }\r
+               }\r
+               \r
+               self::$blog = &$blog;\r
+               self::$contents = &$contents;\r
                \r
-               self::pagehead();\r
                self::$skin->parse('createitem');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -878,11 +844,25 @@ class Admin
                $member->canAlterItem($itemid) or self::disallow();\r
                \r
                $item =& $manager->getItem($itemid, 1, 1);\r
-               $blog =& $manager->getBlog(getBlogIDFromItemID($itemid));\r
+               $blog =& $manager->getBlog($item['blogid']);\r
+               $manager->notify('PrepareItemForEdit', array('blog'=> &$blog, 'item' => &$item));\r
+               \r
+               if ( $blog->convertBreaks() )\r
+               {\r
+                       if ( array_key_exists('body', $item) && !empty($item['body']) )\r
+                       {\r
+                               $item['body'] = removeBreaks($item['body']);\r
+                       }\r
+                       if ( array_key_exists('more', $item) && !empty($item['more']) )\r
+                       {\r
+                               $item['more'] = removeBreaks($item['more']);\r
+                       }\r
+               }\r
+               \r
+               self::$blog = &$blog;\r
+               self::$contents = &$item;\r
                \r
-               self::pagehead();\r
                self::$skin->parse('itemedit');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -907,7 +887,7 @@ class Admin
                // delete actions are handled by itemdelete (which has confirmation)\r
                if ( $actiontype == 'delete' )\r
                {\r
-                       self::$action_itemdelete();\r
+                       self::action_itemdelete();\r
                        return;\r
                }\r
                \r
@@ -924,7 +904,7 @@ class Admin
                }\r
                \r
                // create new category if needed\r
-               if ( strstr($catid,'newcat') )\r
+               if ( i18n::strpos($catid,'newcat') === 0 )\r
                {\r
                        // get blogid\r
                        list($blogid) = sscanf($catid,"newcat-%d");\r
@@ -940,20 +920,20 @@ class Admin
                        }\r
                }\r
                \r
-               /*\r
-                       set some variables based on actiontype\r
-\r
-                       actiontypes:\r
-                               draft items -> addnow, addfuture, adddraft, delete\r
-                               non-draft items -> edit, changedate, delete\r
-\r
-                       variables set:\r
-                               $timestamp: set to a nonzero value for future dates or date changes\r
-                               $wasdraft: set to 1 when the item used to be a draft item\r
-                               $publish: set to 1 when the edited item is not a draft\r
-        */\r
+               /**\r
+                * set some variables based on actiontype\r
+                * \r
+                * actiontypes:\r
+                *      draft items -> addnow, addfuture, adddraft, delete\r
+                *      non-draft items -> edit, changedate, delete\r
+                * \r
+                * variables set:\r
+                *      $timestamp: set to a nonzero value for future dates or date changes\r
+                *      $wasdraft: set to 1 when the item used to be a draft item\r
+                *      $publish: set to 1 when the edited item is not a draft\r
+                */\r
                $blogid =  getBlogIDFromItemID($itemid);\r
-               $blog   =& $manager->getBlog($blogid);\r
+               $blog =& $manager->getBlog($blogid);\r
                \r
                $wasdrafts = array('adddraft', 'addfuture', 'addnow');\r
                $wasdraft  = in_array($actiontype, $wasdrafts) ? 1 : 0;\r
@@ -980,7 +960,7 @@ class Admin
                \r
                if ( $catid != intPostVar('catid') )\r
                {\r
-                       self::$action_categoryedit(\r
+                       self::action_categoryedit(\r
                                $catid,\r
                                $blog->getID(),\r
                                $CONF['AdminURL'] . 'index.php?action=itemlist&blogid=' . getBlogIDFromItemID($itemid)\r
@@ -989,10 +969,12 @@ class Admin
                else\r
                {\r
                        // TODO: set start item correctly for itemlist\r
-                       $item = Item::getItem($itemid, 0, 0);\r
-                       $cnt  = quickQuery('SELECT COUNT(*) FROM ' . sql_table('item') . ' WHERE unix_timestamp(itime) <= ' . $item['timestamp']);\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
                        $_REQUEST['start'] = $cnt + 1;\r
-                       self::$action_itemlist(getBlogIDFromItemID($itemid));\r
+                       self::action_itemlist(getBlogIDFromItemID($itemid));\r
                }\r
                return;\r
        }\r
@@ -1018,9 +1000,7 @@ class Admin
                        self::error(_ERROR_NOSUCHITEM);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('itemdelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1032,20 +1012,20 @@ class Admin
         */\r
        static private function action_itemdeleteconfirm()\r
        {\r
-               global $member;\r
+               global $member, $manager;\r
                \r
                $itemid = intRequestVar('itemid');\r
                \r
                // only allow if user is allowed to alter item\r
                $member->canAlterItem($itemid) or self::disallow();\r
                \r
-               // get blogid first\r
-               $blogid = getBlogIdFromItemId($itemid);\r
+               // get item first\r
+               $item =& $manager->getItem($itemid, 1, 1);\r
                \r
                // delete item (note: some checks will be performed twice)\r
-               self::deleteOneItem($itemid);\r
+               self::deleteOneItem($item['itemid']);\r
                \r
-               self::$action_itemlist($blogid);\r
+               self::action_itemlist($item['blogid']);\r
                return;\r
        }\r
        \r
@@ -1056,7 +1036,7 @@ class Admin
         * @param       integer $itemid ID for item\r
         * @return      void\r
         */\r
-       static private function deleteOneItem($itemid)\r
+       static public function deleteOneItem($itemid)\r
        {\r
                global $member, $manager;\r
                \r
@@ -1067,13 +1047,13 @@ class Admin
                }\r
                \r
                // need to get blogid before the item is deleted\r
-               $blogid = getBlogIDFromItemId($itemid);\r
+               $item =& $manager->getItem($itemid, 1, 1);\r
                \r
                $manager->loadClass('ITEM');\r
-               Item::delete($itemid);\r
+               Item::delete($item['itemid']);\r
                \r
                // update blog's futureposted\r
-               self::updateFuturePosted($blogid);\r
+               self::updateFuturePosted($item['itemid']);\r
                return;\r
        }\r
        \r
@@ -1094,9 +1074,9 @@ class Admin
                \r
                $query = "SELECT * FROM %s WHERE iblog=%d AND iposted=0 AND itime>'%s'";\r
                $query = sprintf($query, sql_table('item'), (integer) $blogid, i18n::formatted_datetime('mysql', $currenttime));\r
-               $result = sql_query($query);\r
+               $result = DB::getResult($query);\r
                \r
-               if ( sql_num_rows($result) > 0 )\r
+               if ( $result->rowCount() > 0 )\r
                {\r
                                $blog->setFuturePost();\r
                }\r
@@ -1121,9 +1101,7 @@ class Admin
                \r
                $member->canAlterItem($itemid) or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('itemmove');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1141,7 +1119,7 @@ class Admin
                $catid = requestVar('catid');\r
                \r
                // create new category if needed\r
-               if ( strstr($catid,'newcat') )\r
+               if ( i18n::strpos($catid,'newcat') === 0 )\r
                {\r
                        // get blogid\r
                        list($blogid) = sscanf($catid,'newcat-%d');\r
@@ -1172,11 +1150,11 @@ class Admin
                \r
                if ( $catid != intRequestVar('catid') )\r
                {\r
-                       self::$action_categoryedit($catid, $blog->getID());\r
+                       self::action_categoryedit($catid, $blog->getID());\r
                }\r
                else\r
                {\r
-                       self::$action_itemlist(getBlogIDFromCatID($catid));\r
+                       self::action_itemlist(getBlogIDFromCatID($catid));\r
                }\r
                return;\r
        }\r
@@ -1190,7 +1168,7 @@ class Admin
         * @param       integer $destCatid      ID for category to which the item will be moved\r
         * @return      void\r
         */\r
-       static private function moveOneItem($itemid, $destCatid)\r
+       static public function moveOneItem($itemid, $destCatid)\r
        {\r
                global $member;\r
                \r
@@ -1224,20 +1202,17 @@ class Admin
                        self::error($result['message']);\r
                }\r
                \r
-               $blogid         =  getBlogIDFromItemID($result['itemid']);\r
-               $blog           =& $manager->getBlog($blogid);\r
-               $btimestamp     =  $blog->getCorrectTime();\r
-               $item           =  $manager->getItem(intval($result['itemid']), 1, 1);\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=' . intval($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
-                       call_user_func(array(&$this, $methodName), $blogid);\r
+                       $methodName = 'action_itemlist';\r
+                       self::action_itemlist($item['blogid']);\r
                }\r
                return;\r
        }\r
@@ -1257,9 +1232,11 @@ class Admin
                \r
                $member->canAlterComment($commentid) or self::disallow();\r
                \r
-               self::pagehead();\r
+               $comment = COMMENT::getComment($commentid);\r
+               $manager->notify('PrepareCommentForEdit', array('comment' => &$comment));\r
+               \r
+               Admin::$contents = $comment;\r
                self::$skin->parse('commentedit');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1307,25 +1284,23 @@ class Admin
                );\r
                $manager->notify('PreUpdateComment', $data);\r
                \r
-               $query = "UPDATE %s SET cmail='%s', cemail  = '%s', cbody= '%s' WHERE cnumber=%d;";\r
-               $query = sprintf($query, sql_real_escape_string($url), sql_real_escape_string($url), sql_real_escape_string($url), (integer) $commentid);\r
-               sql_query($query);\r
+               $query = "UPDATE %s SET cmail=%s, cemail=%s, cbody=%s WHERE cnumber=%d;";\r
+               $query = sprintf($query, sql_table('comment'), DB::quoteValue($url), DB::quoteValue($email), DB::quoteValue($body), (integer) $commentid);\r
+               DB::execute($query);\r
                \r
                // get itemid\r
                $query = "SELECT citem FROM %s WHERE cnumber=%d;";\r
                $query = sprintf($query, sql_table('comment'), (integer) $commentid);\r
                \r
-               $res    = sql_query($query);\r
-               $o              = sql_fetch_object($res);\r
-               $itemid = $o->citem;\r
+               $itemid = DB::getValue($query);\r
                \r
                if ( $member->canAlterItem($itemid) )\r
                {\r
-                       self::$action_itemcommentlist($itemid);\r
+                       self::action_itemcommentlist($itemid);\r
                }\r
                else\r
                {\r
-                       self::$action_browseowncomments();\r
+                       self::action_browseowncomments();\r
                }\r
                return;\r
        }\r
@@ -1344,9 +1319,7 @@ class Admin
                $commentid = intRequestVar('commentid');\r
                $member->canAlterComment($commentid) or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('commentdelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1366,9 +1339,7 @@ class Admin
                $query = "SELECT citem FROM %s WHERE cnumber=%d;";\r
                $query = sprintf($query, sql_table('comment'), (integer) $commentid);\r
                \r
-               $res = sql_query($query);\r
-               $o = sql_fetch_object($res);\r
-               $itemid = $o->citem;\r
+               $itemid = DB::getValue($query);\r
                \r
                $error = self::deleteOneComment($commentid);\r
                if ( $error )\r
@@ -1378,11 +1349,11 @@ class Admin
                \r
                if ( $member->canAlterItem($itemid) )\r
                {\r
-                       self::$action_itemcommentlist($itemid);\r
+                       self::action_itemcommentlist($itemid);\r
                }\r
                else\r
                {\r
-                       self::$action_browseowncomments();\r
+                       self::action_browseowncomments();\r
                }\r
                return;\r
        }\r
@@ -1393,7 +1364,7 @@ class Admin
         * @param       integer $commentid      ID for comment\r
         * @return      void\r
         */\r
-       static private function deleteOneComment($commentid)\r
+       static public function deleteOneComment($commentid)\r
        {\r
                global $member, $manager;\r
                \r
@@ -1413,7 +1384,7 @@ class Admin
                // delete the comments associated with the item\r
                $query = "DELETE FROM %s WHERE cnumber=%d;";\r
                $query = sprintf($query, sql_table('comment'), (integer) $commentid);\r
-               sql_query($query);\r
+               DB::execute($query);\r
                \r
                $data = array(\r
                        'commentid' => $commentid\r
@@ -1438,14 +1409,12 @@ class Admin
                // check if allowed\r
                $member->isAdmin() or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('usermanagement');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
        /**\r
-        * Admin::\r
+        * Admin::action_memberedit()\r
         * Edit member settings\r
         * \r
         * @param       void\r
@@ -1453,7 +1422,7 @@ class Admin
         */\r
        static private function action_memberedit()\r
        {\r
-               self::$action_editmembersettings(intRequestVar('memberid'));\r
+               self::action_editmembersettings(intRequestVar('memberid'));\r
                return;\r
        }\r
        \r
@@ -1479,10 +1448,9 @@ class Admin
                // check if allowed\r
                ($member->getID() == $memberid) or $member->isAdmin() or self::disallow();\r
                \r
-               $extrahead = '<script type="text/javascript" src="javascript/numbercheck.js"></script>';\r
-               self::pagehead($extrahead);\r
+               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
+               \r
                self::$skin->parse('editmembersettings');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1508,6 +1476,7 @@ class Admin
                $email                  = strip_tags(postVar('email'));\r
                $url                    = strip_tags(postVar('url'));\r
                $adminskin              = intPostVar('adminskin');\r
+               $bookmarklet    = intPostVar('bookmarklet');\r
                \r
                // begin if: sometimes user didn't prefix the URL with http:// or https://, this cause a malformed URL. Let's fix it.\r
                if ( !preg_match('#^https?://#', $url) )\r
@@ -1520,7 +1489,7 @@ class Admin
                $notes          = strip_tags(postVar('notes'));\r
                $locale         = postVar('locale');\r
                \r
-               $mem = Member::createFromID($memberid);\r
+               $mem =& $manager->getMember($memberid);\r
                \r
                if ( $CONF['AllowLoginEdit'] || $member->isAdmin() )\r
                {\r
@@ -1582,8 +1551,8 @@ class Admin
                        ||      (!$canlogin && $mem->isAdmin() && $mem->canLogin())\r
                        )\r
                {\r
-                       $r = sql_query('SELECT * FROM '.sql_table('member').' WHERE madmin=1 and mcanlogin=1');\r
-                       if ( sql_num_rows($r) < 2 )\r
+                       $r = DB::getResult('SELECT * FROM '.sql_table('member').' WHERE madmin=1 and mcanlogin=1');\r
+                       if ( $r->rowCount() < 2 )\r
                        {\r
                                self::error(_ERROR_ATLEASTONEADMIN);\r
                        }\r
@@ -1605,7 +1574,9 @@ class Admin
                $mem->setURL($url);\r
                $mem->setNotes($notes);\r
                $mem->setLocale($locale);\r
-               \r
+               $mem->setAdminSkin($adminskin);\r
+               $mem->setBookmarklet($bookmarklet);\r
+\r
                // only allow super-admins to make changes to the admin status\r
                if ( $member->isAdmin() )\r
                {\r
@@ -1640,7 +1611,7 @@ class Admin
                        {\r
                                $member->logout();\r
                        }\r
-                       self::$action_login(_MSG_ACTIVATION_SENT, 0);\r
+                       self::action_login(_MSG_ACTIVATION_SENT, 0);\r
                        return;\r
                }\r
                \r
@@ -1649,11 +1620,11 @@ class Admin
                {\r
                        $mem->newCookieKey();\r
                        $member->logout();\r
-                       self::$action_login(_MSG_LOGINAGAIN, 0);\r
+                       self::action_login(_MSG_LOGINAGAIN, 0);\r
                }\r
                else\r
                {\r
-                       self::$action_overview(_MSG_SETTINGSCHANGED);\r
+                       self::action_overview(_MSG_SETTINGSCHANGED);\r
                }\r
                return;\r
        }\r
@@ -1706,7 +1677,19 @@ class Admin
                );\r
                $manager->notify('PostRegister', $data);\r
                \r
-               self::$action_usermanagement();\r
+               self::action_usermanagement();\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Admin::action_forgotpassword()\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       static private function action_forgotpassword()\r
+       {\r
+               self::$skin->parse('forgotpassword');\r
                return;\r
        }\r
        \r
@@ -1745,7 +1728,7 @@ class Admin
                        self::error(_ERROR_ACTIVATE);\r
                }\r
                \r
-               $mem = Member::createFromId($info->vmember);\r
+               $mem =& $manager->getMember($info->vmember);\r
                \r
                if ( !$mem )\r
                {\r
@@ -1757,9 +1740,7 @@ class Admin
                $_POST['bNeedsPasswordChange']  = TRUE;\r
                \r
                self::$headMess = $message;\r
-               self::pagehead();\r
                self::$skin->parse('activate');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1786,7 +1767,7 @@ class Admin
                        return self::showActivationPage($key, _ERROR_ACTIVATE);\r
                }\r
                \r
-               $mem = Member::createFromId($info->vmember);\r
+               $mem =& $manager->getMember($info->vmember);\r
                \r
                if ( !$mem )\r
                {\r
@@ -1843,9 +1824,7 @@ class Admin
                // do the activation\r
                Member::activate($key);\r
                \r
-               self::pagehead();\r
                self::$skin->parse('activatesetpwd');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1865,9 +1844,7 @@ class Admin
                // check if allowed\r
                $member->blogAdminRights($blogid) or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('manageteam');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1895,7 +1872,7 @@ class Admin
                        self::error(_ERROR_ALREADYONTEAM);\r
                }\r
                \r
-               self::$action_manageteam();\r
+               self::action_manageteam();\r
                return;\r
        }\r
        \r
@@ -1915,12 +1892,10 @@ class Admin
                // check if allowed\r
                $member->blogAdminRights($blogid) or self::disallow();\r
                \r
-               $teammem =  Member::createFromID($memberid);\r
+               $teammem =& $manager->getMember($memberid);\r
                $blog =& $manager->getBlog($blogid);\r
                \r
-               self::pagehead();\r
                self::$skin->parse('teamdelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -1942,7 +1917,7 @@ class Admin
                {\r
                        self::error($error);\r
                }\r
-               self::$action_manageteam();\r
+               self::action_manageteam();\r
                return;\r
        }\r
        \r
@@ -1952,7 +1927,7 @@ class Admin
         * @param       void\r
         * @return      void\r
         */\r
-       static private function deleteOneTeamMember($blogid, $memberid)\r
+       static public function deleteOneTeamMember($blogid, $memberid)\r
        {\r
                global $member, $manager;\r
                \r
@@ -1967,7 +1942,7 @@ class Admin
                \r
                // check if: - there remains at least one blog admin\r
                //           - (there remains at least one team member)\r
-               $tmem = Member::createFromID($memberid);\r
+               $tmem =& $manager->getMember($memberid);\r
                \r
                \r
                $data = array(\r
@@ -1982,8 +1957,8 @@ class Admin
                        // (check for at least two admins before deletion)\r
                        $query = "SELECT * FROM %s WHERE tblog=%d and tadmin=1;";\r
                        $query = sprintf($query, sql_table('team'), (integer) $blogid);\r
-                       $r     = sql_query($query);\r
-                       if ( sql_num_rows($r) < 2 )\r
+                       $r     = DB::getResult($query);\r
+                       if ( $r->rowCount() < 2 )\r
                        {\r
                                return _ERROR_ATLEASTONEBLOGADMIN;\r
                        }\r
@@ -1991,7 +1966,7 @@ class Admin
                \r
                $query = "DELETE FROM %s WHERE tblog=%d AND tmember=%d;";\r
                $query = sprintf($query, sql_table('team'), (integer) $blogid, (integer) $memberid);\r
-               sql_query($query);\r
+               DB::execute($query);\r
                \r
                $data = array(\r
                        'member' => &$tmem,\r
@@ -2010,7 +1985,7 @@ class Admin
         */\r
        static private function action_teamchangeadmin()\r
        {\r
-               global $member;\r
+               global $manager, $member;\r
                \r
                $blogid         = intRequestVar('blogid');\r
                $memberid       = intRequestVar('memberid');\r
@@ -2018,15 +1993,15 @@ class Admin
                // check if allowed\r
                $member->blogAdminRights($blogid) or self::disallow();\r
                \r
-               $mem = Member::createFromID($memberid);\r
+               $mem =& $manager->getMember($memberid);\r
                \r
                // don't allow when there is only one admin at this moment\r
                if ( $mem->isBlogAdmin($blogid) )\r
                {\r
                        $query = "SELECT * FROM %s WHERE tblog=%d AND tadmin=1;";\r
                        $query = sprintf($query, sql_table('team'), (integer) $blogid);\r
-                       $r = sql_query($query);\r
-                       if ( sql_num_rows($r) == 1 )\r
+                       $r = DB::getResult($query);\r
+                       if ( $r->rowCount() == 1 )\r
                        {\r
                                self::error(_ERROR_ATLEASTONEBLOGADMIN);\r
                        }\r
@@ -2043,16 +2018,16 @@ class Admin
                \r
                $query = "UPDATE %s SET tadmin=%d WHERE tblog=%d and tmember=%d;";\r
                $query = sprintf($query, (integer) $blogid, (integer) $newval, (integer) $blogid, (integer) $memberid);\r
-               sql_query($query);\r
+               DB::execute($query);\r
                \r
                // only show manageteam if member did not change its own admin privileges\r
                if ( $member->isBlogAdmin($blogid) )\r
                {\r
-                       self::$action_manageteam();\r
+                       self::action_manageteam();\r
                }\r
                else\r
                {\r
-                       self::$action_overview(_MSG_ADMINCHANGED);\r
+                       self::action_overview(_MSG_ADMINCHANGED);\r
                }\r
                return;\r
        }\r
@@ -2074,10 +2049,9 @@ class Admin
                \r
                $blog =& $manager->getBlog($blogid);\r
                \r
-               $extrahead = '<script type="text/javascript" src="javascript/numbercheck.js"></script>';\r
-               self::pagehead($extrahead);\r
+               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
+               \r
                self::$skin->parse('blogsettings');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2103,10 +2077,10 @@ class Admin
                        self::error(_ERROR_BADCATEGORYNAME);\r
                }\r
                \r
-               $query = "SELECT * FROM %s WHERE cname='%s' AND cblog=%d;";\r
-               $query = sprintf($query, sql_table('category'), sql_real_escape_string($cname), (integer) $blogid);\r
-               $res = sql_query($query);\r
-               if ( sql_num_rows($res) > 0 )\r
+               $query = "SELECT * FROM %s WHERE cname=%s AND cblog=%d;";\r
+               $query = sprintf($query, sql_table('category'), DB::quoteValue($cname), (integer) $blogid);\r
+               $res = DB::getResult($query);\r
+               if ( $res->rowCount() > 0 )\r
                {\r
                        self::error(_ERROR_DUPCATEGORYNAME);\r
                }\r
@@ -2114,7 +2088,7 @@ class Admin
                $blog           =& $manager->getBlog($blogid);\r
                $newCatID       =  $blog->createNewCategory($cname, $cdesc);\r
                \r
-               self::$action_blogsettings();\r
+               self::action_blogsettings();\r
                return;\r
        }\r
        \r
@@ -2151,10 +2125,9 @@ class Admin
                $_REQUEST['desturl']    = $desturl;\r
                $member->blogAdminRights($blogid) or self::disallow();\r
                \r
-               $extrahead = '<script type="text/javascript" src="javascript/numbercheck.js"></script>';\r
-               self::pagehead($extrahead);\r
+               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
+               \r
                self::$skin->parse('categoryedit');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2181,17 +2154,17 @@ class Admin
                        self::error(_ERROR_BADCATEGORYNAME);\r
                }\r
                \r
-               $query  = "SELECT * FROM %s WHERE cname='%s' AND cblog=%d AND not(catid=%d);";\r
-               $query  = sprintf($query, sql_table('category'), sql_real_escape_string($cname), (integer) $blogid, (integer) $catid);\r
-               $res    = sql_query($query);\r
-               if ( sql_num_rows($res) > 0 )\r
+               $query  = "SELECT * FROM %s WHERE cname=%s AND cblog=%d AND not(catid=%d);";\r
+               $query  = sprintf($query, sql_table('category'), DB::quoteValue($cname), (integer) $blogid, (integer) $catid);\r
+               $res    = DB::getResult($query);\r
+               if ( $res->rowCount() > 0 )\r
                {\r
                        self::error(_ERROR_DUPCATEGORYNAME);\r
                }\r
                \r
-               $query =  "UPDATE %s SET cname='%s', cdesc='%s' WHERE catid=%d;";\r
-               $query = sprintf($query, sql_table('category'), sql_real_escape_string($cname), sql_real_escape_string($cdesc), (integer) $catid);\r
-               sql_query($query);\r
+               $query =  "UPDATE %s SET cname=%s, cdesc=%s WHERE catid=%d;";\r
+               $query = sprintf($query, sql_table('category'), DB::quoteValue($cname), DB::quoteValue($cdesc), (integer) $catid);\r
+               DB::execute($query);\r
                \r
                // store plugin options\r
                $aOptions = requestArray('plugoption');\r
@@ -2209,7 +2182,7 @@ class Admin
                }\r
                else\r
                {\r
-                       self::$action_blogsettings();\r
+                       self::action_blogsettings();\r
                }\r
                return;\r
        }\r
@@ -2246,15 +2219,13 @@ class Admin
                // check if catid is the only category left for blogid\r
                $query = "SELECT catid FROM %s WHERE cblog=%d;";\r
                $query = sprintf($query, sql_table('category'), $blogid);\r
-               $res = sql_query($query);\r
-               if ( sql_num_rows($res) == 1 )\r
+               $res = DB::getResult($query);\r
+               if ( $res->rowCount() == 1 )\r
                {\r
                        self::error(_ERROR_DELETELASTCATEGORY);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('categorydelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2279,7 +2250,7 @@ class Admin
                        self::error($error);\r
                }\r
                \r
-               self::$action_blogsettings();\r
+               self::action_blogsettings();\r
                return;\r
        }\r
        \r
@@ -2290,7 +2261,7 @@ class Admin
         * @param       String  $catid  category id for deleting\r
         * @return      Void\r
         */\r
-       static private function deleteOneCategory($catid)\r
+       static public function deleteOneCategory($catid)\r
        {\r
                global $manager, $member;\r
                \r
@@ -2321,10 +2292,10 @@ class Admin
                \r
                // check if catid is the only category left for blogid\r
                $query = "SELECT catid FROM %s WHERE cblog=%d;";\r
-               $query = sprintf(sql_table('category'), (integer) $blogid);\r
+               $query = sprintf($query, sql_table('category'), (integer) $blogid);\r
                \r
-               $res = sql_query($query);\r
-               if ( sql_num_rows($res) == 1 )\r
+               $res = DB::getResult($query);\r
+               if ( $res->rowCount() == 1 )\r
                {\r
                        return _ERROR_DELETELASTCATEGORY;\r
                }\r
@@ -2335,15 +2306,15 @@ class Admin
                // change category for all items to the default category\r
                $query = "UPDATE %s SET icat=%d WHERE icat=%d;";\r
                $query =sprintf($query, sql_table('item'), (integer) $destcatid, (integer) $catid);\r
-               sql_query($query);\r
+               DB::execute($query);\r
                \r
                // delete all associated plugin options\r
-               NucleusPlugin::delete_option_values('category', $catid);\r
+               NucleusPlugin::delete_option_values('category', (integer) $catid);\r
                \r
                // delete category\r
                $query = "DELETE FROM %s WHERE catid=%d;";\r
-               $query = sprintf($query, (integer) $catid);\r
-               sql_query($query);\r
+               $query = sprintf($query, sql_table('category'), (integer) $catid);\r
+               DB::execute($query);\r
                \r
                $data = array('catid' => $catid);\r
                $manager->notify('PostDeleteCategory', $data);\r
@@ -2351,6 +2322,96 @@ class Admin
        }\r
        \r
        /**\r
+        * Admin::moveOneCategory()\r
+        * Delete a category by its id\r
+        * \r
+        * @param       int     $catid          category id for move\r
+        * @param       int     $destblogid     blog id for destination\r
+        * @return      void\r
+        */\r
+       static public function moveOneCategory($catid, $destblogid)\r
+       {\r
+               global $manager, $member;\r
+               $catid      = intval($catid);\r
+               $destblogid = intval($destblogid);\r
+               $blogid     = getBlogIDFromCatID($catid);\r
+               // mover should have admin rights on both blogs\r
+               if (!$member->blogAdminRights($blogid)) {\r
+                       return _ERROR_DISALLOWED;\r
+               }\r
+               if (!$member->blogAdminRights($destblogid)) {\r
+                       return _ERROR_DISALLOWED;\r
+               }\r
+               // cannot move to self\r
+               if ($blogid == $destblogid) {\r
+                       return _ERROR_MOVETOSELF;\r
+               }\r
+               // get blogs\r
+               $blog     =& $manager->getBlog($blogid);\r
+               $destblog =& $manager->getBlog($destblogid);\r
+               // check if the category is valid\r
+               if (!$blog || !$blog->isValidCategory($catid)) {\r
+                       return _ERROR_NOSUCHCATEGORY;\r
+               }\r
+               // don't allow default category to be moved\r
+               if ($blog->getDefaultCategory() == $catid) {\r
+                       return _ERROR_MOVEDEFCATEGORY;\r
+               }\r
+               $manager->notify(\r
+                               'PreMoveCategory',\r
+                               array(\r
+                                               'catid'      => &$catid,\r
+                                               'sourceblog' => &$blog,\r
+                                               'destblog'   => &$destblog\r
+                               )\r
+               );\r
+               // update comments table (cblog)\r
+               $query = 'SELECT '\r
+               . '    inumber '\r
+               . 'FROM '\r
+               .      sql_table('item') . ' '\r
+               . 'WHERE '\r
+               . '    icat = %d';\r
+               $items = sql_query(sprintf($query, $catid));\r
+               while ($oItem = sql_fetch_object($items)) {\r
+                       $query = 'UPDATE '\r
+                       .      sql_table('comment') . ' '\r
+                       . 'SET '\r
+                       . '    cblog = %d' . ' '\r
+                       . 'WHERE '\r
+                       . '    citem = %d';\r
+                       sql_query(sprintf($query, $destblogid, $oItem->inumber));\r
+               }\r
+       \r
+               // update items (iblog)\r
+               $query = 'UPDATE '\r
+               .      sql_table('item') . ' '\r
+               . 'SET '\r
+               . '    iblog = %d '\r
+               . 'WHERE '\r
+               . '    icat = %d';\r
+               sql_query(sprintf($query, $destblogid, $catid));\r
+       \r
+               // move category\r
+               $query = 'UPDATE '\r
+               .      sql_table('category') . ' '\r
+               . 'SET '\r
+               . '    cblog = %d' . ' '\r
+               . 'WHERE '\r
+               . '    catid = %d';\r
+               sql_query(sprintf($query, $destblogid, $catid));\r
+               $manager->notify(\r
+                               'PostMoveCategory',\r
+                               array(\r
+                                               'catid'      => &$catid,\r
+                                               'sourceblog' => &$blog,\r
+                                               'destblog'   => $destblog\r
+                               )\r
+               );\r
+               return;\r
+       }\r
+\r
+       /**\r
         * Admin::action_blogsettingsupdate\r
         * Updating blog settings\r
         * \r
@@ -2439,7 +2500,7 @@ class Admin
                );\r
                $manager->notify('PostPluginOptionsUpdate', $data);\r
                \r
-               self::$action_overview(_MSG_SETTINGSCHANGED);\r
+               self::action_overview(_MSG_SETTINGSCHANGED);\r
                return;\r
        }\r
        \r
@@ -2465,9 +2526,7 @@ class Admin
                \r
                $blog =& $manager->getBlog($blogid);\r
                \r
-               self::pagehead();\r
                self::$skin->parse('deleteblog');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2497,35 +2556,35 @@ class Admin
                \r
                // delete all comments\r
                $query = 'DELETE FROM ' . sql_table('comment') . ' WHERE cblog='.$blogid;\r
-               sql_query($query);\r
+               DB::execute($query);\r
                \r
                // delete all items\r
                $query = 'DELETE FROM ' . sql_table('item') . ' WHERE iblog=' . $blogid;\r
-               sql_query($query);\r
+               DB::execute($query);\r
                \r
                // delete all team members\r
                $query = 'DELETE FROM ' . sql_table('team') . ' WHERE tblog=' . $blogid;\r
-               sql_query($query);\r
+               DB::execute($query);\r
                \r
                // delete all bans\r
                $query = 'DELETE FROM ' . sql_table('ban') . ' WHERE blogid=' . $blogid;\r
-               sql_query($query);\r
+               DB::execute($query);\r
                \r
                // delete all categories\r
                $query = 'DELETE FROM ' . sql_table('category') . ' WHERE cblog=' . $blogid;\r
-               sql_query($query);\r
+               DB::execute($query);\r
                \r
                // delete all associated plugin options\r
                NucleusPlugin::delete_option_values('blog', $blogid);\r
                \r
                // delete the blog itself\r
                $query = 'DELETE FROM ' . sql_table('blog') . ' WHERE bnumber=' . $blogid;\r
-               sql_query($query);\r
+               DB::execute($query);\r
                \r
                $data = array('blogid' => $blogid);\r
                $manager->notify('PostDeleteBlog', $data);\r
                \r
-               self::$action_overview(_DELETED_BLOG);\r
+               self::action_overview(_DELETED_BLOG);\r
                return;\r
        }\r
        \r
@@ -2543,11 +2602,9 @@ class Admin
                \r
                ($member->getID() == $memberid) or $member->isAdmin() or self::disallow();\r
                \r
-               $mem = Member::createFromID($memberid);\r
+               $mem =& $manager->getMember($memberid);\r
                \r
-               self::pagehead();\r
                self::$skin->parse('memberdelete');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2573,11 +2630,11 @@ class Admin
                \r
                if ( $member->isAdmin() )\r
                {\r
-                       self::$action_usermanagement();\r
+                       self::action_usermanagement();\r
                }\r
                else\r
                {\r
-                       self::$action_overview(_DELETED_MEMBER);\r
+                       self::action_overview(_DELETED_MEMBER);\r
                }\r
                return;\r
        }\r
@@ -2590,12 +2647,12 @@ class Admin
         * @params      Integer $memberid       member id\r
         * @return      String  null string or error messages\r
         */\r
-       static private function deleteOneMember($memberid)\r
+       static public function deleteOneMember($memberid)\r
        {\r
                global $manager;\r
                \r
                $memberid = intval($memberid);\r
-               $mem = Member::createFromID($memberid);\r
+               $mem =& $manager->getMember($memberid);\r
                \r
                if ( !$mem->canBeDeleted() )\r
                {\r
@@ -2608,19 +2665,19 @@ class Admin
                /* unlink comments from memberid */\r
                if ( $memberid )\r
                {\r
-                       $query = "UPDATE %s SET cmember=0, cuser='%s' WHERE cmember=%d;";\r
-                       $query = sprintf($query, sql_table('comment'), sql_real_escape_string($mem->getDisplayName()), $memberid);\r
-                       sql_query($query);\r
+                       $query = "UPDATE %s SET cmember=0, cuser=%s WHERE cmember=%d;";\r
+                       $query = sprintf($query, sql_table('comment'), DB::quoteValue($mem->getDisplayName()), $memberid);\r
+                       DB::execute($query);\r
                }\r
                \r
                $query = 'DELETE FROM ' . sql_table('member') . ' WHERE mnumber=' . $memberid;\r
-               sql_query($query);\r
+               DB::execute($query);\r
                \r
                $query = 'DELETE FROM ' . sql_table('team') . ' WHERE tmember=' . $memberid;\r
-               sql_query($query);\r
+               DB::execute($query);\r
                \r
                $query = 'DELETE FROM ' . sql_table('activation') . ' WHERE vmember=' . $memberid;\r
-               sql_query($query);\r
+               DB::execute($query);\r
                \r
                // delete all associated plugin options\r
                NucleusPlugin::delete_option_values('member', $memberid);\r
@@ -2644,9 +2701,7 @@ class Admin
                // Only Super-Admins can do this\r
                $member->isAdmin() or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('createnewlog');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2689,27 +2744,27 @@ class Admin
                $manager->notify('PreAddBlog', $data);\r
                \r
                // add slashes for sql queries\r
-               $bname                  = sql_real_escape_string($bname);\r
-               $bshortname             = sql_real_escape_string($bshortname);\r
-               $btimeoffset    = sql_real_escape_string($btimeoffset);\r
-               $bdesc                  = sql_real_escape_string($bdesc);\r
-               $bdefskin               = sql_real_escape_string($bdefskin);\r
+               $bname                  = DB::quoteValue($bname);\r
+               $bshortname             = DB::quoteValue($bshortname);\r
+               $btimeoffset    = DB::quoteValue($btimeoffset);\r
+               $bdesc                  = DB::quoteValue($bdesc);\r
+               $bdefskin               = DB::quoteValue($bdefskin);\r
                \r
                // create blog\r
-               $query = "INSERT INTO %s (bname, bshortname, bdesc, btimeoffset, bdefskin) VALUES ('%s', '%s', '%s', '%s', '%s');";\r
-               $query = sprintf(sql_table('blog'), $bname, $bshortname, $bdesc, $btimeoffset, $bdefskin);\r
-               sql_query($query);\r
+               $query = "INSERT INTO %s (bname, bshortname, bdesc, btimeoffset, bdefskin) VALUES (%s, %s, %s, %s, %s);";\r
+               $query = sprintf($query, sql_table('blog'), $bname, $bshortname, $bdesc, $btimeoffset, $bdefskin);\r
+               DB::execute($query);\r
                \r
-               $blogid =  sql_insert_id();\r
+               $blogid = DB::getInsertId();\r
                $blog   =& $manager->getBlog($blogid);\r
                \r
                // create new category\r
                $catdefname = (!defined('_EBLOGDEFAULTCATEGORY_NAME') ? 'General' : _EBLOGDEFAULTCATEGORY_NAME);\r
                $catdefdesc = (!defined('_EBLOGDEFAULTCATEGORY_DESC') ? 'Items that do not fit in other categories' : _EBLOGDEFAULTCATEGORY_DESC);\r
                \r
-               $query = 'INSERT INTO %s (cblog, cname, cdesc) VALUES (%d, "%s", "%s")';\r
-               sql_query(sprintf($query, sql_table('category'), (integer) $blogid, $catdefname, $catdefdesc));\r
-               $catid = sql_insert_id();\r
+               $query = 'INSERT INTO %s (cblog, cname, cdesc) VALUES (%d, %s, %s)';\r
+               DB::execute(sprintf($query, sql_table('category'), (integer) $blogid, DB::quoteValue($catdefname), DB::quoteValue($catdefdesc)));\r
+               $catid = DB::getInsertId();\r
                \r
                // set as default category\r
                $blog->setDefaultCategory($catid);\r
@@ -2718,7 +2773,7 @@ class Admin
                // create team member\r
                $query = "INSERT INTO %s (tmember, tblog, tadmin) VALUES (%d, %d, 1);";\r
                $query = sprintf($query, sql_table('team'), (integer) $member->getID(), (integer) $blogid);\r
-               sql_query($query);\r
+               DB::execute($query);\r
                \r
                $itemdeftitle = (defined('_EBLOG_FIRSTITEM_TITLE') ? _EBLOG_FIRSTITEM_TITLE : 'First Item');\r
                $itemdefbody  = (defined('_EBLOG_FIRSTITEM_BODY')  ? _EBLOG_FIRSTITEM_BODY  : 'This is the first item in your weblog. Feel free to delete it.');\r
@@ -2749,9 +2804,7 @@ class Admin
                /* TODO: we should consider to use the other way insterad of this */\r
                $_REQUEST['blogid'] = $blogid;\r
                $_REQUEST['catid']  = $catid;\r
-               self::pagehead();\r
                self::$skin->parse('addnewlog');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2774,7 +2827,7 @@ class Admin
                $blog->setURL(trim($burl));\r
                $blog->writeSettings();\r
                \r
-               self::$action_overview(_MSG_NEWBLOG);\r
+               self::action_overview(_MSG_NEWBLOG);\r
                return;\r
        }\r
        \r
@@ -2792,9 +2845,7 @@ class Admin
                \r
                include_once($DIR_LIBS . 'skinie.php');\r
                \r
-               self::pagehead();\r
                self::$skin->parse('skinieoverview');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -2819,16 +2870,17 @@ class Admin
                $importer = new SkinImport();\r
                \r
                // get full filename\r
-               if ($mode == 'file')\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
-                       /* TODO: remove this */\r
                        if ( !file_exists($skinFile) )\r
                        {\r
                                $skinFile = $DIR_SKINS . $skinFileRaw . '/skindata.xml';\r
                        }\r
+                        */\r
                }\r
                else\r
                {\r
@@ -2844,7 +2896,7 @@ class Admin
                $_REQUEST['tpltnames']  = $importer->getTemplateNames();\r
                \r
                // clashes\r
-               $skinNameClashe                 = $importer->checkSkinNameClashes();\r
+               $skinNameClashes                = $importer->checkSkinNameClashes();\r
                $templateNameClashes    = $importer->checkTemplateNameClashes();\r
                $hasNameClashes                 = (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0);\r
                \r
@@ -2858,14 +2910,12 @@ class Admin
                        self::error($error);\r
                }\r
                \r
-               self::pagehead();\r
                self::$skin->parse('skinieimport');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
        /**\r
-        * Admin::\r
+        * Admin::action_skiniedoimport()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -2873,61 +2923,62 @@ class Admin
        static private function action_skiniedoimport()\r
        {\r
                global $member, $DIR_LIBS, $DIR_SKINS;\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
+               \r
                // load skinie class\r
                include_once($DIR_LIBS . 'skinie.php');\r
-\r
-               $skinFileRaw= postVar('skinfile');\r
-               $mode       = postVar('mode');\r
-\r
+               \r
+               $skinFileRaw    = postVar('skinfile');\r
+               $mode                   = postVar('mode');\r
+               \r
                $allowOverwrite = intPostVar('overwrite');\r
-\r
+               \r
                // get full filename\r
                if ( $mode == 'file' )\r
                {\r
                        $skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml';\r
-\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
                }\r
                else\r
                {\r
                        $skinFile = $skinFileRaw;\r
                }\r
-\r
+               \r
                $importer = new SkinImport();\r
-\r
-               $error    = $importer->readFile($skinFile);\r
-\r
+               \r
+               $error = $importer->readFile($skinFile);\r
+               \r
                if ( $error )\r
                {\r
                        self::error($error);\r
                }\r
-\r
+               \r
                $error = $importer->writeToDatabase($allowOverwrite);\r
-\r
+               \r
                if ( $error )\r
                {\r
                        self::error($error);\r
                }\r
-\r
+               \r
+               /* TODO: we should consider to use the other way insterad of this */\r
                $_REQUEST['skininfo']  = $importer->getInfo();\r
                $_REQUEST['skinnames'] = $importer->getSkinNames();\r
                $_REQUEST['tpltnames'] = $importer->getTemplateNames();\r
-\r
-               self::pagehead();\r
+               \r
                self::$skin->parse('skiniedoimport');\r
-               self::pagefoot();\r
+               return;\r
        }\r
 \r
        /**\r
-        * Admin::\r
+        * Admin::action_skinieexport()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -2935,15 +2986,15 @@ class Admin
        static private function action_skinieexport()\r
        {\r
                global $member, $DIR_LIBS;\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
+               \r
                // load skinie class\r
                include_once($DIR_LIBS . 'skinie.php');\r
-\r
-               $aSkins     = requestIntArray('skin');\r
-               $aTemplates = requestIntArray('template');\r
-\r
+               \r
+               $aSkins         = requestIntArray('skin');\r
+               $aTemplates     = requestIntArray('template');\r
+               \r
                if ( !is_array($aTemplates) )\r
                {\r
                        $aTemplates = array();\r
@@ -2952,14 +3003,14 @@ class Admin
                {\r
                        $aSkins = array();\r
                }\r
-\r
-               $skinList     = array_keys($aSkins);\r
-               $templateList = array_keys($aTemplates);\r
-\r
+               \r
+               $skinList               = array_keys($aSkins);\r
+               $templateList   = array_keys($aTemplates);\r
+               \r
                $info = postVar('info');\r
-\r
+               \r
                $exporter = new SkinExport();\r
-               foreach ($skinList as $skinId)\r
+               foreach ( $skinList as $skinId )\r
                {\r
                        $exporter->addSkin($skinId);\r
                }\r
@@ -2968,12 +3019,13 @@ class Admin
                        $exporter->addTemplate($templateId);\r
                }\r
                $exporter->setInfo($info);\r
-\r
+               \r
                $exporter->export();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_templateoverview()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -2981,18 +3033,17 @@ class Admin
        static private function action_templateoverview()\r
        {\r
                global $member, $manager;\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
-               self::pagehead();\r
+               \r
                self::$skin->parse('templateoverview');\r
-               self::pagefoot();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_templateedit()\r
         * \r
-        * @param       void\r
+        * @param       string  $msg    message for pageheader\r
         * @return      void\r
         */\r
        static private function action_templateedit($msg = '')\r
@@ -3004,32 +3055,18 @@ class Admin
                }\r
                \r
                $templateid = intRequestVar('templateid');\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
-               $extrahead = '<script type="text/javascript" src="javascript/templateEdit.js"></script>';\r
-               $extrahead .= '<script type="text/javascript">setTemplateEditText("' . sql_real_escape_string(_EDITTEMPLATE_EMPTY) . '");</script>';\r
-\r
-               self::pagehead($extrahead);\r
+               \r
+               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(javascript/templateEdit.js)%>\"></script>\n";\r
+               Admin::$extrahead .= "<script type=\"text/javascript\">setTemplateEditText('" . Entity::hsc(_EDITTEMPLATE_EMPTY) . "');</script>\n";\r
+               \r
                self::$skin->parse('templateedit');\r
-               self::pagefoot();\r
+               return;\r
        }\r
-\r
-       /**\r
-        *\r
-       static private function _templateEditRow(&$template, $description, $name, $help = '', $tabindex = 0, $big = 0) {\r
-               static $count = 1;\r
-               if (!isset($template[$name])) $template[$name] = '';\r
-       ?>\r
-               </tr><tr>\r
-                       <td><?php echo $description?> <?php if ($help) help('template'.$help); ?></td>\r
-                       <td id="td<?php echo $count?>"><textarea class="templateedit" name="<?php echo $name?>" tabindex="<?php echo $tabindex?>" cols="50" rows="<?php echo $big?10:5?>" id="textarea<?php echo $count?>"><?php echo  Entity::hsc($template[$name]); ?></textarea></td>\r
-       <?php       $count++;\r
-       }\r
-       */\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_templateupdate()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -3037,97 +3074,85 @@ class Admin
        static private function action_templateupdate()\r
        {\r
                global $member,$manager;\r
-\r
+               \r
                $templateid = intRequestVar('templateid');\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
+               \r
                $name = postVar('tname');\r
                $desc = postVar('tdesc');\r
-\r
+               \r
                if ( !isValidTemplateName($name) )\r
                {\r
                        self::error(_ERROR_BADTEMPLATENAME);\r
                }\r
-\r
+               \r
                if ( (Template::getNameFromId($templateid) != $name) && Template::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPTEMPLATENAME);\r
                }\r
-\r
-               $name = sql_real_escape_string($name);\r
-               $desc = sql_real_escape_string($desc);\r
-\r
+               \r
                // 1. Remove all template parts\r
-               $query = 'DELETE FROM ' . sql_table('template') . ' WHERE tdesc=' . $templateid;\r
-               sql_query($query);\r
-\r
+               $query = "DELETE FROM %s WHERE tdesc=%d;";\r
+               $query = sprintf($query, sql_table('template'), (integer) $templateid);\r
+               DB::execute($query);\r
+               \r
                // 2. Update description\r
-               $query = 'UPDATE '\r
-                          .      sql_table('template_desc')\r
-                          . ' SET'\r
-                          . "    tdname='" . $name . "',"\r
-                          . "    tddesc='" . $desc . "'"\r
-                          . " WHERE"\r
-                          . "    tdnumber=" . $templateid;\r
-               sql_query($query);\r
-\r
+               $query = "UPDATE %s SET tdname=%s, tddesc=%s WHERE tdnumber=%d;";\r
+               $query = sprintf($query, sql_table('template_desc'), DB::quoteValue($name), DB::quoteValue($desc), (integer) $templateid);\r
+               DB::execute($query);\r
+               \r
                // 3. Add non-empty template parts\r
-               self::addToTemplate($templateid, 'ITEM_HEADER', postVar('ITEM_HEADER'));\r
-               self::addToTemplate($templateid, 'ITEM', postVar('ITEM'));\r
-               self::addToTemplate($templateid, 'ITEM_FOOTER', postVar('ITEM_FOOTER'));\r
-               self::addToTemplate($templateid, 'MORELINK', postVar('MORELINK'));\r
-               self::addToTemplate($templateid, 'EDITLINK', postVar('EDITLINK'));\r
-               self::addToTemplate($templateid, 'NEW', postVar('NEW'));\r
-               self::addToTemplate($templateid, 'COMMENTS_HEADER', postVar('COMMENTS_HEADER'));\r
-               self::addToTemplate($templateid, 'COMMENTS_BODY', postVar('COMMENTS_BODY'));\r
-               self::addToTemplate($templateid, 'COMMENTS_FOOTER', postVar('COMMENTS_FOOTER'));\r
-               self::addToTemplate($templateid, 'COMMENTS_CONTINUED', postVar('COMMENTS_CONTINUED'));\r
-               self::addToTemplate($templateid, 'COMMENTS_TOOMUCH', postVar('COMMENTS_TOOMUCH'));\r
-               self::addToTemplate($templateid, 'COMMENTS_AUTH', postVar('COMMENTS_AUTH'));\r
-               self::addToTemplate($templateid, 'COMMENTS_ONE', postVar('COMMENTS_ONE'));\r
-               self::addToTemplate($templateid, 'COMMENTS_MANY', postVar('COMMENTS_MANY'));\r
-               self::addToTemplate($templateid, 'COMMENTS_NONE', postVar('COMMENTS_NONE'));\r
-               self::addToTemplate($templateid, 'ARCHIVELIST_HEADER', postVar('ARCHIVELIST_HEADER'));\r
+               self::addToTemplate($templateid, 'ITEM_HEADER',                 postVar('ITEM_HEADER'));\r
+               self::addToTemplate($templateid, 'ITEM',                                postVar('ITEM'));\r
+               self::addToTemplate($templateid, 'ITEM_FOOTER',                 postVar('ITEM_FOOTER'));\r
+               self::addToTemplate($templateid, 'MORELINK',                    postVar('MORELINK'));\r
+               self::addToTemplate($templateid, 'EDITLINK',                    postVar('EDITLINK'));\r
+               self::addToTemplate($templateid, 'NEW',                                 postVar('NEW'));\r
+               self::addToTemplate($templateid, 'COMMENTS_HEADER',             postVar('COMMENTS_HEADER'));\r
+               self::addToTemplate($templateid, 'COMMENTS_BODY',               postVar('COMMENTS_BODY'));\r
+               self::addToTemplate($templateid, 'COMMENTS_FOOTER',             postVar('COMMENTS_FOOTER'));\r
+               self::addToTemplate($templateid, 'COMMENTS_CONTINUED',  postVar('COMMENTS_CONTINUED'));\r
+               self::addToTemplate($templateid, 'COMMENTS_TOOMUCH',    postVar('COMMENTS_TOOMUCH'));\r
+               self::addToTemplate($templateid, 'COMMENTS_AUTH',               postVar('COMMENTS_AUTH'));\r
+               self::addToTemplate($templateid, 'COMMENTS_ONE',                postVar('COMMENTS_ONE'));\r
+               self::addToTemplate($templateid, 'COMMENTS_MANY',               postVar('COMMENTS_MANY'));\r
+               self::addToTemplate($templateid, 'COMMENTS_NONE',               postVar('COMMENTS_NONE'));\r
+               self::addToTemplate($templateid, 'ARCHIVELIST_HEADER',  postVar('ARCHIVELIST_HEADER'));\r
                self::addToTemplate($templateid, 'ARCHIVELIST_LISTITEM', postVar('ARCHIVELIST_LISTITEM'));\r
-               self::addToTemplate($templateid, 'ARCHIVELIST_FOOTER', postVar('ARCHIVELIST_FOOTER'));\r
-               self::addToTemplate($templateid, 'BLOGLIST_HEADER', postVar('BLOGLIST_HEADER'));\r
-               self::addToTemplate($templateid, 'BLOGLIST_LISTITEM', postVar('BLOGLIST_LISTITEM'));\r
-               self::addToTemplate($templateid, 'BLOGLIST_FOOTER', postVar('BLOGLIST_FOOTER'));\r
-               self::addToTemplate($templateid, 'CATLIST_HEADER', postVar('CATLIST_HEADER'));\r
-               self::addToTemplate($templateid, 'CATLIST_LISTITEM', postVar('CATLIST_LISTITEM'));\r
-               self::addToTemplate($templateid, 'CATLIST_FOOTER', postVar('CATLIST_FOOTER'));\r
-               self::addToTemplate($templateid, 'DATE_HEADER', postVar('DATE_HEADER'));\r
-               self::addToTemplate($templateid, 'DATE_FOOTER', postVar('DATE_FOOTER'));\r
-               self::addToTemplate($templateid, 'FORMAT_DATE', postVar('FORMAT_DATE'));\r
-               self::addToTemplate($templateid, 'FORMAT_TIME', postVar('FORMAT_TIME'));\r
-               self::addToTemplate($templateid, 'LOCALE', postVar('LOCALE'));\r
-               self::addToTemplate($templateid, 'SEARCH_HIGHLIGHT', postVar('SEARCH_HIGHLIGHT'));\r
+               self::addToTemplate($templateid, 'ARCHIVELIST_FOOTER',  postVar('ARCHIVELIST_FOOTER'));\r
+               self::addToTemplate($templateid, 'BLOGLIST_HEADER',             postVar('BLOGLIST_HEADER'));\r
+               self::addToTemplate($templateid, 'BLOGLIST_LISTITEM',   postVar('BLOGLIST_LISTITEM'));\r
+               self::addToTemplate($templateid, 'BLOGLIST_FOOTER',             postVar('BLOGLIST_FOOTER'));\r
+               self::addToTemplate($templateid, 'CATLIST_HEADER',              postVar('CATLIST_HEADER'));\r
+               self::addToTemplate($templateid, 'CATLIST_LISTITEM',    postVar('CATLIST_LISTITEM'));\r
+               self::addToTemplate($templateid, 'CATLIST_FOOTER',              postVar('CATLIST_FOOTER'));\r
+               self::addToTemplate($templateid, 'DATE_HEADER',                 postVar('DATE_HEADER'));\r
+               self::addToTemplate($templateid, 'DATE_FOOTER',                 postVar('DATE_FOOTER'));\r
+               self::addToTemplate($templateid, 'FORMAT_DATE',                 postVar('FORMAT_DATE'));\r
+               self::addToTemplate($templateid, 'FORMAT_TIME',                 postVar('FORMAT_TIME'));\r
+               self::addToTemplate($templateid, 'LOCALE',                              postVar('LOCALE'));\r
+               self::addToTemplate($templateid, 'SEARCH_HIGHLIGHT',    postVar('SEARCH_HIGHLIGHT'));\r
                self::addToTemplate($templateid, 'SEARCH_NOTHINGFOUND', postVar('SEARCH_NOTHINGFOUND'));\r
-               self::addToTemplate($templateid, 'POPUP_CODE', postVar('POPUP_CODE'));\r
-               self::addToTemplate($templateid, 'MEDIA_CODE', postVar('MEDIA_CODE'));\r
-               self::addToTemplate($templateid, 'IMAGE_CODE', postVar('IMAGE_CODE'));\r
-\r
-               $pluginfields = array();\r
-               $manager->notify(\r
-                       'TemplateExtraFields',\r
-                       array(\r
-                               'fields'=>&$pluginfields\r
-                       )\r
-               );\r
-               foreach ($pluginfields as $pfkey=>$pfvalue)\r
+               self::addToTemplate($templateid, 'POPUP_CODE',                  postVar('POPUP_CODE'));\r
+               self::addToTemplate($templateid, 'MEDIA_CODE',                  postVar('MEDIA_CODE'));\r
+               self::addToTemplate($templateid, 'IMAGE_CODE',                  postVar('IMAGE_CODE'));\r
+               \r
+               $data = array('fields' => array());\r
+               $manager->notify('TemplateExtraFields', $data);\r
+               foreach ( $data['fields'] as $pfkey=>$pfvalue )\r
                {\r
-                       foreach ($pfvalue as $pffield=>$pfdesc)\r
+                       foreach ( $pfvalue as $pffield => $pfdesc )\r
                        {\r
                                self::addToTemplate($templateid, $pffield, postVar($pffield));\r
                        }\r
                }\r
-\r
+               \r
                // jump back to template edit\r
-               self::$action_templateedit(_TEMPLATE_UPDATED);\r
-\r
+               self::action_templateedit(_TEMPLATE_UPDATED);\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
         * Admin::addToTemplate()\r
         * \r
@@ -3145,72 +3170,68 @@ class Admin
                        return -1;\r
                }\r
                \r
-               $partname = sql_real_escape_string($partname);\r
-               $content  = sql_real_escape_string($content);\r
-               \r
-               $query = "INSERT INTO %s (tdesc, tpartname, tcontent) VALUES (%d, '%s', '%s')";\r
-               $query = sprintf($query, sql_table('template'), (integer) $id, $partname, $content);\r
-               sql_query($query) or exit(_ADMIN_SQLDIE_QUERYERROR . sql_error());\r
-               return sql_insert_id();\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::\r
+        * Admin::action_templatedelete()\r
         * \r
         * @param       void\r
         * @return      void\r
         */\r
-       static private function action_templatedelete() {\r
+       static private function action_templatedelete()\r
+       {\r
                global $member, $manager;\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
+               \r
                $templateid = intRequestVar('templateid');\r
                // TODO: check if template can be deleted\r
-\r
-               self::pagehead();\r
+               \r
                self::$skin->parse('templatedelete');\r
-               self::pagefoot();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_templatedeleteconfirm()\r
         * \r
         * @param       void\r
         * @return      void\r
         */\r
-       static private function action_templatedeleteconfirm() {\r
+       static private function action_templatedeleteconfirm()\r
+       {\r
                global $member, $manager;\r
-\r
+               \r
                $templateid = intRequestVar('templateid');\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
-               $manager->notify(\r
-                       'PreDeleteTemplate',\r
-                       array(\r
-                               'templateid' => $templateid\r
-                       )\r
-               );\r
-\r
+               \r
+               $data = array('templateid' => $templateid);\r
+               $manager->notify('PreDeleteTemplate', $data);\r
+               \r
                // 1. delete description\r
-               sql_query('DELETE FROM ' . sql_table('template_desc') . ' WHERE tdnumber=' . $templateid);\r
-\r
+               DB::execute('DELETE FROM ' . sql_table('template_desc') . ' WHERE tdnumber=' . $templateid);\r
+               \r
                // 2. delete parts\r
-               sql_query('DELETE FROM ' . sql_table('template') . ' WHERE tdesc=' . $templateid);\r
-\r
-               $manager->notify(\r
-                       'PostDeleteTemplate',\r
-                       array(\r
-                               'templateid' => $templateid\r
-                       )\r
-               );\r
-\r
-               self::$action_templateoverview();\r
+               DB::execute('DELETE FROM ' . sql_table('template') . ' WHERE tdesc=' . $templateid);\r
+               \r
+               \r
+               $data = array('templateid' => $templateid);\r
+               $manager->notify('PostDeleteTemplate', $data);\r
+               \r
+               self::action_templateoverview();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_templatenew()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -3218,29 +3239,30 @@ class Admin
        static private function action_templatenew()\r
        {\r
                global $member;\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
+               \r
                $name = postVar('name');\r
                $desc = postVar('desc');\r
-\r
+               \r
                if ( !isValidTemplateName($name) )\r
                {\r
                        self::error(_ERROR_BADTEMPLATENAME);\r
                }\r
-\r
+               \r
                if ( Template::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPTEMPLATENAME);\r
                }\r
-\r
+               \r
                $newTemplateId = Template::createNew($name, $desc);\r
-\r
-               self::$action_templateoverview();\r
+               \r
+               self::action_templateoverview();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_templateclone()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -3248,20 +3270,21 @@ class Admin
        static private function action_templateclone()\r
        {\r
                global $member;\r
-\r
+               \r
                $templateid = intRequestVar('templateid');\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
+               \r
                // 1. read old template\r
                $name = Template::getNameFromId($templateid);\r
                $desc = Template::getDesc($templateid);\r
-\r
+               \r
                // 2. create desc thing\r
                $name = "cloned" . $name;\r
-\r
+               \r
                // if a template with that name already exists:\r
-               if (Template::exists($name)) {\r
+               if ( Template::exists($name) )\r
+               {\r
                        $i = 1;\r
                        while (Template::exists($name . $i))\r
                        {\r
@@ -3269,63 +3292,62 @@ class Admin
                        }\r
                        $name .= $i;\r
                }\r
-\r
+               \r
                $newid = Template::createNew($name, $desc);\r
-\r
+               \r
                // 3. create clone\r
                // go through parts of old template and add them to the new one\r
-               $que = 'SELECT '\r
-                        . '    tpartname,'\r
-                        . '    tcontent '\r
-                        . 'FROM '\r
-                        .      sql_table('template')\r
-                        . ' WHERE'\r
-                        . '    tdesc=' . intval($templateid);\r
-               $res = sql_query($que);\r
-               while ($o = sql_fetch_object($res)) {\r
-                       self::addToTemplate($newid, $o->tpartname, $o->tcontent);\r
+               $query = "SELECT tpartname, tcontent FROM %s WHERE tdesc=%d;";\r
+               $query = sprintf($query, sql_table('template'), (integer) $templateid);\r
+               \r
+               $res = DB::getResult($query);\r
+               foreach ( $res as $row)\r
+               {\r
+                       self::addToTemplate($newid, $row['tpartname'], $row['tcontent']);\r
                }\r
-\r
-               self::$action_templateoverview();\r
+               \r
+               self::action_templateoverview();\r
+               return;\r
        }\r
        \r
        /**\r
-        * Admin::\r
+        * Admin::action_admintemplateoverview()\r
         * \r
         * @param       void\r
         * @return      void\r
         */\r
        static private function action_admintemplateoverview()\r
        {\r
-               global $member, $manager;\r
+               global $member;\r
                $member->isAdmin() or self::disallow();\r
-               self::pagehead();\r
-               self::$skin->parse('admintemplateoverview');\r
-               self::pagefoot();\r
+               self::$skin->parse('admntemplateoverview');\r
+               return;\r
        }\r
        \r
        /**\r
-        * Admin::\r
+        * Admin::action_admintemplateedit()\r
         * \r
-        * @param       void\r
+        * @param       string  $msg    message for pageheader\r
         * @return      void\r
         */\r
        static private function action_admintemplateedit($msg = '')\r
        {\r
                global $member, $manager;\r
-               if ($msg) {\r
+               if ( $msg )\r
+               {\r
                        self::$headMess = $msg;\r
                }\r
                $member->isAdmin() or self::disallow();\r
-               $extrahead  = '<script type="text/javascript" src="javascript/templateEdit.js"></script>' . "\n";\r
-               $extrahead .= '<script type="text/javascript">setTemplateEditText("' . sql_real_escape_string(_EDITTEMPLATE_EMPTY) . '");</script>';\r
-               self::pagehead($extrahead);\r
+               \r
+               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(javascript/templateEdit.js)%>\"></script>\n";\r
+               Admin::$extrahead .= '<script type="text/javascript">setTemplateEditText("' . Entity::hsc(_EDITTEMPLATE_EMPTY) . '");</script>' . "\n";\r
+               \r
                self::$skin->parse('admintemplateedit');\r
-               self::pagefoot();\r
+               return;\r
        }\r
        \r
        /**\r
-        * Admin::\r
+        * Admin::action_admintemplateupdate()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -3337,197 +3359,177 @@ class Admin
                $member->isAdmin() or self::disallow();\r
                $name = postVar('tname');\r
                $desc = postVar('tdesc');\r
-       \r
-               if (!isValidTemplateName($name)) {\r
+               \r
+               if ( !isValidTemplateName($name) )\r
+               {\r
                        self::error(_ERROR_BADTEMPLATENAME);\r
                }\r
-               //        if (!class_exists('Template')) {\r
-               //            NP_SkinableAdmin::loadSkinableClass('Template');\r
-               //        }\r
-               if ((Template::getNameFromId($templateid) != $name) && Template::exists($name)) {\r
+               \r
+               if ( (Template::getNameFromId($templateid) != $name) && Template::exists($name) )\r
+               {\r
                        self::error(_ERROR_DUPTEMPLATENAME);\r
                }\r
-               $name = sql_real_escape_string($name);\r
-               $desc = sql_real_escape_string($desc);\r
-       \r
+               \r
                // 1. Remove all template parts\r
-               $query = 'DELETE '\r
-               . 'FROM '\r
-               .      sql_table('admintemplate') . ' '\r
-               . 'WHERE '\r
-               . '    tdesc = %d';\r
-               sql_query(sprintf($query, $templateid));\r
-       \r
+               $query = "DELETE FROM %s WHERE tdesc=%d;";\r
+               $query = sprintf($query, sql_table('template'), (integer) $templateid);\r
+               DB::execute($query);\r
+               \r
                // 2. Update description\r
-               $query = 'UPDATE '\r
-               .      sql_table('admintemplate_desc') . ' '\r
-               . 'SET '\r
-               . '    tdname = "' . sql_real_escape_string($name) . '", '\r
-               . '    tddesc = "' . sql_real_escape_string($desc) . '" '\r
-               . 'WHERE '\r
-               . '    tdnumber = %d';\r
-               sql_query(sprintf($query, $templateid));\r
-       \r
+               $query = "UPDATE %s SET tdname=%s, tddesc=%s WHERE tdnumber=%d;";\r
+               $query = sprintf($query, sql_table('template_desc'), DB::quoteValue($name), DB::quoteValue($desc), (integer) $templateid);\r
+               DB::execute($query);\r
+               \r
                // 3. Add non-empty template parts\r
-               self::addToAdminTemplate($templateid, 'ADMINSKINTYPELIST_HEAD',                 postVar('ADMINSKINTYPELIST_HEAD'));\r
-               self::addToAdminTemplate($templateid, 'ADMINSKINTYPELIST_BODY',                 postVar('ADMINSKINTYPELIST_BODY'));\r
-               self::addToAdminTemplate($templateid, 'ADMINSKINTYPELIST_FOOT',                 postVar('ADMINSKINTYPELIST_FOOT'));\r
-               self::addToAdminTemplate($templateid, '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
-       \r
-               $pluginfields = array();\r
-               $manager->notify(\r
-                               'TemplateExtraFields',\r
-                               array(\r
-                                               'fields' => &$pluginfields\r
-                               )\r
-               );\r
-               foreach ($pluginfields as $pfkey => $pfvalue) {\r
-                       foreach ($pfvalue as $pffield => $pfdesc) {\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
+               \r
+               $data = array('fields' => array());\r
+               $manager->notify('AdminTemplateExtraFields', $data);\r
+               foreach ( $data['fields'] as $pfkey => $pfvalue )\r
+               {\r
+                       foreach ( $pfvalue as $pffield => $pfdesc )\r
+                       {\r
                                self::addToAdminTemplate($templateid, $pffield, postVar($pffield));\r
                        }\r
                }\r
-       \r
+               \r
                // jump back to template edit\r
-               self::$action_admintemplateedit(_TEMPLATE_UPDATED);\r
+               self::action_admintemplateedit(_TEMPLATE_UPDATED);\r
+               return;\r
        }\r
        \r
        /**\r
-        * Admin::\r
+        * Admin::addToAdminTemplate()\r
         * \r
-        * @param       void\r
-        * @return      void\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
-               $partname = sql_real_escape_string($partname);\r
-               $content  = sql_real_escape_string($content);\r
-       \r
-       \r
-               $id = intval($id);\r
-       \r
                // don't add empty parts:\r
-               if (!trim($content)) {\r
+               if ( !trim($content) )\r
+               {\r
                        return -1;\r
                }\r
-               $query = 'INSERT '\r
-               . 'INTO '\r
-               .      sql_table('admintemplate') . ' '\r
-               . '('\r
-               . '    tdesc, '\r
-               . '    tpartname, '\r
-               . '    tcontent '\r
-               . ') VALUES ('\r
-               . '    %d, '\r
-               . '    "%s", '\r
-               . '    "%s"'\r
-               . ')';\r
-               sql_query(sprintf($query, $id, $partname, $content)) or exit(_ADMIN_SQLDIE_QUERYERROR . sql_error());\r
-               return sql_insert_id();\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::\r
+        * Admin::action_admintemplatedelete()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -3536,14 +3538,14 @@ class Admin
        {\r
                global $member, $manager;\r
                $member->isAdmin() or self::disallow();\r
+               \r
                // TODO: check if template can be deleted\r
-               self::pagehead();\r
                self::$skin->parse('admintemplatedelete');\r
-               self::pagefoot();\r
+               return;\r
        }\r
        \r
        /**\r
-        * Admin::\r
+        * Admin::action_admintemplatedeleteconfirm()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -3551,36 +3553,32 @@ class Admin
        static private function action_admintemplatedeleteconfirm()\r
        {\r
                global $member, $manager;\r
+               \r
                $templateid = intRequestVar('templateid');\r
                $member->isAdmin() or self::disallow();\r
-               $manager->notify(\r
-                               'PreDeleteAdminTemplate',\r
-                               array(\r
-                                               'templateid' => $templateid\r
-                               )\r
-               );\r
-       \r
-               $query = 'DELETE '\r
-               . 'FROM '\r
-               . '    %s '\r
-               . 'WHERE '\r
-               . '    %s = ' .intval($templateid);\r
+               \r
+               $data = array('templateid' => $templateid);\r
+               $manager->notify('PreDeleteAdminTemplate', $data);\r
+               \r
                // 1. delete description\r
-               sql_query(sprintf($query, sql_table('admintemplate_desc'), 'tdnumber'));\r
+               $query = "DELETE FROM %s WHERE tdnumber=%s;";\r
+               $query = sprintf($query, sql_table('template_desc'), (integer) $templateid);\r
+               DB::execute($query);\r
+               \r
                // 2. delete parts\r
-               sql_query(sprintf($query, sql_table('admintemplate'), 'tdesc'));\r
-       \r
-               $manager->notify(\r
-                               'PostDeleteAdminTemplate',\r
-                               array(\r
-                                               'templateid' => $templateid\r
-                               )\r
-               );\r
-               self::$action_admintemplateoverview();\r
+               $query = "DELETE FROM %s WHERE tdesc=%d;";\r
+               $query = sprintf($query, sql_table('template'), (integer) $templateid);\r
+               DB::execute($query);\r
+               \r
+               $data = array('templateid' => $templateid);\r
+               $manager->notify('PostDeleteAdminTemplate', $data);\r
+               \r
+               self::action_admintemplateoverview();\r
+               return;\r
        }\r
        \r
        /**\r
-        * Admin::\r
+        * Admin::action_admintemplatenew()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -3591,20 +3589,27 @@ class Admin
                $member->isAdmin() or self::disallow();\r
                $name = postVar('name');\r
                $desc = postVar('desc');\r
-       \r
-               if (!isValidTemplateName($name)) {\r
+               \r
+               if ( !isValidTemplateName($name) )\r
+               {\r
                        self::error(_ERROR_BADTEMPLATENAME);\r
                }\r
-               if (Template::exists($name)) {\r
+               else if ( !preg_match('#^admin/#', $name) )\r
+               {\r
+                       self::error(_ERROR_BADADMINTEMPLATENAME);\r
+               }\r
+               else if ( Template::exists($name) )\r
+               {\r
                        self::error(_ERROR_DUPTEMPLATENAME);\r
                }\r
-       \r
+               \r
                $newTemplateId = Template::createNew($name, $desc);\r
-               self::$action_admintemplateoverview();\r
+               self::action_admintemplateoverview();\r
+               return;\r
        }\r
        \r
        /**\r
-        * Admin::\r
+        * Admin::action_admintemplateclone()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -3614,46 +3619,44 @@ class Admin
                global $member;\r
                $templateid = intRequestVar('templateid');\r
                $member->isAdmin() or self::disallow();\r
-       \r
-               //        if (!class_exists('Template')) {\r
-               //            NP_SkinableAdmin::loadSkinableClass('Template');\r
-               //        }\r
-       \r
+               \r
                // 1. read old template\r
                $name = Template::getNameFromId($templateid);\r
                $desc = Template::getDesc($templateid);\r
+               \r
                // 2. create desc thing\r
-               $name = "cloned" . $name;\r
-       \r
+               $name = $name . "cloned";\r
+               \r
                // if a template with that name already exists:\r
-               if (Template::exists($name)) {\r
+               if ( Template::exists($name) )\r
+               {\r
                        $i = 1;\r
-                       while (Template::exists($name . $i)) {\r
+                       while ( Template::exists($name . $i) )\r
+                       {\r
                                $i++;\r
                        }\r
                        $name .= $i;\r
                }\r
-       \r
-               $newid = Template::admincreateNew($name, $desc);\r
-       \r
+               \r
+               $newid = Template::createNew($name, $desc);\r
+               \r
                // 3. create clone\r
                // go through parts of old template and add them to the new one\r
-               $que = 'SELECT '\r
-               . '    tpartname, '\r
-               . '    tcontent '\r
-               . 'FROM '\r
-               .      sql_table('admintemplate') . ' '\r
-               . 'WHERE '\r
-               . '    tdesc = ' . intval($templateid);\r
-               $res = sql_query($que);\r
-               while ($o = sql_fetch_object($res)) {\r
-                       self::addToAdminTemplate($newid, $o->tpartname, $o->tcontent);\r
+               $query = "SELECT tpartname, tcontent FROM %s WHERE tdesc=%d;";\r
+               $query = sprintf($query, sql_table('template'), (integer) $templateid);\r
+               \r
+               $res = DB::getResult($query);\r
+               foreach ( $res as $row )\r
+               {\r
+                       self::addToAdminTemplate($newid, $row['tpartname'], $row['tcontent']);\r
                }\r
-               self::$action_admintemplateoverview();\r
+               \r
+               self::action_admintemplateoverview();\r
+               return;\r
        }\r
 \r
        /**\r
-        * Admin::\r
+        * Admin::action_skinoverview()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -3661,16 +3664,15 @@ class Admin
        static private function action_skinoverview()\r
        {\r
                global $member, $manager;\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
-               self::pagehead();\r
+               \r
                self::$skin->parse('skinoverview');\r
-               self::pagefoot();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_skinnew()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -3678,29 +3680,30 @@ class Admin
        static private function action_skinnew()\r
        {\r
                global $member;\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
+               \r
                $name = trim(postVar('name'));\r
                $desc = trim(postVar('desc'));\r
-\r
+               \r
                if ( !isValidSkinName($name) )\r
                {\r
                        self::error(_ERROR_BADSKINNAME);\r
                }\r
-\r
+               \r
                if ( SKIN::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPSKINNAME);\r
                }\r
-\r
+               \r
                $newId = SKIN::createNew($name, $desc);\r
-\r
-               self::$action_skinoverview();\r
+               \r
+               self::action_skinoverview();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_skinedit()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -3708,51 +3711,46 @@ class Admin
        static private function action_skinedit()\r
        {\r
                global $member, $manager;\r
-\r
-//             $skinid = intRequestVar('skinid');\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
-//             $skin = new SKIN($skinid);\r
-\r
-               self::pagehead();\r
+               \r
                self::$skin->parse('skinedit');\r
-               self::pagefoot();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_skineditgeneral()\r
         * \r
         * @param       void\r
         * @return      void\r
         */\r
        static private function action_skineditgeneral()\r
        {\r
-               global $member;\r
-\r
+               global $manager, $member;\r
+               \r
                $skinid = intRequestVar('skinid');\r
-\r
+               \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
+               \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);\r
+               \r
                // 1. Some checks\r
                if ( !isValidSkinName($name) )\r
                {\r
                        self::error(_ERROR_BADSKINNAME);\r
                }\r
-\r
+               \r
                if ( ($skin->getName() != $name) && SKIN::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPSKINNAME);\r
                }\r
-\r
+               \r
                if ( !$type )\r
                {\r
                        $type = 'text/html';\r
@@ -3761,95 +3759,98 @@ class Admin
                {\r
                        $inc_mode = 'normal';\r
                }\r
-\r
+               \r
                // 2. Update description\r
                $skin->updateGeneralInfo($name, $desc, $type, $inc_mode, $inc_prefix);\r
-\r
-               self::$action_skinedit();\r
-\r
+               \r
+               self::action_skinedit();\r
+               return;\r
        }\r
-\r
+       \r
        static private function action_skinedittype($msg = '')\r
        {\r
                global $member, $manager;\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
-               if ($msg) {\r
+               \r
+               if ( $msg )\r
+               {\r
                        self::$headMess = $msg;\r
                }\r
-               $skinid = intRequestVar('skinid');\r
-               $type   = requestVar('type');\r
-               $type   = trim($type);\r
-               $type   = strtolower($type);\r
-\r
+               \r
+               $skinid = intRequestVar('skinid');\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
                }\r
-\r
-               self::pagehead();\r
+               \r
                self::$skin->parse('skinedittype');\r
-               self::pagefoot();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_skinupdate()\r
         * \r
         * @param       void\r
         * @return      void\r
         */\r
        static private function action_skinupdate()\r
        {\r
-               global $member;\r
-\r
+               global $manager, $member;\r
+               \r
                $skinid = intRequestVar('skinid');\r
                $content = trim(postVar('content'));\r
                $type = postVar('type');\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
-               $skin = new SKIN($skinid);\r
+               \r
+               $skin =& $manager->getSKIN($skinid);\r
                $skin->update($type, $content);\r
-\r
-               self::$action_skinedittype(_SKIN_UPDATED);\r
+               \r
+               self::action_skinedittype(_SKIN_UPDATED);\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_skindelete()\r
         * \r
         * @param       void\r
         * @return      void\r
         */\r
        static private function action_skindelete()\r
        {\r
-               global $member, $manager, $CONF;\r
-\r
+               global $manager, $member, $CONF;\r
+               \r
                $skinid = intRequestVar('skinid');\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
+               \r
                // don't allow default skin to be deleted\r
                if ( $skinid == $CONF['BaseSkin'] )\r
                {\r
                        self::error(_ERROR_DEFAULTSKIN);\r
                }\r
-\r
+               \r
                // don't allow deletion of default skins for blogs\r
-               $query = 'SELECT bname FROM ' . sql_table('blog') . ' WHERE bdefskin=' . $skinid;\r
-               $r = sql_query($query);\r
-               if ( $o = sql_fetch_object($r) )\r
+               $query = "SELECT bname FROM %s WHERE bdefskin=%d";\r
+               $query = sprintf($query, sql_table('blog'), (integer) $skinid);\r
+               \r
+               $name = DB::getValue($query);\r
+               if ( $name )\r
                {\r
-                       self::error(_ERROR_SKINDEFDELETE . Entity::hsc($o->bname));\r
+                       self::error(_ERROR_SKINDEFDELETE . Entity::hsc($name));\r
                }\r
-\r
-               self::pagehead();\r
+               \r
                self::$skin->parse('skindelete');\r
-               self::pagefoot();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_skindeleteconfirm()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -3857,158 +3858,155 @@ class Admin
        static private function action_skindeleteconfirm()\r
        {\r
                global $member, $CONF, $manager;\r
-\r
+               \r
                $skinid = intRequestVar('skinid');\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
+               \r
                // don't allow default skin to be deleted\r
                if ( $skinid == $CONF['BaseSkin'] )\r
                {\r
                        self::error(_ERROR_DEFAULTSKIN);\r
                }\r
-\r
+               \r
                // don't allow deletion of default skins for blogs\r
-               $query = 'SELECT'\r
-                          . '    bname '\r
-                          . 'FROM '\r
-                          .      sql_table('blog') . ' '\r
-                          . 'WHERE'\r
-                          . '    bdefskin=' . $skinid;\r
-               $r = sql_query($query);\r
-               if ( $o = sql_fetch_object($r) )\r
-               {\r
-                       self::error(_ERROR_SKINDEFDELETE .$o->bname);\r
+               $query = "SELECT bname FROM %s WHERE bdefskin=%d;";\r
+               $query = sprintf($query, sql_table('blog'), (integer) $skinid);\r
+               \r
+               $name = DB::getValue($query);\r
+               if ( $name )\r
+                               {\r
+                       self::error(_ERROR_SKINDEFDELETE . Entity::hsc($name));\r
                }\r
-\r
-               $manager->notify(\r
-                       'PreDeleteSkin',\r
-                       array(\r
-                               'skinid' => $skinid\r
-                       )\r
-               );\r
-\r
+               \r
+               $data = array('skinid' => $skinid);\r
+               $manager->notify('PreDeleteSkin', $data);\r
+               \r
                // 1. delete description\r
-               sql_query('DELETE FROM '.sql_table('skin_desc').' WHERE sdnumber=' . $skinid);\r
-\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
-               sql_query('DELETE FROM '.sql_table('skin').' WHERE sdesc=' . $skinid);\r
-\r
-               $manager->notify(\r
-                       'PostDeleteSkin',\r
-                       array(\r
-                               'skinid' => $skinid\r
-                       )\r
-               );\r
-\r
-               self::$action_skinoverview();\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
+               \r
+               self::action_skinoverview();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_skinremovetype()\r
         * \r
         * @param       void\r
         * @return      void\r
         */\r
-       static private function action_skinremovetype() {\r
+       static private function action_skinremovetype()\r
+       {\r
                global $member, $manager, $CONF;\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
+               \r
                $skinid = intRequestVar('skinid');\r
                $skintype = requestVar('type');\r
-\r
+               \r
                if ( !isValidShortName($skintype) )\r
                {\r
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
                }\r
-\r
-\r
+               \r
                // don't allow default skinparts to be deleted\r
+               /* TODO: this array should be retrieved from Action class */\r
                if ( in_array($skintype, array('index', 'item', 'archivelist', 'archive', 'search', 'error', 'member', 'imagepopup')) )\r
                {\r
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
                }\r
-\r
-               self::pagehead();\r
+               \r
                self::$skin->parse('skinremovetype');\r
-               self::pagefoot();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_skinremovetypeconfirm()\r
         * \r
         * @param       void\r
         * @return      void\r
         */\r
-       static private function action_skinremovetypeconfirm() {\r
+       static private function action_skinremovetypeconfirm()\r
+       {\r
                global $member, $CONF, $manager;\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
+               \r
                $skinid = intRequestVar('skinid');\r
                $skintype = requestVar('type');\r
-\r
+               \r
                if ( !isValidShortName($skintype) )\r
                {\r
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
                }\r
-\r
+               \r
                // don't allow default skinparts to be deleted\r
+               /* TODO: this array should be retrieved from Action class */\r
                if ( in_array($skintype, array('index', 'item', 'archivelist', 'archive', 'search', 'error', 'member', 'imagepopup')) )\r
                {\r
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
                }\r
-\r
-               $manager->notify(\r
-                       'PreDeleteSkinPart',\r
-                       array(\r
-                               'skinid'   => $skinid,\r
-                               'skintype' => $skintype\r
-                       )\r
+               \r
+               $data = array(\r
+                       'skinid'   => $skinid,\r
+                       'skintype' => $skintype\r
                );\r
-\r
+               $manager->notify('PreDeleteSkinPart', $data);\r
                // delete part\r
-               sql_query("DELETE FROM " . sql_table('skin') . " WHERE sdesc=" . $skinid . " AND stype='" . $skintype . "'");\r
-\r
-               $manager->notify(\r
-                       'PostDeleteSkinPart',\r
-                       array(\r
-                               'skinid'   => $skinid,\r
-                               'skintype' => $skintype\r
-                       )\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
-\r
-               self::$action_skinedit();\r
+               $manager->notify('PostDeleteSkinPart', $data);\r
+               \r
+               self::action_skinedit();\r
+               return;\r
        }\r
 \r
        /**\r
-        * Admin::\r
+        * Admin::action_skinclone()\r
         * \r
         * @param       void\r
         * @return      void\r
         */\r
        static private function action_skinclone()\r
        {\r
-               global $member;\r
-\r
+               global $manager, $member;\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
+               \r
                $skinid = intRequestVar('skinid');\r
-\r
+               \r
                // 1. read skin to clone\r
-               $skin = new SKIN($skinid);\r
-\r
-               $name = "clone_" . $skin->getName();\r
-\r
+               $skin =& $manager->getSkin($skinid);\r
+               \r
+               $name = "{$skin->getName()}_clone";\r
+               \r
                // if a skin with that name already exists:\r
-               if (Skin::exists($name)) {\r
+               if ( Skin::exists($name) )\r
+               {\r
                        $i = 1;\r
-                       while (Skin::exists($name . $i))\r
+                       while ( Skin::exists($name . $i) )\r
+                       {\r
                                $i++;\r
+                       }\r
                        $name .= $i;\r
                }\r
-\r
+               \r
                // 2. create skin desc\r
                $newid = Skin::createNew(\r
                        $name,\r
@@ -4017,19 +4015,21 @@ class Admin
                        $skin->getIncludeMode(),\r
                        $skin->getIncludePrefix()\r
                );\r
-\r
-\r
+               \r
                // 3. clone\r
-               $query = "SELECT stype FROM " . sql_table('skin') . " WHERE sdesc = " . $skinid;\r
-               $res = sql_query($query);\r
-               while ($row = sql_fetch_assoc($res)) {\r
-                       self::$skinclonetype($skin, $newid, $row['stype']);\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
-\r
-               self::$action_skinoverview();\r
-\r
+               \r
+               self::action_skinoverview();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
         * Admin::skinclonetype()\r
         * \r
@@ -4041,35 +4041,35 @@ class Admin
        static private function skinclonetype($skin, $newid, $type)\r
        {\r
                $newid = intval($newid);\r
-               $content = $skin->getContent($type);\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, $content, $type);\r
-                       sql_query($query);\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::\r
+        * Admin::action_adminskinoverview()\r
         * \r
         * @param       void\r
         * @return      void\r
         */\r
-       static private function action_adminskinoverview() {\r
+       static private function action_adminskinoverview()\r
+       {\r
                global $member, $manager;\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
-               self::pagehead();\r
+               \r
                self::$skin->parse('adminskinoverview');\r
-               self::pagefoot();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_adminskinnew()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -4080,19 +4080,27 @@ class Admin
                $member->isAdmin() or self::disallow();\r
                $name = trim(postVar('name'));\r
                $desc = trim(postVar('desc'));\r
-\r
-               if (!isValidSkinName($name)) {\r
+               \r
+               if ( !isValidSkinName($name) )\r
+               {\r
                        self::error(_ERROR_BADSKINNAME);\r
                }\r
-               if (SkinSKIN::exists($name)) {\r
+               else if ( !preg_match('#^admin/#', $name) )\r
+               {\r
+                       self::error(_ERROR_BADADMINSKINNAME);\r
+               }\r
+               else if ( Skin::exists($name) )\r
+               {\r
                        self::error(_ERROR_DUPSKINNAME);\r
                }\r
+               /* TODO: $newId is not reused... */\r
                $newId = Skin::createNew($name, $desc);\r
-               self::$action_adminskinoverview();\r
+               self::action_adminskinoverview();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_adminskinedit()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -4100,100 +4108,110 @@ class Admin
        static private function action_adminskinedit()\r
        {\r
                global $member, $manager;\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-               self::pagehead();\r
                self::$skin->parse('adminskinedit');\r
-               self::pagefoot();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_adminskineditgeneral()\r
         * \r
         * @param       void\r
         * @return      void\r
         */\r
        static private function action_adminskineditgeneral()\r
        {\r
-               global $member;\r
-\r
+               global $manager, $member;\r
+               \r
                $skinid = intRequestVar('skinid');\r
-\r
+               \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
+               \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, 'AdminActions', 'AdminSkin');\r
+               \r
                // 1. Some checks\r
-               if (!isValidSkinName($name)) {\r
+               if ( !isValidSkinName($name) )\r
+               {\r
                        self::error(_ERROR_BADSKINNAME);\r
                }\r
-               if (($skin->getName() != $name) && Skin::exists($name)) {\r
+               if ( ($skin->getName() != $name) && Skin::exists($name) )\r
+               {\r
                        self::error(_ERROR_DUPSKINNAME);\r
                }\r
-               if (!$type) {\r
+               if ( !$type )\r
+               {\r
                        $type = 'text/html';\r
                }\r
-               if (!$inc_mode) {\r
+               if ( !$inc_mode )\r
+               {\r
                        $inc_mode = 'normal';\r
                }\r
                // 2. Update description\r
                $skin->updateGeneralInfo($name, $desc, $type, $inc_mode, $inc_prefix);\r
-               self::$action_adminskinedit();\r
+               self::action_adminskinedit();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_adminskinedittype()\r
         * \r
-        * @param       void\r
+        * @param       string  $msg    message for pageheader\r
         * @return      void\r
         */\r
        static private function action_adminskinedittype($msg = '')\r
        {\r
                global $member, $manager;\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-               if ($msg) {\r
+               \r
+               if ( $msg )\r
+               {\r
                        self::$headMess = $msg;\r
                }\r
                $type = requestVar('type');\r
                $type = trim($type);\r
                $type = strtolower($type);\r
-               if (!isValidShortName($type)) {\r
+               \r
+               if ( !isValidShortName($type) )\r
+               {\r
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT);\r
                }\r
-               self::pagehead();\r
+               \r
                self::$skin->parse('adminskinedittype');\r
-               self::pagefoot();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_adminskinupdate()\r
         * \r
         * @param       void\r
         * @return      void\r
         */\r
        static private function action_adminskinupdate()\r
        {\r
-               global $member;\r
-               $skinid  = intRequestVar('skinid');\r
+               global $manager, $member;\r
+               \r
+               $skinid = intRequestVar('skinid');\r
                $content = trim(postVar('content'));\r
-               $type    = postVar('type');\r
-\r
+               $type = postVar('type');\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
-               $skin = new Skin($skinid);\r
+               \r
+               $skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin');\r
                $skin->update($type, $content);\r
-               self::$action_adminskinedittype(_SKIN_UPDATED);\r
+               self::action_adminskinedittype(_SKIN_UPDATED);\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_adminskindelete()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -4202,14 +4220,15 @@ class Admin
        {\r
                global $member, $manager, $CONF;\r
                $member->isAdmin() or self::disallow();\r
+               \r
+               /* TODO: needless variable $skinid... */\r
                $skinid = intRequestVar('skinid');\r
-               self::pagehead();\r
                self::$skin->parse('adminskindelete');\r
-               self::pagefoot();\r
+               return;\r
        }\r
 \r
        /**\r
-        * Admin::\r
+        * Admin::action_adminskindeleteconfirm()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -4217,42 +4236,50 @@ class Admin
        static private function action_adminskindeleteconfirm()\r
        {\r
                global $member, $CONF, $manager;\r
+               \r
                $member->isAdmin() or self::disallow();\r
                $skinid = intRequestVar('skinid');\r
+               \r
                // don't allow default skin to be deleted\r
-               if ($skinid == $CONF['DefaultAdminSkin']) {\r
+               if ( $skinid == $CONF['AdminSkin'] )\r
+               {\r
                        self::error(_ERROR_DEFAULTSKIN);\r
                }\r
-               // don't allow deletion of default skins for members\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
-                       if ($skinid == $adminskin) {\r
-                               $mem = MEMBER::createFromID($memID);\r
+               foreach ( $memberDefaults as $memID => $adminskin )\r
+               {\r
+                       if ( $skinid == $adminskin )\r
+                       {\r
+                               $mem =& $manager->getMember($memID);\r
                                self::error(_ERROR_SKINDEFDELETE . $mem->displayname);\r
                        }\r
                }\r
-               $manager->notify(\r
-                       'PreDeleteAdminSkin',\r
-                       array(\r
-                               'skinid' => intval($skinid)\r
-                       )\r
-               );\r
-               $query = 'DELETE FROM %s WHERE %s = ' . intval($skinid);\r
+               */\r
+               \r
+               $manager->notify('PreDeleteAdminSkin', array('skinid' => (integer) $skinid));\r
+               \r
                // 1. delete description\r
-               sql_query(sprintf($query, sql_table('adminskin_desc'), 'sdnumber'));\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
-               sql_query(sprintf($query, sql_table('adminskin'), 'sdesc'));\r
-               $manager->notify(\r
-                       'PostDeleteAdminSkin',\r
-                       array(\r
-                               'skinid' => intval($skinid)\r
-                       )\r
-               );\r
-               self::$action_adminskinoverview();\r
+               $query = "DELETE FROM %s WHERE sdesc=%d;";\r
+               $query = sprintf($query, sql_table('skin'), (integer) $skinid);\r
+               \r
+               DB::execute($query);\r
+               \r
+               $manager->notify('PostDeleteAdminSkin', array('skinid' => (integer) $skinid));\r
+               self::action_adminskinoverview();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_adminskinremovetype()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -4262,18 +4289,21 @@ class Admin
                global $member, $manager, $CONF;\r
 \r
                $member->isAdmin() or self::disallow();\r
-               $skinid   = intRequestVar('skinid');\r
-               $skintype = requestVar('type');\r
-               if (!isValidShortName($skintype)) {\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
-               self::pagehead();\r
+               \r
                self::$skin->parse('adminskinremovetype');\r
-               self::pagefoot();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_adminskinremovetypeconfirm()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -4281,55 +4311,67 @@ class Admin
        static private function action_adminskinremovetypeconfirm()\r
        {\r
                global $member, $CONF, $manager;\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-               $skinid   = intRequestVar('skinid');\r
-               $skintype = requestVar('type');\r
-               if (!isValidShortName($skintype)) {\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
-               $manager->notify(\r
-                       'PreDeleteAdminSkinPart',\r
-                       array(\r
-                               'skinid'   => $skinid,\r
-                               'skintype' => $skintype\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
-               sql_query(sprintf($query, sql_table('adminskin'), intval($skinid), $skintype ));\r
-               $manager->notify(\r
-                       'PostDeleteAdminSkinPart',\r
-                       array(\r
-                               'skinid'   => $skinid,\r
-                               'skintype' => $skintype\r
-                       )\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
-               self::$action_adminskinedit();\r
+               $manager->notify('PostDeleteAdminSkinPart', $data);\r
+               \r
+               self::action_adminskinedit();\r
+               return;\r
        }\r
 \r
        /**\r
-        * Admin::\r
+        * Admin::action_adminskinclone()\r
         * \r
         * @param       void\r
         * @return      void\r
         */\r
        static private function action_adminskinclone()\r
        {\r
-               global $member;\r
+               global $manager, $member;\r
+               \r
                $member->isAdmin() or self::disallow();\r
+               \r
                $skinid = intRequestVar('skinid');\r
+               \r
                // 1. read skin to clone\r
-               $skin = new Skin($skinid);\r
-               $name = "clone_" . $skin->getName();\r
+               $skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin');\r
+               $name = "{$skin->getName()}_clone";\r
+               \r
                // if a skin with that name already exists:\r
-               if (Skin::exists($name)) {\r
+               if ( Skin::exists($name) )\r
+               {\r
                        $i = 1;\r
-                       while (Skin::exists($name . $i)) {\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
@@ -4338,48 +4380,43 @@ class Admin
                        $skin->getIncludeMode(),\r
                        $skin->getIncludePrefix()\r
                );\r
-               $query = 'SELECT '\r
-                               . '    stype '\r
-                               . 'FROM '\r
-                               .      sql_table('adminskin') . ' '\r
-                               . 'WHERE '\r
-                               . '    sdesc = ' . $skinid;\r
-               $res   = sql_query($query);\r
-               while ($row = sql_fetch_assoc($res)) {\r
-                       self::$skinclonetype($skin, $newid, $row['stype']);\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
+               self::action_adminskinoverview();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::adminskinclonetype()\r
         * \r
-        * @param       void\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
-               $newid   = intval($newid);\r
-               $content = $skin->getContent($type);\r
-               if ($content) {\r
-                       $query = 'INSERT '\r
-                                       . 'INTO '\r
-                                       .      sql_table('adminskin') . ' '\r
-                                       . '('\r
-                                       . '    sdesc, '\r
-                                       . '    scontent, '\r
-                                       . '    stype'\r
-                                       . ') VALUES ('\r
-                                       .      intval($newid) . ', '\r
-                                       . '"' . sql_real_escape_string($content) . '", '\r
-                                       . '"' . sql_real_escape_string($type) . '" '\r
-                                       . ')';\r
-                       sql_query($query);\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
        /**\r
-        * Admin::\r
+        * Admin::action_adminskinieoverview()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -4387,110 +4424,160 @@ class Admin
        static private function action_adminskinieoverview()\r
        {\r
                global $member, $DIR_LIBS, $manager;\r
+               \r
                $member->isAdmin() or self::disallow();\r
+               \r
                // load skinie class\r
                include_once($DIR_LIBS . 'skinie.php');\r
-               self::pagehead();\r
+               \r
                self::$skin->parse('adminskinieoverview');\r
-               self::pagefoot();\r
-\r
+               return;\r
        }\r
 \r
        /**\r
-        * Admin::\r
+        * FIXME: DUPLICATION, NO NEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEED!!!!!!\r
+        * Admin::action_adminskinieimport()\r
         * \r
         * @param       void\r
         * @return      void\r
         */\r
        static private function action_adminskinieimport()\r
        {\r
-               global $DIR_LIBS, $DIR_ADMINSKINS, $manager, $member;\r
+               global $DIR_LIBS, $DIR_SKINS, $manager, $member;\r
+               \r
                $member->isAdmin() or self::disallow();\r
+               \r
                // load skinie class\r
                include_once($DIR_LIBS . 'skinie.php');\r
-               $skinFileRaw= postVar('skinfile');\r
-               $mode       = postVar('mode');\r
-               $importer   = new SKINIMPORT();\r
+               \r
+               $skinFileRaw    = postVar('skinfile');\r
+               $mode                   = postVar('mode');\r
+               \r
+               $importer = new SKINIMPORT();\r
+               \r
                // get full filename\r
-               if ($mode == 'file') {\r
-                       $skinFile = $DIR_ADMINSKINS . $skinFileRaw . '/skinbackup.xml';\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
-                               $skinFile = $DIR_ADMINSKINS . $skinFileRaw . '/skindata.xml';\r
+                       if ( !file_exists($skinFile) )\r
+                       {\r
+                               $skinFile = "{$DIR_SKINS}admin/{$skinFileRaw}/skindata.xml";\r
                        }\r
-               } else {\r
+               }\r
+               else\r
+               {\r
                        $skinFile = $skinFileRaw;\r
                }\r
+               \r
                // read only metadata\r
                $error = $importer->readFile($skinFile, 1);\r
-               if ($error) {\r
+               if ( $error )\r
+               {\r
                        self::error($error);\r
                }\r
-\r
-               $_REQUEST['skininfo']  = $importer->getInfo();\r
-               $_REQUEST['skinnames'] = $importer->getSkinNames();\r
-               $_REQUEST['tpltnames'] = $importer->getTemplateNames();\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
-               $_REQUEST['skinclashes'] = $skinNameClashes;\r
-               $_REQUEST['tpltclashes'] = $templateNameClashes;\r
-               $_REQUEST['nameclashes'] = $hasNameClashes ? 1 : 0;\r
+               $skinNameClashes                        = $importer->checkSkinNameClashes();\r
+               $templateNameClashes            = $importer->checkTemplateNameClashes();\r
+               $hasNameClashes                         = (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0);\r
+               /* TODO: we should consider to use the other way instead of this */\r
+               $_REQUEST['skinclashes']        = $skinNameClashes;\r
+               $_REQUEST['tpltclashes']        = $templateNameClashes;\r
+               $_REQUEST['nameclashes']        = $hasNameClashes ? 1 : 0;\r
 \r
-               self::pagehead();\r
-               self::$skin->parse('adminskinieimport');\r
-               self::pagefoot();\r
+               if ( !is_object(self::$skin) )\r
+               {\r
+                       self::action_adminskiniedoimport();\r
+               }\r
+               else\r
+               {\r
+                       self::$skin->parse('adminskinieimport');\r
+               }\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * FIXME: DUPLICATION, NO NEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEED!!!!!!\r
+        * Admin::action_adminskiniedoimport()\r
         * \r
         * @param       void\r
         * @return      void\r
         */\r
        static private function action_adminskiniedoimport()\r
        {\r
-               global $DIR_LIBS, $DIR_ADMINSKINS, $member;\r
+               global $DIR_LIBS, $DIR_SKINS, $manager, $member;\r
+               \r
                $member->isAdmin() or self::disallow();\r
+               \r
                // load skinie class\r
                include_once($DIR_LIBS . 'skinie.php');\r
-               $skinFileRaw    = postVar('skinfile');\r
-               $mode           = postVar('mode');\r
-               $allowOverwrite = intPostVar('overwrite');\r
+               \r
+               $skinFileRaw    = postVar('skinfile');\r
+               $mode                   = postVar('mode');\r
+               $allowOverwrite = intPostVar('overwrite');\r
+               \r
                // get full filename\r
-               if ($mode == 'file') {\r
-                       $skinFile = $DIR_ADMINSKINS . $skinFileRaw . '/skinbackup.xml';\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
-                               $skinFile = $DIR_ADMINSKINS . $skinFileRaw . '/skindata.xml';\r
+                       if ( !file_exists($skinFile) )\r
+                       {\r
+                               $skinFile = "{$DIR_SKINS}admin/{$skinFileRaw}/skindata.xml";\r
                        }\r
-               } else {\r
+               }\r
+               else\r
+               {\r
                        $skinFile = $skinFileRaw;\r
                }\r
+               \r
                $importer = new SKINIMPORT();\r
-               $error    = $importer->readFile($skinFile);\r
-               if ($error) {\r
+               \r
+               $error = $importer->readFile($skinFile);\r
+               if ( $error )\r
+               {\r
                        self::error($error);\r
                }\r
+               \r
                $error = $importer->writeToDatabase($allowOverwrite);\r
-               if ($error) {\r
+               if ( $error )\r
+               {\r
                        self::error($error);\r
                }\r
-\r
-               $_REQUEST['skininfo']  = $importer->getInfo();\r
-               $_REQUEST['skinnames'] = $importer->getSkinNames();\r
-               $_REQUEST['tpltnames'] = $importer->getTemplateNames();\r
-\r
-               self::pagehead();\r
-               self::$skin->parse('adminskiniedoimport');\r
-               self::pagefoot();\r
-\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
+                       $query  = "SELECT min(sdnumber) FROM %s WHERE sdname != 'admin/bookmarklet' AND sdname LIKE 'admin/%%'";\r
+                       $query  = sprintf($query, sql_table('skin_desc'));\r
+                       $res    = intval(DB::getValue($query));\r
+                       $query  = "UPDATE %s SET value = %d WHERE name = 'AdminSkin'";\r
+                       $query  = sprintf($query, sql_table('config'), $res);\r
+                       DB::execute($query);\r
+                       $skin   =& $manager->Skin(0, 'AdminActions', 'AdminSkin');\r
+                       $skin->parse('importAdmin', $DIR_SKINS . 'admin/defaultimporter.skn');\r
+               }\r
+               else\r
+               {\r
+                       self::$skin->parse('adminskiniedoimport');\r
+               }\r
+               return;\r
        }\r
 \r
        /**\r
-        * Admin::\r
+        * Admin::action_adminskinieexport()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -4498,47 +4585,54 @@ class Admin
        static private function action_adminskinieexport()\r
        {\r
                global $member, $DIR_PLUGINS;\r
+               \r
                $member->isAdmin() or self::disallow();\r
+               \r
                // load skinie class\r
-               $aSkins     = requestIntArray('skin');\r
-               $aTemplates = requestIntArray('template');\r
-               if (!is_array($aTemplates)) {\r
-                       $aTemplates = array();\r
-               }\r
+               $aSkins = requestIntArray('skin');\r
                if (!is_array($aSkins)) {\r
                        $aSkins = array();\r
                }\r
-               $skinList     = array_keys($aSkins);\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
+               \r
                $info = postVar('info');\r
-\r
-               $exporter = new SkinEXPORT();\r
-               foreach ($skinList as $skinId) {\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
+               foreach ( $templateList as $templateId )\r
+               {\r
                        $exporter->addTemplate($templateId);\r
                }\r
                $exporter->setInfo($info);\r
                $exporter->export();\r
-               \r
+               return;\r
        }\r
-\r
+       \r
        /**\r
         * Admin::action_settingsedit()\r
         * \r
         * @param       Void\r
         * @return      Void\r
         */\r
-       static private function action_settingsedit() {\r
+       static private function action_settingsedit()\r
+       {\r
                global $member, $manager, $CONF, $DIR_NUCLEUS, $DIR_MEDIA;\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
-               self::pagehead();\r
+               \r
                self::$skin->parse('settingsedit');\r
-               self::pagefoot();\r
+               return;\r
        }\r
        \r
        /**\r
@@ -4548,7 +4642,8 @@ class Admin
         * @param       void\r
         * @return      void\r
         */\r
-       static private function action_settingsupdate() {\r
+       static private function action_settingsupdate()\r
+       {\r
                global $member, $CONF;\r
                \r
                $member->isAdmin() or self::disallow();\r
@@ -4560,49 +4655,51 @@ class Admin
                }\r
                \r
                // save settings\r
-               self::updateConfig('DefaultBlog',         postVar('DefaultBlog'));\r
-               self::updateConfig('BaseSkin',           postVar('BaseSkin'));\r
-               self::updateConfig('IndexURL',           postVar('IndexURL'));\r
-               self::updateConfig('AdminURL',           postVar('AdminURL'));\r
-               self::updateConfig('PluginURL',         postVar('PluginURL'));\r
-               self::updateConfig('SkinsURL',           postVar('SkinsURL'));\r
-               self::updateConfig('ActionURL',         postVar('ActionURL'));\r
-               self::updateConfig('Locale',               postVar('Locale'));\r
-               self::updateConfig('AdminEmail',           postVar('AdminEmail'));\r
-               self::updateConfig('SessionCookie',     postVar('SessionCookie'));\r
-               self::updateConfig('AllowMemberCreate',postVar('AllowMemberCreate'));\r
-               self::updateConfig('AllowMemberMail',  postVar('AllowMemberMail'));\r
-               self::updateConfig('NonmemberMail',     postVar('NonmemberMail'));\r
-               self::updateConfig('ProtectMemNames',  postVar('ProtectMemNames'));\r
-               self::updateConfig('SiteName',           postVar('SiteName'));\r
-               self::updateConfig('NewMemberCanLogon',postVar('NewMemberCanLogon'));\r
-               self::updateConfig('DisableSite',         postVar('DisableSite'));\r
-               self::updateConfig('DisableSiteURL',   postVar('DisableSiteURL'));\r
-               self::updateConfig('LastVisit',         postVar('LastVisit'));\r
-               self::updateConfig('MediaURL',           postVar('MediaURL'));\r
-               self::updateConfig('AllowedTypes',       postVar('AllowedTypes'));\r
-               self::updateConfig('AllowUpload',         postVar('AllowUpload'));\r
-               self::updateConfig('MaxUploadSize',     postVar('MaxUploadSize'));\r
-               self::updateConfig('MediaPrefix',         postVar('MediaPrefix'));\r
-               self::updateConfig('AllowLoginEdit',   postVar('AllowLoginEdit'));\r
-               self::updateConfig('DisableJsTools',   postVar('DisableJsTools'));\r
-               self::updateConfig('CookieDomain',       postVar('CookieDomain'));\r
-               self::updateConfig('CookiePath',           postVar('CookiePath'));\r
-               self::updateConfig('CookieSecure',       postVar('CookieSecure'));\r
-               self::updateConfig('URLMode',             postVar('URLMode'));\r
-               self::updateConfig('CookiePrefix',       postVar('CookiePrefix'));\r
+               self::updateConfig('DefaultBlog',               postVar('DefaultBlog'));\r
+               self::updateConfig('BaseSkin',                  postVar('BaseSkin'));\r
+               self::updateConfig('IndexURL',                  postVar('IndexURL'));\r
+               self::updateConfig('AdminURL',                  postVar('AdminURL'));\r
+               self::updateConfig('PluginURL',                 postVar('PluginURL'));\r
+               self::updateConfig('SkinsURL',                  postVar('SkinsURL'));\r
+               self::updateConfig('ActionURL',                 postVar('ActionURL'));\r
+               self::updateConfig('Locale',                    postVar('Locale'));\r
+               self::updateConfig('AdminEmail',                postVar('AdminEmail'));\r
+               self::updateConfig('SessionCookie',             postVar('SessionCookie'));\r
+               self::updateConfig('AllowMemberCreate', postVar('AllowMemberCreate'));\r
+               self::updateConfig('AllowMemberMail',   postVar('AllowMemberMail'));\r
+               self::updateConfig('NonmemberMail',             postVar('NonmemberMail'));\r
+               self::updateConfig('ProtectMemNames',   postVar('ProtectMemNames'));\r
+               self::updateConfig('SiteName',                  postVar('SiteName'));\r
+               self::updateConfig('NewMemberCanLogon', postVar('NewMemberCanLogon'));\r
+               self::updateConfig('DisableSite',               postVar('DisableSite'));\r
+               self::updateConfig('DisableSiteURL',    postVar('DisableSiteURL'));\r
+               self::updateConfig('LastVisit',                 postVar('LastVisit'));\r
+               self::updateConfig('MediaURL',                  postVar('MediaURL'));\r
+               self::updateConfig('AllowedTypes',              postVar('AllowedTypes'));\r
+               self::updateConfig('AllowUpload',               postVar('AllowUpload'));\r
+               self::updateConfig('MaxUploadSize',             postVar('MaxUploadSize'));\r
+               self::updateConfig('MediaPrefix',               postVar('MediaPrefix'));\r
+               self::updateConfig('AllowLoginEdit',    postVar('AllowLoginEdit'));\r
+               self::updateConfig('DisableJsTools',    postVar('DisableJsTools'));\r
+               self::updateConfig('CookieDomain',              postVar('CookieDomain'));\r
+               self::updateConfig('CookiePath',                postVar('CookiePath'));\r
+               self::updateConfig('CookieSecure',              postVar('CookieSecure'));\r
+               self::updateConfig('URLMode',                   postVar('URLMode'));\r
+               self::updateConfig('CookiePrefix',              postVar('CookiePrefix'));\r
                self::updateConfig('DebugVars',                 postVar('DebugVars'));\r
-               self::updateConfig('DefaultListSize',             postVar('DefaultListSize'));\r
-               self::updateConfig('AdminCSS',            postVar('AdminCSS'));\r
-               \r
+               self::updateConfig('DefaultListSize',   postVar('DefaultListSize'));\r
+               self::updateConfig('AdminCSS',                  postVar('AdminCSS'));\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
                getConfig();\r
                redirect($CONF['AdminURL'] . '?action=manage');\r
-               exit;\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
         * Admin::action_systemoverview()\r
         * Output system overview\r
@@ -4612,11 +4709,10 @@ class Admin
         */\r
        static private function action_systemoverview()\r
        {\r
-               self::pagehead();\r
                self::$skin->parse('systemoverview');\r
-               self::pagefoot();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
         * Admin::updateConfig()\r
         * \r
@@ -4626,14 +4722,14 @@ class Admin
         */\r
        static private function updateConfig($name, $val)\r
        {\r
-               $name = sql_real_escape_string($name);\r
-               $val = trim(sql_real_escape_string($val));\r
-               \r
-               $query = "UPDATE %s SET value='%s' WHERE name='%s'";\r
-               $query = sprintf($query, sql_table('config'), $val, $name);\r
-//             sql_query($query) or die("Query error: " . sql_error());\r
-        sql_query($query) or die(_ADMIN_SQLDIE_QUERYERROR . sql_error());\r
-               return sql_insert_id();\r
+               $query = "UPDATE %s SET value=%s WHERE name=%s";\r
+               $query = sprintf($query, sql_table('config'), DB::quoteValue($val), DB::quoteValue($name));\r
+               if ( DB::execute($query) === FALSE )\r
+               {\r
+                       $err = DB::getError();\r
+                       die(_ADMIN_SQLDIE_QUERYERROR . $err[2]);\r
+               }\r
+               return DB::getInsertId();\r
        }\r
        \r
        /**\r
@@ -4643,12 +4739,11 @@ class Admin
         * @param       string  $msg    message that will be shown\r
         * @return      void\r
         */\r
-       static private function error($msg)\r
+       static public function error($msg)\r
        {\r
-               self::pagehead();\r
-               self::parse('adminerrorpage');\r
-               self::pagefoot();\r
-               exit;\r
+               self::$headMess = $msg;\r
+               self::$skin->parse('adminerrorpage');\r
+               return;\r
        }\r
        \r
        /**\r
@@ -4658,316 +4753,30 @@ class Admin
         * @param       void\r
         * @return      void\r
         */\r
-       static private function disallow()\r
+       static public function disallow()\r
        {\r
                ActionLog::add(WARNING, _ACTIONLOG_DISALLOWED . serverVar('REQUEST_URI'));\r
                self::error(_ERROR_DISALLOWED);\r
                return;\r
        }\r
-       \r
+\r
        /**\r
-        * Admin::pagehead()\r
-        * Output admin page head\r
-        * \r
-        * @param       void\r
+        * Admin::action_PluginAdmin()\r
+        * Output pluginadmin\r
+        *\r
+        * @param       string  $skinContents\r
+        * @param       string  $extrahead\r
         * @return      void\r
         */\r
-       static private function pagehead($extrahead = '')\r
+       static public function action_PluginAdmin($skinContents, $extrahead = '')\r
        {\r
-               global $member, $nucleus, $CONF, $manager;\r
-               \r
-               if ( self::existsSkinContents('pagehead') )\r
-               {\r
-                       if ( isset($extrahead) && !empty($extrahead) )\r
-                       {\r
-                       self::$extrahead = $extrahead;\r
-                       }\r
-                       self::parse('pagehead');\r
-               }\r
-               else\r
-               {\r
-                       $data = array(\r
-                               'extrahead' => &$extrahead,\r
-                               'action'    => self::$action\r
-                       );\r
-                       \r
-                       $manager->notify('AdminPrePageHead', $data);\r
-                       \r
-                       $baseUrl = Entity::hsc($CONF['AdminURL']);\r
-                       \r
-                       /*\r
-                        * TODO: obsoleted\r
-                       if ( !array_key_exists('AdminCSS', $CONF) )\r
-                       {\r
-                               sql_query("INSERT INTO " . sql_table('config') . " VALUES ('AdminCSS', 'original')");\r
-                               $CONF['AdminCSS'] = 'original';\r
-                       }\r
-                       */\r
-                       \r
-                       /* HTTP 1.1 application for no caching */\r
-                       header("Cache-Control: no-cache, must-revalidate");\r
-                       header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");\r
-                       \r
-                       $root_element = 'html';\r
-                       $charset = i18n::get_current_charset();\r
-                       $locale = preg_replace('#_#', '-', i18n::get_current_locale());\r
-                       $xml_version_info = self::xml_version_info;\r
-                       $formal_public_identifier = self::formal_public_identifier;\r
-                       $system_identifier = self::system_identifier;\r
-                       $xhtml_namespace = self::xhtml_namespace;\r
-                       \r
-                       echo "<?xml version=\"{$xml_version_info}\" encoding=\"{$charset}\" ?>\n";\r
-                       echo "<!DOCTYPE {$root_element} PUBLIC \"{$formal_public_identifier}\" \"{$system_identifier}\">\n";\r
-                       echo "<{$root_element} xmlns=\"{$xhtml_namespace}\" xml:lang=\"{$locale}\" lang=\"{$locale}\">\n";\r
-                       echo "<head>\n";\r
-                       echo '<title>' . Entity::hsc($CONF['SiteName']) . " - Admin</title>\n";\r
-                       /*\r
-                        * TODO: obsoleted\r
-                       echo "<link rel=\"stylesheet\" title=\"Nucleus Admin Default\" type=\"text/css\" href=\"{$baseUrl}styles/admin_{$CONF["AdminCSS"]}.css\" />\n";\r
-                       */\r
-                       echo "<link rel=\"stylesheet\" title=\"Nucleus Admin Default\" type=\"text/css\" href=\"{$baseUrl}styles/addedit.css\" />\n";\r
-                       echo "<script type=\"text/javascript\" src=\"{$baseUrl}javascript/edit.js\"></script>\n";\r
-                       echo "<script type=\"text/javascript\" src=\"{$baseUrl}javascript/admin.js\"></script>\n";\r
-                       echo "<script type=\"text/javascript\" src=\"{$baseUrl}javascript/compatibility.js\"></script>\n";\r
-                       echo "{$extrahead}\n";\r
-                       echo "</head>\n\n";\r
-                       echo "<body>\n";\r
-                       echo "<div id=\"adminwrapper\">\n";\r
-                       echo "<div class=\"header\">\n";\r
-                       echo '<h1>' . Entity::hsc($CONF['SiteName']) . "</h1>\n";\r
-                       echo "</div>\n";\r
-                       echo "<div id=\"container\">\n";\r
-                       echo "<div id=\"content\">\n";\r
-                       echo "<div class=\"loginname\">\n";\r
-                       if ( $member->isLoggedIn() )\r
-                       {\r
-                               echo _LOGGEDINAS . ' ' . $member->getDisplayName() ." - <a href='index.php?action=logout'>" . _LOGOUT. "</a><br />\n";\r
-                               echo "<a href='index.php?action=overview'>" . _ADMINHOME . "</a> - ";\r
-                       }\r
-                       else\r
-                       {\r
-                               echo '<a href="index.php?action=showlogin" title="Log in">' . _NOTLOGGEDIN . "</a><br />\n";\r
-                       }\r
-                       echo "<a href='".$CONF['IndexURL']."'>"._YOURSITE."</a><br />\n";\r
-                       echo '(';\r
-                       \r
-                       if (array_key_exists('codename', $nucleus) && $nucleus['codename'] != '' )\r
-                       {\r
-                               $codenamestring = ' &quot;' . $nucleus['codename'].'&quot;';\r
-                       }\r
-                       else\r
-                       {\r
-                               $codenamestring = '';\r
-                       }\r
-                       \r
-                       if ( $member->isLoggedIn() && $member->isAdmin() )\r
-                       {\r
-                               $checkURL = sprintf(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_URL, getNucleusVersion(), getNucleusPatchLevel());\r
-                               echo '<a href="' . $checkURL . '" title="' . _ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE . '">Nucleus CMS ' . $nucleus['version'] . $codenamestring . '</a>';\r
-                               \r
-                               $newestVersion = getLatestVersion();\r
-                               $newestCompare = str_replace('/', '.', $newestVersion);\r
-                               $currentVersion = str_replace(array('/','v'), array('.',''), $nucleus['version']);\r
-                               \r
-                               if ( $newestVersion && version_compare($newestCompare, $currentVersion) > 0 )\r
-                               {\r
-                                       echo "<br />\n";\r
-                                       echo '<a style="color:red" href="http://nucleuscms.org/upgrade.php" title="' . _ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TITLE . '">';\r
-                                       echo _ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TEXT . $newestVersion;\r
-                                       echo "</a>";\r
-                               }\r
-                       }\r
-                       else\r
-                       {\r
-                               echo "Nucleus CMS {$nucleus['version']}{$codenamestring}";\r
-                       }\r
-                       echo ')';\r
-                       echo '</div>';\r
-               }\r
+               self::$extrahead .= $extrahead;\r
+               self::$skin->parse('pluginadmin', $skinContents);\r
                return;\r
        }\r
        \r
        /**\r
-        * Admin::pagefoot()\r
-        * Output admin page foot include quickmenu\r
-        * \r
-        * @param       void\r
-        * @return      void\r
-        */\r
-       static private function pagefoot()\r
-       {\r
-               global $action, $member, $manager;\r
-               \r
-               if ( self::existsSkinContents('pagefoot') )\r
-               {\r
-                       self::parse('pagefoot');\r
-                       exit;\r
-               }\r
-               else\r
-               {\r
-                       $data = array(\r
-                               'action' => self::$action\r
-                       );\r
-                       \r
-                       $manager->notify('AdminPrePageFoot', $data);\r
-                       \r
-                       if ( $member->isLoggedIn() && ($action != 'showlogin') )\r
-                       {\r
-                               echo '<h2>' . _LOGOUT . "</h2>\n";\r
-                               echo "<ul>\n";\r
-                               echo '<li><a href="index.php?action=overview">' . _BACKHOME . "</a></li>\n";\r
-                               echo '<li><a href="index.php?action=logout">' .  _LOGOUT . "</a></li>\n";\r
-                               echo "</ul>\n";\r
-                       }\r
-                       \r
-                       echo "<div class=\"foot\">\n";\r
-                       echo '<a href="' . _ADMINPAGEFOOT_OFFICIALURL . '">Nucleus CMS</a> &copy; 2002-' . date('Y') . ' ' . _ADMINPAGEFOOT_COPYRIGHT;\r
-                       echo '-';\r
-                       echo '<a href="' . _ADMINPAGEFOOT_DONATEURL . '">' . _ADMINPAGEFOOT_DONATE . "</a>\n";\r
-                       echo "</div>\n";\r
-                       \r
-                       echo "<div id=\"quickmenu\">\n";\r
-                       \r
-                       if ( ($action != 'showlogin') && ($member->isLoggedIn()) )\r
-                       {\r
-                               echo "<ul>\n";\r
-                               echo '<li><a href="index.php?action=overview">' . _QMENU_HOME . "</a></li>\n";\r
-                               echo "</ul>\n";\r
-                               \r
-                               echo '<h2>' . _QMENU_ADD . "</h2>\n";\r
-                               echo "<form method=\"get\" action=\"index.php\">\n";\r
-                               echo "<p>\n";\r
-                               echo "<input type=\"hidden\" name=\"action\" value=\"createitem\" />\n";\r
-                               \r
-                               $showAll = requestVar('showall');\r
-                               \r
-                               if ( ($member->isAdmin()) && ($showAll == 'yes') )\r
-                               {\r
-                                       // Super-Admins have access to all blogs! (no add item support though)\r
-                                       $query = "SELECT bnumber as value, bname as text FROM %s ORDER BY bname;";\r
-                                       $query = sprintf($query, sql_table('blog'));\r
-                               }\r
-                               else\r
-                               {\r
-                                       $query = "SELECT bnumber as value, bname as text FROM %s, %s WHERE tblog=bnumber and tmember=%d ORDER BY bname;";\r
-                                       $query = sprintf($query, sql_table('blog'), sql_table('team'), (integer) $member->getID());\r
-                               }\r
-                               $template['name']               = 'blogid';\r
-                               $template['tabindex']   = 15000;\r
-                               $template['extra']              = _QMENU_ADD_SELECT;\r
-                               $template['selected']   = -1;\r
-                               $template['shorten']    = 10;\r
-                               $template['shortenel']  = '';\r
-                               $template['javascript'] = 'onchange="return form.submit()"';\r
-                               showlist($query, 'select', $template);\r
-                               \r
-                               echo "</p>\n";\r
-                               echo "</form>\n";\r
-                               \r
-                               echo "<h2>{$member->getDisplayName()}</h2>\n";\r
-                               echo "<ul>\n";\r
-                               echo '<li><a href="index.php?action=editmembersettings">' . _QMENU_USER_SETTINGS . "</a></li>\n";\r
-                               echo '<li><a href="index.php?action=browseownitems">' . _QMENU_USER_ITEMS . "</a></li>\n";\r
-                               echo '<li><a href="index.php?action=browseowncomments">' . _QMENU_USER_COMMENTS . "</a></li>\n";\r
-                               echo "</ul>\n";\r
-                               \r
-                               if ( $member->isAdmin() )\r
-                               {\r
-                                       echo '<h2>' . _QMENU_MANAGE . "</h2>\n";\r
-                                       echo "<ul>\n";\r
-                                       echo '<li><a href="index.php?action=actionlog">' . _QMENU_MANAGE_LOG . "</a></li>\n";\r
-                                       echo '<li><a href="index.php?action=settingsedit">' . _QMENU_MANAGE_SETTINGS . "</a></li>\n";\r
-                                       echo '<li><a href="index.php?action=systemoverview">' . _QMENU_MANAGE_SYSTEM . "</a></li>\n";\r
-                                       echo '<li><a href="index.php?action=usermanagement">' . _QMENU_MANAGE_MEMBERS . "</a></li>\n";\r
-                                       echo '<li><a href="index.php?action=createnewlog">' . _QMENU_MANAGE_NEWBLOG . "</a></li>\n";\r
-                                       echo '<li><a href="index.php?action=backupoverview">' . _QMENU_MANAGE_BACKUPS . "</a></li>\n";\r
-                                       echo '<li><a href="index.php?action=pluginlist">' . _QMENU_MANAGE_PLUGINS . "</a></li>\n";\r
-                                       echo "</ul>\n";\r
-                                       \r
-                                       echo "<h2>" . _QMENU_LAYOUT . "</h2>\n";\r
-                                       echo "<ul>\n";\r
-                                       echo '<li><a href="index.php?action=skinoverview">' . _QMENU_LAYOUT_SKINS . "</a></li>\n";\r
-                                       echo '<li><a href="index.php?action=templateoverview">' . _QMENU_LAYOUT_TEMPL . "</a></li>\n";\r
-                                       echo '<li><a href="index.php?action=skinieoverview">' . _QMENU_LAYOUT_IEXPORT . "</a></li>\n";\r
-                                       echo "</ul>\n";\r
-                               }\r
-                               \r
-                               $data = array('options' => array());\r
-                               \r
-                               $manager->notify('QuickMenu', $data);\r
-                               \r
-                               if ( count($data['options']) > 0 )\r
-                               {\r
-                                       echo "<h2>" . _QMENU_PLUGINS . "</h2>\n";\r
-                                       echo "<ul>\n";\r
-                                       foreach ( $data['options'] as $option )\r
-                                       {\r
-                                               echo '<li><a href="' . Entity::hsc($option['url']) . '" title="' . Entity::hsc($option['tooltip']) . '">' . Entity::hsc($option['title']) . "</a></li>\n";\r
-                                       }\r
-                                       echo "</ul>\n";\r
-                               }\r
-                       }\r
-                       else if ( ($action == 'activate') || ($action == 'activatesetpwd') )\r
-                       {\r
-                       \r
-                               echo '<h2>' . _QMENU_ACTIVATE . '</h2>' . _QMENU_ACTIVATE_TEXT;\r
-                       }\r
-                       else\r
-                       {\r
-                               echo '<h2>' . _QMENU_INTRO . '</h2>' . _QMENU_INTRO_TEXT;\r
-                       }\r
-                       \r
-                       echo "<!-- quickmenu -->\n";\r
-                       echo "</div>\n";\r
-                       \r
-                       echo "<!-- content -->\n";\r
-                       echo "</div>\n";\r
-                       \r
-                       echo "<!-- container -->\n";\r
-                       echo "</div>\n";\r
-                       \r
-                       echo "<!-- adminwrapper -->\n";\r
-                       echo "</div>\n";\r
-                       \r
-                       echo "</body>\n";\r
-                       echo "</html>\n";\r
-               }\r
-               return;\r
-       }\r
-       \r
-       /**\r
-        * Admin::\r
-        * \r
-        * @param       void\r
-        * @return      void\r
-        */\r
-       static private function action_regfile()\r
-       {\r
-               global $member, $CONF;\r
-\r
-               $blogid = intRequestVar('blogid');\r
-\r
-               $member->teamRights($blogid) or self::disallow();\r
-\r
-               // header-code stolen from phpMyAdmin\r
-               // REGEDIT and bookmarklet code stolen from GreyMatter\r
-\r
-               $sjisBlogName = sprintf(_WINREGFILE_TEXT, getBlogNameFromID($blogid));\r
-\r
-\r
-               header('Content-Type: application/octetstream');\r
-               header('Content-Disposition: filename="nucleus.reg"');\r
-               header('Pragma: no-cache');\r
-               header('Expires: 0');\r
-\r
-               echo "REGEDIT4\n";\r
-               echo "[HKEY_CURRENT_USER\\Software\\Microsoft\\Internet Explorer\\MenuExt\\" . $sjisBlogName . "]\n";\r
-               echo '@="' . $CONF['AdminURL'] . "bookmarklet.php?action=contextmenucode&blogid=".intval($blogid)."\"\n";\r
-               echo '"contexts"=hex:31';\r
-       }\r
-\r
-       /**\r
-        * Admin::\r
+        * Admin::action_bookmarklet()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -4975,19 +4784,16 @@ class Admin
        static private function action_bookmarklet()\r
        {\r
                global $member, $manager;\r
-\r
-               $member->teamRights($blogid) or self::disallow();\r
-\r
+               \r
                $blogid = intRequestVar('blogid');\r
-\r
-               self::pagehead();\r
+               $member->teamRights($blogid) or self::disallow();\r
+               \r
                self::$skin->parse('bookmarklet');\r
-               self::pagefoot();\r
-\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_actionlog()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -4995,53 +4801,49 @@ class Admin
        static private function action_actionlog()\r
        {\r
                global $member, $manager;\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
-               self::pagehead();\r
+               \r
                self::$skin->parse('actionlog');\r
-               self::pagefoot();\r
-\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_banlist()\r
         * \r
         * @param       void\r
         * @return      void\r
         */\r
-       static private function action_banlist() {\r
+       static private function action_banlist()\r
+       {\r
                global $member, $manager;\r
-\r
-               $member->blogAdminRights($blogid) or self::disallow();\r
-\r
+               \r
                $blogid = intRequestVar('blogid');\r
-\r
-               self::pagehead();\r
+               $member->blogAdminRights($blogid) or self::disallow();\r
+               \r
                self::$skin->parse('banlist');\r
-               self::pagefoot();\r
-\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_banlistdelete()\r
         * \r
         * @param       void\r
         * @return      void\r
         */\r
-       static private function action_banlistdelete() {\r
+       static private function action_banlistdelete()\r
+       {\r
                global $member, $manager;\r
-\r
+               \r
                $blogid = intRequestVar('blogid');\r
                $member->blogAdminRights($blogid) or self::disallow();\r
-\r
-               self::pagehead();\r
+               \r
                self::$skin->parse('banlistdelete');\r
-               self::pagefoot();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_banlistdeleteconfirm()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -5049,20 +4851,20 @@ class Admin
        static private function action_banlistdeleteconfirm()\r
        {\r
                global $member, $manager;\r
-\r
+               \r
+               $blogid         = intPostVar('blogid');\r
+               $allblogs       = postVar('allblogs');\r
+               $iprange        = postVar('iprange');\r
+               \r
                $member->blogAdminRights($blogid) or self::disallow();\r
-\r
-               $blogid = intPostVar('blogid');\r
-               $allblogs = postVar('allblogs');\r
-               $iprange = postVar('iprange');\r
-\r
+               \r
                $deleted = array();\r
-\r
+               \r
                if ( !$allblogs )\r
                {\r
                        if ( Ban::removeBan($blogid, $iprange) )\r
                        {\r
-                               array_push($deleted, $blogid);\r
+                               $deleted[] = $blogid;\r
                        }\r
                }\r
                else\r
@@ -5073,81 +4875,90 @@ class Admin
                        {\r
                                if ( Ban::removeBan($blogje, $iprange) )\r
                                {\r
-                                       array_push($deleted, $blogje);\r
+                                       $deleted[] = $blogje;\r
                                }\r
                        }\r
                }\r
-\r
+               \r
                if ( sizeof($deleted) == 0 )\r
                {\r
                        self::error(_ERROR_DELETEBAN);\r
                }\r
-\r
-               self::pagehead();\r
+               \r
+               /* TODO: we should use other ways */\r
+               $_REQUEST['delblogs'] = $deleted;\r
+               \r
                self::$skin->parse('banlistdeleteconfirm');\r
-               self::pagefoot();\r
-\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_banlistnewfromitem()\r
         * \r
         * @param       void\r
         * @return      void\r
         */\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
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_banlistnew()\r
         * \r
-        * @param       void\r
+        * @param       integer $blogid ID for weblog\r
         * @return      void\r
         */\r
        static private function action_banlistnew($blogid = '')\r
        {\r
                global $member, $manager;\r
-\r
+               \r
                if ( $blogid == '' )\r
                {\r
                        $blogid = intRequestVar('blogid');\r
                }\r
-\r
+               \r
                $ip = requestVar('ip');\r
-\r
+               \r
                $member->blogAdminRights($blogid) or self::disallow();\r
-\r
+               \r
+               /* TODO: we should consider to use the other way instead of this */\r
                $_REQUEST['blogid'] = $blogid;          \r
-\r
-               self::pagehead();\r
+               \r
                self::$skin->parse('banlistnew');\r
-               self::pagefoot();\r
+               \r
+               return;\r
        }\r
 \r
        /**\r
-        * Admin::\r
+        * Admin::action_banlistadd()\r
         * \r
         * @param       void\r
         * @return      void\r
         */\r
-       static private function action_banlistadd() {\r
+       static private function action_banlistadd()\r
+       {\r
                global $member;\r
-\r
-               $blogid   = intPostVar('blogid');\r
-               $allblogs = postVar('allblogs');\r
-               $iprange  = postVar('iprange');\r
+               \r
+               $blogid         = intPostVar('blogid');\r
+               $allblogs       = postVar('allblogs');\r
+               $iprange        = postVar('iprange');\r
+               \r
                if ( $iprange == "custom" )\r
                {\r
                        $iprange = postVar('customiprange');\r
                }\r
                $reason   = postVar('reason');\r
-\r
+               \r
                $member->blogAdminRights($blogid) or self::disallow();\r
-\r
+               \r
                // TODO: check IP range validity\r
-\r
+               \r
                if ( !$allblogs )\r
                {\r
                        if ( !Ban::addBan($blogid, $iprange, $reason) )\r
@@ -5172,11 +4983,12 @@ class Admin
                                self::error(_ERROR_ADDBAN);\r
                        }\r
                }\r
-               self::$action_banlist();\r
+               self::action_banlist();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_clearactionlog()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -5184,16 +4996,17 @@ class Admin
        static private function action_clearactionlog()\r
        {\r
                global $member;\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
+               \r
                ActionLog::clear();\r
-\r
-               self::$action_manage(_MSG_ACTIONLOGCLEARED);\r
+               \r
+               self::action_manage(_MSG_ACTIONLOGCLEARED);\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_backupoverview()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -5201,12 +5014,11 @@ class Admin
        static private function action_backupoverview()\r
        {\r
                global $member, $manager;\r
-\r
+               \r
                $member->isAdmin() or self::disallow();\r
-\r
-               self::pagehead();\r
+               \r
                self::$skin->parse('backupoverview');\r
-               self::pagefoot();\r
+               return;\r
        }\r
 \r
        /**\r
@@ -5265,9 +5077,7 @@ class Admin
                {\r
                        self::error($message);\r
                }\r
-               self::pagehead();\r
                self::$skin->parse('backuprestore');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -5286,14 +5096,12 @@ class Admin
                // check if allowed\r
                $member->isAdmin() or self::disallow();\r
                \r
-               self::pagehead();\r
                self::$skin->parse('pluginlist');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
        /**\r
-        * Admin::\r
+        * Admin::action_pluginhelp()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -5301,22 +5109,21 @@ class Admin
        static private function action_pluginhelp()\r
        {\r
                global $member, $manager, $DIR_PLUGINS, $CONF;\r
-\r
+               \r
                // check if allowed\r
                $member->isAdmin() or self::disallow();\r
-\r
+               \r
                $plugid = intGetVar('plugid');\r
-\r
+               \r
                if ( !$manager->pidInstalled($plugid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
                }\r
-\r
-               self::pagehead();\r
+               \r
                self::$skin->parse('pluginhelp');\r
-               self::pagefoot();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
         * Admin::action_pluginadd()\r
         * \r
@@ -5344,31 +5151,20 @@ class Admin
                }\r
                \r
                // get number of currently installed plugins\r
-               $res = sql_query('SELECT * FROM ' . sql_table('plugin'));\r
-               $numCurrent = sql_num_rows($res);\r
+               $res = DB::getResult('SELECT * FROM ' . sql_table('plugin'));\r
+               $numCurrent = $res->rowCount();\r
                \r
                // plugin will be added as last one in the list\r
                $newOrder = $numCurrent + 1;\r
                \r
-               $manager->notify(\r
-                       'PreAddPlugin',\r
-                       array(\r
-                               'file' => &$name\r
-                       )\r
-               );\r
+               $data = array('file' => &$name);\r
+               $manager->notify('PreAddPlugin', $data);\r
                \r
                // do this before calling getPlugin (in case the plugin id is used there)\r
-               $query = 'INSERT INTO '\r
-                          .      sql_table('plugin')\r
-                          . ' ('\r
-                          . '    porder,'\r
-                          . '    pfile'\r
-                          . ') VALUES ('\r
-                          .      $newOrder . ','\r
-                          . '"' . sql_real_escape_string($name) . '"'\r
-                          . ')';\r
-               sql_query($query);\r
-               $iPid = sql_insert_id();\r
+               $query = "INSERT INTO %s (porder, pfile) VALUES (%d, %s);";\r
+               $query = sprintf($query, sql_table('plugin'), (integer) $newOrder, DB::quoteValue($name));\r
+               DB::execute($query);\r
+               $iPid = DB::getInsertId();\r
                \r
                $manager->clearCachedInfo('installedPlugins');\r
                \r
@@ -5378,7 +5174,11 @@ class Admin
                // check if it got loaded (could have failed)\r
                if ( !$plugin )\r
                {\r
-                       sql_query('DELETE FROM ' . sql_table('plugin') . ' WHERE pid='. intval($iPid));\r
+                       $query = "DELETE FROM %s WHERE pid=%d;";\r
+                       $query = sprintf($query, sql_table('plugin'), (integer) $iPid);\r
+                       \r
+                       DB::execute($query);\r
+                       \r
                        $manager->clearCachedInfo('installedPlugins');\r
                        self::error(_ERROR_PLUGIN_LOAD);\r
                }\r
@@ -5406,8 +5206,8 @@ class Admin
                $pluginList = $plugin->getPluginDep();\r
                foreach ( $pluginList as $pluginName )\r
                {\r
-                       $res = sql_query('SELECT * FROM '.sql_table('plugin') . ' WHERE pfile="' . $pluginName . '"');\r
-                       if (sql_num_rows($res) == 0)\r
+                       $res = DB::getResult('SELECT * FROM '.sql_table('plugin') . ' WHERE pfile=' . DB::quoteValue($pluginName));\r
+                       if ($res->rowCount() == 0)\r
                        {\r
                                // uninstall plugin again...\r
                                self::deleteOnePlugin($plugin->getID());\r
@@ -5418,15 +5218,11 @@ class Admin
                // call the install method of the plugin\r
                $plugin->install();\r
                \r
-               $manager->notify(\r
-                       'PostAddPlugin',\r
-                       array(\r
-                               'plugin' => &$plugin\r
-                       )\r
-               );\r
+               $data = array('plugin' => &$plugin);\r
+               $manager->notify('PostAddPlugin', $data);\r
                \r
                // update all events\r
-               self::$action_pluginupdate();\r
+               self::action_pluginupdate();\r
                return;\r
        }\r
        \r
@@ -5445,22 +5241,22 @@ class Admin
                $member->isAdmin() or self::disallow();\r
                \r
                // delete everything from plugin_events\r
-               sql_query('DELETE FROM '.sql_table('plugin_event'));\r
+               DB::execute('DELETE FROM '.sql_table('plugin_event'));\r
                \r
                // loop over all installed plugins\r
-               $res = sql_query('SELECT pid, pfile FROM '.sql_table('plugin'));\r
-               while ( $o = sql_fetch_object($res) )\r
+               $res = DB::getResult('SELECT pid, pfile FROM '.sql_table('plugin'));\r
+               foreach ( $res as $row )\r
                {\r
-                       $pid  =  $o->pid;\r
-                       $plug =& $manager->getPlugin($o->pfile);\r
+                       $pid  =  $row['pid'];\r
+                       $plug =& $manager->getPlugin($row['pfile']);\r
                        if ( $plug )\r
                        {\r
                                $eventList = $plug->getEventList();\r
                                foreach ( $eventList as $eventName )\r
                                {\r
-                                       $query = "INSERT INTO %s (pid, event) VALUES (%d, '%s')";\r
-                                       $query = sprintf($query, sql_table('plugin_event'), (integer) $pid, sql_real_escape_string($eventName));\r
-                                       sql_query($query);\r
+                                       $query = "INSERT INTO %s (pid, event) VALUES (%d, %s)";\r
+                                       $query = sprintf($query, sql_table('plugin_event'), (integer) $pid, DB::quoteValue($eventName));\r
+                                       DB::execute($query);\r
                                }\r
                        }\r
                }\r
@@ -5469,7 +5265,7 @@ class Admin
        }\r
        \r
        /**\r
-        * Admin::\r
+        * Admin::action_plugindelete()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -5477,24 +5273,23 @@ class Admin
        static private function action_plugindelete()\r
        {\r
                global $member, $manager;\r
-\r
+               \r
                // check if allowed\r
                $member->isAdmin() or self::disallow();\r
-\r
+               \r
                $pid = intGetVar('plugid');\r
-\r
+               \r
                if ( !$manager->pidInstalled($pid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
                }\r
-\r
-               self::pagehead();\r
+               \r
                self::$skin->parse('plugindelete');\r
-               self::pagefoot();\r
+               return;\r
        }\r
 \r
        /**\r
-        * Admin::\r
+        * Admin::action_plugindeleteconfirm()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -5502,71 +5297,64 @@ class Admin
        static private function action_plugindeleteconfirm()\r
        {\r
                global $member, $manager, $CONF;\r
-\r
+               \r
                // check if allowed\r
                $member->isAdmin() or self::disallow();\r
-\r
+               \r
                $pid = intPostVar('plugid');\r
-\r
+               \r
                $error = self::deleteOnePlugin($pid, 1);\r
-               if ($error) {\r
+               if ( $error )\r
+               {\r
                        self::error($error);\r
                }\r
-\r
+               \r
                redirect($CONF['AdminURL'] . '?action=pluginlist');\r
-//             self::$action_pluginlist();\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
         * Admin::\r
         * \r
         * @param       void\r
         * @return      void\r
         */\r
-       static private function deleteOnePlugin($pid, $callUninstall = 0)\r
+       static public function deleteOnePlugin($pid, $callUninstall = 0)\r
        {\r
                global $manager;\r
-\r
+               \r
                $pid = intval($pid);\r
-\r
+               \r
                if ( !$manager->pidInstalled($pid) )\r
                {\r
                        return _ERROR_NOSUCHPLUGIN;\r
                }\r
-\r
-               $name = quickQuery('SELECT pfile as result FROM ' . sql_table('plugin') . ' WHERE pid=' . $pid);\r
-\r
-/*             // call the unInstall method of the plugin\r
-               if ($callUninstall) {\r
-                       $plugin =& $manager->getPlugin($name);\r
-                       if ($plugin) $plugin->unInstall();\r
-               }*/\r
-\r
+               \r
+               $query = "SELECT pfile as result FROM %s WHERE pid=%d;";\r
+               $query = sprintf($query, sql_table('plugin'), (integer) $pid);\r
+               $name = DB::getValue($query);\r
+               \r
                // check dependency before delete\r
-               $res = sql_query('SELECT pfile FROM ' . sql_table('plugin'));\r
-               while ($o = sql_fetch_object($res))\r
+               $res = DB::getResult('SELECT pfile FROM ' . sql_table('plugin'));\r
+               foreach ( $res as $row )\r
                {\r
-                       $plug =& $manager->getPlugin($o->pfile);\r
-                       if ($plug)\r
+                       $plug =& $manager->getPlugin($row['pfile']);\r
+                       if ( $plug )\r
                        {\r
                                $depList = $plug->getPluginDep();\r
-                               foreach ($depList as $depName)\r
+                               foreach ( $depList as $depName )\r
                                {\r
-                                       if ($name == $depName)\r
+                                       if ( $name == $depName )\r
                                        {\r
-                                               return sprintf(_ERROR_DELREQPLUGIN, $o->pfile);\r
+                                               return sprintf(_ERROR_DELREQPLUGIN, $row['pfile']);\r
                                        }\r
                                }\r
                        }\r
                }\r
-\r
-               $manager->notify(\r
-                       'PreDeletePlugin',\r
-                       array(\r
-                               'plugid' => $pid\r
-                       )\r
-               );\r
-\r
+               \r
+               $data = array('plugid' => $pid);\r
+               $manager->notify('PreDeletePlugin', $data);\r
+               \r
                // call the unInstall method of the plugin\r
                if ( $callUninstall )\r
                {\r
@@ -5576,47 +5364,42 @@ class Admin
                                $plugin->unInstall();\r
                        }\r
                }\r
-\r
+               \r
                // delete all subscriptions\r
-               sql_query('DELETE FROM ' . sql_table('plugin_event') . ' WHERE pid=' . $pid);\r
-\r
+               DB::execute('DELETE FROM ' . sql_table('plugin_event') . ' WHERE pid=' . $pid);\r
+               \r
                // delete all options\r
                // get OIDs from plugin_option_desc\r
-               $res = sql_query('SELECT oid FROM ' . sql_table('plugin_option_desc') . ' WHERE opid=' . $pid);\r
+               $res = DB::getResult('SELECT oid FROM ' . sql_table('plugin_option_desc') . ' WHERE opid=' . $pid);\r
                $aOIDs = array();\r
-               while ($o = sql_fetch_object($res))\r
+               foreach ( $res as $row )\r
                {\r
-                       array_push($aOIDs, $o->oid);\r
+                       array_push($aOIDs, $row['oid']);\r
                }\r
-\r
+               \r
                // delete from plugin_option and plugin_option_desc\r
-               sql_query('DELETE FROM ' . sql_table('plugin_option_desc') . ' WHERE opid=' . $pid);\r
+               DB::execute('DELETE FROM ' . sql_table('plugin_option_desc') . ' WHERE opid=' . $pid);\r
                if (count($aOIDs) > 0)\r
                {\r
-                       sql_query('DELETE FROM ' . sql_table('plugin_option') . ' WHERE oid in (' . implode(',',$aOIDs) . ')');\r
+                       DB::execute('DELETE FROM ' . sql_table('plugin_option') . ' WHERE oid in (' . implode(',', $aOIDs) . ')');\r
                }\r
-\r
+               \r
                // update order numbers\r
-               $res = sql_query('SELECT porder FROM ' . sql_table('plugin') . ' WHERE pid=' . $pid);\r
-               $o = sql_fetch_object($res);\r
-               sql_query('UPDATE ' . sql_table('plugin') . ' SET porder=(porder - 1) WHERE porder>' . $o->porder);\r
-\r
+               $res = DB::getValue('SELECT porder FROM ' . sql_table('plugin') . ' WHERE pid=' . $pid);\r
+               DB::execute('UPDATE ' . sql_table('plugin') . ' SET porder=(porder - 1) WHERE porder>' . $res);\r
+               \r
                // delete row\r
-               sql_query('DELETE FROM ' . sql_table('plugin') . ' WHERE pid=' . $pid);\r
-\r
+               DB::execute('DELETE FROM ' . sql_table('plugin') . ' WHERE pid=' . $pid);\r
+               \r
                $manager->clearCachedInfo('installedPlugins');\r
-               $manager->notify(\r
-                       'PostDeletePlugin',\r
-                       array(\r
-                               'plugid' => $pid\r
-                       )\r
-               );\r
-\r
+               $data = array('plugid' => $pid);\r
+               $manager->notify('PostDeletePlugin', $data);\r
+               \r
                return '';\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_pluginup()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -5624,36 +5407,35 @@ class Admin
        static private function action_pluginup()\r
        {\r
                global $member, $manager, $CONF;\r
-\r
+               \r
                // check if allowed\r
                $member->isAdmin() or self::disallow();\r
-\r
+               \r
                $plugid = intGetVar('plugid');\r
-\r
+               \r
                if ( !$manager->pidInstalled($plugid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
                }\r
-\r
+               \r
                // 1. get old order number\r
-               $res = sql_query('SELECT porder FROM ' . sql_table('plugin') . ' WHERE pid=' . $plugid);\r
-               $o = sql_fetch_object($res);\r
-               $oldOrder = $o->porder;\r
-\r
+               $oldOrder = DB::getValue('SELECT porder FROM ' . sql_table('plugin') . ' WHERE pid=' . $plugid);\r
+               \r
                // 2. calculate new order number\r
                $newOrder = ($oldOrder > 1) ? ($oldOrder - 1) : 1;\r
-\r
+               \r
                // 3. update plug numbers\r
-               sql_query('UPDATE ' . sql_table('plugin') . ' SET porder=' . $oldOrder . ' WHERE porder=' . $newOrder);\r
-               sql_query('UPDATE ' . sql_table('plugin') . ' SET porder=' . $newOrder . ' WHERE pid=' . $plugid);\r
-\r
-               //self::$action_pluginlist();\r
+               DB::execute('UPDATE ' . sql_table('plugin') . ' SET porder=' . $oldOrder . ' WHERE porder=' . $newOrder);\r
+               DB::execute('UPDATE ' . sql_table('plugin') . ' SET porder=' . $newOrder . ' WHERE pid=' . $plugid);\r
+               \r
+               //self::action_pluginlist();\r
                // To avoid showing ticket in the URL, redirect to pluginlist, instead.\r
                redirect($CONF['AdminURL'] . '?action=pluginlist');\r
+               return;\r
        }\r
-\r
+       \r
        /**\r
-        * Admin::\r
+        * Admin::action_plugindown()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -5661,34 +5443,33 @@ class Admin
        static private function action_plugindown()\r
        {\r
                global $member, $manager, $CONF;\r
-\r
+               \r
                // check if allowed\r
                $member->isAdmin() or self::disallow();\r
-\r
+               \r
                $plugid = intGetVar('plugid');\r
                if ( !$manager->pidInstalled($plugid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
                }\r
-\r
+               \r
                // 1. get old order number\r
-               $res = sql_query('SELECT porder FROM ' . sql_table('plugin') . ' WHERE pid=' . $plugid);\r
-               $o   = sql_fetch_object($res);\r
-               $oldOrder = $o->porder;\r
-\r
-               $res = sql_query('SELECT * FROM ' . sql_table('plugin'));\r
-               $maxOrder = sql_num_rows($res);\r
-\r
+               $oldOrder = DB::getValue('SELECT porder FROM ' . sql_table('plugin') . ' WHERE pid=' . $plugid);\r
+               \r
+               $res = DB::getResult('SELECT * FROM ' . sql_table('plugin'));\r
+               $maxOrder = $res->rowCount();\r
+               \r
                // 2. calculate new order number\r
                $newOrder = ($oldOrder < $maxOrder) ? ($oldOrder + 1) : $maxOrder;\r
-\r
+               \r
                // 3. update plug numbers\r
-               sql_query('UPDATE ' . sql_table('plugin') . ' SET porder=' . $oldOrder . ' WHERE porder=' . $newOrder);\r
-               sql_query('UPDATE ' . sql_table('plugin') . ' SET porder=' . $newOrder . ' WHERE pid=' . $plugid);\r
-\r
-               //self::$action_pluginlist();\r
+               DB::execute('UPDATE ' . sql_table('plugin') . ' SET porder=' . $oldOrder . ' WHERE porder=' . $newOrder);\r
+               DB::execute('UPDATE ' . sql_table('plugin') . ' SET porder=' . $newOrder . ' WHERE pid=' . $plugid);\r
+               \r
+               //self::action_pluginlist();\r
                // To avoid showing ticket in the URL, redirect to pluginlist, instead.\r
                redirect($CONF['AdminURL'] . '?action=pluginlist');\r
+               return;\r
        }\r
        \r
        /**\r
@@ -5701,28 +5482,28 @@ class Admin
         * @return      void\r
         * \r
         */\r
-       static public function action_pluginoptions($message = '')\r
+       static private function action_pluginoptions($message = '')\r
        {\r
                global $member, $manager;\r
                \r
                // check if allowed\r
                $member->isAdmin() or self::disallow();\r
                \r
-//             $pid = (integer) requestVar('plugid');\r
                $pid = intRequestVar('plugid');\r
                if ( !$manager->pidInstalled($pid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
                }\r
-\r
+               \r
                if ( isset($message) )\r
                {\r
                        self::$headMess = $message;\r
                }\r
-               $extrahead = "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";\r
-               self::pagehead($extrahead);\r
+               $plugname       = $manager->getPluginNameFromPid($pid);\r
+               $plugin         = $manager->getPlugin($plugname);\r
+               Admin::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";\r
+               \r
                self::$skin->parse('pluginoptions');\r
-               self::pagefoot();\r
                return;\r
        }\r
        \r
@@ -5735,7 +5516,7 @@ class Admin
         * @param       void\r
         * @return      void\r
         */\r
-       static public function action_pluginoptionsupdate()\r
+       static private function action_pluginoptionsupdate()\r
        {\r
                global $member, $manager;\r
                \r
@@ -5743,7 +5524,7 @@ class Admin
                $member->isAdmin() or self::disallow();\r
                \r
                $pid = intRequestVar('plugid');\r
-//             $pid = (integer) requestVar('plugid');\r
+               \r
                if ( !$manager->pidInstalled($pid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
@@ -5751,208 +5532,91 @@ class Admin
                \r
                $aOptions = requestArray('plugoption');\r
                NucleusPlugin::apply_plugin_options($aOptions);\r
-\r
-               $manager->notify(\r
-                       'PostPluginOptionsUpdate',\r
-                       array(\r
-                               'context' => 'global',\r
-                               'plugid' => $pid\r
-                       )\r
-               );\r
-               \r
-               self::$action_pluginoptions(_PLUGS_OPTIONS_UPDATED);\r
-               return;\r
-       }\r
-       \r
-       /**\r
-        * Admin::_insertPluginOptions()\r
-        * \r
-        * Output plugin option field\r
-        * \r
-        * @access      public\r
-        * @param string        $context        plugin option context\r
-        * @param integer       $contextid      plugin option context id\r
-        * @return      void\r
-        */\r
-       static public function _insertPluginOptions($context, $contextid = 0)\r
-       {\r
-               // get all current values for this contextid\r
-               // (note: this might contain doubles for overlapping contextids)\r
-               $aIdToValue = array();\r
-               $res = sql_query('SELECT oid, ovalue FROM ' . sql_table('plugin_option') . ' WHERE ocontextid=' . intval($contextid));\r
-               while ( $object = sql_fetch_object($res) )\r
-               {\r
-                       $aIdToValue[$object->oid] = $object->ovalue;\r
-               }\r
-               \r
-               // get list of oids per pid\r
-               $query = 'SELECT '\r
-                          . '    * '\r
-                          . 'FROM '\r
-                          .      sql_table('plugin_option_desc') . ', '\r
-                          .      sql_table('plugin') . ' '\r
-                          . 'WHERE '\r
-                          . '    opid     = pid '\r
-                          . 'and ocontext = "' . sql_real_escape_string($context) . '" '\r
-                          . 'ORDER BY '\r
-                          . '    porder, oid ASC';\r
-               $res   = sql_query($query);\r
-               $aOptions = array();\r
-               while ( $object = sql_fetch_object($res) )\r
-               {\r
-                       if ( !in_array($object->oid, array_keys($aIdToValue)) )\r
-                       {\r
-                               $value = $object->odef;\r
-                       }\r
-                       else\r
-                       {\r
-                               $value = $aIdToValue[$object->oid];\r
-                       }\r
-                       \r
-                       array_push(\r
-                               $aOptions,\r
-                               array(\r
-                                       'pid'                   => $object->pid,\r
-                                       'pfile'                 => $object->pfile,\r
-                                       'oid'                   => $object->oid,\r
-                                       'value'                 => $value,\r
-                                       'name'                  => $object->oname,\r
-                                       'description'   => $object->odesc,\r
-                                       'type'                  => $object->otype,\r
-                                       'typeinfo'              => $object->oextra,\r
-                                       'contextid'             => $contextid,\r
-                                       'extra'                 => ''\r
-                               )\r
-                       );\r
-               }\r
                \r
-               global $manager;\r
-               $manager->notify(\r
-                       'PrePluginOptionsEdit',\r
-                       array(\r
-                               'context'   =>  $context,\r
-                               'contextid' =>  $contextid,\r
-                               'options'   =>& $aOptions\r
-                       )\r
+               $data = array(\r
+                       'context'       => 'global',\r
+                       'plugid'        => $pid\r
                );\r
+               $manager->notify('PostPluginOptionsUpdate', $data);\r
                \r
-               self::$aOptions = $aOptions;\r
-               self::$skin->parse('insertpluginoptions');\r
+               self::action_pluginoptions(_PLUGS_OPTIONS_UPDATED);\r
                return;\r
        }\r
        \r
        /**\r
-        * Admin::\r
+        * Admin::action_parseSpecialskin()\r
         * \r
         * @param       void\r
         * @return      void\r
         */\r
        static private function action_parseSpecialskin()\r
        {\r
-               self::pagehead();\r
                self::$skin->parse(self::$action);\r
-               self::pagefoot();\r
-       }\r
-       \r
-       /*\r
-        * TODO: I guess this method was simply copied from Skin class...\r
-       static private function parse($type)\r
-       {\r
-               global $manager, $CONF;\r
-               \r
-               if ( $type == 'pagehead' )\r
-               {\r
-                       $data = array(\r
-                               'skin' => &self::$skin,\r
-                               'type' => $type\r
-                       );\r
-                       \r
-                       $manager->notify('InitAdminSkinParse', $data);\r
-                       sendContentType(self::$skin->getContentType(), 'skin', i18n::get_current_charset());\r
-               }\r
-               \r
-               $contents = self::$skin->getContent($type);\r
-               \r
-               if ( !$contents )\r
-               {\r
-                       echo _ERROR_SKIN;\r
-                       return;\r
-               }\r
-               \r
-               $actions = self::$skin->getAllowedActionsForType($type);\r
-               \r
-               if ( $type == 'pagehead' )\r
-               {\r
-                       $data = array(\r
-                               'skin'          => &self::$skin,\r
-                               'type'          => $type,\r
-                               'contents'      => &$contents\r
-                       );\r
-                       \r
-                       $manager->notify('PreAdminSkinParse', $data);\r
-               }\r
-               \r
-               PARSER::setProperty('IncludeMode', self::$skin->getIncludeMode());\r
-               PARSER::setProperty('IncludePrefix', self::$skin->getIncludePrefix());\r
-               \r
-               if ( $type == 'createitem' || $type == 'itemedit' )\r
-               {\r
-                       // TODO: where is this class???\r
-                       $handler = new Factory(intRequestVar('blogid'), $type, self::$skin, $this);\r
-                       $actions = array_merge($actions, $handler->actions);\r
-               }\r
-               else\r
-               {\r
-                       // TODO: why???\r
-                       $actions = array_merge($actions, self::$skin->getAllowedActionsForType($type));\r
-               }\r
-               \r
-               $parser = new Parser($actions, $handler);\r
-               $handler->setParser($parser);\r
-               $handler->setSkin(self::$skin);\r
-               $parser->parse($contents);\r
-               \r
-               if ( $type == 'pagefoot' )\r
-               {\r
-                       $data = array(\r
-                               'skin'  => &self::$skin,\r
-                               'type'  => $type,\r
-                       );\r
-                       \r
-                       $manager->notify('PostAdminSkinParse', $data);\r
-               }\r
                return;\r
        }\r
-       */\r
        \r
        /**\r
-        * Admin::\r
+        * Admin::getAdminskinIDFromName()\r
         * \r
-        * @param       void\r
-        * @return      void\r
+        * @param       string  $skinname       name of skin\r
+        * @return      integer ID for skin\r
         */\r
        static private function getAdminskinIDFromName($skinname)\r
        {\r
-               $query     = "SELECT 'sdnumber' as result FROM %s WHERE sdname = '%s';";\r
-               $admnSknID = quickQuery(sprintf($query, sql_table('skin_desc'), mysql_real_escape_string($skinname)));\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
        }\r
        \r
        /**\r
-        * Admin::\r
+        * Admin::getAdminskinNameFromID()\r
         * \r
-        * @param       void\r
-        * @return      void\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
-               $admnSknID = quickQuery(sprintf($query, sql_table('skin_desc'), (integer) $skinid));\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::\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
+        */\r
+       static public function getAdminAction()\r
+       {\r
+               return self::$action;\r
+       }\r
+       \r
+       /**\r
+        * Admin::getAdminaOption()\r
+        */\r
+       static public function getAdminaOption()\r
+       {\r
+               return self::$aOptions;\r
+       }\r
+       \r
+       /**\r
+        * Admin::action_importAdmin()\r
         * \r
         * @param       void\r
         * @return      void\r
@@ -5962,7 +5626,7 @@ class Admin
                global $DIR_ADMINSKINS, $action;\r
                if ( $action == 'adminskinieimport' )\r
                {\r
-                       self::_doAdminskinimport();\r
+                       self::doAdminskinimport();\r
                }\r
                $skn = array();\r
                if ( $action == 'showlogin' )\r
@@ -5987,21 +5651,21 @@ class Admin
                \r
                self::$skin                             = (object) $skn;\r
                $handler = new AdminActions($actnName, self::$skin, $this);\r
-               $actions = Skin::getAllowedActionsForType($actnName);\r
                \r
-               $parser = new PARSER($actions, $handler);\r
-               $handler->setParser($parser);\r
-               $handler->setSkin(self::$skin);\r
+               $parser = new PARSER($handler);\r
+               $parser->setSkin(self::$skin);\r
                $parser->parse($contents);\r
+               \r
+               return;\r
        }\r
        \r
        /**\r
-        * Admin::\r
+        * Admin::doAdminskinimport()\r
         * \r
         * @param       void\r
         * @return      void\r
         */\r
-       static private function _doAdminskinimport()\r
+       static private function doAdminskinimport()\r
        {\r
                global $DIR_LIBS, $DIR_ADMINSKINS, $CONF, $member;\r
                \r
@@ -6040,12 +5704,4 @@ class Admin
                header('Location: ' . $CONF['AdminURL']);\r
                exit;\r
        }\r
-\r
-       /**\r
-        * Returns a link to a weblog\r
-        * @param object BLOG\r
-        */\r
-       static private function bloglink(&$blog) {\r
-               return '<a href="'.Entity::hsc($blog->getURL()).'" title="'._BLOGLIST_TT_VISIT.'">'. Entity::hsc( $blog->getName() ) .'</a>';\r
-       }\r
 }\r