OSDN Git Service

ADD/FIX/CHANGE/REMOVE: スキン・テンプレート表示処理の改良
authorsakamocchi <o-takashi@sakamocchi.jp>
Sat, 26 May 2012 11:56:26 +0000 (20:56 +0900)
committersakamocchi <o-takashi@sakamocchi.jp>
Sat, 26 May 2012 11:56:26 +0000 (20:56 +0900)
変更点は多岐に渡る。概ね以下の通り
・Encapsulate/Batch/navListクラスを廃止。代替関数をshowlist.phpに用意。
・通常/管理画面用スキン・テンプレート内で使用可能な変数名を、区別せず統合
・通常/管理画面用スキン・テンプレートを表示する処理を、区別せず統合

具体的には以下。

・統合・変更したスキン用タグ(括弧内を廃止)

defskinselect
(adminskinselectoptions)

editskintype
(admineditskintype)

editskin
(editadminskin)

normalskinlist
(defaultadminskintypes)

specialskinlist
(adminspecialskinlist)

editskintype
(editadminskintype)

allowedskinactions
(allowedadminskinactions)

skineditallowedlist
(adminskineditallowedlist)

selectlocalskinfiles
(selectlocaladminskinfiles)

skinielist
(adminskinielist)

skinoverview
(adminskinoverview)

editskintype
(editadminskintype)

edittemplateinfo
(editadmintemplateinfo)

templateoverview
(admintemplateoverview)

・追加・変更したテンプレート用タグ(括弧内を廃止)
NORMALSKINLIST_HEAD
(SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD)

NORMALSKINLIST_BODY
(SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY)

NORMALSKINLIST_FOOT
(SHOWLIST_LISTPLUG_TABLE_SKINLIST_FOOT)

SPECIALSKINLIST_HEAD
(SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD)

SPECIALSKINLIST_BODY
(SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY)

SPECIALSKINLIST_FOOT
(SHOWLIST_LISTPLUG_TABLE_TPLTLIST_FOOT)

・統合・変更した関数・クラス(括弧内を廃止)
listplug_list_normalskinlist()
(listplug_table_adminskinlist())

listplug_list_specialskinlist()
(listplug_table_admintemplatelist())

listplug_input_yesno()
(AdminActions::input_yesno())

batchlist()
(Batchクラス)
(Encapsulateクラス)

navlist()
(NavListクラス)
(Encapsulateクラス)

16 files changed:
install/index.php
nucleus/convert/bloggercaif.php
nucleus/convert/functions.inc.php
nucleus/convert/genericImport.php
nucleus/convert/greymatter.php
nucleus/convert/livejournal.php
nucleus/documentation/help.html
nucleus/index.php
nucleus/libs/ADMIN.php
nucleus/libs/AdminActions.php
nucleus/libs/ENCAPSULATE.php [deleted file]
nucleus/libs/showlist.php
nucleus/locales/adminskinTypes.php
skins/admin/default/skinbackup.xml
skins/admin/defaultimporter.skn
skins/admin/showlogin.skn

index 11e3c6e..03d65f9 100644 (file)
@@ -1341,7 +1341,6 @@ function do_check_files()
                '../nucleus/libs/COMMENT.php',\r
                '../nucleus/libs/COMMENTACTIONS.php',\r
                '../nucleus/libs/COMMENTS.php',\r
                '../nucleus/libs/COMMENT.php',\r
                '../nucleus/libs/COMMENTACTIONS.php',\r
                '../nucleus/libs/COMMENTS.php',\r
-               '../nucleus/libs/ENCAPSULATE.php',\r
                '../nucleus/libs/ENTITY.php',\r
                '../nucleus/libs/globalfunctions.php',\r
                '../nucleus/libs/i18n.php',\r
                '../nucleus/libs/ENTITY.php',\r
                '../nucleus/libs/globalfunctions.php',\r
                '../nucleus/libs/i18n.php',\r
index 72c70bf..8293083 100644 (file)
@@ -220,7 +220,7 @@ while ($a_name = array_pop($authors)) {
                <?php                   $query =  'SELECT mname as text, mnumber as value FROM '.sql_table('member');
 
                        $template['name'] = 'memberid[' . $idx . ']';
                <?php                   $query =  'SELECT mname as text, mnumber as value FROM '.sql_table('member');
 
                        $template['name'] = 'memberid[' . $idx . ']';
-                       showlist($query,'select',$template);
+                       echo showlist($query,'select',$template);
                ?>
                        </td>
                        <td>
                ?>
                        </td>
                        <td>
@@ -247,7 +247,7 @@ while ($a_name = array_pop($authors)) {
                        <?php                                   $query =  'SELECT bname as text, bnumber as value FROM '.sql_table('blog');
                                        $template['name'] = 'blogid';
                                        $template['selected'] = $CONF['DefaultBlog'];
                        <?php                                   $query =  'SELECT bname as text, bnumber as value FROM '.sql_table('blog');
                                        $template['name'] = 'blogid';
                                        $template['selected'] = $CONF['DefaultBlog'];
-                                       showlist($query,'select',$template);
+                                       echo showlist($query,'select',$template);
                        ?>
                </div>
                <div>
                        ?>
                </div>
                <div>
@@ -258,7 +258,7 @@ while ($a_name = array_pop($authors)) {
                                <?php                                   $query =  'SELECT mname as text, mnumber as value FROM '.sql_table('member');
 
                                        $template['name'] = 'newowner';
                                <?php                                   $query =  'SELECT mname as text, mnumber as value FROM '.sql_table('member');
 
                                        $template['name'] = 'newowner';
-                                       showlist($query,'select',$template);
+                                       echo showlist($query,'select',$template);
                                ?>
                                </li>
                        </ul>
                                ?>
                                </li>
                        </ul>
index 045cbdb..c712614 100644 (file)
@@ -294,7 +294,7 @@ class BlogImport {
                                $query =  'SELECT bname as text, bnumber as value FROM '.sql_table('blog');
                                $template['name'] = 'blogid';
                                $template['selected'] = $CONF['DefaultBlog'];
                                $query =  'SELECT bname as text, bnumber as value FROM '.sql_table('blog');
                                $template['name'] = 'blogid';
                                $template['selected'] = $CONF['DefaultBlog'];
-                               showlist($query,'select',$template);
+                               echo showlist($query,'select',$template);
                                break;
 // ----------------------------------------------------------------------------------------
                        case 'ConvertSelectMembers':
                                break;
 // ----------------------------------------------------------------------------------------
                        case 'ConvertSelectMembers':
index 58f5f7d..2c46a9a 100644 (file)
@@ -149,7 +149,7 @@ function gi_assignMembers() {
                        <?php                                   $query =  'SELECT bname as text, bnumber as value FROM '.sql_table('blog');
                                        $template['name'] = 'blogid';
                                        $template['selected'] = $CONF['DefaultBlog'];
                        <?php                                   $query =  'SELECT bname as text, bnumber as value FROM '.sql_table('blog');
                                        $template['name'] = 'blogid';
                                        $template['selected'] = $CONF['DefaultBlog'];
-                                       showlist($query,'select',$template);
+                                       echo showlist($query,'select',$template);
                        ?>
                </div>
                <div>
                        ?>
                </div>
                <div>
@@ -160,7 +160,7 @@ function gi_assignMembers() {
                                <?php                                   $query =  'SELECT mname as text, mnumber as value FROM '.sql_table('member');
 
                                        $template['name'] = 'newowner';
                                <?php                                   $query =  'SELECT mname as text, mnumber as value FROM '.sql_table('member');
 
                                        $template['name'] = 'newowner';
-                                       showlist($query,'select',$template);
+                                       echo showlist($query,'select',$template);
                                ?>
                                </li>
                        </ul>
                                ?>
                                </li>
                        </ul>
index f0bda61..30367f0 100644 (file)
@@ -184,7 +184,7 @@ while ($author = fgets($filehandle,4096)) {
                        $query =  'SELECT mname as text, mnumber as value FROM '.sql_table('member');
 
                        $template['name'] = 'memberid[' . $idx . ']';
                        $query =  'SELECT mname as text, mnumber as value FROM '.sql_table('member');
 
                        $template['name'] = 'memberid[' . $idx . ']';
-                       showlist($query,'select',$template);
+                       echo showlist($query,'select',$template);
                ?>
                        </td>
                        <td>
                ?>
                        </td>
                        <td>
@@ -209,7 +209,7 @@ fclose($filehandle);
                                        $query =  'SELECT mname as text, mnumber as value FROM '.sql_table('member');
 
                                        $template['name'] = 'memberid[0]';
                                        $query =  'SELECT mname as text, mnumber as value FROM '.sql_table('member');
 
                                        $template['name'] = 'memberid[0]';
-                                       showlist($query,'select',$template);
+                                       echo showlist($query,'select',$template);
                                ?>
                        </td>
                        <td>
                                ?>
                        </td>
                        <td>
@@ -231,7 +231,7 @@ fclose($filehandle);
                        <?php                                   $query =  'SELECT bname as text, bnumber as value FROM '.sql_table('blog');
                                        $template['name'] = 'blogid';
                                        $template['selected'] = $CONF['DefaultBlog'];
                        <?php                                   $query =  'SELECT bname as text, bnumber as value FROM '.sql_table('blog');
                                        $template['name'] = 'blogid';
                                        $template['selected'] = $CONF['DefaultBlog'];
-                                       showlist($query,'select',$template);
+                                       echo showlist($query,'select',$template);
                        ?>
                </div>
                <div>
                        ?>
                </div>
                <div>
@@ -243,7 +243,7 @@ fclose($filehandle);
                                        $query =  'SELECT mname as text, mnumber as value FROM '.sql_table('member');
 
                                        $template['name'] = 'newowner';
                                        $query =  'SELECT mname as text, mnumber as value FROM '.sql_table('member');
 
                                        $template['name'] = 'newowner';
-                                       showlist($query,'select',$template);
+                                       echo showlist($query,'select',$template);
                                ?>
                                </li>
                        </ul>
                                ?>
                                </li>
                        </ul>
index a20f493..735c988 100644 (file)
@@ -157,7 +157,7 @@ function bc_assignMembers() {
                                   . " FROM ".sql_table('member');
 
                        $template['name'] = 'memberid[' . $idx . ']';
                                   . " FROM ".sql_table('member');
 
                        $template['name'] = 'memberid[' . $idx . ']';
-                       showlist($query,'select',$template);
+                       echo showlist($query,'select',$template);
                ?>
                        </td>
                        <td>
                ?>
                        </td>
                        <td>
@@ -187,7 +187,7 @@ function bc_assignMembers() {
                                                   . " FROM ".sql_table('blog');
                                        $template['name'] = 'blogid';
                                        $template['selected'] = $CONF['DefaultBlog'];
                                                   . " FROM ".sql_table('blog');
                                        $template['name'] = 'blogid';
                                        $template['selected'] = $CONF['DefaultBlog'];
-                                       showlist($query,'select',$template);
+                                       echo showlist($query,'select',$template);
                        ?>
                </div>
                <div>
                        ?>
                </div>
                <div>
@@ -200,7 +200,7 @@ function bc_assignMembers() {
                                                   . " FROM ".sql_table('member');
 
                                        $template['name'] = 'newowner';
                                                   . " FROM ".sql_table('member');
 
                                        $template['name'] = 'newowner';
-                                       showlist($query,'select',$template);
+                                       echo showlist($query,'select',$template);
                                ?>
                                </li>
                        </ul>
                                ?>
                                </li>
                        </ul>
index 64086f9..dd78248 100644 (file)
@@ -5561,7 +5561,7 @@ adminskinoverview
 <p>templateName</p>
 <h2>Skintypes</h2>
 <p>
 <p>templateName</p>
 <h2>Skintypes</h2>
 <p>
-admntemplateoverview
+admintemplateoverview
 </p>
 <h2>Examples</h2>
 <pre>
 </p>
 <h2>Examples</h2>
 <pre>
index 6bc8c7e..a2b5368 100644 (file)
@@ -78,12 +78,11 @@ if ( $bNeedsLogin )
        $action = 'showlogin';
 }
 
        $action = 'showlogin';
 }
 
-/* FIXME: Skin class also output this HTTP1.1 headers
-sendContentType('text/html', 'admin-' . $action);
-*/
-
 if ( !Admin::initialize() )
 {
 if ( !Admin::initialize() )
 {
+       /* TODO: this is a bad way... */
+       sendContentType('text/html', 'admin-' . $action);
+       
        $skin = new Skin(0, 'AdminActions', 'AdminSkin');
        if ( $bNeedsLogin )
        {
        $skin = new Skin(0, 'AdminActions', 'AdminSkin');
        if ( $bNeedsLogin )
        {
index 453d624..6dbf3b3 100644 (file)
@@ -208,7 +208,6 @@ class Admin
                        $alias = array(\r
                                'login' => 'overview',\r
                                ''              => 'overview',\r
                        $alias = array(\r
                                'login' => 'overview',\r
                                ''              => 'overview',\r
-                               'admntemplateoverview' => 'admintemplateoverview'\r
                        );\r
                }\r
                if ( array_key_exists($action, $alias) && isset($alias[$action]) )\r
                        );\r
                }\r
                if ( array_key_exists($action, $alias) && isset($alias[$action]) )\r
@@ -233,7 +232,7 @@ class Admin
                                self::error(_ERROR_BADTICKET);\r
                        }\r
                }\r
                                self::error(_ERROR_BADTICKET);\r
                        }\r
                }\r
-\r
+               \r
                /* 3. parse according to the action */\r
                if ( !method_exists('Admin', $methodName) && !in_array(self::$action, $allowActions) && self::existsSkinContents($action) )\r
                {\r
                /* 3. parse according to the action */\r
                if ( !method_exists('Admin', $methodName) && !in_array(self::$action, $allowActions) && self::existsSkinContents($action) )\r
                {\r
@@ -251,7 +250,7 @@ class Admin
                }\r
                elseif ( $id != $CONF['AdminSkin'] )\r
                {\r
                }\r
                elseif ( $id != $CONF['AdminSkin'] )\r
                {\r
-                       self::$skin = new Skin($CONF['AdminSkin']);\r
+                       self::$skin = new Skin($CONF['AdminSkin'], 'AdminActions');\r
                        if ( self::$skin && self::existsSkinContents('adminerrorpage') )\r
                        {\r
                                self::error(_BADACTION . ENTITY::hsc($action));\r
                        if ( self::$skin && self::existsSkinContents('adminerrorpage') )\r
                        {\r
                                self::error(_BADACTION . ENTITY::hsc($action));\r
@@ -3059,27 +3058,13 @@ class Admin
                $member->isAdmin() or self::disallow();\r
                \r
                Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/templateEdit.js\"></script>\n";\r
                $member->isAdmin() or self::disallow();\r
                \r
                Admin::$extrahead .= "<script type=\"text/javascript\" src=\"javascript/templateEdit.js\"></script>\n";\r
-               Admin::$extrahead .= '<script type=\"text/javascript">setTemplateEditText("' . Entity::hsc(_EDITTEMPLATE_EMPTY) . "\");</script>\n";\r
+               Admin::$extrahead .= "<script type=\"text/javascript\">setTemplateEditText('" . Entity::hsc(_EDITTEMPLATE_EMPTY) . "');</script>\n";\r
                \r
                self::$skin->parse('templateedit');\r
                return;\r
        }\r
        \r
        /**\r
                \r
                self::$skin->parse('templateedit');\r
                return;\r
        }\r
        \r
        /**\r
-        * TODO: remove this\r
-        *\r
-       static private function _templateEditRow(&$template, $description, $name, $help = '', $tabindex = 0, $big = 0) {\r
-               static $count = 1;\r
-               if (!isset($template[$name])) $template[$name] = '';\r
-       ?>\r
-               </tr><tr>\r
-                       <td><?php echo $description?> <?php if ($help) help('template'.$help); ?></td>\r
-                       <td id="td<?php echo $count?>"><textarea class="templateedit" name="<?php echo $name?>" tabindex="<?php echo $tabindex?>" cols="50" rows="<?php echo $big?10:5?>" id="textarea<?php echo $count?>"><?php echo  Entity::hsc($template[$name]); ?></textarea></td>\r
-       <?php       $count++;\r
-       }\r
-       */\r
-       \r
-       /**\r
         * Admin::action_templateupdate()\r
         * \r
         * @param       void\r
         * Admin::action_templateupdate()\r
         * \r
         * @param       void\r
@@ -3395,9 +3380,9 @@ class Admin
                DB::execute($query);\r
                \r
                // 3. Add non-empty template parts\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, '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_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
@@ -4448,6 +4433,7 @@ class Admin
        }\r
 \r
        /**\r
        }\r
 \r
        /**\r
+        * FIXME: DUPLICATION, NO NEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEED!!!!!!\r
         * Admin::action_adminskinieimport()\r
         * \r
         * @param       void\r
         * Admin::action_adminskinieimport()\r
         * \r
         * @param       void\r
@@ -4516,6 +4502,7 @@ class Admin
        }\r
        \r
        /**\r
        }\r
        \r
        /**\r
+        * FIXME: DUPLICATION, NO NEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEED!!!!!!\r
         * Admin::action_adminskiniedoimport()\r
         * \r
         * @param       void\r
         * Admin::action_adminskiniedoimport()\r
         * \r
         * @param       void\r
index 0623290..f81e916 100644 (file)
@@ -9,122 +9,6 @@ class AdminActions extends BaseActions
 {
        private $skintype;
        
 {
        private $skintype;
        
-       /* NOTE: list of whole available action names for tags
-               'actionloglist',
-               'actionurl',
-               'activationmessage',
-               'addtickettourl',
-               'adminbanlist',
-               'adminbatchaction',
-               'adminbatchlist',
-               'adminbloglink',
-               'adminerrormesg',
-               'adminskineditallowedlist',
-               'adminskinielist',
-               'adminskinoverview',
-               'adminskinselectoptions',
-               'adminspecialskinlist',
-               'admintemplateoverview',
-               'allowedadminskinactions',
-               'allowedskinactions',
-               'banlistdeletedlist',
-               'batchdeletelist',
-               'batchdeletetype',
-               'batchmovebtn',
-               'batchmovelist',
-               'batchmovetitle',
-               'batchmovetype',
-               'blogcatlist',
-               'blognotifysetting',
-               'blogsetting',
-               'blogsettingyesno',
-               'blogteamlist',
-               'blogteammembers',
-               'blogtime',
-               'bookmarkletadmin',
-               'category',
-               'categorysetting',
-               'codename',
-               'commentnavlist',
-               'configsettingsedit',
-               'configsettingsyesno',
-               'createaccountinput',
-               'createaccountsuccess',
-               'createaccountdisable',
-               'customhelplink',
-               'date',
-               'defaultadminskintypes',
-               'defblogselect',
-               'defcatselect',
-               'defskinselect',
-               'deletecomment',
-               'deleteitembody',
-               'deleteitemid',
-               'deleteitemtitle',
-               'editadminskin',
-               'editadminskintype',
-               'editadmintemplateinfo',
-               'editcomment',
-               'editdesturl',
-               'editmember',
-               'editmemberlist',
-               'editpluginfo',
-               'editplugoptionslist',
-               'editskin',
-               'editskintype',
-               'edittemplateinfo',
-               'eventformextra',
-               'extrahead',
-               'getblogsetting',
-               'geteditpluginfo',
-               'getmember',
-               'headmessage',
-               'helplink',
-               'helpplugname',
-               'ilistaddnew',
-               'importskininfo',
-               'inputyesno',
-               'insertpluginfo',
-               'insplugoptcontent',
-               'iprangeinput',
-               'itemnavlist',
-               'jstoolbaroptions',
-               'listplugplugoptionrow',
-               'localeselectoptions',
-               'mediadirwarning',
-               'movedistselect',
-               'moveitemid',
-               'newestcompare',
-               'newmemberselect',
-               'newpluginlist',
-               'outputspecialdirs',
-               'passrequestvars',
-               'pluginextras',
-               'pluginhelp',
-               'pluginlistlist',
-               'pluginoptions',
-               'qmenuaddselect',
-               'quickmenu',
-               'requestblogid',
-               'requestiprange',
-               'selectlocaladminskinfiles',
-               'selectlocalskinfiles',
-               'skineditallowedlist',
-               'skinfile',
-               'skinielist',
-               'skinoverview',
-               'skintypehelp',
-               'specialskinlist',
-               'sprinttext',
-               'systemsettings',
-               'templateoverview',
-               'text',
-               'ticket',
-               'versioncheckurl',
-               'yrbloglist'
-       );
-        */
-       
        /**
         * AdminActions::$default_actions
         * list of whole action names with which this class can deal
        /**
         * AdminActions::$default_actions
         * list of whole action names with which this class can deal
@@ -172,7 +56,7 @@ class AdminActions extends BaseActions
                'adminskinremovetype'   => _ADM_SKPRT_ADMINSKINREMOVETYPE,
                'admintemplatedelete'   => _ADM_SKPRT_ADMINTEMPLATEDELETE,
                'admintemplateedit'             => _ADM_SKPRT_ADMINTEMPLATEEDIT,
                'adminskinremovetype'   => _ADM_SKPRT_ADMINSKINREMOVETYPE,
                'admintemplatedelete'   => _ADM_SKPRT_ADMINTEMPLATEDELETE,
                'admintemplateedit'             => _ADM_SKPRT_ADMINTEMPLATEEDIT,
-               'admntemplateoverview'  => _ADM_SKPRT_ADMINTEMPLATEOVERVIEW,
+               'admintemplateoverview' => _ADM_SKPRT_ADMINTEMPLATEOVERVIEW,
                'backupoverview'                => _ADM_SKPRT_BACKUPOVERVIEW,
                'backuprestore'                 => _ADM_SKPRT_BACKUPRESTORE,
                'banlist'                               => _ADM_SKPRT_BANLIST,
                'backupoverview'                => _ADM_SKPRT_BACKUPOVERVIEW,
                'backuprestore'                 => _ADM_SKPRT_BACKUPRESTORE,
                'banlist'                               => _ADM_SKPRT_BANLIST,
@@ -241,7 +125,7 @@ class AdminActions extends BaseActions
        
        /**
         * AdminActions::getAvailableSkinTypes()
        
        /**
         * AdminActions::getAvailableSkinTypes()
-        * 
+        *
         * @static
         * @param       void
         * @return      array   list of friendly names for page actions
         * @static
         * @param       void
         * @return      array   list of friendly names for page actions
@@ -266,7 +150,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::__construct()
         * Constructor for a new Actions object
        /**
         * AdminActions::__construct()
         * Constructor for a new Actions object
-        * 
+        *
         * @param       string  $type
         * @return      void
         */
         * @param       string  $type
         * @return      void
         */
@@ -274,571 +158,588 @@ class AdminActions extends BaseActions
        {
                // call constructor of superclass first
                parent::__construct();
        {
                // call constructor of superclass first
                parent::__construct();
-               $this->skintype = $type;
-               if ( !class_exists('Navlist') || !class_exists('Batch') )
+
+               /* alias */
+               if ( $type == 'admntemplateoverview' )
+               {
+                       $this->skintype = 'admintemplateoverview';
+               }
+               else
                {
                {
-                       global $DIR_LIBS;
-                       include $DIR_LIBS . 'ENCAPSULATE.php';
+                       $this->skintype = $type;
                }
                }
+       
                return;
        }
        
        /**
         * AdminActions::getAvailableActions()
                return;
        }
        
        /**
         * AdminActions::getAvailableActions()
-        * 
+        *
         * @param       void
         * @return      array   allowed actions for the page type
         */
        public function getAvailableActions()
        {
                $extra_actions = array();
         * @param       void
         * @return      array   allowed actions for the page type
         */
        public function getAvailableActions()
        {
                $extra_actions = array();
-               
+
                switch ( $this->skintype )
                {
                        case 'actionlog':
                                $extra_actions = array(
                switch ( $this->skintype )
                {
                        case 'actionlog':
                                $extra_actions = array(
-                                       'actionloglist',
+                               'actionloglist',
                                );
                                break;
                        case 'activate':
                                $extra_actions = array(
                                );
                                break;
                        case 'activate':
                                $extra_actions = array(
-                                       'activationmessage',
-                                       'eventformextra',
+                               'activationmessage',
+                               'eventformextra',
                                );
                                break;
                        case 'activatesetpwd':
                                $extra_actions = array(
                                );
                                break;
                        case 'activatesetpwd':
                                $extra_actions = array(
+                               /* nothing special */
                                );
                                break;
                        case 'addnewlog':
                                $extra_actions = array(
                                );
                                break;
                        case 'addnewlog':
                                $extra_actions = array(
-                                       'getblogsetting',
-                                       'blogsetting',
-                                       'requestblogid',
-                                       );
+                               'getblogsetting',
+                               'blogsetting',
+                               'requestblogid',
+                               );
                                break;
                        case 'adminerrorpage':
                                $extra_actions = array(
                                break;
                        case 'adminerrorpage':
                                $extra_actions = array(
+                               /* nothing special */
                                );
                                break;
                        case 'adminskindelete':
                                $extra_actions = array(
                                );
                                break;
                        case 'adminskindelete':
                                $extra_actions = array(
-                                       'editadminskintype',
+                               'editskintype',
                                );
                                break;
                        case 'adminskinedit':
                                $extra_actions = array(
                                );
                                break;
                        case 'adminskinedit':
                                $extra_actions = array(
-                                       'editadminskin',
-                                       'defaultadminskintypes',
-                                       'adminspecialskinlist',
+                               'editskin',
+                               'normalskinlist',
+                               'specialskinlist',
                                );
                                break;
                        case 'adminskinedittype':
                                $extra_actions = array(
                                );
                                break;
                        case 'adminskinedittype':
                                $extra_actions = array(
-                                       'editadminskintype',
-                                       'skintypehelp',
-                                       'allowedadminskinactions',
-                                       'adminskineditallowedlist',
+                               'editskintype',
+                               'skintypehelp',
+                               'allowedskinactions',
+                               'skineditallowedlist',
                                );
                                break;
                        case 'adminskiniedoimport':
                                $extra_actions = array(
                                );
                                break;
                        case 'adminskiniedoimport':
                                $extra_actions = array(
-                                       'importskininfo',
+                               'importskininfo',
                                );
                                break;
                        case 'adminskinieimport':
                                $extra_actions = array(
                                );
                                break;
                        case 'adminskinieimport':
                                $extra_actions = array(
-                                       'importskininfo',
+                               'importskininfo',
                                );
                                break;
                        case 'adminskinieoverview':
                                $extra_actions = array(
                                );
                                break;
                        case 'adminskinieoverview':
                                $extra_actions = array(
-                                       'selectlocaladminskinfiles',
-                                       'adminskinielist',
+                               'selectlocalskinfiles',
+                               'skinielist',
                                );
                                break;
                        case 'adminskinoverview':
                                $extra_actions = array(
                                );
                                break;
                        case 'adminskinoverview':
                                $extra_actions = array(
-                                       'adminskinoverview',
+                               'skinoverview',
                                );
                                break;
                        case 'adminskinremovetype':
                                $extra_actions = array(
                                );
                                break;
                        case 'adminskinremovetype':
                                $extra_actions = array(
-                                       'editadminskintype',
+                               'editskintype',
                                );
                                break;
                        case 'admintemplatedelete':
                                $extra_actions = array(
                                );
                                break;
                        case 'admintemplatedelete':
                                $extra_actions = array(
-                                       'editadmintemplateinfo',
+                               'editadmintemplateinfo',
                                );
                        case 'admintemplateedit':
                                $extra_actions = array(
                                );
                        case 'admintemplateedit':
                                $extra_actions = array(
-                                       'editadmintemplateinfo',
+                               'edittemplateinfo',
                                );
                                break;
                                );
                                break;
-                       case 'admntemplateoverview':
+                       case 'admintemplateoverview':
                                $extra_actions = array(
                                $extra_actions = array(
-                                       'admintemplateoverview',
+                               'templateoverview',
                                );
                                break;
                        case 'backupoverview':
                                $extra_actions = array(
                                );
                                break;
                        case 'backupoverview':
                                $extra_actions = array(
+                               /* nothing special */
                                );
                                break;
                        case 'backuprestore':
                                $extra_actions = array(
                                );
                                break;
                        case 'backuprestore':
                                $extra_actions = array(
+                               /* nothing special */
                                );
                                break;
                        case 'banlist':
                                $extra_actions = array(
                                );
                                break;
                        case 'banlist':
                                $extra_actions = array(
-                                       'adminbloglink',
-                                       'adminbanlist',
-                                       'requestblogid',
+                               'adminbloglink',
+                               'adminbanlist',
+                               'requestblogid',
                                );
                                break;
                        case 'banlistdelete':
                                $extra_actions = array(
                                );
                                break;
                        case 'banlistdelete':
                                $extra_actions = array(
-                                       'requestiprange',
-                                       'requestblogid',
+                               'requestiprange',
+                               'requestblogid',
                                );
                                break;
                        case 'banlistdeleteconfirm':
                                $extra_actions = array(
                                );
                                break;
                        case 'banlistdeleteconfirm':
                                $extra_actions = array(
-                                       'banlistdeletedlist',
-                                       'requestblogid',
+                               'banlistdeletedlist',
+                               'requestblogid',
                                );
                                break;
                        case 'banlistnew':
                                $extra_actions = array(
                                );
                                break;
                        case 'banlistnew':
                                $extra_actions = array(
-                                       'iprangeinput',
-                                       'requestblogid',
-                                       'blogsetting',
+                               'iprangeinput',
+                               'requestblogid',
+                               'blogsetting',
                                );
                                break;
                        case 'batchcategory':
                                $extra_actions = array(
                                );
                                break;
                        case 'batchcategory':
                                $extra_actions = array(
-                                       'adminbatchaction',
-                                       'adminbatchlist',
+                               'adminbatchaction',
+                               'adminbatchlist',
                                );
                                break;
                        case 'batchcomment':
                                $extra_actions = array(
                                );
                                break;
                        case 'batchcomment':
                                $extra_actions = array(
-                                       'adminbatchaction',
-                                       'adminbatchlist',
+                               'adminbatchaction',
+                               'adminbatchlist',
                                );
                                break;
                        case 'batchdelete':
                                $extra_actions = array(
                                );
                                break;
                        case 'batchdelete':
                                $extra_actions = array(
-                                       'batchdeletetype',
-                                       'batchdeletelist',
+                               'batchdeletetype',
+                               'batchdeletelist',
                                );
                                break;
                        case 'batchitem':
                                $extra_actions = array(
                                );
                                break;
                        case 'batchitem':
                                $extra_actions = array(
-                                       'adminbatchaction',
-                                       'adminbatchlist',
+                               'adminbatchaction',
+                               'adminbatchlist',
                                );
                                break;
                        case 'batchmember':
                                $extra_actions = array(
                                );
                                break;
                        case 'batchmember':
                                $extra_actions = array(
-                                       'adminbatchaction',
-                                       'adminbatchlist',
+                               'adminbatchaction',
+                               'adminbatchlist',
                                );
                                break;
                        case 'batchmove':
                                $extra_actions = array(
                                );
                                break;
                        case 'batchmove':
                                $extra_actions = array(
-                                       'batchmovetitle',
-                                       'batchmovetype',
-                                       'batchmovelist',
-                                       'movedistselect',
-                                       'batchmovebtn',
+                               'batchmovetitle',
+                               'batchmovetype',
+                               'batchmovelist',
+                               'movedistselect',
+                               'batchmovebtn',
                                );
                                break;
                        case 'batchmovecat':
                                $extra_actions = array(
                                );
                                break;
                        case 'batchmovecat':
                                $extra_actions = array(
-                                       'batchmovetitle',
-                                       'batchmovetype',
-                                       'batchmovelist',
-                                       'movedistselect',
-                                       'batchmovebtn',
+                               'batchmovetitle',
+                               'batchmovetype',
+                               'batchmovelist',
+                               'movedistselect',
+                               'batchmovebtn',
                                );
                                break;
                        case 'batchteam':
                                $extra_actions = array(
                                );
                                break;
                        case 'batchteam':
                                $extra_actions = array(
-                                       'requestblogid',
-                                       'adminbatchaction',
-                                       'adminbatchlist',
+                               'requestblogid',
+                               'adminbatchaction',
+                               'adminbatchlist',
                                );
                                break;
                        case 'blogcommentlist':
                                $extra_actions = array(
                                );
                                break;
                        case 'blogcommentlist':
                                $extra_actions = array(
-                                       'adminbloglink',
-                                       'commentnavlist',
-                                       'adminbatchlist',
+                               'adminbloglink',
+                               'commentnavlist',
+                               'adminbatchlist',
                                );
                                break;
                        case 'blogsettings':
                                $extra_actions = array(
                                );
                                break;
                        case 'blogsettings':
                                $extra_actions = array(
-                                       'adminbloglink',
-                                       'blogcatlist',
-                                       'blognotifysetting',
-                                       'blogsetting',
-                                       'blogsettingyesno',
-                                       'blogteammembers',
-                                       'blogtime',
-                                       'defcatselect',
-                                       'defskinselect',
-                                       'pluginextras',
-                                       'pluginoptions',
-                                       'requestblogid',
+                               'adminbloglink',
+                               'blogcatlist',
+                               'blognotifysetting',
+                               'blogsetting',
+                               'blogsettingyesno',
+                               'blogteammembers',
+                               'blogtime',
+                               'defcatselect',
+                               'defskinselect',
+                               'pluginextras',
+                               'pluginoptions',
+                               'requestblogid',
                                );
                                break;
                        case 'bookmarklet':
                                $extra_actions = array(
                                );
                                break;
                        case 'bookmarklet':
                                $extra_actions = array(
-                                       'bookmarkletadmin',
+                               'bookmarkletadmin',
                                );
                                break;
                        case 'browseowncomments':
                                $extra_actions = array(
                                );
                                break;
                        case 'browseowncomments':
                                $extra_actions = array(
-                                       'commentnavlist',
+                               'commentnavlist',
                                );
                                break;
                        case 'browseownitems':
                                $extra_actions = array(
                                );
                                break;
                        case 'browseownitems':
                                $extra_actions = array(
-                                       'itemnavlist',
+                               'itemnavlist',
                                );
                                break;
                        case 'categorydelete':
                                $extra_actions = array(
                                );
                                break;
                        case 'categorydelete':
                                $extra_actions = array(
-                                       'categorysetting',
-                                       'requestblogid',
+                               'categorysetting',
+                               'requestblogid',
                                );
                                break;
                        case 'categoryedit':
                                $extra_actions = array(
                                );
                                break;
                        case 'categoryedit':
                                $extra_actions = array(
-                                       'requestblogid',
-                                       'categorysetting',
-                                       'editdesturl',
-                                       'pluginoptions'
+                               'requestblogid',
+                               'categorysetting',
+                               'editdesturl',
+                               'pluginoptions'
                                );
                                break;
                        case 'commentdelete':
                                $extra_actions = array(
                                );
                                break;
                        case 'commentdelete':
                                $extra_actions = array(
-                                       'deletecomment',
+                               'deletecomment',
                                );
                                break;
                        case 'commentedit':
                                $extra_actions = array(
                                );
                                break;
                        case 'commentedit':
                                $extra_actions = array(
-                                       'editcomment',
+                               'editcomment',
                                );
                                break;
                        case 'createaccountinput':
                                $extra_actions = array(
                                );
                                break;
                        case 'createaccountinput':
                                $extra_actions = array(
-                                       'contents',
-                                       'pluginextras',
-                                       'eventformextra',
+                               'contents',
+                               'pluginextras',
+                               'eventformextra',
                                );\r
                                break;
                        case 'createaccountsuccess':
                                $extra_actions = array(\r
                                );\r
                                break;
                        case 'createaccountsuccess':
                                $extra_actions = array(\r
-                                       'contents',
+                               'contents',
                                );\r
                                break;
                        case 'createaccountdisable':
                                $extra_actions = array(
                                );\r
                                break;
                        case 'createaccountdisable':
                                $extra_actions = array(
-                                       /* nothins */
+                               /* nothing special */
                                );\r
                                break;
                        case 'createitem':
                                $extra_actions = array(
                                );\r
                                break;
                        case 'createitem':
                                $extra_actions = array(
-                                       'adminbloglink',
-                                       'blogid',
-                                       'contents',
-                                       'categories',
-                                       'currenttime',
-                                       'init',
-                                       'pluginoptions',
-                                       'pluginextras'
+                               'adminbloglink',
+                               'blogid',
+                               'contents',
+                               'categories',
+                               'currenttime',
+                               'init',
+                               'pluginoptions',
+                               'pluginextras'
                                );
                                break;
                        case 'createnewlog':
                                $extra_actions = array(
                                );
                                break;
                        case 'createnewlog':
                                $extra_actions = array(
-                                       'defskinselect',
-                                       'blogtime',
+                               'defskinselect',
+                               'blogtime',
                                );
                                break;
                        case 'deleteblog':
                                $extra_actions = array(
                                );
                                break;
                        case 'deleteblog':
                                $extra_actions = array(
-                                       'blogsetting',
-                                       'requestblogid',
+                               'blogsetting',
+                               'requestblogid',
                                );
                                break;
                        case 'editmembersettings':
                                $extra_actions = array(
                                );
                                break;
                        case 'editmembersettings':
                                $extra_actions = array(
-                                       'adminskinselectoptions',
-                                       'editmember',
-                                       'localeselectoptions',
-                                       'pluginoptions',
+                               'defskinselect',
+                               'editmember',
+                               'localeselectoptions',
+                               'pluginoptions',
                                );
                                break;
                        case 'forgotpassword':
                                $extra_actions = array(
                                );
                                break;
                        case 'forgotpassword':
                                $extra_actions = array(
-                                       /* nothing */
+                               /* nothing special */
                                );
                                break;
                        case 'itemcommentlist':
                                $extra_actions = array(
                                );
                                break;
                        case 'itemcommentlist':
                                $extra_actions = array(
-                                       'requestblogid',
-                                       'commentnavlist',
+                               'requestblogid',
+                               'commentnavlist',
                                );
                                break;
                        case 'itemdelete':
                                $extra_actions = array(
                                );
                                break;
                        case 'itemdelete':
                                $extra_actions = array(
-                                       'deleteitemtitle',
-                                       'deleteitembody',
-                                       'deleteitemid',
+                               'deleteitemtitle',
+                               'deleteitembody',
+                               'deleteitemid',
                                );
                                break;
                        case 'itemedit':
                                $extra_actions = array(
                                );
                                break;
                        case 'itemedit':
                                $extra_actions = array(
-                                       'init',
-                                       'contents',
-                                       'checkedonval',
-                                       'categories',
-                                       'currenttime',
-                                       'itemtime',
-                                       'pluginoptions',
-                                       'pluginextras'
+                               'init',
+                               'contents',
+                               'checkedonval',
+                               'categories',
+                               'currenttime',
+                               'itemtime',
+                               'pluginoptions',
+                               'pluginextras'
                                );
                                break;
                        case 'itemlist':
                                $extra_actions = array(
                                );
                                break;
                        case 'itemlist':
                                $extra_actions = array(
-                                       'adminbloglink',
-                                       'ilistaddnew',
-                                       'itemnavlist',
+                               'adminbloglink',
+                               'ilistaddnew',
+                               'itemnavlist',
                                );
                                break;
                        case 'itemmove':
                                $extra_actions = array(
                                );
                                break;
                        case 'itemmove':
                                $extra_actions = array(
-                                       'moveitemid',
-                                       'movedistselect',
+                               'moveitemid',
+                               'movedistselect',
                                );
                                break;
                        case 'manage':
                                $extra_actions = array(
                                );
                                break;
                        case 'manage':
                                $extra_actions = array(
+                               /* nothing special */
                                );
                                break;
                        case 'manageteam':
                                $extra_actions = array(
                                );
                                break;
                        case 'manageteam':
                                $extra_actions = array(
-                                       'requestblogid',
-                                       'blogsetting',
-                                       'blogteamlist',
-                                       'newmemberselect',
-                                       'inputyesno',
+                               'requestblogid',
+                               'blogsetting',
+                               'blogteamlist',
+                               'newmemberselect',
+                               'inputyesno',
                                );
                                break;
                        case 'memberdelete':
                                $extra_actions = array(
                                );
                                break;
                        case 'memberdelete':
                                $extra_actions = array(
-                                       'editmember',
+                               'editmember',
                                );
                                break;
                        case 'overview':
                                $extra_actions = array(
                                );
                                break;
                        case 'overview':
                                $extra_actions = array(
-                                       'yrbloglist',
+                               'yrbloglist',
                                );
                                break;
                        case 'plugindelete':
                                $extra_actions = array(
                                );
                                break;
                        case 'plugindelete':
                                $extra_actions = array(
-                                       'editpluginfo',
+                               'editpluginfo',
                                );
                                break;
                        case 'pluginhelp':
                                $extra_actions = array(
                                );
                                break;
                        case 'pluginhelp':
                                $extra_actions = array(
-                                       'helpplugname',
-                                       'pluginhelp',
+                               'helpplugname',
+                               'pluginhelp',
                                );
                                break;
                        case 'pluginlist':
                                $extra_actions = array(
                                );
                                break;
                        case 'pluginlist':
                                $extra_actions = array(
-                                       'pluginlistlist',
-                                       'newpluginlist',
+                               'pluginlistlist',
+                               'newpluginlist',
                                );
                                break;
                        case 'pluginoptions':
                                $extra_actions = array(
                                );
                                break;
                        case 'pluginoptions':
                                $extra_actions = array(
-                                       'editpluginfo',
-                                       'editplugoptionslist',
+                               'editpluginfo',
+                               'editplugoptionslist',
                                );
                                break;
                        case 'settingsedit':
                                $extra_actions = array(
                                );
                                break;
                        case 'settingsedit':
                                $extra_actions = array(
-                                       'defblogselect',
-                                       'defskinselect',
-                                       'configsettingsedit',
-                                       'configsettingsyesno',
-                                       'outputspecialdirs',
-                                       'jstoolbaroptions',
-                                       'localeselectoptions',
-                                       'mediadirwarning',
-                                       'pluginextras',
+                               'defblogselect',
+                               'defskinselect',
+                               'configsettingsedit',
+                               'configsettingsyesno',
+                               'outputspecialdirs',
+                               'jstoolbaroptions',
+                               'localeselectoptions',
+                               'mediadirwarning',
+                               'pluginextras',
                                );
                                break;
                        case 'showlogin':
                                $extra_actions = array(
                                );
                                break;
                        case 'showlogin':
                                $extra_actions = array(
-                                       'passrequestvars',
+                               'passrequestvars',
                                );
                                break;
                        case 'skindelete':
                                $extra_actions = array(
                                );
                                break;
                        case 'skindelete':
                                $extra_actions = array(
-                                       'editskintype',
+                               'editskintype',
                                );
                                break;
                        case 'skinedit':
                                $extra_actions = array(
                                );
                                break;
                        case 'skinedit':
                                $extra_actions = array(
-                                       'editskin',
-                                       'specialskinlist',
+                               'editskin',
+                               'normalskinlist',
+                               'specialskinlist'
                                );
                                break;
                        case 'skinedittype':
                                $extra_actions = array(
                                );
                                break;
                        case 'skinedittype':
                                $extra_actions = array(
-                                       'editskintype',
-                                       'skintypehelp',
-                                       'allowedskinactions',
-                                       'skineditallowedlist',
-                                       'skineditallowedlist',
+                               'editskintype',
+                               'skintypehelp',
+                               'allowedskinactions',
+                               'skineditallowedlist'
                                );
                                break;
                        case 'skiniedoimport':
                                $extra_actions = array(
                                );
                                break;
                        case 'skiniedoimport':
                                $extra_actions = array(
-                                       'importskininfo',
+                               'importskininfo',
                                );
                                break;
                        case 'skinieimport':
                                $extra_actions = array(
                                );
                                break;
                        case 'skinieimport':
                                $extra_actions = array(
-                                       'importskininfo',
+                               'importskininfo',
                                );
                                break;
                        case 'skinieoverview':
                                $extra_actions = array(
                                );
                                break;
                        case 'skinieoverview':
                                $extra_actions = array(
-                                       'selectlocalskinfiles',
-                                       'skinielist',
+                               'selectlocalskinfiles',
+                               'skinielist',
                                );
                                break;
                        case 'skinoverview':
                                $extra_actions = array(
                                );
                                break;
                        case 'skinoverview':
                                $extra_actions = array(
-                                       'skinoverview',
+                               'skinoverview',
                                );
                                break;
                        case 'skinremovetype':
                                $extra_actions = array(
                                );
                                break;
                        case 'skinremovetype':
                                $extra_actions = array(
-                                       'editskintype',
+                               'editskintype',
                                );
                                break;
                        case 'systemoverview':
                                $extra_actions = array(
                                );
                                break;
                        case 'systemoverview':
                                $extra_actions = array(
-                                       'systemsettings',
+                               'systemsettings',
                                );
                                break;
                        case 'teamdelete':
                                $extra_actions = array(
                                );
                                break;
                        case 'teamdelete':
                                $extra_actions = array(
-                                       'editmember',
-                                       'blogsetting',
-                                       'requestblogid',
+                               'editmember',
+                               'blogsetting',
+                               'requestblogid',
                                );
                                break;
                        case 'templatedelete':
                                $extra_actions = array(
                                );
                                break;
                        case 'templatedelete':
                                $extra_actions = array(
-                                       'edittemplateinfo',
+                               'edittemplateinfo',
                                );
                                break;
                        case 'templateedit':
                                $extra_actions = array(
                                );
                                break;
                        case 'templateedit':
                                $extra_actions = array(
-                                       'edittemplateinfo',
+                               'edittemplateinfo',
                                );
                                break;
                        case 'templateoverview':
                                $extra_actions = array(
                                );
                                break;
                        case 'templateoverview':
                                $extra_actions = array(
-                                       'templateoverview',
+                               'templateoverview',
                                );
                                break;
                        case 'usermanagement':
                                $extra_actions = array(
                                );
                                break;
                        case 'usermanagement':
                                $extra_actions = array(
-                                       'editmemberlist',
-                                       'inputyesno',
+                               'editmemberlist',
+                               'inputyesno',
                                );
                                break;
                        case 'importAdmin':
                                $extra_actions = array(
                                );
                                break;
                        case 'importAdmin':
                                $extra_actions = array(
-                                       'charset',
-                                       'adminurl',
-                                       'extrahead',
-                                       'member',
-                                       'versioncheckurl',
-                                       'version',
-                                       'codename',
-                                       'newestcompare',
-                                       'selectlocaladminskinfiles',
-                                       'adminskinielist',
+                               'charset',
+                               'adminurl',
+                               'extrahead',
+                               'member',
+                               'versioncheckurl',
+                               'version',
+                               'codename',
+                               'newestcompare',
+                               'selectlocalskinfiles',
+                               'skinielist',
                                );
                                break;
                        default:
                                break;
                }
                                );
                                break;
                        default:
                                break;
                }
-               
+       
                $defined_actions = array_merge(self::$default_actions, $extra_actions);
                $defined_actions = array_merge(self::$default_actions, $extra_actions);
-               
+
                return array_merge($defined_actions, parent::getAvailableActions());
        }
        
        /**
         * AdminActions::parse_actionloglist()
         * Parse skinvar actionloglist
                return array_merge($defined_actions, parent::getAvailableActions());
        }
        
        /**
         * AdminActions::parse_actionloglist()
         * Parse skinvar actionloglist
-        * 
-        * @param       string  $templateName   name of template to use
+        *
+        * @param       string  $template_name  name of template to use
         * @return      void
         */
         * @return      void
         */
-       public function parse_actionloglist($templateName = '')
+       public function parse_actionloglist($template_name = '')
        {
        {
-               $query = "SELECT * FROM %s ORDER BY timestamp DESC";
-               $query = sprintf($query, sql_table('actionlog'));       
-               
-               $template['content'] = 'actionlist';
-               $amount = showlist($query, 'table', $template, $templateName);
+               $query = "SELECT * FROM %s ORDER BY timestamp DESC;";
+               $query = sprintf($query, sql_table('actionlog'));
+
+               $resource = DB::getResult($query);
+               if ( $resource->rowCount() > 0 )
+               {
+                       $template['content'] = 'actionlist';
+                       $this->parser->parse(showlist($resource, 'table', $template, $template_name));
+               }
+               else
+               {
+                       /* TODO: nothing to be shown */
+               }
                return;
        }
        
                return;
        }
        
-       
        /**
         * AdminActions::parse_activationmessage()
         * Parse skinvar activationmessage
        /**
         * AdminActions::parse_activationmessage()
         * Parse skinvar activationmessage
-        * 
+        *
         * @param       string  $type                   type of message
         * @param       string  $type                   type of message
-        * @param       string  $templateName   name of template to use
+        * @param       string  $template_name  name of template to use
         * @return      void
         */
         * @return      void
         */
-       public function parse_activationmessage($type, $templateName = '')
+       public function parse_activationmessage($type, $template_name = '')
        {
                global $CONF, $manager;
                
                $template = array();
                
        {
                global $CONF, $manager;
                
                $template = array();
                
-               if ( !empty($templateName))
+               if ( !empty($template_name))
                {
                {
-                       $template =& $manager->getTemplate($templateName);
+                       $template =& $manager->getTemplate($template_name);
                }
                }
-               
+       
                $key = postVar('ackey');
                if ( !$key )
                {
                        Admin::error(_ERROR_ACTIVATE);
                }
                $key = postVar('ackey');
                if ( !$key )
                {
                        Admin::error(_ERROR_ACTIVATE);
                }
-               
+       
                $info = MEMBER::getActivationInfo($key);
                if ( !$info )
                {
                        Admin::error(_ERROR_ACTIVATE);
                }
                $info = MEMBER::getActivationInfo($key);
                if ( !$info )
                {
                        Admin::error(_ERROR_ACTIVATE);
                }
-               
+       
                $mem =& $manager->getMember($info->vmember);
                if ( !$mem )
                {
                $mem =& $manager->getMember($info->vmember);
                if ( !$mem )
                {
@@ -902,8 +803,8 @@ class AdminActions extends BaseActions
                                break;
                }
                $aVars = array(
                                break;
                }
                $aVars = array(
-                       'memberName'    => Entity::hsc($mem->getDisplayName()),
-                       'realName'              => Entity::hsc($mem->getRealName()),
+               'memberName'    => Entity::hsc($mem->getDisplayName()),
+               'realName'              => Entity::hsc($mem->getRealName()),
                );
                switch ( $type )
                {
                );
                switch ( $type )
                {
@@ -923,7 +824,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_addtickettourl()
         * Parse skinvar addtickettourl
        /**
         * AdminActions::parse_addtickettourl()
         * Parse skinvar addtickettourl
-        * 
+        *
         * @param       string  $url    URI for ticket
         * @return      void
         */
         * @param       string  $url    URI for ticket
         * @return      void
         */
@@ -938,22 +839,24 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_adminbanlist()
         * Parse skinvar adminbanlist
        /**
         * AdminActions::parse_adminbanlist()
         * Parse skinvar adminbanlist
-        * 
-        * @param       string  $templateName   name of template to use
+        *
+        * @param       string  $template_name  name of template to use
         * @return      void
         */
         * @return      void
         */
-       public function parse_adminbanlist($templateName = '')
+       public function parse_adminbanlist($template_name = '')
        {
                $blogid = intRequestVar('blogid');
        {
                $blogid = intRequestVar('blogid');
-               
+
                $query = "SELECT * FROM %s WHERE blogid=%d ORDER BY iprange;";
                $query = sprintf($query, sql_table('ban'), (integer) $blogid);
                $query = "SELECT * FROM %s WHERE blogid=%d ORDER BY iprange;";
                $query = sprintf($query, sql_table('ban'), (integer) $blogid);
-               
-               $template['content'] = 'banlist';
-               
-               $amount = Showlist($query, 'table', $template, $templateName);
-               
-               if ( $amount == 0 )
+
+               $resource = DB::getResult($query);
+               if ( $resource->rowCount() > 0 )
+               {
+                       $template['content'] = 'banlist';
+                       $this->parser-parse(showlist($resource, 'table', $template, $template_name));
+               }
+               else
                {
                        echo _BAN_NONE;
                }
                {
                        echo _BAN_NONE;
                }
@@ -963,7 +866,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_adminbatchaction()
         * Parse skinvar adminbatchaction
        /**
         * AdminActions::parse_adminbatchaction()
         * Parse skinvar adminbatchaction
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -976,36 +879,36 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_adminbatchlist()
         * Parse skinvar adminbatchlist
        /**
         * AdminActions::parse_adminbatchlist()
         * Parse skinvar adminbatchlist
-        * 
-        * @param       string  $templateName   name of template to use
+        *
+        * @param       string  $template_name  name of template to use
         * @return      void
         */
         * @return      void
         */
-       public function parse_adminbatchlist($templateName = '')
+       public function parse_adminbatchlist($template_name = '')
        {
                global $manager;
                $templates = array();
        {
                global $manager;
                $templates = array();
-               
-               if ( !empty($templateName) )
+
+               if ( !empty($template_name) )
                {
                {
-                       $templates =& $manager->getTemplate($templateName);
+                       $templates =& $manager->getTemplate($template_name);
                }
                }
-               
+       
                if ( !array_key_exists('ADMIN_BATCHLIST', $templates) || empty($templates['ADMIN_BATCHLIST']) )
                {
                        $template = '<li><%text(_BATCH_EXECUTING)%>&nbsp;'
                if ( !array_key_exists('ADMIN_BATCHLIST', $templates) || empty($templates['ADMIN_BATCHLIST']) )
                {
                        $template = '<li><%text(_BATCH_EXECUTING)%>&nbsp;'
-                                 . '<b><%adminbatchaction%></b>&nbsp;'
-                                 . '<%batchlisttype%>&nbsp;'
-                                 . '<b><%batchid%></b>...&nbsp;'
-                                 . '<b><%batchlistmsg%></b>'
-                                 . '</li>' . "\n";
+                       . '<b><%adminbatchaction%></b>&nbsp;'
+                       . '<%batchlisttype%>&nbsp;'
+                       . '<b><%batchid%></b>...&nbsp;'
+                       . '<b><%batchlistmsg%></b>'
+                       . "</li>\n";
                }
                else
                {
                        $template = $templates['ADMIN_BATCHLIST'];
                }
                }
                else
                {
                        $template = $templates['ADMIN_BATCHLIST'];
                }
-               
+       
                $selected = requestIntArray('batch');
                $selected = requestIntArray('batch');
-               $action   = requestVar('batchaction');
+               $action = requestVar('batchaction');
 
                switch ( $this->skintype )
                {
 
                switch ( $this->skintype )
                {
@@ -1043,7 +946,7 @@ class AdminActions extends BaseActions
                                $destid                 = intRequestVar('destblogid');
                                break;
                }
                                $destid                 = intRequestVar('destblogid');
                                break;
                }
-               
+       
                // walk over all selectedids and perform action
                foreach ( $selected as $selectedid )
                {
                // walk over all selectedids and perform action
                foreach ( $selected as $selectedid )
                {
@@ -1058,7 +961,7 @@ class AdminActions extends BaseActions
                                        }
                                        else
                                        {
                                        }
                                        else
                                        {
-                                               $error  = Admin::deleteOneTeamMember($blogid, $selectedid);
+                                               $error = Admin::deleteOneTeamMember($blogid, $selectedid);
                                        }
                                        break;
                                case 'move':
                                        }
                                        break;
                                case 'move':
@@ -1084,23 +987,16 @@ class AdminActions extends BaseActions
                                default:
                                        $error = _BATCH_UNKNOWN . Entity::hsc($action);
                        }
                                default:
                                        $error = _BATCH_UNKNOWN . Entity::hsc($action);
                        }
-                       
+                               
                        $data = array(
                        $data = array(
-                               'batchid'                       => $selectedid,
-                               'batchlisttype'         => Entity::hsc($batchlisttype),
-                               'adminbatchaction'      => Entity::hsc($action),
-                               'batchlistmsg'          => $error ? $error : _BATCH_SUCCESS,
+                       'batchid'                       => $selectedid,
+                       'batchlisttype'         => Entity::hsc($batchlisttype),
+                       'adminbatchaction'      => Entity::hsc($action),
+                       'batchlistmsg'          => $error ? $error : _BATCH_SUCCESS,
                        );
                        );
-                       
-                       $handler = new AdminActions('template');
-                       $parser = new Parser($handler);
-                       
-                       $output = Template::fill($template, $data);
-                       ob_start();
-                       $parser->parse($output);
-                       $output = ob_get_contents();
-                       ob_end_clean();
-                       echo "{$output}<br />";
+                               
+                       $this->parser->parse(Template::fill($template, $data));
+                       echo '<br />';
                }
                return;
        }
                }
                return;
        }
@@ -1108,22 +1004,22 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_adminbloglink()
         * Parse skinvar adminbloglink
        /**
         * AdminActions::parse_adminbloglink()
         * Parse skinvar adminbloglink
-        * 
-        * @param       string  $templateName   name of template to use
+        *
+        * @param       string  $template_name  name of template to use
         * @return      void
         */
         * @return      void
         */
-       public function parse_adminbloglink($templateName = '')
+       public function parse_adminbloglink($template_name = '')
        {
                global $manager;
                $blogid =  intRequestVar('blogid');
                $blog   =& $manager->getBlog($blogid);
                $templates = array();
        {
                global $manager;
                $blogid =  intRequestVar('blogid');
                $blog   =& $manager->getBlog($blogid);
                $templates = array();
-               
-               if ( !empty($templateName) )
+
+               if ( !empty($template_name) )
                {
                {
-                       $templates =& $manager->getTemplate($templateName);
+                       $templates =& $manager->getTemplate($template_name);
                }
                }
-               
+       
                if ( !array_key_exists('ADMIN_BLOGLINK', $templates) || empty($templates['ADMIN_BLOGLINK']) )
                {
                        $template = '<a href="<%url%>" title="<%adminbloglinktitle%>"><%blogname%></a>';
                if ( !array_key_exists('ADMIN_BLOGLINK', $templates) || empty($templates['ADMIN_BLOGLINK']) )
                {
                        $template = '<a href="<%url%>" title="<%adminbloglinktitle%>"><%blogname%></a>';
@@ -1132,13 +1028,13 @@ class AdminActions extends BaseActions
                {
                        $template = $templates['ADMIN_BLOGLINK'];
                }
                {
                        $template = $templates['ADMIN_BLOGLINK'];
                }
-               
+       
                $data = array(
                $data = array(
-                       'url'                                   => Entity::hsc($blog->getURL()),
-                       'adminbloglinktitle'    => _BLOGLIST_TT_VISIT,
-                       'blogname'                              => Entity::hsc($blog->getName())
+               'url'                                   => Entity::hsc($blog->getURL()),
+               'adminbloglinktitle'    => _BLOGLIST_TT_VISIT,
+               'blogname'                              => Entity::hsc($blog->getName())
                );
                );
-               
+
                echo Template::fill($template, $data);
                return;
        }
                echo Template::fill($template, $data);
                return;
        }
@@ -1146,7 +1042,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_adminerrormesg()
         * Parse skinvar adminerrormesg
        /**
         * AdminActions::parse_adminerrormesg()
         * Parse skinvar adminerrormesg
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -1154,7 +1050,7 @@ class AdminActions extends BaseActions
        {
                global $CONF;
                $message = '';
        {
                global $CONF;
                $message = '';
-               
+
                if ( requestVar('errormessage') )
                {
                        $message = requestVar('errormessage');
                if ( requestVar('errormessage') )
                {
                        $message = requestVar('errormessage');
@@ -1172,408 +1068,134 @@ class AdminActions extends BaseActions
        }
        
        /**
        }
        
        /**
-        * AdminActions::parse_adminskineditallowedlist()
-        * Parse skinvar adminskineditallowedlist
-        * 
-        * @param       string  $type                   template/blog
-        * @param       string  $templateName   name of template to use
+        * AdminActions::parse_allowedskinactions()
+        * Parse skinvar allowedskinactions
+        *
+        * @param       void
         * @return      void
         */
         * @return      void
         */
-       public function parse_adminskineditallowedlist($type = 'template', $templateName = '')
+       public function parse_allowedskinactions()
        {
        {
-               switch ( $type )
+               $type = strtolower(trim(requestVar('type')));
+               $skinid = intRequestVar('skinid');
+
+               if ( !preg_match('#^admin#', $this->skintype) )
                {
                {
-                       /* TODO: blog seems not to be used */
-                       case 'blog':
-                               $query = "SELECT bshortname, bname FROM %s";
-                               $query = sprintf($query, sql_table('blog'));
-                               $show  = array(
-                                       'content' => 'shortblognames'
-                               );
-                               Showlist($query, 'table', $show, $templateName);
-                               break;
-                       case 'template':
-                               $query = "SELECT tdname as name, tddesc as description FROM %s WHERE tdname LIKE 'admin/%%'";
-                               $query = sprintf($query, sql_table('template_desc'));
-                               $show  = array(
-                                       'content' => 'shortnames'
-                               );
-                               Showlist($query, 'table', $show, $templateName);
-                               break;
+                       $skin = new Skin($skinid);
+                       $tag = 'skinvar';
+               }
+               else
+               {
+                       $skin = new Skin($skinid, 'AdminActions');
+                       $tag = 'adminskinvar';
+               }
+       
+               $actions = $skin->getAllowedActionsForType($type);
+               sort($actions);
+
+               while ( $current = array_shift($actions) )
+               {
+                       echo helplink("{$tag}-{$current}") . "$current</a>\n";
+
+                       if ( count($actions) != 0 )
+                       {
+                               echo ", ";
+                       }
                }
                return;
        }
        
        /**
                }
                return;
        }
        
        /**
-        * AdminActions::parse_adminskinielist()
-        * Parse skinvar adminskinielist
-        * 
-        * @param       string  $type                   skin/template
-        * @param       string  $templateName   name of template to use
+        * AdminActions::parse_banlistdeletedlist()
+        * Parse skinvar banlistdeletedlist
+        *
+        * @param       string  $template_name  name of template to use
         * @return      void
         */
         * @return      void
         */
-       public function parse_adminskinielist($type, $templateName = '')
+       public function parse_banlistdeletedlist($template_name = '')
        {
                global $manager;
        {
                global $manager;
-               
+
                $templates = array();
                $templates = array();
-               if ( $templateName )
+               if ( $template_name )
                {
                {
-                       $templates =& $manager->getTemplate($templateName);
+                       $templates =& $manager->getTemplate($template_name);
                }
                }
-               
-               if ( !array_key_exists('SKINIE_EXPORT_LIST', $templates) || empty($templates['SKINIE_EXPORT_LIST']) )
+       
+               if ( !array_key_exists('BANLIST_DELETED_LIST', $templates) || empty($templates['BANLIST_DELETED_LIST']) )
                {
                {
-                       $template = "<td>"
-                                 . "<input type=\"checkbox\" name=\"<%typeid%>\"  id=\"<%expid%>\" />\n"
-                                 . "<label for=\"<%expid%>\"><%expname%></label>"
-                                 . "</td>\n"
-                                 . "<td><%expdesc%></td>\n"
-                                 . "</tr>\n"
-                                 . "<tr>\n";
+                       $template = "<li><%blogname%></li>\n";
                }
                else
                {
                }
                else
                {
-                       $template = $templates['SKINIE_EXPORT_LIST'];
+                       $template = $templates['BANLIST_DELETED_LIST'];
                }
                }
-               
-               switch ( $type )
+       
+               $deleted = requestArray('delblogs');
+               foreach ( $deleted as $delblog )
                {
                {
-                       case 'skin':
-                               $query = "SELECT * FROM %s WHERE sdname LIKE 'admin/%%';";
-                               $query = sprintf($query, sql_table('skin_desc'));
-                               $res = DB::getResult($query);
-                               
-                               foreach ( $res as $row )
-                               {
-                                       $data = array(
-                                               'typeid'        => 'skin[' . $row['sdnumber'] . ']',
-                                               'expid'         => 'skinexp' . $row['sdnumber'],
-                                               'expname'       => Entity::hsc($row['sdname']),
-                                               'expdesc'       => Entity::hsc($row['sddesc']),
-                                       );
-                                       echo Template::fill($template, $data);
-                               }
-                               break;
-                       case 'template':
-                               $query = "SELECT * FROM %s WHERE tdname LIKE 'admin/%%';";
-                               $query = sprintf($query, sql_table('template_desc'));
-                               $res = DB::getResult($query);
-                               foreach ( $res as $row )
-                               {
-                                       $data = array(
-                                               'typeid'        => 'template[' . $row['tdnumber'] . ']',
-                                               'expid'         => 'templateexp' . $row['tdnumber'],
-                                               'expname'       => Entity::hsc($row['tdname']),
-                                               'expdesc'       => Entity::hsc($row['tddesc']),
-                                       );
-                                       echo Template::fill($template, $data);
-                               }
-                               break;
+                       $blog =& $manager->getBlog($delblog);
+                       $data =  array(
+       'blogname' => Entity::hsc($blog->getName())
+                       );
+                       echo Template::fill($template, $data);
                }
                }
-               return;
-       }
        
        
-       /**
-        * AdminActions::parse_adminskinoverview()
-        * Parse skinvar adminskinoverview
-        * 
-        * @param       string  $templateName   name of template to use
-        * @return      void
-        */
-       public function parse_adminskinoverview($templateName = '')
-       {
-               $query = "SELECT * FROM %s WHERE sdname LIKE 'admin/%%' ORDER BY sdname;";
-               $query = sprintf($query, sql_table('skin_desc'));
-               
-               $template['content'] = 'adminskinlist';
-               $template['tabindex'] = 10;
-               $template['friendly_names'] = $this->parser->skin->getAvailableTypes();
-               Showlist($query, 'table', $template, $templateName);
                return;
        }
        
        /**
                return;
        }
        
        /**
-        * AdminActions::parse_adminskinselectoptions()
-        * Parse skinvar adminskinselectoptions
-        * 
+        * AdminActions::parse_batchdeletelist()
+        * Parse skinvar batchdeletelist
+        *
         * @param       void
         * @return      void
         * @param       void
         * @return      void
-        */     
-       public function parse_adminskinselectoptions($templateName = '')
-       {
-               global $CONF;
-               $query = "SELECT sdname as text, sdnumber as value FROM %s WHERE sdname LIKE 'admin/%%';";
-               $query = sprintf($query, sql_table('skin_desc'));
-               
-               $template['name'] = 'adminskin';
-               $template['selected'] = $CONF['AdminSkin'];
-               $template['tabindex'] = 110;
-               Showlist($query, 'select', $template, $templateName);
-               return;
-       }
-       
-       /**
-        * AdminActions::parse_adminspecialskinlist()
-        * Parse skinvar adminspecialskinlist
-        * 
-        * @param       string  $templateName   name of template to use
         */
         */
-       public function parse_adminspecialskinlist($templateName = '')
+       public function parse_batchdeletelist()
        {
        {
-               global $manager;
-               
-               $templates = array();
-               if ( $templateName )
+               $selected = requestIntArray('batch');
+               $index  = 0;
+
+               foreach ( $selected as $select )
+               {
+                       echo '<input type="hidden" name="batch[' . ($index++) . ']" value="' . intval($select) . "\" />\n";
+               }
+               // add hidden vars for team & comment
+               if ( requestVar('action') == 'batchteam' )
                {
                {
-                       $templates =& $manager->getTemplate($templateName);
+                       echo '<input type="hidden" name="blogid" value="' . intRequestVar('blogid') . "\" />\n";
                }
                }
-               
-               $nType  = $this->parser->skin->getDefaultTypes();
-               $types = self::$default_skin_types;
-               unset($types['memberedit']);
-               unset($types['login']);
-               $nType  = array_keys($types);
-               $skinid = intRequestVar('skinid');
-               
-               $query = "SELECT stype FROM  %s WHERE stype NOT IN (%s) AND sdesc=%d;";
-               $query = sprintf($query, sql_table('skin'), "'" . implode("', '", $nType) . "'", (integer) $skinid);
-               
-               $res    = DB::getResult($query);
-               if ( $res && $res->rowCount() > 0 )
+               if ( requestVar('action') == 'batchcomment' )
                {
                {
-                       /* NOTE: set templates for HEAD/BODY/FOOT */
-                       if ( !array_key_exists('ADMIN_SPECIALSKINLIST_HEAD', $templates) || empty($templates['ADMIN_SPECIALSKINLIST_HEAD']) )
-                       {
-                               $template['head'] = "<ul>\n";
-                       }
-                       else
-                       {
-                               $template['head'] = $templates['ADMIN_SPECIALSKINLIST_HEAD'];
-                       }
-                       if ( !array_key_exists('ADMIN_SPECIALSKINLIST_BODY', $templates) || empty($templates['ADMIN_SPECIALSKINLIST_BODY']) )
-                       {
-                               $template['body'] = '<li>'
-                                                 . '<a tabindex="<%tabindex%>" href="index.php?action=adminskinedittype&amp;skinid=<%skinid%>&amp;type=<%skintype%>">'
-                                                 . '<%skintype%>'
-                                                 . '</a>'
-                                                 . '(<a tabindex="<%tabindex%>" href="index.php?action=adminskinremovetype&amp;skinid=<%skinid%>&amp;type=<%skintype%>">'
-                                                 . 'remove'
-                                                 . '</a>)'
-                                                 . "</li>\n";
-                       }
-                       else
-                       {
-                               $template['body'] = $templates['ADMIN_SPECIALSKINLIST_BODY'];
-                       }
-                       if ( !array_key_exists('ADMIN_SPECIALSKINLIST_FOOT', $templates) || empty($templates['ADMIN_SPECIALSKINLIST_FOOT']) )
-                       {
-                               $template['foot'] = "</ul>\n";
-                       }
-                       else
-                       {
-                               $template['foot'] = $templates['ADMIN_SPECIALSKINLIST_FOOT'];
-                       }
-                       
-                       $tabstart = 120;
-                       
-                       /* NOTE: do echo */
-                       $data = array();
-                       echo $template['head'];
-                       foreach ( $res as $row )
-                       {
-                               $data = array(
-                                       'tabindex'      => $tabstart++,
-                                       'skinid'        => $skinid,
-                                       'skintype'      => Entity::hsc(strtolower($row['stype']))
-                               );
-                               echo Template::fill($template['body'], $data);
-                       }
-                       $data = array();
-                       echo $template['foot'];
+                       echo '<input type="hidden" name="itemid" value="' . intRequestVar('itemid') . "\" />\n";
                }
                return;
        }
        
        /**
                }
                return;
        }
        
        /**
-        * AdminActions::parse_admintemplateoverview()
-        * Parse skinvar admintemplateoverview
-        * 
-        * @param       string  $templateName   name of template to use
+        * AdminActions::parse_batchdeletetype()
+        * Parse skinvar batchdeletetype
+        *
+        * @param       void
         * @return      void
         */
         * @return      void
         */
-       public function parse_admintemplateoverview($templateName = '')
+       public function parse_batchdeletetype()
        {
        {
-               $query = "SELECT * FROM %s WHERE tdname LIKE 'admin/%%' ORDER BY tdname;";
-               $query = sprintf($query, sql_table('template_desc'));
-               
-               $template['content'] = 'admintemplatelist';
-               $template['tabindex'] = 10;
-               
-               Showlist($query, 'table', $template, $templateName);
+               echo Entity::hsc(requestVar('action'));
                return;
        }
        
        /**
                return;
        }
        
        /**
-        * AdminActions::parse_allowedadminskinactions()
-        * Parse skinvar allowedadminskinactions
-        * 
+        * AdminActions::parse_batchmovebtn()
+        * Parse skinvar batchmovebtn
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
-       public function parse_allowedadminskinactions()
+       public function parse_batchmovebtn()
        {
        {
-               global $DIR_ADMINSKINS;
-               $skinType = strtolower(trim(requestVar('type')));
-               $actions  = $this->parser->skin->getAllowedActionsForType($skinType);
-               sort($actions);
-               
-               while ( $current = array_shift($actions) )
-               {
-                       // TODO: remove this
-                       // skip deprecated vars
-                       if ($current == 'ifcat' || $current == 'imagetext' || $current == 'vars')
-                       {
-                               continue;
-                       }
-                       
-                       echo helplink("adminskinvar-{$current}") . "$current</a>\n";
-                       
-                       if ( count($actions) != 0 )
-                       {
-                               echo ", ";
-                       }
-               }
-               return;
-       }
-       
-       /**
-        * AdminActions::parse_allowedskinactions()
-        * Parse skinvar allowedskinactions
-        * 
-        * @param       void
-        * @return      void
-        */
-       public function parse_allowedskinactions()
-       {
-               $skinType = strtolower(trim(requestVar('type')));
-               $skinid = intRequestVar('skinid');
-               
-               $skin = new Skin($skinid);
-               $actions = $skin->getAllowedActionsForType($skinType);
-               sort($actions);
-               
-               while ( $current = array_shift($actions) )
-               {
-                       // TODO: remove this
-                       // skip deprecated vars
-                       if ( $current == 'ifcat' || $current == 'imagetext' || $current == 'vars' )
-                       {
-                               continue;
-                       }
-                       
-                       /* TODO: alternative function should be used or not?  */
-                       echo helplink("skinvar-{$current}") . "$current</a>\n";
-                       
-                       if ( count($actions) != 0 )
-                       {
-                               echo ", ";
-                       }
-               }
-               return;
-       }
-       
-       /**
-        * AdminActions::parse_banlistdeletedlist()
-        * Parse skinvar banlistdeletedlist
-        * 
-        * @param       string  $templateName   name of template to use
-        * @return      void
-        */
-       public function parse_banlistdeletedlist($templateName = '')
-       {
-               global $manager;
-               
-               $templates = array();
-               if ( $templateName )
-               {
-                       $templates =& $manager->getTemplate($templateName);
-               }
-               
-               if ( !array_key_exists('BANLIST_DELETED_LIST', $templates) || empty($templates['BANLIST_DELETED_LIST']) )
-               {
-                       $template = "<li><%blogname%></li>\n";
-               }
-               else
-               {
-                       $template = $templates['BANLIST_DELETED_LIST'];
-               }
-               
-               $deleted = requestArray('delblogs');
-               foreach ( $deleted as $delblog )
-               {
-                       $blog =& $manager->getBlog($delblog);
-                       $data =  array(
-                               'blogname' => Entity::hsc($blog->getName())
-                       );
-                       echo Template::fill($template, $data);
-               }
-               
-               return;
-       }
-       
-       /**
-        * AdminActions::parse_batchdeletelist()
-        * Parse skinvar batchdeletelist
-        * 
-        * @param       void
-        * @return      void
-        */
-       public function parse_batchdeletelist()
-       {
-               $selected = requestIntArray('batch');
-               $index  = 0;
-               
-               foreach ( $selected as $select )
-               {
-                       echo '<input type="hidden" name="batch[' . ($index++) . ']" value="' . intval($select) . "\" />\n";
-               }
-               // add hidden vars for team & comment
-               if ( requestVar('action') == 'batchteam' )
-               {
-                       echo '<input type="hidden" name="blogid" value="' . intRequestVar('blogid') . "\" />\n";
-               }
-               if ( requestVar('action') == 'batchcomment' )
-               {
-                       echo '<input type="hidden" name="itemid" value="' . intRequestVar('itemid') . "\" />\n";
-               }
-               return;
-       }
-       
-       /**
-        * AdminActions::parse_batchdeletetype()
-        * Parse skinvar batchdeletetype
-        * 
-        * @param       void
-        * @return      void
-        */
-       public function parse_batchdeletetype()
-       {
-               echo Entity::hsc(requestVar('action'));
-               return;
-       }
-
-       /**
-        * AdminActions::parse_batchmovebtn()
-        * Parse skinvar batchmovebtn
-        * 
-        * @param       void
-        * @return      void
-        */
-       public function parse_batchmovebtn()
-       {
-               $actionType = requestVar('action');
-               switch ( $actionType )
+               $actionType = requestVar('action');
+               switch ( $actionType )
                {
                        case 'batchitem':
                                echo _MOVE_BTN;
                {
                        case 'batchitem':
                                echo _MOVE_BTN;
@@ -1588,7 +1210,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_batchmovelist()
         * Parse skinvar batchmovelist
        /**
         * AdminActions::parse_batchmovelist()
         * Parse skinvar batchmovelist
-        * 
+        *
         * @param       void
         * @param       void
         */
         * @param       void
         * @param       void
         */
@@ -1607,7 +1229,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_batchmovetitle()
         * Parse skinvar batchmovetitle
        /**
         * AdminActions::parse_batchmovetitle()
         * Parse skinvar batchmovetitle
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -1629,7 +1251,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_batchmovetype()
         * Parse skinvar batchmovetype
        /**
         * AdminActions::parse_batchmovetype()
         * Parse skinvar batchmovetype
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -1642,29 +1264,37 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_blogcatlist()
         * Parse skinvar blogcatlist
        /**
         * AdminActions::parse_blogcatlist()
         * Parse skinvar blogcatlist
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
-       public function parse_blogcatlist($templateName = '')
+       public function parse_blogcatlist($template_name = '')
        {
                global $manager;
                $blogid = intRequestVar('blogid');
        {
                global $manager;
                $blogid = intRequestVar('blogid');
-               $query  = "SELECT * FROM %s WHERE cblog = %d ORDER BY cname;";
+               $query = "SELECT * FROM %s WHERE cblog = %d ORDER BY cname;";
                $query = sprintf($query, sql_table('category'), (integer) $blogid);
                $query = sprintf($query, sql_table('category'), (integer) $blogid);
-               
-               $template['content']  = 'categorylist';
-               $template['tabindex'] = 200;
-               
-               $batch = new Batch('category');
-               $batch->showlist($query, 'table', $template, $templateName);
+
+               $resource = DB::getResult($query);
+               if ( $resource->rowCount() > 0 )
+               {
+                       $template['content']  = 'categorylist';
+                       $template['tabindex'] = 200;
+                       $this->parser->parse(listplug_batchlist('category', $resource, 'table', $template));
+               }
+               else
+               {
+                       /* TODO: nothing to be shown */
+               }
+               $resource->closeCursor();
+
                return;
        }
        
        /**
         * AdminActions::parse_blogid()
         * Parse skinvar blogid
                return;
        }
        
        /**
         * AdminActions::parse_blogid()
         * Parse skinvar blogid
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -1677,7 +1307,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_blognotifysetting()
         * Parse skinvar blognotifysetting
        /**
         * AdminActions::parse_blognotifysetting()
         * Parse skinvar blognotifysetting
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -1686,7 +1316,7 @@ class AdminActions extends BaseActions
                global $manager;
                $blogid =  intRequestVar('blogid');
                $blog   =& $manager->getBlog($blogid);
                global $manager;
                $blogid =  intRequestVar('blogid');
                $blog   =& $manager->getBlog($blogid);
-               
+
                switch ( $type )
                {
                        case 'comment':
                switch ( $type )
                {
                        case 'comment':
@@ -1715,7 +1345,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_blogsetting()
         * Parse skinvar blogsetting
        /**
         * AdminActions::parse_blogsetting()
         * Parse skinvar blogsetting
-        * 
+        *
         * @param       string  $which  name of weblog setting
         * @return      void
         */
         * @param       string  $which  name of weblog setting
         * @return      void
         */
@@ -1728,18 +1358,18 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_blogsettingyesno()
         * Parse skinvar blogsettingyesno
        /**
         * AdminActions::parse_blogsettingyesno()
         * Parse skinvar blogsettingyesno
-        * 
+        *
         * @param       string  $type                   type of weblog setting
         * @param       string  $type                   type of weblog setting
-        * @param       string  $templateName   name of template to use
+        * @param       string  $template_name  name of template to use
         * @return      void
         */
         * @return      void
         */
-       public function parse_blogsettingyesno($type, $templateName = '')
+       public function parse_blogsettingyesno($type, $template_name = '')
        {
                global $manager;
        {
                global $manager;
-               
+
                $blogid =  intRequestVar('blogid');
                $blog   =& $manager->getBlog($blogid);
                $blogid =  intRequestVar('blogid');
                $blog   =& $manager->getBlog($blogid);
-               
+
                switch ( $type )
                {
                        case 'convertbreaks':
                switch ( $type )
                {
                        case 'convertbreaks':
@@ -1767,38 +1397,47 @@ class AdminActions extends BaseActions
                                $tabindex   = 122;
                                break;
                }
                                $tabindex   = 122;
                                break;
                }
-               $this->parse_inputyesno($type, $checkedval, $tabindex, 1, 0, _YES, _NO, 0, $templateName);
+               $this->parse_inputyesno($type, $checkedval, $tabindex, 1, 0, _YES, _NO, 0, $template_name);
                return;
        }
        
        /**
         * AdminActions::parse_blogteamlist()
         * Parse skinvar blogteamlist
                return;
        }
        
        /**
         * AdminActions::parse_blogteamlist()
         * Parse skinvar blogteamlist
-        * 
-        * @param       string  $templateName   name of template to use
+        *
+        * @param       string  $template_name  name of template to use
         * @return      void
         */
         * @return      void
         */
-       public function parse_blogteamlist($templateName = '')
+       public function parse_blogteamlist($template_name = '')
        {
                global $manager;
                $blogid = intRequestVar('blogid');
        {
                global $manager;
                $blogid = intRequestVar('blogid');
-               $query  = "SELECT tblog, tmember, mname, mrealname, memail, tadmin "
-                       . "FROM %s, %s "
-                       . "WHERE tmember=mnumber AND tblog= %d";
+               $query = "SELECT tblog, tmember, mname, mrealname, memail, tadmin "
+               . "FROM %s, %s "
+               . "WHERE tmember=mnumber AND tblog= %d";
                $query = sprintf($query, sql_table('member'), sql_table('team'), (integer) $blogid);
                
                $query = sprintf($query, sql_table('member'), sql_table('team'), (integer) $blogid);
                
-               $template['content']  = 'teamlist';
-               $template['tabindex'] = 10;
-
-               $batch = new Batch('team');
-               $batch->showList($query, 'table', $template, $templateName, _LISTS_NOMORE);
+               $resource = DB::getResult($query);
+               if ( $resource->rowCount() > 0 )
+               {
+                       $template['content']  = 'teamlist';
+                       $template['tabindex'] = 10;
+                               
+                       $this->parser->parse(listplug_batchlist('team', $resource, 'table', $template));
+               }
+               else
+               {
+                       echo _LISTS_NOMORE;
+               }
+               $resource->closeCursor();
+               
                return;
        }
        
        /**
         * AdminActions::parse_blogteammembers()
         * Parse skinvar blogteammembers
                return;
        }
        
        /**
         * AdminActions::parse_blogteammembers()
         * Parse skinvar blogteammembers
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -1806,8 +1445,8 @@ class AdminActions extends BaseActions
        {
                $blogid = intRequestVar('blogid');
                $query  = "SELECT mname, mrealname "
        {
                $blogid = intRequestVar('blogid');
                $query  = "SELECT mname, mrealname "
-                               . "FROM %s, %s "
-                               . "WHERE mnumber=tmember AND tblog=%d;";
+               . "FROM %s, %s "
+               . "WHERE mnumber=tmember AND tblog=%d;";
                $query = sprintf($query, sql_table('member'), sql_table('team'), (integer) $blogid);
                $res = DB::getResult($query);
                $memberNames = array();
                $query = sprintf($query, sql_table('member'), sql_table('team'), (integer) $blogid);
                $res = DB::getResult($query);
                $memberNames = array();
@@ -1821,7 +1460,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_blogtime()
         * Parse skinvar blogtime
        /**
         * AdminActions::parse_blogtime()
         * Parse skinvar blogtime
-        * 
+        *
         * @param       string  $type   type of time
         * @param       string  $format format for time expression
         * @param       integer $offset offset of time
         * @param       string  $type   type of time
         * @param       string  $format format for time expression
         * @param       integer $offset offset of time
@@ -1830,7 +1469,7 @@ class AdminActions extends BaseActions
        public function parse_blogtime($type, $format = '%H:%M', $offset = 0)
        {
                global $manager;
        public function parse_blogtime($type, $format = '%H:%M', $offset = 0)
        {
                global $manager;
-               
+
                if ( $type != 'blogtime' )
                {
                        /* return server time */
                if ( $type != 'blogtime' )
                {
                        /* return server time */
@@ -1850,7 +1489,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_bookmarkletadmin()
         * Parse skinvar bookmarkletadmin
        /**
         * AdminActions::parse_bookmarkletadmin()
         * Parse skinvar bookmarkletadmin
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -1863,24 +1502,24 @@ class AdminActions extends BaseActions
                echo Entity::hsc('javascript:' . getBookmarklet($blogid));
                return;
        }
                echo Entity::hsc('javascript:' . getBookmarklet($blogid));
                return;
        }
-
+       
        /**
         * AdminActions::parse_categories()
         * Parse skinvar categories
        /**
         * AdminActions::parse_categories()
         * Parse skinvar categories
-        * 
+        *
         * create category dropdown box
         * create category dropdown box
-        * 
+        *
         * @param       string  $type   name of setting for category
         * @return      void
         */
        public function parse_categories($startidx = 0)
        {
                global $manager;
         * @param       string  $type   name of setting for category
         * @return      void
         */
        public function parse_categories($startidx = 0)
        {
                global $manager;
-               
+
                $item = FALSE;
                $itemid =  intRequestVar('itemid');
                $item   = &$manager->getItem($itemid, 1, 1);
                $item = FALSE;
                $itemid =  intRequestVar('itemid');
                $item   = &$manager->getItem($itemid, 1, 1);
-               
+
                $blog = FALSE;
                if ( !$item )
                {
                $blog = FALSE;
                if ( !$item )
                {
@@ -1891,19 +1530,19 @@ class AdminActions extends BaseActions
                        $blogid =  $item['blogid'];
                }
                $blog   = &$manager->getBlog($blogid);
                        $blogid =  $item['blogid'];
                }
                $blog   = &$manager->getBlog($blogid);
-               
+
                if ( $item && $blog->convertBreaks() && requestVar('action') == 'itemedit' )
                {
                        $item['body'] = removeBreaks($item['body']);
                        $item['more'] = removeBreaks($item['more']);
                }
                if ( $item && $blog->convertBreaks() && requestVar('action') == 'itemedit' )
                {
                        $item['body'] = removeBreaks($item['body']);
                        $item['more'] = removeBreaks($item['more']);
                }
-               
+       
                $contents = array();
                if ( requestVar('action') == 'itemedit' )
                {
                        $contents = $item;
                }
                $contents = array();
                if ( requestVar('action') == 'itemedit' )
                {
                        $contents = $item;
                }
-               
+       
                if ( !array_key_exists('catid', $contents) || empty($contents['catid']) )
                {
                        // on add item
                if ( !array_key_exists('catid', $contents) || empty($contents['catid']) )
                {
                        // on add item
@@ -1914,16 +1553,16 @@ class AdminActions extends BaseActions
                        // on edit item
                        $catid = $contents['catid'];
                }
                        // on edit item
                        $catid = $contents['catid'];
                }
-               
+       
                $this->selectBlog('catid', 'category', $catid, $startidx, 1, $blog->getID());
                $this->selectBlog('catid', 'category', $catid, $startidx, 1, $blog->getID());
-               
+
                return;
        }
        
        /**
         * AdminActions::parse_category()
         * Parse skinvar category
                return;
        }
        
        /**
         * AdminActions::parse_category()
         * Parse skinvar category
-        * 
+        *
         * @param       string  $type   name of setting for category
         * @return      void
         */
         * @param       string  $type   name of setting for category
         * @return      void
         */
@@ -1936,7 +1575,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_categorysetting()
         * Parse skinvar categorysetting
        /**
         * AdminActions::parse_categorysetting()
         * Parse skinvar categorysetting
-        * 
+        *
         * @param       string  $type   type in category setting
         * @return      void
         */
         * @param       string  $type   type in category setting
         * @return      void
         */
@@ -1952,7 +1591,7 @@ class AdminActions extends BaseActions
                $query  = "SELECT * FROM %s WHERE cblog = %d AND catid = %d;";
                $query  = sprintf($query, sql_table('category'), (integer) $blogid, (integer) $catid);
                $row    = DB::getRow($query);
                $query  = "SELECT * FROM %s WHERE cblog = %d AND catid = %d;";
                $query  = sprintf($query, sql_table('category'), (integer) $blogid, (integer) $catid);
                $row    = DB::getRow($query);
-               
+
                if ( $type != 'name' )
                {
                        echo Entity::hsc($row['cdesc']);
                if ( $type != 'name' )
                {
                        echo Entity::hsc($row['cdesc']);
@@ -1961,34 +1600,34 @@ class AdminActions extends BaseActions
                {
                        echo Entity::hsc($row['cname']);
                }
                {
                        echo Entity::hsc($row['cname']);
                }
-               
+       
                return;
        }
        
        /**
         * AdminActions::parse_codename()
         * Parse templatevar codename
                return;
        }
        
        /**
         * AdminActions::parse_codename()
         * Parse templatevar codename
-        * 
+        *
         * @param       $value
         * @param       $name
         * @param       $value
         * @param       $name
-        * 
+        *
         */
        public function parse_checkedonval($value, $name)
        {
                global $manager;
         */
        public function parse_checkedonval($value, $name)
        {
                global $manager;
-               
+
                $item = false;
                $itemid = intRequestVar('itemid');
                $item =& $manager->getItem($itemid, 1, 1);
                $item = false;
                $itemid = intRequestVar('itemid');
                $item =& $manager->getItem($itemid, 1, 1);
-               
+
                $blog =& $manager->getBlog(getBlogIDFromItemID($itemid));
                $blog =& $manager->getBlog(getBlogIDFromItemID($itemid));
-               
+
                if ( $item && $blog->convertBreaks() && requestVar('action') == 'itemedit' )
                {
                        $item['body'] = removeBreaks($item['body']);
                        $item['more'] = removeBreaks($item['more']);
                }
                if ( $item && $blog->convertBreaks() && requestVar('action') == 'itemedit' )
                {
                        $item['body'] = removeBreaks($item['body']);
                        $item['more'] = removeBreaks($item['more']);
                }
-               
+       
                $contents = array();
                if ( requestVar('action') == 'itemedit' )
                {
                $contents = array();
                if ( requestVar('action') == 'itemedit' )
                {
@@ -2008,10 +1647,10 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_codename()
         * Parse templatevar codename
        /**
         * AdminActions::parse_codename()
         * Parse templatevar codename
-        * 
+        *
         * @param       void
         * @return      void
         * @param       void
         * @return      void
-        * 
+        *
         * TODO: is this need???
         */
        public function parse_codename()
         * TODO: is this need???
         */
        public function parse_codename()
@@ -2024,14 +1663,14 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_commentnavlist()
         * Parse skinvar commentnavlist
        /**
         * AdminActions::parse_commentnavlist()
         * Parse skinvar commentnavlist
-        * 
+        *
         * @param       void
         * @return      void
         */
        public function parse_commentnavlist()
        {
                global $CONF, $manager, $member;
         * @param       void
         * @return      void
         */
        public function parse_commentnavlist()
        {
                global $CONF, $manager, $member;
-               
+
                // start index
                if ( postVar('start') )
                {
                // start index
                if ( postVar('start') )
                {
@@ -2041,7 +1680,7 @@ class AdminActions extends BaseActions
                {
                        $start = 0;
                }
                {
                        $start = 0;
                }
-               
+       
                // amount of items to show
                if ( postVar('amount') )
                {
                // amount of items to show
                if ( postVar('amount') )
                {
@@ -2056,11 +1695,11 @@ class AdminActions extends BaseActions
                        }
                }
                $query = 'SELECT cbody, cuser, cmail, cemail, mname, ctime, chost, cnumber, cip, citem '
                        }
                }
                $query = 'SELECT cbody, cuser, cmail, cemail, mname, ctime, chost, cnumber, cip, citem '
-                      . 'FROM %s '
-                      . 'LEFT OUTER JOIN %s ON  mnumber=cmember '
-                      . 'WHERE ';
+               . 'FROM %s '
+               . 'LEFT OUTER JOIN %s ON  mnumber=cmember '
+               . 'WHERE ';
                $query = sprintf($query, sql_table('comment'), sql_table('member'));
                $query = sprintf($query, sql_table('comment'), sql_table('member'));
-               
+
                if ( $this->skintype == 'itemcommentlist' )
                {
                        $itemid                                 = intRequestVar('itemid');
                if ( $this->skintype == 'itemcommentlist' )
                {
                        $itemid                                 = intRequestVar('itemid');
@@ -2085,26 +1724,44 @@ class AdminActions extends BaseActions
                        $bid                                    = intRequestVar('blogid');
                        $nonComments                    = _NOCOMMENTS_BLOG;
                }
                        $bid                                    = intRequestVar('blogid');
                        $nonComments                    = _NOCOMMENTS_BLOG;
                }
-               
+       
                $search = postVar('search');
                if ( !empty($search) )
                {
                        $query .= ' and cbody LIKE ' . DB::quoteValue('%'.$search.'%');
                }
                $search = postVar('search');
                if ( !empty($search) )
                {
                        $query .= ' and cbody LIKE ' . DB::quoteValue('%'.$search.'%');
                }
-               
+       
                $query .= " ORDER BY ctime ASC LIMIT {$start},{$amount}";
                $query .= " ORDER BY ctime ASC LIMIT {$start},{$amount}";
-               
-               $template['content'] = 'commentlist';
-               
-               $navList = new Navlist($this->skintype, $start, $amount, 0, 1000, $bid, $search, $itemid);
-               $navList->showBatchList('comment', $query, 'table', $template, $nonComments);
+
+               $resource = DB::getResult($query);
+               if ( $resource->rowCount() > 0 )
+               {
+                       $template['action'] = $this->skintype;
+                       $template['start'] = $start;
+                       $template['amount'] = $amount;
+                       $template['minamount'] = 0;
+                       $template['maxamount'] = 1000;
+                       $template['blogid'] = $bid;
+                       $template['search'] = $search;
+                       $template['itemid'] = $itemid;
+                               
+                       $template['content'] = 'commentlist';
+                               
+                       $this->parser->parse(listplug_navlist('comment', $query, 'table', $template));
+               }
+               else
+               {
+                       /* TODO: nothing to be shown */
+               }
+               $resource->closeCursor();
+
                return;
        }
        
        /**
         * AdminActions::parse_configsettingsedit()
         * Parse skinvar configsettingsedit
                return;
        }
        
        /**
         * AdminActions::parse_configsettingsedit()
         * Parse skinvar configsettingsedit
-        * 
+        *
         * @param       string  $type   type of global configuration
         * @return      void
         */
         * @param       string  $type   type of global configuration
         * @return      void
         */
@@ -2152,7 +1809,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_configsettingsyesno()
         * Parse skinvar configsettingsyesno
        /**
         * AdminActions::parse_configsettingsyesno()
         * Parse skinvar configsettingsyesno
-        * 
+        *
         * @param       string  $type           type of global setting
         * @param       integer $tabindex       tabindex attribute of input element
         * @return      void
         * @param       string  $type           type of global setting
         * @param       integer $tabindex       tabindex attribute of input element
         * @return      void
@@ -2170,7 +1827,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_contents()
         * Parse skinvar contents
        /**
         * AdminActions::parse_contents()
         * Parse skinvar contents
-        * 
+        *
         * @param       string  $which          part for item
         * @return      void
         */
         * @param       string  $which          part for item
         * @return      void
         */
@@ -2186,7 +1843,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_currenttime()
         * Parse skinvar currenttime
        /**
         * AdminActions::parse_currenttime()
         * Parse skinvar currenttime
-        * 
+        *
         * @param       string  $what
         */
        // for future items
         * @param       string  $what
         */
        // for future items
@@ -2199,7 +1856,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_customhelplink()
         * Parse skinvar customhelplink
        /**
         * AdminActions::parse_customhelplink()
         * Parse skinvar customhelplink
-        * 
+        *
         * @param       string  $topic          name of topic
         * @param       string  $tplName        name of template
         * @param       string  $url            string as URI
         * @param       string  $topic          name of topic
         * @param       string  $tplName        name of template
         * @param       string  $url            string as URI
@@ -2227,177 +1884,151 @@ class AdminActions extends BaseActions
        }
        
        /**
        }
        
        /**
-        * AdminActions::parse_defaultadminskintypes()
+        * AdminActions::parse_normalskinlist()
         * Parse skinvar defaultadminskintypes
         * Parse skinvar defaultadminskintypes
-        * 
-        * @param       string  $tabindex               index number for tabindex attribute of input element
-        * @param       string  $templateName   name of template
+        *
+        * @param       string  $template_name  name of template
         * @return      void
         */
         * @return      void
         */
-       public function parse_defaultadminskintypes($tabindex, $templateName = '')
+       public function parse_normalskinlist($template_name = '')
        {
        {
-               global $manager;
-               
-               $templates = array();
-               
-               if ( $templateName )
-               {
-                       $templates =& $manager->getTemplate($templateName);
-               }
-               
-               $types = self::$default_skin_types;
-               unset($types['memberedit']);
-               unset($types['login']);
-               ksort($types);
-               
-               /* NOTE: set templates for HEAD/BODY/FOOT */
-               if ( !array_key_exists('ADMINSKINTYPELIST_HEAD', $templates) || empty($templates['ADMINSKINTYPELIST_HEAD']) )
-               {
-                       $template['head'] = "<ul>\n";
-               }
-               else
-               {
-                       $template['head'] = $templates['ADMINSKINTYPELIST_HEAD'];
-               }
-               if ( !array_key_exists('ADMINSKINTYPELIST_BODY', $templates) || empty($templates['ADMINSKINTYPELIST_BODY']) )
-               {
-                       $template['body'] = "<li>"
-                                         . "<a tabindex=\"<%tabindex%>\" href=\"index.php?action=adminskinedittype&amp;skinid=<%skinid%>&amp;type=<%skintype%>\"><%name%></a> <%help%>"
-                                         . "</li>\n";
-               }
-               else
-               {
-                       $template['body'] = $templates['ADMINSKINTYPELIST_BODY'];
-               }
-               if ( !array_key_exists('ADMINSKINTYPELIST_FOOT', $templates) || empty($templates['ADMINSKINTYPELIST_FOOT']) )
+               global $CONF, $manager;
+
+               if ( !preg_match('#^admin#', $this->skintype) )
                {
                {
-                       $template['foot'] = "</ul>\n";
+                       $skin = new Skin($CONF['BaseSkin']);
+                       /* TODO: removeaction? */
+                       $template['editaction'] = 'skinedittype';
                }
                else
                {
                }
                else
                {
-                       $template['foot'] = $templates['ADMINSKINTYPELIST_FOOT'];
+                       $skin = new Skin($CONF['AdminSkin'], 'AdminActions');
+                       $template['editaction'] = 'adminskinedittype';
+                       /* TODO: removeaction? */
                }
                }
-               
-               $handler = new AdminActions('template');
-               $parser = new PARSER($handler);
-               
-               /* NOTE: do output */
-               echo $template['head'];
-               foreach ( $types as $type => $fName )
+       
+               $temporary = $skin->getDefaultTypes();
+               $normal_skintype = array();
+               foreach ( $temporary as $type => $label )
                {
                {
-                       $helplink = $this->customHelpHtml("skinpart{$type}{$templateName}");
-                       $data = array(
-                               'tabindex'      => $tabindex,
-                               'skintype'      => $type,
-                               'name'          => $fName,
-                               'help'          => $helplink,
-                               'skinid'        => intrequestVar('skinid'),
+                       $normal_skintype[] = array(
+                       'skintype'              => $type,
+                       'skintypename'  => $label
                        );
                        );
-                       $parser->parse(Template::fill($template['body'], $data));
-                       $tabindex++;
                }
                }
-               echo $template['foot'];
-               
+       
+               $template['tabindex'] = 10;
+               $template['skinid'] = $skin->getID();
+               $template['skinname'] = $skin->getName();
+               $this->parser->parse(showlist($normal_skintype, 'list_normalskinlist', $template, $template_name));
+
                return;
        }
        
        /**
         * AdminActions::parse_defblogselect()
         * Parse skinvar defblogselect
                return;
        }
        
        /**
         * AdminActions::parse_defblogselect()
         * Parse skinvar defblogselect
-        * 
-        * @param       string  $templateName   name of template
+        *
+        * @param       string  $template_name  name of template
         * @return      void
         */
         * @return      void
         */
-       public function parse_defblogselect($templateName = '')
+       public function parse_defblogselect($template_name = '')
        {
                global $CONF;
        {
                global $CONF;
-               
+
                $query = "SELECT bname as text, bnumber as value FROM %s;";
                $query = sprintf($query, sql_table('blog'));
                $query = "SELECT bname as text, bnumber as value FROM %s;";
                $query = sprintf($query, sql_table('blog'));
-               
+
                $template['name'] = 'DefaultBlog';
                $template['selected'] = $CONF['DefaultBlog'];
                $template['tabindex'] = 10;
                $template['name'] = 'DefaultBlog';
                $template['selected'] = $CONF['DefaultBlog'];
                $template['tabindex'] = 10;
-               
-               Showlist($query, 'select', $template, $templateName);
-               
+               $this->parser->parse(showlist($query, 'select', $template, $template_name));
+
                return;
        }
        
        /**
         * AdminActions::parse_defcatselect()
         * Parse skinvar defcatselect
                return;
        }
        
        /**
         * AdminActions::parse_defcatselect()
         * Parse skinvar defcatselect
-        * 
-        * @param       string  $templateName   name of template
+        *
+        * @param       string  $template_name  name of template
         * @return      void
         */
         * @return      void
         */
-       public function parse_defcatselect($templateName = '')
+       public function parse_defcatselect($template_name = '')
        {
                global $manager;
        {
                global $manager;
-               
+
                $blogid = intRequestVar('blogid');
                $blog =& $manager->getBlog($blogid);
                $blogid = intRequestVar('blogid');
                $blog =& $manager->getBlog($blogid);
-               
+
                $query = "SELECT cname as text, catid as value FROM %s WHERE cblog=%d;";
                $query = sprintf($query, sql_table('category'), (integer) $blog->getID());
                $query = "SELECT cname as text, catid as value FROM %s WHERE cblog=%d;";
                $query = sprintf($query, sql_table('category'), (integer) $blog->getID());
-               
+
                $template['name']        = 'defcat';
                $template['selected'] = $blog->getDefaultCategory();
                $template['tabindex'] = 110;
                $template['name']        = 'defcat';
                $template['selected'] = $blog->getDefaultCategory();
                $template['tabindex'] = 110;
-               
-               Showlist($query, 'select', $template, $templateName);
-               
+
+               $this->parser->parse(showlist($query, 'select', $template, $template_name));
+
                return;
        }
        
        /**
         * AdminActions::parse_defskinselect()
         * Parse skinvar defskinselect
                return;
        }
        
        /**
         * AdminActions::parse_defskinselect()
         * Parse skinvar defskinselect
-        * 
+        *
         * @param       string  $type                   type of skin
         * @param       string  $type                   type of skin
-        * @param       string  $templateName   name of template
+        * @param       string  $template_name  name of template
         * @return      void
         */
         * @return      void
         */
-       public function parse_defskinselect($type = 'blog', $templateName = '')
+       public function parse_defskinselect($type = 'blog', $template_name = '')
        {
        {
-               global $CONF, $manager;
-               
-               $query  = "SELECT sdname as text, sdnumber as value FROM %s WHERE sdname NOT LIKE 'admin/%%';";
-               $query = sprintf($query, sql_table('skin_desc'));
-               
-               $blogid = intRequestVar('blogid');
-               
-               if ( !$blogid )
-               {
-                       $template['selected'] = $CONF['BaseSkin'];
-               }
-               else
-               {
-                       $blog =& $manager->getBlog($blogid);
-                       $template['selected'] = $blog->getDefaultSkin();
-               }
-               
-               if ( $type != 'blog' )
+               global $CONF, $manager, $member;
+
+               if ( !preg_match('#^admin#', $this->skintype) )
                {
                {
-                       $nname = 'BaseSkin';
+                       $blogid = intRequestVar('blogid');
+                       if ( !$blogid )
+                       {
+                               $template['selected'] = $CONF['BaseSkin'];
+                       }
+                       else
+                       {
+                               $blog =& $manager->getBlog($blogid);
+                               $template['selected'] = $blog->getDefaultSkin();
+                       }
+                               
+                       if ( $type != 'blog' )
+                       {
+                               $template['name'] = 'BaseSkin';
+                       }
+                       else
+                       {
+                               $template['name'] = 'defskin';
+                       }
+                               
+                       $query = "SELECT sdname as text, sdnumber as value FROM %s WHERE sdname NOT LIKE 'admin/%%';";
                }
                else
                {
                }
                else
                {
-                       $nname = 'defskin';
+                       /* TODO: member object will have its own adminskin id */
+                       $template['selected'] = $CONF['AdminSkin'];
+                       $template['name'] = 'AdminSkin';
+                       $query = "SELECT sdname as text, sdnumber as value FROM %s WHERE sdname LIKE 'admin/%%';";
                }
                }
-               
-               $template['name']        = $nname;
+       
+               $query = sprintf($query, sql_table('skin_desc'));
                $template['tabindex'] = 50;
                $template['tabindex'] = 50;
-               
-               Showlist($query, 'select', $template, $templateName);
-               
+
+               $this->parser->parse(showlist($query, 'select', $template, $template_name));
+
                return;
        }
        
        /**
         * AdminActions::parse_deletecomment()
         * Parse skinvar deletecomment
                return;
        }
        
        /**
         * AdminActions::parse_deletecomment()
         * Parse skinvar deletecomment
-        * 
+        *
         * @param       string  $type   type of infomation for comment
         * @return      void
         */
         * @param       string  $type   type of infomation for comment
         * @return      void
         */
@@ -2405,7 +2036,7 @@ class AdminActions extends BaseActions
        {
                $commentid      = intRequestVar('commentid');
                $comment        = COMMENT::getComment($commentid);
        {
                $commentid      = intRequestVar('commentid');
                $comment        = COMMENT::getComment($commentid);
-               
+
                switch ( $type )
                {
                        case 'id':
                switch ( $type )
                {
                        case 'id':
@@ -2431,28 +2062,28 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_deleteitembody()
         * Parse skinvar deleteitembody
        /**
         * AdminActions::parse_deleteitembody()
         * Parse skinvar deleteitembody
-        * 
+        *
         * @param       void
         * @return      void
         */
        public function parse_deleteitembody()
        {
                global $manager;
         * @param       void
         * @return      void
         */
        public function parse_deleteitembody()
        {
                global $manager;
-               
+
                $itemid =  intRequestVar('itemid');
                $item =& $manager->getItem($itemid, 1, 1);
                $itemid =  intRequestVar('itemid');
                $item =& $manager->getItem($itemid, 1, 1);
-               
+
                $body =  strip_tags($item['body']);
                $body =  strip_tags($item['body']);
-               
+
                echo Entity::hsc(shorten($body, 300, '...'));
                echo Entity::hsc(shorten($body, 300, '...'));
-               
+
                return;
        }
        
        /**
         * AdminActions::parse_deleteitemid()
         * Parse skinvar deleteitemid
                return;
        }
        
        /**
         * AdminActions::parse_deleteitemid()
         * Parse skinvar deleteitemid
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -2465,137 +2096,38 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_deleteitemtitle()
         * Parse skinvar deleteitemtitle
        /**
         * AdminActions::parse_deleteitemtitle()
         * Parse skinvar deleteitemtitle
-        * 
+        *
         * @param       void
         * @return      void
         */
        public function parse_deleteitemtitle()
        {
                global $manager;
         * @param       void
         * @return      void
         */
        public function parse_deleteitemtitle()
        {
                global $manager;
-               
+
                $itemid = intRequestVar('itemid');
                $item =& $manager->getItem($itemid, 1, 1);
                $itemid = intRequestVar('itemid');
                $item =& $manager->getItem($itemid, 1, 1);
-               
+
                echo Entity::hsc(strip_tags($item['title']));
                echo Entity::hsc(strip_tags($item['title']));
-               
-               return;
-       }
-       
-       /**
-        * AdminActions::parse_editadminskin()
-        * Parse skinvar editadminskin
-        * 
-        * @param       string  $type   type of skin setting
-        * @return      void
-        */
-       public function parse_editadminskin($type = 'id')
-       {
-               $skinid = intRequestVar('skinid');
-               $skin   = new Skin($skinid);
-               switch ( $type )
-               {
-                       case 'id':
-                               echo intRequestVar('skinid');
-                               break;
-                       case 'name':
-                               echo Entity::hsc($skin->getName());
-                               break;
-                       case 'desc':
-                               echo Entity::hsc($skin->getDescription());
-                               break;
-                       case 'type':
-                               echo Entity::hsc($skin->getContentType());
-                               break;
-                       case 'prefix':
-                               echo Entity::hsc($skin->getIncludePrefix());
-                               break;
-                       case 'mode':
-                               $this->parse_inputyesno('inc_mode', $skin->getIncludeMode(), 120, 'skindir', 'normal', _PARSER_INCMODE_SKINDIR, _PARSER_INCMODE_NORMAL);
-                       default:
-                               break;
-               }
-               return;
-       }
-       
-       /**
-        * AdminActions::parse_editadminskintype()
-        * Parse skinvar editadminskintype
-        * 
-        * @param       string  $type   name of skin type
-        * @return      void
-        */
-       public function parse_editadminskintype($type = 'id')
-       {
-               global $CONF, $manager, $member;
-               
-               static $skin = NULL;
-               static $types = array();
-               
-               if ( $skin == NULL )
-               {
-                       $skinid = intRequestVar('skinid');
-                       $skin = new Skin($skinid, 'AdminActions');
-                       $types = $skin->getDefaultTypes();
-               }
-               
-               $stype = strtolower(trim(requestVar('type')));
-               if ( empty($stype) )
-               {
-                       $stype = $type;
-               }
-               switch ( $type )
-               {
-                       case 'id':
-                               echo $skin->getID();
-                               break;
-                       case 'name':
-                               echo Entity::hsc($skin->getName());
-                               break;
-                       case 'desc':
-                               echo Entity::hsc($skin->getDescription());
-                               break;
-                       case 'type':
-                               echo Entity::hsc($skin->getContentType());
-                               break;
-                       case 'content':
-                               echo Entity::hsc($skin->getContentFromDB($stype));
-                               break;
-                       case 'skintype':
-                               $friendly_name = !array_key_exists($stype, $types) ? ucfirst($stype) : $types[$stype];
-                               echo Entity::hsc($friendly_name);
-                               break;
-                       case 'skintyperaw':
-                               echo Entity::hsc($stype);
-                               break;
-                       case 'prefix':
-                               echo Entity::hsc($skin->getIncludePrefix());
-                               break;
-                       case 'mode':
-                               $incMode = $skin->getIncludeMode() ? _PARSER_INCMODE_SKINDIR : _PARSER_INCMODE_NORMAL;
-                               echo Entity::hsc($incMode);
-                               break;
-                       default:
-                               break;
-               }
+
                return;
        }
        
        /**
         * AdminActions::parse_editcomment()
         * Parse skinvar editcomment
                return;
        }
        
        /**
         * AdminActions::parse_editcomment()
         * Parse skinvar editcomment
-        * 
+        *
         * @param       string  $type   type of comment setting
         * @return      void
         */
        public function parse_editcomment($type = 'id')
        {
                global $manager;
         * @param       string  $type   type of comment setting
         * @return      void
         */
        public function parse_editcomment($type = 'id')
        {
                global $manager;
-               
+
                $commentid      = intRequestVar('commentid');
                $comment        = COMMENT::getComment($commentid);
                $commentid      = intRequestVar('commentid');
                $comment        = COMMENT::getComment($commentid);
-               
+
                $manager->notify('PrepareCommentForEdit', array('comment' => &$comment));
                $manager->notify('PrepareCommentForEdit', array('comment' => &$comment));
-               
+
                switch ( $type )
                {
                        case 'id':
                switch ( $type )
                {
                        case 'id':
@@ -2648,38 +2180,49 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_editmemberlist()
         * Parse skinvar editmemberlist
        /**
         * AdminActions::parse_editmemberlist()
         * Parse skinvar editmemberlist
-        * 
-        * @param       string  $templateName   name of template
+        *
+        * @param       string  $template_name  name of template
         * @return      void
         */
         * @return      void
         */
-       public function parse_editmemberlist($templateName = '')
+       public function parse_editmemberlist($template_name = '')
        {
                global $manager;
                // show list of members with actions
        {
                global $manager;
                // show list of members with actions
-               $query =  'SELECT * FROM '.sql_table('member');
-               $template['content'] = 'memberlist';
-               $template['tabindex'] = 10;
+               $query = 'SELECT * FROM %s;';
+               $query =  sprintf($query, sql_table('member'));
+               
+               $resource = DB::getResult($query);
+               if ( $resource->rowCount() > 0 )
+               {
+                       $template['content'] = 'memberlist';
+                       $template['tabindex'] = 10;
+                               
+                       $this->parser->parse(listplug_batchlist('member', $resource, 'table', $template));
+               }
+               else
+               {
+                       echo _LISTS_NOMORE;
+               }
+               $resource->closeCursor();
                
                
-               $batch = new Batch('member');
-               $batch->showList($query, 'table', $template, $templateName, _LISTS_NOMORE);
                return;
        }
        
        /**
         * AdminActions::parse_editmember()
         * Parse skinvar editmember
                return;
        }
        
        /**
         * AdminActions::parse_editmember()
         * Parse skinvar editmember
-        * 
+        *
         * @param       string  $type                   type of information for member
         * @return      string  $tempateName    name of template to use
         * @return      void
         */
         * @param       string  $type                   type of information for member
         * @return      string  $tempateName    name of template to use
         * @return      void
         */
-       public function parse_editmember($type = 'id', $templateName = '')
+       public function parse_editmember($type = 'id', $template_name = '')
        {
                global $CONF, $manager, $member;
        {
                global $CONF, $manager, $member;
-               
+
                $memberid = intRequestVar('memberid');
                $mem =& $manager->getMember($memberid);
                $memberid = intRequestVar('memberid');
                $mem =& $manager->getMember($memberid);
-               
+
                switch ( $type )
                {
                        case 'id':
                switch ( $type )
                {
                        case 'id':
@@ -2713,16 +2256,16 @@ class AdminActions extends BaseActions
                                echo Entity::hsc($mem->getURL());
                                break;
                        case 'admin':
                                echo Entity::hsc($mem->getURL());
                                break;
                        case 'admin':
-                               $this->parse_inputyesno('admin', $mem->isAdmin(), 60, 1, 0, _YES, _NO, 0, $templateName);
+                               $this->parse_inputyesno('admin', $mem->isAdmin(), 60, 1, 0, _YES, _NO, 0, $template_name);
                                break;
                        case 'canlogin':
                                break;
                        case 'canlogin':
-                               $this->parse_inputyesno('canlogin', $mem->canLogin(), 70, 1, 0, _YES, _NO, $mem->isAdmin(), $templateName);
+                               $this->parse_inputyesno('canlogin', $mem->canLogin(), 70, 1, 0, _YES, _NO, $mem->isAdmin(), $template_name);
                                break;
                        case 'notes':
                                echo Entity::hsc($mem->getNotes());
                                break;
                        case 'autosave':
                                break;
                        case 'notes':
                                echo Entity::hsc($mem->getNotes());
                                break;
                        case 'autosave':
-                               $this->parse_inputyesno('autosave', $mem->getAutosave(), 87, 1, 0, _YES, _NO, 0, $templateName);
+                               $this->parse_inputyesno('autosave', $mem->getAutosave(), 87, 1, 0, _YES, _NO, 0, $template_name);
                                break;
                        default:
                                break;
                                break;
                        default:
                                break;
@@ -2733,14 +2276,14 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_editpluginfo()
         * Parse skinvar editpluginfo
        /**
         * AdminActions::parse_editpluginfo()
         * Parse skinvar editpluginfo
-        * 
+        *
         * @param       string  $type   type of plugin info
         * @return      void
         */
        public function parse_editpluginfo($type)
        {
                global $manager;
         * @param       string  $type   type of plugin info
         * @return      void
         */
        public function parse_editpluginfo($type)
        {
                global $manager;
-               
+
                $pid = intRequestVar('plugid');
                switch ( $type )
                {
                $pid = intRequestVar('plugid');
                switch ( $type )
                {
@@ -2757,63 +2300,63 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_editplugoptionslist()
         * Parse skinvar editplugoptionslist
        /**
         * AdminActions::parse_editplugoptionslist()
         * Parse skinvar editplugoptionslist
-        * 
-        * @param       string  $templateName   name of template
+        *
+        * @param       string  $template_name  name of template
         * @return      void
         */
         * @return      void
         */
-       public function parse_editplugoptionslist($templateName = '')
+       public function parse_editplugoptionslist($template_name = '')
        {
                global $manager;
        {
                global $manager;
-               
+
                $pid = intRequestVar('plugid');
                $aOptions = array();
                $aOIDs  = array();
                $pid = intRequestVar('plugid');
                $aOptions = array();
                $aOIDs  = array();
-               
+
                $query  = "SELECT * FROM %s WHERE ocontext='global' AND opid=%d ORDER BY oid ASC;";
                $query = sprintf($query, sql_table('plugin_option_desc'), (integer) $pid);
                $resource = DB::getResult($query);
                $query  = "SELECT * FROM %s WHERE ocontext='global' AND opid=%d ORDER BY oid ASC;";
                $query = sprintf($query, sql_table('plugin_option_desc'), (integer) $pid);
                $resource = DB::getResult($query);
-               
+
                foreach ( $resource as $row )
                {
                foreach ( $resource as $row )
                {
-                       array_push($aOIDs, $row['oid']);
+                       $aOIDs[] = $row['oid'];
                        $aOptions[$row['oid']] = array(
                        $aOptions[$row['oid']] = array(
-                               'oid'                   => $row['oid'],
-                               'value'                 => $row['odef'],
-                               'name'                  => $row['oname'],
-                               'description'   => $row['odesc'],
-                               'type'                  => $row['otype'],
-                               'typeinfo'              => $row['oextra'],
-                               'contextid'             => 0
+                       'oid'                   => $row['oid'],
+                       'value'                 => $row['odef'],
+                       'name'                  => $row['oname'],
+                       'description'   => $row['odesc'],
+                       'type'                  => $row['otype'],
+                       'typeinfo'              => $row['oextra'],
+                       'contextid'             => 0
                        );
                }
                        );
                }
-               
+       
                // fill out actual values
                if ( count($aOIDs) > 0 )
                {
                        $query = 'SELECT oid, ovalue FROM %s WHERE oid in (%s)';
                        $query = sprintf($query, sql_table('plugin_option'), implode(',', $aOIDs));
                // fill out actual values
                if ( count($aOIDs) > 0 )
                {
                        $query = 'SELECT oid, ovalue FROM %s WHERE oid in (%s)';
                        $query = sprintf($query, sql_table('plugin_option'), implode(',', $aOIDs));
-                       
+                               
                        $result = DB::getResult($query);
                        $result = DB::getResult($query);
-                       
                        foreach ( $result as $row )
                        {
                                $aOptions[$row['oid']]['value'] = $row['ovalue'];
                        }
                }
                        foreach ( $result as $row )
                        {
                                $aOptions[$row['oid']]['value'] = $row['ovalue'];
                        }
                }
-               
+       
                // call plugins
                $data = array(
                // call plugins
                $data = array(
-                       'context'       =>  'global',
-                       'plugid'        =>  $pid,
-                       'options'       => &$aOptions
+               'context'       =>  'global',
+               'plugid'        =>  $pid,
+               'options'       => &$aOptions
                );
                $manager->notify('PrePluginOptionsEdit', $data);
                );
                $manager->notify('PrePluginOptionsEdit', $data);
-               
-               $template['content'] = 'plugoptionlist';
-               
-               $amount = Showlist($aOptions, 'table', $template, $templateName);
-               
-               if ( $amount == 0 )
+
+               if ( sizeof($aOptions) > 0 )
+               {
+                       $template['content'] = 'plugoptionlist';
+                       $this->parser->parse(showlist($aOptions, 'table', $template, $template_name));
+               }
+               else
                {
                        echo '<p>' . _ERROR_NOPLUGOPTIONS . "</p>\n";
                }
                {
                        echo '<p>' . _ERROR_NOPLUGOPTIONS . "</p>\n";
                }
@@ -2823,14 +2366,23 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_editskin()
         * Parse skinvar editskin
        /**
         * AdminActions::parse_editskin()
         * Parse skinvar editskin
-        * 
+        *
         * @param       string  $type   type of skin
         * @return      void
         */
        public function parse_editskin($type = 'id')
        {
                $skinid = intRequestVar('skinid');
         * @param       string  $type   type of skin
         * @return      void
         */
        public function parse_editskin($type = 'id')
        {
                $skinid = intRequestVar('skinid');
-               $skin   = new SKIN($skinid);
+
+               if ( !preg_match('#^admin#', $this->skintype) )
+               {
+                       $skin = new SKIN($skinid);
+               }
+               else
+               {
+                       $skin = new SKIN($skinid, 'AdminActions');
+               }
+       
                switch ( $type )
                {
                        case 'id':
                switch ( $type )
                {
                        case 'id':
@@ -2859,21 +2411,37 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_editskintype()
         * Parse skinvar editskintype
        /**
         * AdminActions::parse_editskintype()
         * Parse skinvar editskintype
-        * 
+        *
         * @param       string  $type   name of type for skin type
         * @return      void
         */
         * @param       string  $type   name of type for skin type
         * @return      void
         */
-       public function parse_editskintype($type = 'id')
+       public function parse_editskintype($stype = 'id')
        {
        {
-               global $CONF, $manager, $member;
-               $skinid = intRequestVar('skinid');
-               $skin   = new SKIN($skinid);
-               $fNames = $skin->getDefaultTypes();
-               $sType  = strtolower(trim(requestVar('type')));
-               switch ( $type )
+               static $skin = NULL;
+               static $types = array();
+               
+               if ( $skin == NULL )
+               {
+                       $skinid = intRequestVar('skinid');
+                       
+                       if ( !preg_match('#^admin#', $this->skintype) )
+                       {
+                               $skin = new Skin($skinid);
+                       }
+                       else
+                       {
+                               $skin = new Skin($skinid, 'AdminActions');
+                       }
+                       
+                       $types = $skin->getDefaultTypes();
+               }
+               
+               $type = strtolower(trim(requestVar('type')));
+               
+               switch ( $stype )
                {
                        case 'id':
                {
                        case 'id':
-                               echo intRequestVar('skinid');
+                               echo $skin->getID();
                                break;
                        case 'name':
                                echo Entity::hsc($skin->getName());
                                break;
                        case 'name':
                                echo Entity::hsc($skin->getName());
@@ -2885,20 +2453,34 @@ class AdminActions extends BaseActions
                                echo Entity::hsc($skin->getContentType());
                                break;
                        case 'content':
                                echo Entity::hsc($skin->getContentType());
                                break;
                        case 'content':
-                               echo Entity::hsc($skin->getContentFromDB($sType));
+                               echo Entity::hsc($skin->getContentFromDB($type));
                                break;
                        case 'skintype':
                                break;
                        case 'skintype':
-                               $skinType = !array_key_exists($sType, $fNames) ? ucfirst($sType) : $fNames[$sType];
+                               if ( !array_key_exists($type, $types) )
+                               {
+                                       $skinType = ucfirst($type);
+                               }
+                               else
+                               {
+                                       $skinType = $types[$type];
+                               }
                                echo Entity::hsc($skinType);
                                break;
                        case 'skintyperaw':
                                echo Entity::hsc($skinType);
                                break;
                        case 'skintyperaw':
-                               echo Entity::hsc($sType);
+                               echo Entity::hsc($type);
                                break;
                        case 'prefix':
                                echo Entity::hsc($skin->getIncludePrefix());
                                break;
                        case 'mode':
                                break;
                        case 'prefix':
                                echo Entity::hsc($skin->getIncludePrefix());
                                break;
                        case 'mode':
-                               $incMode = $skin->getIncludeMode() ? _PARSER_INCMODE_SKINDIR : _PARSER_INCMODE_NORMAL;
+                               if ( !$skin->getIncludeMode() != 'skindir' )
+                               {
+                                       $incMode = _PARSER_INCMODE_NORMAL;
+                               }
+                               else
+                               {
+                                       $incMode = _PARSER_INCMODE_SKINDIR;
+                               }
                                echo Entity::hsc($incMode);
                                break;
                        default:
                                echo Entity::hsc($incMode);
                                break;
                        default:
@@ -2924,191 +2506,134 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_edittemplateinfo()
         * Parse skinvar edittemplateinfo
        /**
         * AdminActions::parse_edittemplateinfo()
         * Parse skinvar edittemplateinfo
-        * 
-        * @param       string  $type                   name of type for skin
-        * @param       string  $description    description for skin
-        * @param       string  $name                   name of skin
-        * @param       string  $help                   
-        * @param       string  $tabindex               index value for tabindex attribute of input element
-        * @param       string  $big                    
-        * @param       string  $tplt                   name of template
-        * @return      boolean 
-        */
-       public function parse_edittemplateinfo($type, $desc = '', $name = '', $help = '', $tabindex = 0, $big = 0, $tplt = '')
+        *
+        * @param       string  $format         format to output
+        * @param       string  $typedesc       type of template
+        * @param       string  $typename       type name of template
+        * @param       string  $help           help text
+        * @param       string  $tabindex       index value for tabindex attribute of input element
+        * @param       string  $big            textarea size
+        * @param       string  $tplt           name of template to be filled
+        * @return      boolean
+        */
+       public function parse_edittemplateinfo($format, $typedesc = '', $typename = '', $help = '', $tabindex = 0, $big = 0, $template_name = '')
        {
                global $manager;
        {
                global $manager;
-               static $cache = array();
-               
-               if ( !array_key_exists('id', $cache) )
+               static $id = NULL;
+               static $name = NULL;
+               static $desc = NULL;
+
+               if ( $id == NULL )
                {
                {
-                       $cache['id'] = intRequestVar('templateid');
+                       $id = intRequestVar('templateid');
                }
                }
-               
-               if ( !array_key_exists('name', $cache) )
+       
+               if ( $name == NULL )
                {
                {
-                       $cache['name'] = Template::getNameFromId($cache['id']);
+                       $name = Template::getNameFromId($id);
                }
                }
-               
-               if ( !array_key_exists('desc', $cache) )
+       
+               if ( $desc == NULL )
                {
                {
-                       $cache['desc'] = Template::getDesc($cache['id']);
+                       $desc = Template::getDesc($id);
                }
                }
-               
-               $template =& $manager->getTemplate($cache['name']);
-               
-               switch ( $type )
+       
+               $template =& $manager->getTemplate($name);
+
+               switch ( $format )
                {
                        case 'id':
                {
                        case 'id':
-                               echo (integer) $cache['id'];
+                               echo (integer) $id;
                                break;
                        case 'name':
                                break;
                        case 'name':
-                               echo Entity::hsc($cache['name']);
+                               echo Entity::hsc($name);
                                break;
                        case 'desc':
                                break;
                        case 'desc':
-                               echo Entity::hsc($cache['desc']);
+                               echo Entity::hsc($desc);
                                break;
                        case 'extratemplate':
                                $tabidx = 600;
                                $pluginfields = array();
                                break;
                        case 'extratemplate':
                                $tabidx = 600;
                                $pluginfields = array();
-                               $manager->notify('TemplateExtraFields', array('fields' => &$pluginfields));
-                               
-                               $tmplt = array();
-                               if ( $desc )
+                               if ( !preg_match('#^admin/#', $this->skintype) )
                                {
                                {
-                                       $tmplt =& $manager->getTemplate($desc);
-                               }
-                               if ( !array_key_exists('TEMPLATE_EDIT_EXPLUGNAME', $tmplt) || empty($tmplt['TEMPLATE_EDIT_EXPLUGNAME']) )
-                               {
-                                       $base = "</tr>\n"
-                                             . "<tr>\n"
-                                             . '<th colspan="2"><%explugtplname%>' . "</th>\n";
+                                       $manager->notify('TemplateExtraFields', array('fields' => &$pluginfields));
                                }
                                else
                                {
                                }
                                else
                                {
-                                       $base = $tmplt['TEMPLATE_EDIT_EXPLUGNAME'];
+                                       $manager->notify('AdminTemplateExtraFields', array('fields' => &$pluginfields));
                                }
                                }
-                               
-                               foreach ( $pluginfields as $pfkey => $pfvalue )
+       
+                               foreach ( $pluginfields as $ptkey => $ptvalue )
                                {
                                {
-                                       $data = array('explugtplname' => Entity::hsc($pfkey));
-                                       
+                                       $tmplt = array();
+                                       if ( $desc )
+                                       {
+                                               $tmplt =& $manager->getTemplate($desc);
+                                       }
+                                               
+                                       /* extra plugin field */
+                                       if ( !array_key_exists('TEMPLATE_EDIT_EXPLUGNAME', $tmplt) || empty($tmplt['TEMPLATE_EDIT_EXPLUGNAME']) )
+                                       {
+                                               $base = "</tr>\n"
+                                               . "<tr>\n"
+                                               . "<th colspan=\"2\"><%explugtplname%></th>\n";
+                                       }
+                                       else
+                                       {
+                                               $base = $tmplt['TEMPLATE_EDIT_EXPLUGNAME'];
+                                       }
+                                       $data = array(
+                       'explugtplname' => Entity::hsc($ptkey)
+                                       );
                                        echo Template::fill($base, $data);
                                        echo Template::fill($base, $data);
-                                       
-                                       foreach ( $pfvalue as $pffield => $pfdesc )
+                                               
+                                       foreach ( $ptvalue as $ptname => $ptdesc )
                                        {
                                        {
-                                               $this->templateEditRow($template, $pfdesc, $pffield, '', ++$tabidx, 0, $name);
+                                               if ( !array_key_exists($ptname, $template) )
+                                               {
+                                                       $content = '';
+                                               }
+                                               else
+                                               {
+                                                       $content = $template[$ptname];
+                                               }
+                                               $this->parser->parse(listplug_templateEditRow($content, $ptdesc, $ptname, $help, $tabidx++, $big, $template_name));
+                                               continue;
                                        }
                                }
                                break;
                        default:
                                        }
                                }
                                break;
                        default:
-                               $desc = defined($desc) ? constant($desc) : $desc;
-                               $name = defined($name) ? constant($name) : $name;
-                               $this->templateEditRow($template, $desc, $name, $help, $tabindex, $big, $tplt);
-                               break;
-               }
-               
-               return;
-       }
-       
-       /**
-        * AdminActions::parse_editadmintemplateinfo()
-        * Parse skinvar editadmintemplateinfo
-        * 
-        * @param       string  $type                   type of skin template
-        * @param       string  $description    description of template
-        * @param       string  $name                   name of stemplate
-        * @param       string  $tabindex               index number for tabindex attribute of input element
-        * @param       string  $big                    
-        * @param       string  $tplt                   
-        */
-       public function parse_editadmintemplateinfo($type, $desc = '', $name = '', $help = '', $tabindex = 0, $big = 0, $tplt = '')
-       {
-               global $manager;
-               static $cache = array();
-               
-               if ( !array_key_exists('id', $cache) )
-               {
-                       $cache['id'] = intRequestVar('templateid');
-               }
-               
-               if ( !array_key_exists('name', $cache) )
-               {
-                       $cache['name'] = Template::getNameFromId($cache['id']);
-               }
-               
-               if ( !array_key_exists('desc', $cache) )
-               {
-                       $cache['desc'] = Template::getDesc($cache['id']);
-               }
-               
-               $template =& $manager->getTemplate($cache['name']);
-               
-               switch ( $type )
-               {
-                       case 'id':
-                               echo (integer) $cache['id'];
-                               break;
-                       case 'name':
-                               echo Entity::hsc($cache['name']);
-                               break;
-                       case 'desc':
-                               echo Entity::hsc($cache['desc']);
-                               break;
-                       case 'extratemplate':
-                               $tabidx = 600;
-                               $pluginfields = array();
-                               $manager->notify('AdminTemplateExtraFields', array('fields' => &$pluginfields));
-                               
-                               $tmplt = array();
-                               if ( $desc )
-                               {
-                                       $tmplt =& $manager->getTemplate($desc);
-                               }
-                               if ( !array_key_exists('TEMPLATE_EDIT_EXPLUGNAME', $tmplt) || empty($tmplt['TEMPLATE_EDIT_EXPLUGNAME']) )
+                               $typedesc = defined($typedesc) ? constant($typedesc) : $typedesc;
+                               $typename = defined($typename) ? constant($typename) : $typename;
+
+                               if ( !array_key_exists($typename, $template) )
                                {
                                {
-                                       $base = "</tr>\n"
-                                             . "<tr>\n"
-                                             . '<th colspan="2"><%explugtplname%>' . "</th>\n";
+                                       $content = '';
                                }
                                else
                                {
                                }
                                else
                                {
-                                       $base = $tmplt['TEMPLATE_EDIT_EXPLUGNAME'];
-                               }
-                               
-                               foreach ( $pluginfields as $pfkey => $pfvalue )
-                               {
-                                       $data = array('explugtplname' => Entity::hsc($pfkey));
-                                       
-                                       echo Template::fill($base, $data);
-                                       
-                                       foreach ( $pfvalue as $pffield => $pfdesc )
-                                       {
-                                               $this->templateEditRow($template, $pfdesc, $pffield, '', ++$tabidx, 0, $name);
-                                       }
+                                       $content = $template[$typename];
                                }
                                }
-                               break;
-                       default:
-                               $desc = defined($desc) ? constant($desc) : $desc;
-                               $name = defined($name) ? constant($name) : $name;
-                               $this->templateEditRow($template, $desc, $name, $help, $tabindex, $big, $tplt);
+                               $this->parser->parse(listplug_templateEditRow($content, $typedesc, $typename, $help, $tabindex, $big, $template_name));
                                break;
                }
                                break;
                }
+       
                return;
        }
        
        /**
         * AdminActions::parse_eventformextra()
         * Parse skinvar eventformextra
                return;
        }
        
        /**
         * AdminActions::parse_eventformextra()
         * Parse skinvar eventformextra
-        * 
+        *
         * @param       string  $type   name of type for event form extra
         * @return      void
         */
        public function parse_eventformextra($type = 'activation')
        {
                global $manager;
         * @param       string  $type   name of type for event form extra
         * @return      void
         */
        public function parse_eventformextra($type = 'activation')
        {
                global $manager;
-               
+
                $data = array();
                $data = array();
-               
+
                switch ( $type )
                {
                        case 'activation':
                switch ( $type )
                {
                        case 'activation':
@@ -3128,8 +2653,8 @@ class AdminActions extends BaseActions
                                        Admin::error(_ERROR_ACTIVATE);
                                }
                                $data = array(
                                        Admin::error(_ERROR_ACTIVATE);
                                }
                                $data = array(
-                                       'type'          => 'activation',
-                                       'member'        => $mem
+               'type'          => 'activation',
+               'member'        => $mem
                                );
                                break;
                        case 'membermailform-notloggedin':
                                );
                                break;
                        case 'membermailform-notloggedin':
@@ -3147,14 +2672,14 @@ class AdminActions extends BaseActions
        public function parse_extrahead()
        {
                global $manager;
        public function parse_extrahead()
        {
                global $manager;
-               
+
                $extrahead = Admin::getAdminextrahead();
                $extrahead = Admin::getAdminextrahead();
-               
+
                $data = array(
                $data = array(
-                       'extrahead'     => &$extrahead,
-                       'action'        => Admin::getAdminAction()
+'extrahead'    => &$extrahead,
+'action'       => Admin::getAdminAction()
                );
                );
-               
+
                $manager->notify('AdminPrePageHead', $data);
                echo $extrahead;
                return;
                $manager->notify('AdminPrePageHead', $data);
                echo $extrahead;
                return;
@@ -3164,14 +2689,14 @@ class AdminActions extends BaseActions
         * AdminActions::parse_member()
         * Parse skinvar member
         * (includes a member info thingie)
         * AdminActions::parse_member()
         * Parse skinvar member
         * (includes a member info thingie)
-        * 
+        *
         * @param       string  $what   which memberdata is needed
         * @return      void
         */
        public function parse_member($what)
        {
                global $memberinfo, $member, $CONF;
         * @param       string  $what   which memberdata is needed
         * @return      void
         */
        public function parse_member($what)
        {
                global $memberinfo, $member, $CONF;
-               
+
                // 1. only allow the member-details-page specific variables on member pages
                if ( $this->skintype == 'member' )
                {
                // 1. only allow the member-details-page specific variables on member pages
                if ( $this->skintype == 'member' )
                {
@@ -3197,7 +2722,7 @@ class AdminActions extends BaseActions
                                        break;
                        }
                }
                                        break;
                        }
                }
-               
+       
                // 2. the next bunch of options is available everywhere, as long as the user is logged in
                if ( $member->isLoggedIn() )
                {
                // 2. the next bunch of options is available everywhere, as long as the user is logged in
                if ( $member->isLoggedIn() )
                {
@@ -3255,7 +2780,7 @@ class AdminActions extends BaseActions
         * AdminActions::parse_sitevar()
         * Parse skinvar sitevar
         * (include a sitevar)
         * AdminActions::parse_sitevar()
         * Parse skinvar sitevar
         * (include a sitevar)
-        * 
+        *
         * @param       string  $which
         * @return      void
         */
         * @param       string  $which
         * @return      void
         */
@@ -3283,7 +2808,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_actionurl()
         * Parse $CONF;
        /**
         * AdminActions::parse_actionurl()
         * Parse $CONF;
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -3301,7 +2826,7 @@ class AdminActions extends BaseActions
        public function parse_getblogsetting($which)
        {
                global $blog, $manager;
        public function parse_getblogsetting($which)
        {
                global $blog, $manager;
-               
+
                if ( $blog )
                {
                        $b =& $blog;
                if ( $blog )
                {
                        $b =& $blog;
@@ -3314,7 +2839,7 @@ class AdminActions extends BaseActions
                {
                        return;
                }
                {
                        return;
                }
-               
+       
                switch ( $which )
                {
                        case 'id':
                switch ( $which )
                {
                        case 'id':
@@ -3351,7 +2876,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_geteditpluginfo()
         * Parse skinvar geteditpluginfo
        /**
         * AdminActions::parse_geteditpluginfo()
         * Parse skinvar geteditpluginfo
-        * 
+        *
         * @param       string  $type   name of setting for edit plugin info
         * @return      void
         */
         * @param       string  $type   name of setting for edit plugin info
         * @return      void
         */
@@ -3375,7 +2900,7 @@ class AdminActions extends BaseActions
         * AdminActions::parse_getmember()
         * Parse skinvar getmember
         * (includes a member info thingie)
         * AdminActions::parse_getmember()
         * Parse skinvar getmember
         * (includes a member info thingie)
-        * 
+        *
         * @param       string  $what   name of setting for member
         * @return      void
         */
         * @param       string  $what   name of setting for member
         * @return      void
         */
@@ -3438,7 +2963,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_headmessage()
         * Parse skinvar headmessage
        /**
         * AdminActions::parse_headmessage()
         * Parse skinvar headmessage
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -3454,7 +2979,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_helplink()
         * Parse skinvar helplink
        /**
         * AdminActions::parse_helplink()
         * Parse skinvar helplink
-        * 
+        *
         * @param       string  $topic  name of topic for help
         * @return      void
         */
         * @param       string  $topic  name of topic for help
         * @return      void
         */
@@ -3470,7 +2995,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_helpplugname()
         * Parse skinvar helpplugname
        /**
         * AdminActions::parse_helpplugname()
         * Parse skinvar helpplugname
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -3484,7 +3009,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_ilistaddnew()
         * Parse skinvar ilistaddnew
        /**
         * AdminActions::parse_ilistaddnew()
         * Parse skinvar ilistaddnew
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -3501,7 +3026,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_importskininfo()
         * Parse skinvar importskininfo
        /**
         * AdminActions::parse_importskininfo()
         * Parse skinvar importskininfo
-        * 
+        *
         * @param       string  $type   name of information for imported skin
         * @return      void
         */
         * @param       string  $type   name of information for imported skin
         * @return      void
         */
@@ -3539,24 +3064,22 @@ class AdminActions extends BaseActions
        }
        
        /**
        }
        
        /**
-        * AdminActions::parse_inputyesno()
-        * Parse skinvar inputyesno
-        * 
+        * AdminActions::parse_init()
         * some init stuff for all forms
         * some init stuff for all forms
-        * 
+        *
         * @param       void
         * @return      void
         */
        public function parse_init()
        {
                global $manager;
         * @param       void
         * @return      void
         */
        public function parse_init()
        {
                global $manager;
-               
+
                $authorid = '';
                if ( requestVar('action') == 'itemedit' )
                {
                        $authorid = Admin::$contents['authorid'];
                }
                $authorid = '';
                if ( requestVar('action') == 'itemedit' )
                {
                        $authorid = Admin::$contents['authorid'];
                }
-               
+       
                Admin::$blog->insertJavaScriptInfo($authorid);
                return;
        }
                Admin::$blog->insertJavaScriptInfo($authorid);
                return;
        }
@@ -3564,21 +3087,21 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_inputyesno()
         * Parse skinvar inputyesno
        /**
         * AdminActions::parse_inputyesno()
         * Parse skinvar inputyesno
-        * 
-        * @param       string  $name                   
-        * @param       string  $checkedval             
-        * @param       string  $tabindex               
-        * @param       string  $value1                 
-        * @param       string  $value2                 
-        * @param       string  $yesval                 
-        * @param       string  $noval                  
-        * @param       string  $isAdmin                
-        * @param       string  $templateName   
+        *
+        * @param       string  $name
+        * @param       string  $checkedval
+        * @param       string  $tabindex
+        * @param       string  $value1
+        * @param       string  $value2
+        * @param       string  $yesval
+        * @param       string  $noval
+        * @param       string  $isAdmin
+        * @param       string  $template_name
         * @return      void
         */
         * @return      void
         */
-       public function parse_inputyesno($name, $checkedval, $tabindex = 0, $value1 = 1, $value2 = 0, $yesval = _YES, $noval = _NO, $isAdmin = 0, $templateName = '')
+       public function parse_inputyesno($name, $checkedval, $tabindex = 0, $value1 = 1, $value2 = 0, $yesval = _YES, $noval = _NO, $isAdmin = 0, $template_name = '')
        {
        {
-               self::input_yesno($name, $checkedval, $tabindex, $value1, $value2, $yesval, $noval, $isAdmin, $templateName );
+               $this->parser->parse(listplug_input_yesno($name, $checkedval, $tabindex, $value1, $value2, $yesval, $noval, $isAdmin, $template_name));
                return;
        }
        
                return;
        }
        
@@ -3604,14 +3127,14 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_insplugoptcontent()
         * Parse skinvar insplugoptcontent
        /**
         * AdminActions::parse_insplugoptcontent()
         * Parse skinvar insplugoptcontent
-        * 
+        *
         * @param       void
         * @return      void
         */
        public function parse_insplugoptcontent()
        {
                $option = Admin::getAdminaOption();
         * @param       void
         * @return      void
         */
        public function parse_insplugoptcontent()
        {
                $option = Admin::getAdminaOption();
-               
+
                $meta = NucleusPlugin::getOptionMeta($option['typeinfo']);
                if ( array_key_exists('access', $meta) && $meta['access'] != 'hidden' )
                {
                $meta = NucleusPlugin::getOptionMeta($option['typeinfo']);
                if ( array_key_exists('access', $meta) && $meta['access'] != 'hidden' )
                {
@@ -3625,7 +3148,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_iprangeinput()
         * Parse skinvar iprangeinput
        /**
         * AdminActions::parse_iprangeinput()
         * Parse skinvar iprangeinput
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -3651,20 +3174,20 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_itemnavlist()
         * Parse skinvar itemnavlist
        /**
         * AdminActions::parse_itemnavlist()
         * Parse skinvar itemnavlist
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
-       public function parse_itemnavlist($templateName)
+       public function parse_itemnavlist($template_name)
        {
                global $CONF, $manager, $member;
        {
                global $CONF, $manager, $member;
-               
+
                $query  = "SELECT bshortname, cname, mname, ititle, ibody, inumber, idraft, itime"
                $query  = "SELECT bshortname, cname, mname, ititle, ibody, inumber, idraft, itime"
-                       . " FROM %s, %s, %s, %s"
-                       . " WHERE iblog=bnumber AND iauthor=mnumber AND icat=catid";
-               
+               . " FROM %s, %s, %s, %s"
+               . " WHERE iblog=bnumber AND iauthor=mnumber AND icat=catid";
+
                $query = sprintf($query, sql_table('item'), sql_table('blog'), sql_table('member'), sql_table('category'));
                $query = sprintf($query, sql_table('item'), sql_table('blog'), sql_table('member'), sql_table('category'));
-               
+
                if ( $this->skintype == 'itemlist' )
                {
                        $blog = FALSE;
                if ( $this->skintype == 'itemlist' )
                {
                        $blog = FALSE;
@@ -3679,10 +3202,10 @@ class AdminActions extends BaseActions
                                $blogid =  (integer) $item['blogid'];
                        }
                        $blog =& $manager->getBlog($blogid);
                                $blogid =  (integer) $item['blogid'];
                        }
                        $blog =& $manager->getBlog($blogid);
-                       
+                               
                        $query .= " AND iblog={$blogid}";
                        $template['now'] = $blog->getCorrectTime(time());
                        $query .= " AND iblog={$blogid}";
                        $template['now'] = $blog->getCorrectTime(time());
-                       
+                               
                        // non-blog-admins can only edit/delete their own items
                        if ( !$member->blogAdminRights($blogid) )
                        {
                        // non-blog-admins can only edit/delete their own items
                        if ( !$member->blogAdminRights($blogid) )
                        {
@@ -3695,17 +3218,17 @@ class AdminActions extends BaseActions
                        $blogid = 0;
                        $template['now'] = time();
                }
                        $blogid = 0;
                        $template['now'] = time();
                }
-               
+       
                // search through items
                $search = postVar('search');
                // search through items
                $search = postVar('search');
-               
+
                if ( !empty($search) )
                {
                        $query .= ' AND ((ititle LIKE ' . DB::quoteValue('%'.$search.'%') . ') '
                if ( !empty($search) )
                {
                        $query .= ' AND ((ititle LIKE ' . DB::quoteValue('%'.$search.'%') . ') '
-                               . '  OR  (ibody LIKE ' . DB::quoteValue('%'.$search.'%') . ') '
-                               . '  OR  (imore LIKE ' . DB::quoteValue('%'.$search.'%') . '))';
+                       . '  OR  (ibody LIKE ' . DB::quoteValue('%'.$search.'%') . ') '
+                       . '  OR  (imore LIKE ' . DB::quoteValue('%'.$search.'%') . '))';
                }
                }
-               
+       
                if ( postVar('start') )
                {
                        $start = intPostVar('start');
                if ( postVar('start') )
                {
                        $start = intPostVar('start');
@@ -3714,7 +3237,7 @@ class AdminActions extends BaseActions
                {
                        $start = 0;
                }
                {
                        $start = 0;
                }
-               
+       
                // amount of items to show
                if ( postVar('amount') )
                {
                // amount of items to show
                if ( postVar('amount') )
                {
@@ -3728,50 +3251,68 @@ class AdminActions extends BaseActions
                                $amount = 10;
                        }
                }
                                $amount = 10;
                        }
                }
-               
+       
                $query .= ' ORDER BY itime DESC'
                $query .= ' ORDER BY itime DESC'
-                       . " LIMIT {$start},{$amount}";
-               
-               $template['content'] = 'itemlist';
+               . " LIMIT {$start},{$amount}";
+
+               $resource = DB::getResult($query);
+               if ( $resource->rowCount() > 0 )
+               {
+                       $template['action'] = $this->skintype;
+                       $template['start'] = $start;
+                       $template['amount'] = $amount;
+                       $template['minamount'] = 0;
+                       $template['maxamount'] = 1000;
+                       $template['blogid'] = $blogid;
+                       $template['search'] = $search;
+                       $template['itemid'] = 0;
+                               
+                       $template['content'] = 'itemlist';
+                               
+                       $this->parser->parse(listplug_navlist('item', $query, 'table', $template));
+               }
+               else
+               {
+                       /* TODO: nothing to be shown */
+               }
+               $resource->closeCursor();
 
 
-               $navList = new Navlist($this->skintype, $start, $amount, 0, 1000, $blogid, $search, 0);
-               $navList->showBatchList('item', $query, 'table', $template, '', $templateName);
                return;
        }
        
        /**
         * AdminActions::parse_itemtime()
         * date change on edit item
                return;
        }
        
        /**
         * AdminActions::parse_itemtime()
         * date change on edit item
-        * 
+        *
         * @param       string  $key    key of PHP's getDate()
         * @return      void
         */
        public function parse_itemtime($key)
        {
                global $manager;
         * @param       string  $key    key of PHP's getDate()
         * @return      void
         */
        public function parse_itemtime($key)
        {
                global $manager;
-               
+
                $item = false;
                $itemid = intRequestVar('itemid');
                $item =& $manager->getItem($itemid, 1, 1);
                $item = false;
                $itemid = intRequestVar('itemid');
                $item =& $manager->getItem($itemid, 1, 1);
-               
+
                $blog   =& $manager->getBlog(getBlogIDFromItemID($itemid));
                $blog   =& $manager->getBlog(getBlogIDFromItemID($itemid));
-               
+
                if ( $item && $blog->convertBreaks() && requestVar('action') == 'itemedit' )
                {
                        $item['body'] = removeBreaks($item['body']);
                        $item['more'] = removeBreaks($item['more']);
                }
                if ( $item && $blog->convertBreaks() && requestVar('action') == 'itemedit' )
                {
                        $item['body'] = removeBreaks($item['body']);
                        $item['more'] = removeBreaks($item['more']);
                }
-               
+       
                $contents = array();
                if ( requestVar('action') == 'itemedit' )
                {
                        $contents = $item;
                $contents = array();
                if ( requestVar('action') == 'itemedit' )
                {
                        $contents = $item;
-               } 
+               }
                elseif ( requestVar('action') == 'createitem' )
                {
                        $data = array(
                elseif ( requestVar('action') == 'createitem' )
                {
                        $data = array(
-                               'contents' => &$contents,
-                               'blog'     => &$this->blog
+                       'contents'      => &$contents,
+                       'blog'          => &$this->blog
                        );
                        $manager->notify('PreAddItemForm', $data);
                }
                        );
                        $manager->notify('PreAddItemForm', $data);
                }
@@ -3783,7 +3324,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_jstoolbaroptions()
         * Parse skinvar jstoolbaroptions
        /**
         * AdminActions::parse_jstoolbaroptions()
         * Parse skinvar jstoolbaroptions
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -3791,11 +3332,11 @@ class AdminActions extends BaseActions
        {
                global $CONF;
                $options = array(
        {
                global $CONF;
                $options = array(
-                       _SETTINGS_JSTOOLBAR_NONE,
-                       _SETTINGS_JSTOOLBAR_SIMPLE,
-                       _SETTINGS_JSTOOLBAR_FULL
+               _SETTINGS_JSTOOLBAR_NONE,
+               _SETTINGS_JSTOOLBAR_SIMPLE,
+               _SETTINGS_JSTOOLBAR_FULL
                );
                );
-               
+
                $i = 1;
                foreach ( $options as $option )
                {
                $i = 1;
                foreach ( $options as $option )
                {
@@ -3809,16 +3350,16 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_localeselectoptions()
         * Parse skinvar localeselectoptions
        /**
         * AdminActions::parse_localeselectoptions()
         * Parse skinvar localeselectoptions
-        * 
+        *
         * @param       void
         * @return      void
         */
        public function parse_localeselectoptions()
        {
                global $manager;
         * @param       void
         * @return      void
         */
        public function parse_localeselectoptions()
        {
                global $manager;
-               
+
                $locales = i18n::get_available_locale_list();
                $locales = i18n::get_available_locale_list();
-               
+
                $memid = intRequestVar('memberid');
                if ( $memid )
                {
                $memid = intRequestVar('memberid');
                if ( $memid )
                {
@@ -3878,20 +3419,20 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_listplugplugoptionrow()
         * Parse templatevar listplugplugoptionrow
        /**
         * AdminActions::parse_listplugplugoptionrow()
         * Parse templatevar listplugplugoptionrow
-        * 
-        * @param       string  $templateName   name of template
+        *
+        * @param       string  $template_name  name of template
         * @return      void
         */
         * @return      void
         */
-       public function parse_listplugplugoptionrow($templateName = '')
+       public function parse_listplugplugoptionrow($template_name = '')
        {
        {
-               echo listplug_plugOptionRow(Admin::getAdminaOption(), $templateName);
+               echo listplug_plugOptionRow(Admin::getAdminaOption(), $template_name);
                return;
        }
        
        /**
         * AdminActions::parse_mediadirwarning()
         * Parse skinvar mediadirwarning
                return;
        }
        
        /**
         * AdminActions::parse_mediadirwarning()
         * Parse skinvar mediadirwarning
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -3944,7 +3485,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_moveitemid()
         * Parse skinvar moveitemid
        /**
         * AdminActions::parse_moveitemid()
         * Parse skinvar moveitemid
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -3957,18 +3498,18 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_newestcompare()
         * Parse skinvar newestcompare
        /**
         * AdminActions::parse_newestcompare()
         * Parse skinvar newestcompare
-        * 
+        *
         * @param       void
         * @return      void
         */
        public function parse_newestcompare()
        {
                global $nucleus;
         * @param       void
         * @return      void
         */
        public function parse_newestcompare()
        {
                global $nucleus;
-               
+
                $newestVersion  = getLatestVersion();
                $newestCompare  = str_replace('/', '.', $newestVersion);
                $currentVersion = str_replace(array('/', 'v'), array('.', ''), $nucleus['version']);
                $newestVersion  = getLatestVersion();
                $newestCompare  = str_replace('/', '.', $newestVersion);
                $currentVersion = str_replace(array('/', 'v'), array('.', ''), $nucleus['version']);
-               
+
                if ( $newestVersion && version_compare($newestCompare, $currentVersion, '>') )
                {
                        echo '<br /><a style="color:red" href="http://nucleuscms.org/upgrade.php" title="' . _ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TITLE . '">';
                if ( $newestVersion && version_compare($newestCompare, $currentVersion, '>') )
                {
                        echo '<br /><a style="color:red" href="http://nucleuscms.org/upgrade.php" title="' . _ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TITLE . '">';
@@ -3980,40 +3521,40 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_newmemberselect()
         * Parse skinvar newmemberselect
        /**
         * AdminActions::parse_newmemberselect()
         * Parse skinvar newmemberselect
-        * 
-        * @param       string  $templateName   name of template to use
+        *
+        * @param       string  $template_name  name of template to use
         * @return      void
         */
         * @return      void
         */
-       public function parse_newmemberselect($templateName = '')
+       public function parse_newmemberselect($template_name = '')
        {
                $blogid = intRequestVar('blogid');
        {
                $blogid = intRequestVar('blogid');
-               
+
                $query = "SELECT tmember FROM %s WHERE tblog=%d;";
                $query = sprintf($query, sql_table('team'), (integer) $blogid);
                $res = DB::getResult($query);
                $query = "SELECT tmember FROM %s WHERE tblog=%d;";
                $query = sprintf($query, sql_table('team'), (integer) $blogid);
                $res = DB::getResult($query);
-               
+
                $tmem = array();
                $tmem = array();
-               foreach ( $res as $row ) 
+               foreach ( $res as $row )
                {
                        $tmem[] = intval($row['tmember']);
                }
                {
                        $tmem[] = intval($row['tmember']);
                }
-               
+       
                $query  = "SELECT mname as text, mnumber as value FROM %s WHERE mnumber NOT IN (%s);";
                $query = sprintf($query, sql_table('member'), implode(', ', $tmem));
                $query  = "SELECT mname as text, mnumber as value FROM %s WHERE mnumber NOT IN (%s);";
                $query = sprintf($query, sql_table('member'), implode(', ', $tmem));
-               
+
                $template = array(
                $template = array(
-                                       'name'          => 'memberid',
-                                       'tabindex'      => 10000,
-                                       'selected'      => 0
-                               );
-               Showlist($query, 'select', $template, $templateName);
+               'name'          => 'memberid',
+               'tabindex'      => 10000,
+               'selected'      => 0
+               );
+               $this->parser->parse(showlist($query, 'select', $template, $template_name));
                return;
        }
        
        /**
         * AdminActions::parse_newpluginlist()
         * Parse skinvar newpluginlist
                return;
        }
        
        /**
         * AdminActions::parse_newpluginlist()
         * Parse skinvar newpluginlist
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -4030,14 +3571,14 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_outputspecialdirs()
         * Parse skinvar outputspecialdirs
        /**
         * AdminActions::parse_outputspecialdirs()
         * Parse skinvar outputspecialdirs
-        * 
+        *
         * @param       string  $type   type of setting for directory
         * @return      void
         */
        public function parse_outputspecialdirs($type)
        {
                global $DIR_MEDIA, $DIR_NUCLEUS;
         * @param       string  $type   type of setting for directory
         * @return      void
         */
        public function parse_outputspecialdirs($type)
        {
                global $DIR_MEDIA, $DIR_NUCLEUS;
-               
+
                switch ( $type )
                {
                        case 'nucleusdir':
                switch ( $type )
                {
                        case 'nucleusdir':
@@ -4053,7 +3594,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_passrequestvars()
         * Parse skinvar passrequestvars
        /**
         * AdminActions::parse_passrequestvars()
         * Parse skinvar passrequestvars
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -4061,11 +3602,11 @@ class AdminActions extends BaseActions
        {
                $passvar   = Admin::getAdminpassvar();
                $oldaction = postVar('oldaction');
        {
                $passvar   = Admin::getAdminpassvar();
                $oldaction = postVar('oldaction');
-               
+
                if ( ($oldaction != 'logout')
                if ( ($oldaction != 'logout')
-                 && ($oldaction != 'login')
-                 && $passvar
-                 && !postVar('customaction') )
+               && ($oldaction != 'login')
+               && $passvar
+               && !postVar('customaction') )
                {
                        passRequestVars();
                }
                {
                        passRequestVars();
                }
@@ -4075,14 +3616,14 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_pluginextras()
         * Parse skinvar pluginextras
        /**
         * AdminActions::parse_pluginextras()
         * Parse skinvar pluginextras
-        * 
+        *
         * @param       string  $type   type of plugin context
         * @return      void
         */
        public function parse_pluginextras($type = 'global')
        {
                global $manager;
         * @param       string  $type   type of plugin context
         * @return      void
         */
        public function parse_pluginextras($type = 'global')
        {
                global $manager;
-               
+
                switch ( $type )
                {
                        case 'member':
                switch ( $type )
                {
                        case 'member':
@@ -4097,14 +3638,14 @@ class AdminActions extends BaseActions
                                break;
                        case 'createaccount':
                                $data = array(
                                break;
                        case 'createaccount':
                                $data = array(
-                                       'type'          => 'createaccount.php',
-                                       'prelabel'      => '',
-                                       'postlabel'     => '<br />',
-                                       'prefield'      => '',
-                                       'postfield'     => '<br /><br />'
-                               );
-                               $manager->notify('RegistrationFormExtraFields', $data);
-                       break;
+               'type'          => 'createaccount.php',
+               'prelabel'      => '',
+               'postlabel'     => '<br />',
+               'prefield'      => '',
+               'postfield'     => '<br /><br />'
+               );
+               $manager->notify('RegistrationFormExtraFields', $data);
+               break;
                        default:
                                $manager->notify('GeneralSettingsFormExtras', array());
                                break;
                        default:
                                $manager->notify('GeneralSettingsFormExtras', array());
                                break;
@@ -4115,18 +3656,18 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_pluginhelp()
         * Parse skinvar pluginhelp
        /**
         * AdminActions::parse_pluginhelp()
         * Parse skinvar pluginhelp
-        * 
+        *
         * @param       void
         * @return      void
         */
        public function parse_pluginhelp()
        {
                global $manager, $DIR_PLUGINS;
         * @param       void
         * @return      void
         */
        public function parse_pluginhelp()
        {
                global $manager, $DIR_PLUGINS;
-               
+
                $plugid = intGetVar('plugid');
                $plugName = $manager->getPluginNameFromPid($plugid);
                $plug =& $manager->getPlugin($plugName);
                $plugid = intGetVar('plugid');
                $plugName = $manager->getPluginNameFromPid($plugid);
                $plug =& $manager->getPlugin($plugName);
-               
+
                if ( $plug->supportsFeature('HelpPage') > 0 )
                {
                        $helpfile = $DIR_PLUGINS . $plug->getShortName() . '/help.';
                if ( $plug->supportsFeature('HelpPage') > 0 )
                {
                        $helpfile = $DIR_PLUGINS . $plug->getShortName() . '/help.';
@@ -4149,34 +3690,34 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_pluginlistlist()
         * Parse skinvar pluginlistlist
        /**
         * AdminActions::parse_pluginlistlist()
         * Parse skinvar pluginlistlist
-        * 
-        * @param       string  $templateName   name of template to use
+        *
+        * @param       string  $template_name  name of template to use
         * @return      void
         */
         * @return      void
         */
-       public function parse_pluginlistlist($templateName = '')
+       public function parse_pluginlistlist($template_name = '')
        {
                $query = "SELECT * FROM %s ORDER BY porder ASC;";
                $query = sprintf($query, sql_table('plugin'));
        {
                $query = "SELECT * FROM %s ORDER BY porder ASC;";
                $query = sprintf($query, sql_table('plugin'));
-               
+
                $template['content']  = 'pluginlist';
                $template['tabindex'] = 10;
                $template['content']  = 'pluginlist';
                $template['tabindex'] = 10;
-               
-               Showlist($query, 'table', $template, $templateName);
-               
+
+               $this->parser->parse(showlist($query, 'table', $template, $template_name));
+
                return;
        }
        
        /**
         * AdminActions::parse_pluginoptions()
         * Parse skinvar pluginoptions
                return;
        }
        
        /**
         * AdminActions::parse_pluginoptions()
         * Parse skinvar pluginoptions
-        * 
+        *
         * @param       string  $type   type of plugin option
         * @return      void
         */
         * @param       string  $type   type of plugin option
         * @return      void
         */
-       public function parse_pluginoptions($context='global', $templateName='')
+       public function parse_pluginoptions($context='global', $template_name='')
        {
                global $itemid, $manager;
        {
                global $itemid, $manager;
-               
+
                switch ( $context )
                {
                        case 'member':
                switch ( $context )
                {
                        case 'member':
@@ -4192,7 +3733,7 @@ class AdminActions extends BaseActions
                                $contextid = $itemid;
                                break;
                }
                                $contextid = $itemid;
                                break;
                }
-               
+       
                /* Actually registererd plugin options */
                $aIdToValue = array();
                $query = "SELECT oid, ovalue FROM %s WHERE ocontextid=%d;";
                /* Actually registererd plugin options */
                $aIdToValue = array();
                $query = "SELECT oid, ovalue FROM %s WHERE ocontextid=%d;";
@@ -4202,12 +3743,12 @@ class AdminActions extends BaseActions
                {
                        $aIdToValue[$row['oid']] = $row['ovalue'];
                }
                {
                        $aIdToValue[$row['oid']] = $row['ovalue'];
                }
-               
+       
                /* Currently available plugin options */
                $query  = "SELECT * FROM %s, %s WHERE opid=pid and ocontext= %s ORDER BY porder, oid ASC;";
                $query  = sprintf($query, sql_table('plugin_option_desc'), sql_table('plugin'), DB::quoteValue($context));
                $res    = DB::getResult($query);
                /* Currently available plugin options */
                $query  = "SELECT * FROM %s, %s WHERE opid=pid and ocontext= %s ORDER BY porder, oid ASC;";
                $query  = sprintf($query, sql_table('plugin_option_desc'), sql_table('plugin'), DB::quoteValue($context));
                $res    = DB::getResult($query);
-               
+
                $options = array();
                foreach ($res as $row )
                {
                $options = array();
                foreach ($res as $row )
                {
@@ -4219,161 +3760,145 @@ class AdminActions extends BaseActions
                        {
                                $value = $aIdToValue[$row['oid']];
                        }
                        {
                                $value = $aIdToValue[$row['oid']];
                        }
-                               
+       
                        $options[] = array(
                        $options[] = array(
-                               'pid'                   => $row['pid'],
-                               'pfile'                 => $row['pfile'],
-                               'oid'                   => $row['oid'],
-                               'value'                 => $value,
-                               'name'                  => $row['oname'],
-                               'description'   => $row['odesc'],
-                               'type'                  => $row['otype'],
-                               'typeinfo'              => $row['oextra'],
-                               'contextid'             => $contextid,
-                               'extra'                 => ''
-                       );
+       'pid'                   => $row['pid'],
+       'pfile'                 => $row['pfile'],
+       'oid'                   => $row['oid'],
+       'value'                 => $value,
+       'name'                  => $row['oname'],
+       'description'   => $row['odesc'],
+       'type'                  => $row['otype'],
+       'typeinfo'              => $row['oextra'],
+       'contextid'             => $contextid,
+       'extra'                 => ''
+       );
                }
                }
-               
+       
                $data = array(
                $data = array(
-                       'context'       =>  $context,
-                       'contextid'     =>  $contextid,
-                       'options'       => &$options
+'context'      =>  $context,
+'contextid'    =>  $contextid,
+'options'      => &$options
                );
                $manager->notify('PrePluginOptionsEdit', $data);
                );
                $manager->notify('PrePluginOptionsEdit', $data);
-               
+
                $template = array();
                $template = array();
-               if ( $templateName )
+               if ( $template_name )
                {
                {
-                       $templates =& $manager->getTemplate($templateName);
+                       $templates =& $manager->getTemplate($template_name);
                        if ( !array_key_exists('INSERT_PLUGOPTION_TITLE', $templates) || empty($templates['INSERT_PLUGOPTION_TITLE']) )
                        {
                                $template['title'] = "<tr>"
                        if ( !array_key_exists('INSERT_PLUGOPTION_TITLE', $templates) || empty($templates['INSERT_PLUGOPTION_TITLE']) )
                        {
                                $template['title'] = "<tr>"
-                                                  . "<th colspan=\"2\"><%sprinttext(_PLUGIN_OPTIONS_TITLE, <|%insertpluginfo(name)%|>)%></th>"
-                                                  . "</tr>\n";
+                               . "<th colspan=\"2\"><%sprinttext(_PLUGIN_OPTIONS_TITLE, <|%insertpluginfo(name)%|>)%></th>"
+                               . "</tr>\n";
                        }
                        else
                        {
                                $template['title'] = $templates['INSERT_PLUGOPTION_TITLE'];
                        }
                        }
                        else
                        {
                                $template['title'] = $templates['INSERT_PLUGOPTION_TITLE'];
                        }
-                       
+       
                        if ( !array_key_exists('INSERT_PLUGOPTION_BODY', $templates) || empty($templates['INSERT_PLUGOPTION_BODY']) )
                        {
                                $template['body'] = "<tr>"
                        if ( !array_key_exists('INSERT_PLUGOPTION_BODY', $templates) || empty($templates['INSERT_PLUGOPTION_BODY']) )
                        {
                                $template['body'] = "<tr>"
-                                                 . "<%listplugplugoptionrow%>"
-                                                 . "</tr>\n";
+                               . "<%listplugplugoptionrow%>"
+                               . "</tr>\n";
                        }
                        else
                        {
                                $template['body'] = $templates['INSERT_PLUGOPTION_BODY'];
                        }
                }
                        }
                        else
                        {
                                $template['body'] = $templates['INSERT_PLUGOPTION_BODY'];
                        }
                }
-               
+       
                $prevPid = -1;
                $prevPid = -1;
-               
-               include_libs('ACTIONS.php');
-               $handler = new Actions($this->skintype);
-               $parser = new PARSER($handler);
-                       
+
                foreach ( $options as $option )
                {
                        // new plugin?
                        if ( $prevPid != $option['pid'] )
                        {
                                $prevPid  = $option['pid'];
                foreach ( $options as $option )
                {
                        // new plugin?
                        if ( $prevPid != $option['pid'] )
                        {
                                $prevPid  = $option['pid'];
-                               $parser->parse($template['title']);
+                               $this->parser->parse($template['title']);
                        }
                        }
-                       
+       
                        $meta = NucleusPlugin::getOptionMeta($option['typeinfo']);
                        $meta = NucleusPlugin::getOptionMeta($option['typeinfo']);
-                       
+
                        if ( @$meta['access'] != 'hidden' )
                        {
                        if ( @$meta['access'] != 'hidden' )
                        {
-                               $parsed = $parser->parse($template['body']);
+                               $parsed = $this->parser->parse($template['body']);
                        }
                }
                        }
                }
-               
+       
                return;
        }
        
        /**
         * AdminActions::parse_qmenuaddselect()
         * Parse skinvar qmanuaddselect
                return;
        }
        
        /**
         * AdminActions::parse_qmenuaddselect()
         * Parse skinvar qmanuaddselect
-        * 
-        * @param       string  $templateName   name of template to use
+        *
+        * @param       string  $template_name  name of template to use
         * @return      void
         */
         * @return      void
         */
-       public function parse_qmenuaddselect($templateName = '')
+       public function parse_qmenuaddselect($template_name = '')
        {
        {
-               global $member;
+               global $member, $blogid;
                $showAll = requestVar('showall');
                if ( $member->isAdmin() && ($showAll == 'yes') )
                {
                        // Super-Admins have access to all blogs! (no add item support though)
                $showAll = requestVar('showall');
                if ( $member->isAdmin() && ($showAll == 'yes') )
                {
                        // Super-Admins have access to all blogs! (no add item support though)
-                       $query =  'SELECT bnumber as value, bname as text'
-                              . ' FROM ' . sql_table('blog')
-                              . ' ORDER BY bname';
+                       $query =  'SELECT bnumber as value, bname as text FROM %s ORDER BY bname;';
+                       $query = sprintf($query, sql_table('blog'));
                }
                else
                {
                }
                else
                {
-                       $query =  'SELECT bnumber as value, bname as text'
-                              . ' FROM ' . sql_table('blog') . ', ' . sql_table('team')
-                              . ' WHERE tblog=bnumber and tmember=' . $member->getID()
-                              . ' ORDER BY bname';
+                       $query =  'SELECT bnumber as value, bname as text FROM %s, %s WHERE tblog=bnumber and tmember=%d ORDER BY bname;';
+                       $query = sprintf($query, sql_table('blog'), sql_table('team'), (integer) $member->getID());
                }
                }
-               
+       
                $template['name']               = 'blogid';
                $template['tabindex']   = 15000;
                $template['extra']              = _QMENU_ADD_SELECT;
                $template['name']               = 'blogid';
                $template['tabindex']   = 15000;
                $template['extra']              = _QMENU_ADD_SELECT;
-               $template['selected']   = -1;
+               $template['selected']   = 0;
                $template['shorten']    = 10;
                $template['shortenel']  = '';
                $template['javascript'] = 'onchange="return form.submit()"';
                $template['shorten']    = 10;
                $template['shortenel']  = '';
                $template['javascript'] = 'onchange="return form.submit()"';
-               
-               Showlist($query, 'select', $template, $templateName);
-               
+
+               $this->parser->parse(showlist($query, 'select', $template, $template_name));
+
                return;
        }
                return;
        }
-
+       
        /**
         * AdminActions::parse_quickmenu()
         * Parse skinvar quickmenu
        /**
         * AdminActions::parse_quickmenu()
         * Parse skinvar quickmenu
-        * 
-        * @param       string  $templateName   name of template to use
+        *
+        * @param       string  $template_name  name of template to use
         * @return      void
         */
         * @return      void
         */
-       public function parse_quickmenu($templateName = '')
+       public function parse_quickmenu($template_name = '')
        {
                global $manager;
                $templates = array();
        {
                global $manager;
                $templates = array();
-               $template  = array();
-               if ( !empty($templateName) )
+
+               if ( !empty($template_name) )
                {
                {
-                       $templates = & $manager->getTemplate($templateName);
+                       $templates = & $manager->getTemplate($template_name);
                }
                $pluginExtras = array();
                }
                $pluginExtras = array();
-               $manager->notify(
-                       'QuickMenu',
-                       array(
-                               'options' => &$pluginExtras
-                       )
-               );
+               $manager->notify('QuickMenu', array('options' => &$pluginExtras));
+
+               $template  = array();
                if ( count($pluginExtras) > 0 )
                {
                if ( count($pluginExtras) > 0 )
                {
-                       if ( !array_key_exists('PLUGIN_QUICKMENU_TITLE', $templates) || empty($templates['PLUGIN_QUICKMENU_TITLE']) )
-                       {
-                               $template['title'] = "<h2><%text(_QMENU_PLUGINS)%></h2>\n";
-                       }
-                       else
-                       {
-                               $template['title'] = $templates['PLUGIN_QUICKMENU_TITLE'];
-                       }
                        if ( !array_key_exists('PLUGIN_QUICKMENU_HEAD', $templates) || empty($templates['PLUGIN_QUICKMENU_HEAD']) )
                        {
                        if ( !array_key_exists('PLUGIN_QUICKMENU_HEAD', $templates) || empty($templates['PLUGIN_QUICKMENU_HEAD']) )
                        {
-                               $template['head'] = "<ul>\n";
+                               $template['head'] = "<h2><%text(_QMENU_PLUGINS)%></h2>\n"
+                               . "<ul>\n";
                        }
                        else
                        {
                                $template['head'] = $templates['PLUGIN_QUICKMENU_HEAD'];
                        }
                        }
                        else
                        {
                                $template['head'] = $templates['PLUGIN_QUICKMENU_HEAD'];
                        }
+       
                        if ( !array_key_exists('PLUGIN_QUICKMENU_BODY', $templates) && empty($templates['PLUGIN_QUICKMENU_BODY']) )
                        {
                                $template['body'] = "<li><a href=\"<%plugadminurl%>\" title=\"<%plugadmintooltip%>\"><%plugadmintitle%></a></li>\n";
                        if ( !array_key_exists('PLUGIN_QUICKMENU_BODY', $templates) && empty($templates['PLUGIN_QUICKMENU_BODY']) )
                        {
                                $template['body'] = "<li><a href=\"<%plugadminurl%>\" title=\"<%plugadmintooltip%>\"><%plugadmintitle%></a></li>\n";
@@ -4382,6 +3907,7 @@ class AdminActions extends BaseActions
                        {
                                $template['body'] = $templates['PLUGIN_QUICKMENU_BODY'];
                        }
                        {
                                $template['body'] = $templates['PLUGIN_QUICKMENU_BODY'];
                        }
+       
                        if ( !array_key_exists('PLUGIN_QUICKMENU_FOOT', $templates) || empty($templates['PLUGIN_QUICKMENU_FOOT']) )
                        {
                                $template['foot'] = "</ul>\n";
                        if ( !array_key_exists('PLUGIN_QUICKMENU_FOOT', $templates) || empty($templates['PLUGIN_QUICKMENU_FOOT']) )
                        {
                                $template['foot'] = "</ul>\n";
@@ -4390,22 +3916,18 @@ class AdminActions extends BaseActions
                        {
                                $template['foot'] = $templates['PLUGIN_QUICKMENU_FOOT'];
                        }
                        {
                                $template['foot'] = $templates['PLUGIN_QUICKMENU_FOOT'];
                        }
-                       
-                       $handler = new Actions($this->skintype);
-                       $parser = new PARSER($handler);
-                       
-                       $parser->parse($template['title']);
-                       echo $template['head'];
+       
+                       $this->parser->parse($template['head']);
                        foreach ( $pluginExtras as $aInfo )
                        {
                                $data = array(
                        foreach ( $pluginExtras as $aInfo )
                        {
                                $data = array(
-                                       'plugadminurl'          => Entity::hsc($aInfo['url']),
-                                       'plugadmintooltip'      => Entity::hsc($aInfo['tooltip']),
-                                       'plugadmintitle'        => Entity::hsc($aInfo['title']),
+               'plugadminurl'          => Entity::hsc($aInfo['url']),
+               'plugadmintooltip'      => Entity::hsc($aInfo['tooltip']),
+               'plugadmintitle'        => Entity::hsc($aInfo['title']),
                                );
                                );
-                               echo Template::fill($template['body'], $data);
+                               $this->parser->parse(Template::fill($template['body'], $data));
                        }
                        }
-                       echo $template['foot'];
+                       $this->parser->parse($template['foot']);
                }
                return;
        }
                }
                return;
        }
@@ -4413,7 +3935,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_requestblogid()
         * Parse skinvar requestblogid
        /**
         * AdminActions::parse_requestblogid()
         * Parse skinvar requestblogid
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -4426,7 +3948,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_requestiprange()
         * Parse skinvar requestiprange
        /**
         * AdminActions::parse_requestiprange()
         * Parse skinvar requestiprange
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -4444,141 +3966,151 @@ class AdminActions extends BaseActions
        }
        
        /**
        }
        
        /**
-        * AdminActions::parse_selectlocaladminskinfiles()
-        * Parse skinvar selectlocaladminskinfiles
-        * 
+        * AdminActions::parse_selectlocalskinfiles()
+        * Parse skinvar selectlocalskinfiles
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
-       public function parse_selectlocaladminskinfiles()
+       public function parse_selectlocalskinfiles()
        {
        {
-               global $DIR_SKINS, $manager, $DIR_LIBS;
-               
+               global $DIR_SKINS;
+
                if ( !class_exists('SkinImport', FALSE) )
                {
                if ( !class_exists('SkinImport', FALSE) )
                {
-                       include_once("{$DIR_LIBS}skinie.php");
+                       include_libs('skinie.php');
                }
                }
-               $adminskindir = $DIR_SKINS . 'admin/';
-               $candidates = SkinImport::searchForCandidates($adminskindir);
-               
-               foreach ( $candidates as $skinname => $skinfile )
+       
+               if ( !preg_match('#^admin#', $this->skintype) )
                {
                {
-                       $html = Entity::hsc($skinfile);
-                       echo '<option value="' . $html . '">' . $skinname . "</option>\n";
+                       $skindir = $DIR_SKINS;
+               }
+               else
+               {
+                       $skindir = "{$DIR_SKINS}admin/";
                }
                }
-               
-               return;
-       }
        
        
-       /**
-        * AdminActions::parse_selectlocalskinfiles()
-        * Parse skinvar selectlocalskinfiles
-        * 
-        * @param       void
-        * @return      void
-        */
-       public function parse_selectlocalskinfiles()
-       {
-               global $DIR_SKINS;
-               
-               $candidates = SkinImport::searchForCandidates($DIR_SKINS);
-               
+               $candidates = SkinImport::searchForCandidates($skindir);
                foreach ( $candidates as $skinname => $skinfile )
                {
                foreach ( $candidates as $skinname => $skinfile )
                {
-                       $html = Entity::hsc($skinfile);
-                       echo '<option value="' . $html . '">' . $skinname . "</option>\n";
+                       $skinfile = Entity::hsc($skinfile);
+                       $skinname = Entity::hsc($skinname);
+                       echo "<option value=\"{$skinfile}\">{$skinname}</option>\n";
                }
                }
-               
+       
                return;
        }
        
        /**
         * AdminActions::parse_skineditallowedlist()
         * Parse skinvar skineditallowedlist
                return;
        }
        
        /**
         * AdminActions::parse_skineditallowedlist()
         * Parse skinvar skineditallowedlist
-        * 
+        *
         * @param       string  $type                   type of skin
         * @param       string  $type                   type of skin
-        * @param       string  $templateName   name of template
+        * @param       string  $template_name  name of template
         * @return      void
         */
         * @return      void
         */
-       public function parse_skineditallowedlist($type, $templateName = '')
+       public function parse_skineditallowedlist($type, $template_name = '')
        {
                switch ( $type )
                {
                        case 'blog':
                                $query = "SELECT bshortname, bname FROM %s;";
                                $show  = array(
        {
                switch ( $type )
                {
                        case 'blog':
                                $query = "SELECT bshortname, bname FROM %s;";
                                $show  = array(
-                                       'content' => 'shortblognames'
+                               'content' => 'shortblognames'
                                );
                                $query = sprintf($query, sql_table('blog'));
                                );
                                $query = sprintf($query, sql_table('blog'));
-                               Showlist($query, 'table', $show, $templateName);
                                break;
                        case 'template':
                                break;
                        case 'template':
-                               $query = "SELECT tdname as name, tddesc as description FROM %s WHERE tdname NOT LIKE 'admin/%%';";
+                               if ( !preg_match('#^admin#', $this->skintype) )
+                               {
+                                       $query = "SELECT tdname as name, tddesc as description FROM %s WHERE tdname NOT LIKE 'admin/%%';";
+                               }
+                               else
+                               {
+                                       $query = "SELECT tdname as name, tddesc as description FROM %s WHERE tdname LIKE 'admin/%%';";
+                               }
                                $show  = array(
                                $show  = array(
-                                       'content' => 'shortnames'
+                               'content' => 'shortnames'
                                );
                                $query = sprintf($query, sql_table('template_desc'));
                                );
                                $query = sprintf($query, sql_table('template_desc'));
-                               Showlist($query, 'table', $show, $templateName);
                                break;
                }
                                break;
                }
+       
+               $this->parser->parse(showlist($query, 'table', $show, $template_name));
                return;
        }
        
        /**
         * AdminActions::parse_skinielist()
         * Parse skinvar skinielist
                return;
        }
        
        /**
         * AdminActions::parse_skinielist()
         * Parse skinvar skinielist
-        * 
+        *
         * @param       string  $type                   type of skin
         * @param       string  $type                   type of skin
-        * @param       string  $templateName   name of template to use
+        * @param       string  $template_name  name of template to use
         * @return      void
         */
         * @return      void
         */
-       public function parse_skinielist($type, $templateName = '')
+       public function parse_skinielist($type, $template_name = '')
        {
                global $manager;
        {
                global $manager;
-               
+
                $templates = array();
                $templates = array();
-               if ( $templateName )
+               if ( $template_name )
                {
                {
-                       $templates =& $manager->getTemplate($templateName);
+                       $templates =& $manager->getTemplate($template_name);
                }
                }
-               if ( array_key_exists('SKINIE_EXPORT_LIST', $templates) && !empty($templates['SKINIE_EXPORT_LIST']) )
+               if ( !array_key_exists('SKINIE_EXPORT_LIST', $templates) || empty($templates['SKINIE_EXPORT_LIST']) )
                {
                {
-                       $template = $templates['SKINIE_EXPORT_LIST'];
+                       $template = "<td>"
+                       . "<input type=\"checkbox\" name=\"<%typeid%>\" id=\"<%expid%>\" />\n"
+                       . "<label for=\"<%expid%>\"><%expname%></label>\n"
+                       . "</td>\n"
+                       . "<td><%expdesc%></td>\n"
+                       . "</tr>\n"
+                       . "<tr>\n";
                }
                else
                {
                }
                else
                {
-                       $template = "<td>"
-                                 . "<input type=\"checkbox\" name=\"<%typeid%>\" id=\"<%expid%>\" />\n"
-                                 . "<label for=\"<%expid%>\"><%expname%></label>\n"
-                                 . "</td>\n"
-                                 . "<td><%expdesc%></td>\n"
-                                 . "</tr>\n"
-                                 . "<tr>\n";
+                       $template = $templates['SKINIE_EXPORT_LIST'];
                }
                }
+       
                switch ( $type )
                {
                        case 'skin':
                switch ( $type )
                {
                        case 'skin':
-                               $res = DB::getResult('SELECT * FROM ' . sql_table('skin_desc'). " WHERE sdname NOT LIKE 'admin/%%';");
+                               if ( !preg_match('#^admin#', $this->skintype) )
+                               {
+                                       $res = DB::getResult('SELECT * FROM ' . sql_table('skin_desc'). " WHERE sdname NOT LIKE 'admin/%%';");
+                               }
+                               else
+                               {
+                                       $res = DB::getResult('SELECT * FROM ' . sql_table('skin_desc'). " WHERE sdname LIKE 'admin/%%';");
+                               }
                                foreach ( $res as $row )
                                {
                                        $data = array(
                                foreach ( $res as $row )
                                {
                                        $data = array(
-                                               'typeid'        => 'skin[' . $row['sdnumber'] . ']',
-                                               'expid'         => 'skinexp' . $row['sdnumber'],
-                                               'expname'       => Entity::hsc($row['sdname']),
-                                               'expdesc'       => Entity::hsc($row['sddesc'])
+                       'typeid'        => 'skin[' . $row['sdnumber'] . ']',
+                       'expid'         => 'skinexp' . $row['sdnumber'],
+                       'expname'       => Entity::hsc($row['sdname']),
+                       'expdesc'       => Entity::hsc($row['sddesc'])
                                        );
                                        echo Template::fill($template, $data);
                                }
                                break;
                        case 'template':
                                        );
                                        echo Template::fill($template, $data);
                                }
                                break;
                        case 'template':
-                               $res = DB::getResult('SELECT * FROM '.sql_table('template_desc'). " WHERE tdname NOT LIKE 'admin/%%';");
+                               if ( !preg_match('#^admin#', $this->skintype) )
+                               {
+                                       $res = DB::getResult('SELECT * FROM '.sql_table('template_desc'). " WHERE tdname NOT LIKE 'admin/%%';");
+
+                               }
+                               else
+                               {
+                                       $res = DB::getResult('SELECT * FROM '.sql_table('template_desc'). " WHERE tdname LIKE 'admin/%%';");
+                               }
                                foreach ( $res as $row )
                                {
                                        $data = array(
                                foreach ( $res as $row )
                                {
                                        $data = array(
-                                               'typeid'        => 'template[' . $row['tdnumber'] . ']',
-                                               'expid'         => 'templateexp' . $row['tdnumber'],
-                                               'expname'       => Entity::hsc($row['tdname']),
-                                               'expdesc'       => Entity::hsc($row['tddesc'])
+                       'typeid'        => 'template[' . $row['tdnumber'] . ']',
+                       'expid'         => 'templateexp' . $row['tdnumber'],
+                       'expname'       => Entity::hsc($row['tdname']),
+                       'expdesc'       => Entity::hsc($row['tddesc'])
                                        );
                                        echo Template::fill($template, $data);
                                }
                                        );
                                        echo Template::fill($template, $data);
                                }
@@ -4590,27 +4122,47 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_skinoverview()
         * Parse skinvar skinoverview
        /**
         * AdminActions::parse_skinoverview()
         * Parse skinvar skinoverview
-        * 
-        * @param       string  $templateName   name of template to use
+        *
+        * @param       string  $template_name  name of template to use
         * @return      void
         */
         * @return      void
         */
-       public function parse_skinoverview($templateName = '')
+       public function parse_skinoverview($template_name = '')
        {
                global $CONF;
        {
                global $CONF;
-               $query = "SELECT * FROM %s WHERE sdname NOT LIKE 'admin/%%';";
+
+               $template = array();
+               if ( !preg_match('#^admin#', $this->skintype) )
+               {
+                       $query = "SELECT * FROM %s WHERE sdname NOT LIKE 'admin/%%' ORDER BY sdname;";
+                       $template['editaction'] = 'skinedit';
+                       $template['cloneaction'] = 'skinclone';
+                       $template['deleteaction'] = 'skindelete';
+                       $template['edittypeaction'] = 'skinedittype';
+                       $template['default'] = $CONF['BaseSkin'];
+               }
+               else
+               {
+                       $query = "SELECT * FROM %s WHERE sdname LIKE 'admin/%%' ORDER BY sdname;";
+                       $template['editaction'] = 'adminskinedit';
+                       $template['cloneaction'] = 'adminskinclone';
+                       $template['deleteaction'] = 'adminskindelete';
+                       $template['edittypeaction'] = 'adminskinedittype';
+                       $template['default'] = $CONF['AdminSkin'];
+               }
                $query = sprintf($query, sql_table('skin_desc'));
                $query = sprintf($query, sql_table('skin_desc'));
-               
-               $template['content']  = 'skinlist';
+
                $template['tabindex'] = 10;
                $template['tabindex'] = 10;
-               
-               Showlist($query, 'table', $template, $templateName);
+               $template['content'] = 'skinlist';
+
+               $this->parser->parse(showlist($query, 'table', $template, $template_name));
+
                return;
        }
        
        /**
         * AdminActions::parse_skintypehelp()
         * Check editing skintypehelp
                return;
        }
        
        /**
         * AdminActions::parse_skintypehelp()
         * Check editing skintypehelp
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -4629,17 +4181,17 @@ class AdminActions extends BaseActions
                {
                        /* TODO: use Skin class */
                        $regularType = array(
                {
                        /* TODO: use Skin class */
                        $regularType = array(
-                               'index',
-                               'item',
-                               'archivelist',
-                               'archive',
-                               'search',
-                               'error',
-                               'member',
-                               'imagepopup'
-                       );
+       'index',
+       'item',
+       'archivelist',
+       'archive',
+       'search',
+       'error',
+       'member',
+       'imagepopup'
+       );
                }
                }
-               
+       
                if ( in_array($nowSkinType, $regularType) )
                {
                        help('skinpart' . $nowSkinType);
                if ( in_array($nowSkinType, $regularType) )
                {
                        help('skinpart' . $nowSkinType);
@@ -4654,89 +4206,66 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_specialskinlist()
         * Parse skinvar specialskinlist
        /**
         * AdminActions::parse_specialskinlist()
         * Parse skinvar specialskinlist
-        * 
-        * @param       string  $templateName   name of template to use
+        *
+        * @param       string  $template_name  name of template to use
         * @return      void
         */
         * @return      void
         */
-       public function parse_specialskinlist($templateName = '')
+       public function parse_specialskinlist($template_name = '')
        {
        {
-               global $manager;
-               
-               $templates = array();
-               if ( $templateName )
+               global $CONF, $manager;
+
+               $template = array();
+
+               $skinid = intRequestVar('skinid');
+
+               if ( !preg_match('#^admin#', $this->skintype) )
                {
                {
-                       $templates =& $manager->getTemplate($templateName);
+                       $skin = new Skin($skinid);
+                       $template['editaction'] = 'skinedittype';
+                       $template['removeaction'] = 'skinremovetype';
                }
                }
-               
-               /* TODO: use Skin class */
-               $nType  = array(
-                       'index',
-                       'item',
-                       'error',
-                       'search',
-                       'archive',
-                       'archivelist',
-                       'imagepopup',
-                       'member'
-               );
-               $skinid = intRequestVar('skinid');
-               $query  = "SELECT stype FROM %s WHERE stype NOT IN ('%s') AND sdesc = %d;";
-               $query = sprintf($query, sql_table('skin'), implode("', '", $nType), $skinid);
-               
-               $res    = DB::getResult($query);
-               if ( $res && $res->rowCount() > 0 )
+               else
                {
                {
-                       $data = array();
-                       if ( array_key_exists('SPECIALSKINLIST_HEAD', $templates) && !empty($templates['SPECIALSKINLIST_HEAD']) )
-                       {
-                               $template['head'] = $templates['SPECIALSKINLIST_HEAD'];
-                       }
-                       else
-                       {
-                               $template['head'] = "<ul>\n";
-                       }
-                       echo Template::fill($template['head'], $data);
-                       if ( !array_key_exists('SPECIALSKINLIST_BODY', $templates) || empty($templates['SPECIALSKINLIST_BODY']) )
-                       {
-                               $template['body'] = '<li><a tabindex="<%tabindex%>" href="index.php?action=skinedittype&amp;skinid=<%skinid%>'
-                                                                 . '&amp;type=<%skintype%>"><%skintype%></a> (<a tabindex="<%tabindex%>" href="index.php?'
-                                                                 . 'action=skinremovetype&amp;skinid=<%skinid%>&amp;type=<%skintype%>">remove</a>)</li>';
-                       }
-                       else
-                       {
-                               $template['body'] = $templates['SPECIALSKINLIST_BODY'];
-                       }
-                       
-                       $tabstart = 75;
-                       foreach ( $res as $row )
+                       $skin = new Skin($skinid, 'AdminActions');
+                       $template['editaction'] = 'adminskinedittype';
+                       $template['removeaction'] = 'adminskinremovetype';
+               }
+               $normal_types = $skin->getDefaultTypes();
+               $available_types = $skin->getAvailableTypes();
+
+               $special_skintypes = array();
+               foreach( $available_types as $skintype => $skinname )
+               {
+                       if ( !array_key_exists($skintype, $normal_types) )
                        {
                        {
-                               $data = array(
-                                       'tabindex'      => $tabstart++,
-                                       'skinid'        => $skinid,
-                                       'skintype'      => Entity::hsc(strtolower($row['stype']))
+                               $special_skintypes[] = array(
+               'skintype'              => $skintype,
+               'skintypename'  => $skinname
                                );
                                );
-                               echo Template::fill($template['body'], $data);
-                       }
-                       $data = array();
-                       if (array_key_exists('SPECIALSKINLIST_FOOT', $templates) && !empty($templates['SPECIALSKINLIST_FOOT']) )
-                       {
-                               $template['foot'] = $templates['SPECIALSKINLIST_FOOT'];
                        }
                        }
-                       else
-                       {
-                               $template['foot'] = "</ul>\n";
-                       }
-                       echo Template::fill($template['foot'], $data);
-                       return;
                }
                }
+       
+               if ( sizeof($special_skintypes) > 0 )
+               {
+                       $template['tabindex'] = 75;
+                       $template['skinid'] = $skin->getID();
+                       $template['skinname'] = $skin->getName();
+                       $this->parser->parse(showlist($special_skintypes, 'list_specialskinlist', $template, $template_name));
+               }
+               else
+               {
+                       /* TODO: nothing to be shown */
+               }
+       
+               return;
        }
        
        /**
         * AdminActions::parse_sprinttext()
         * Parse sprinttext
        }
        
        /**
         * AdminActions::parse_sprinttext()
         * Parse sprinttext
-        * 
-        * @param       string  $which  
-        * @param       string  $val    
+        *
+        * @param       string  $which
+        * @param       string  $val
         * @return      void
         */
        public function parse_sprinttext($which, $val)
         * @return      void
         */
        public function parse_sprinttext($which, $val)
@@ -4749,7 +4278,7 @@ class AdminActions extends BaseActions
                {
                        $base = constant($which);
                }
                {
                        $base = constant($which);
                }
-               
+       
                if ( preg_match('#[^<|%].*[^%|>]#', $val, $matchies) )
                {
                        if ( !preg_match('#[(].*[^)]#', $matchies[0], $args) )
                if ( preg_match('#[^<|%].*[^%|>]#', $val, $matchies) )
                {
                        if ( !preg_match('#[(].*[^)]#', $matchies[0], $args) )
@@ -4761,13 +4290,13 @@ class AdminActions extends BaseActions
                                $arg = trim($args[0], '()');
                                $met = 'parse_' . substr($matchies[0], 0, strpos($matchies[0], '('));
                        }
                                $arg = trim($args[0], '()');
                                $met = 'parse_' . substr($matchies[0], 0, strpos($matchies[0], '('));
                        }
-                       
+       
                        if ( method_exists($this, $met) )
                        {
                                $value = call_user_func(array(&$this, $met), $arg);
                        }
                }
                        if ( method_exists($this, $met) )
                        {
                                $value = call_user_func(array(&$this, $met), $arg);
                        }
                }
-               
+       
                if ( !isset($value) || empty($value) )
                {
                        $value = $val;
                if ( !isset($value) || empty($value) )
                {
                        $value = $val;
@@ -4779,20 +4308,20 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_systemsettings()
         * Parse skinvar systemsettings
        /**
         * AdminActions::parse_systemsettings()
         * Parse skinvar systemsettings
-        * 
+        *
         * @param       string  $type                   type of settings for system
         * @param       string  $type                   type of settings for system
-        * @param       string  $templateName   name of template to use 
+        * @param       string  $template_name  name of template to use
         * @return      void
         */
         * @return      void
         */
-       public function parse_systemsettings($type = 'phpinfo', $templateName = '')
+       public function parse_systemsettings($type = 'phpinfo', $template_name = '')
        {
                global $manager, $member, $CONF, $nucleus;
        {
                global $manager, $member, $CONF, $nucleus;
-               
+
                $member->isAdmin() or Admin::disallow();
                $member->isAdmin() or Admin::disallow();
-               
+
                $enable  = _ADMIN_SYSTEMOVERVIEW_ENABLE;
                $disable = _ADMIN_SYSTEMOVERVIEW_DISABLE;
                $enable  = _ADMIN_SYSTEMOVERVIEW_ENABLE;
                $disable = _ADMIN_SYSTEMOVERVIEW_DISABLE;
-               
+
                switch ( $type )
                {
                        case 'phpversion':
                switch ( $type )
                {
                        case 'phpversion':
@@ -4815,24 +4344,24 @@ class AdminActions extends BaseActions
                                break;
                        case 'gdinfo':
                                $templates = array();
                                break;
                        case 'gdinfo':
                                $templates = array();
-                               if ( $templateName )
+                               if ( $template_name )
                                {
                                {
-                                       $templates =& $manager->getTemplate($templateName);
+                                       $templates =& $manager->getTemplate($template_name);
                                }
                                if ( !array_key_exists('SYSTEMINFO_GDSETTINGS', $templates) || empty($templates['SYSTEMINFO_GDSETTINGS']) )
                                {
                                        $template = "<tr>\n"
                                }
                                if ( !array_key_exists('SYSTEMINFO_GDSETTINGS', $templates) || empty($templates['SYSTEMINFO_GDSETTINGS']) )
                                {
                                        $template = "<tr>\n"
-                                                 . "<td><%key%></td>\n"
-                                                 . "<td><%value%></td>\n"
-                                                 . "</tr>\n";
+                                       . "<td><%key%></td>\n"
+                                       . "<td><%value%></td>\n"
+                                       . "</tr>\n";
                                }
                                else
                                {
                                        $template = $templates['SYSTEMINFO_GDSETTINGS'];
                                }
                                }
                                else
                                {
                                        $template = $templates['SYSTEMINFO_GDSETTINGS'];
                                }
-                               
+       
                                $gdinfo = gd_info();
                                $gdinfo = gd_info();
-                               
+
                                foreach ( $gdinfo as $key => $value )
                                {
                                        if ( is_bool($value) )
                                foreach ( $gdinfo as $key => $value )
                                {
                                        if ( is_bool($value) )
@@ -4844,8 +4373,8 @@ class AdminActions extends BaseActions
                                                $value = Entity::hsc($value);
                                        }
                                        $data = array(
                                                $value = Entity::hsc($value);
                                        }
                                        $data = array(
-                                               'key'   => $key,
-                                               'value' => $value,
+                       'key'   => $key,
+                       'value' => $value,
                                        );
                                        echo Template::fill($template, $data);
                                }
                                        );
                                        echo Template::fill($template, $data);
                                }
@@ -4888,27 +4417,40 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_templateoverview()
         * Parse skinvar templateoverview
        /**
         * AdminActions::parse_templateoverview()
         * Parse skinvar templateoverview
-        * 
-        * @param       string  $templateName   name of template to use
+        *
+        * @param       string  $template_name  name of template to use
         * @return      void
         */
         * @return      void
         */
-       public function parse_templateoverview($templateName = '')
+       public function parse_templateoverview($template_name = '')
        {
        {
-               $query  = "SELECT * FROM %s WHERE tdname NOT LIKE 'admin/%%' ORDER BY tdname";
+               if ( !preg_match('#^admin#', $this->skintype) )
+               {
+                       $query = "SELECT * FROM %s WHERE tdname NOT LIKE 'admin/%%' ORDER BY tdname;";
+                       $template['deleteaction'] = 'templatedelete';
+                       $template['editaction'] = 'templateedit';
+                       $template['cloneaction'] = 'templateclone';
+               }
+               else
+               {
+                       $query = "SELECT * FROM %s WHERE tdname LIKE 'admin/%%' ORDER BY tdname;";
+                       $template['deleteaction'] = 'admintemplatedelete';
+                       $template['editaction'] = 'admintemplateedit';
+                       $template['cloneaction'] = 'admintemplateclone';
+               }
                $query = sprintf($query, sql_table('template_desc'));
                $query = sprintf($query, sql_table('template_desc'));
-               
-               $template['content']  = 'templatelist';
+
                $template['tabindex'] = 10;
                $template['tabindex'] = 10;
-               
-               Showlist($query, 'table', $template, $templateName);
-               
+               $template['content'] = 'templatelist';
+
+               $this->parser->parse(showlist($query, 'table', $template, $template_name));
+
                return;
        }
        
        /**
         * AdminActions::parse_ticket()
         * Parse ticket
                return;
        }
        
        /**
         * AdminActions::parse_ticket()
         * Parse ticket
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -4922,7 +4464,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_versioncheckurl()
         * Parse skinvar versioncheckurl
        /**
         * AdminActions::parse_versioncheckurl()
         * Parse skinvar versioncheckurl
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -4935,69 +4477,75 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::parse_yrbloglist()
         * Parse skinvar yrbloglist
        /**
         * AdminActions::parse_yrbloglist()
         * Parse skinvar yrbloglist
-        * 
-        * @param       string  $templateName   name of template to use
+        *
+        * @param       string  $template_name  name of template to use
         * @return      void
         */
         * @return      void
         */
-       public function parse_yrbloglist($templateName = '')
+       public function parse_yrbloglist($template_name = '')
        {
                global $member;
                $showAll = requestVar('showall');
        {
                global $member;
                $showAll = requestVar('showall');
-               
+
                if ( $member->isAdmin() && ($showAll == 'yes') )
                {
                        // Super-Admins have access to all blogs! (no add item support though)
                        $query =  "SELECT bnumber, bname, 1 as tadmin, burl, bshortname"
                if ( $member->isAdmin() && ($showAll == 'yes') )
                {
                        // Super-Admins have access to all blogs! (no add item support though)
                        $query =  "SELECT bnumber, bname, 1 as tadmin, burl, bshortname"
-                               . " FROM %s"
-                               . " ORDER BY bnumber;";
+                       . " FROM %s"
+                       . " ORDER BY bnumber;";
                        $query = sprintf($query, sql_table('blog'));
                }
                else
                {
                        $query = sprintf($query, sql_table('blog'));
                }
                else
                {
-                       $query =  "SELECT bnumber, bname, tadmin, burl, bshortname"
-                               . " FROM %s,%s"
-                               . " WHERE tblog=bnumber and tmember=%d"
-                               . " ORDER BY bnumber;";
+                       $query = "SELECT bnumber, bname, tadmin, burl, bshortname"
+                       . " FROM %s,%s"
+                       . " WHERE tblog=bnumber and tmember=%d"
+                       . " ORDER BY bnumber;";
                        $query = sprintf($query, sql_table('blog'), sql_table('team'), (integer) $member->getID());
                }
                        $query = sprintf($query, sql_table('blog'), sql_table('team'), (integer) $member->getID());
                }
-               
-               $template['content']    = 'bloglist';
-               $template['superadmin'] = $member->isAdmin();
-               
-               $amount = Showlist($query, 'table', $template, $templateName);
-               
-               if ( ($showAll != 'yes') && ($member->isAdmin()) )
+       
+               $resource = DB::getResult($query);
+               if ( ($showAll != 'yes') && $member->isAdmin() )
                {
                        $query = 'SELECT COUNT(*) as result FROM ' . sql_table('blog');
                {
                        $query = 'SELECT COUNT(*) as result FROM ' . sql_table('blog');
-                       
                        $total = DB::getValue($query);
                        $total = DB::getValue($query);
-                       if ( $total > $amount )
+                               
+                       if ( $total > $resource->rowCount() )
                        {
                                echo '<p><a href="index.php?action=overview&amp;showall=yes">' . _OVERVIEW_SHOWALL . '</a></p>';
                        }
                }
                        {
                                echo '<p><a href="index.php?action=overview&amp;showall=yes">' . _OVERVIEW_SHOWALL . '</a></p>';
                        }
                }
-               
-               if ( $amount == 0 )
-               {
-                       echo _OVERVIEW_NOBLOGS;
-               }
-               elseif( $amount != 0 )
+       
+               if ( $resource->rowCount() > 0 )
                {
                {
+                       $template['content']    = 'bloglist';
+                       $template['superadmin'] = $member->isAdmin();
+                               
+                       $this->parser->parse(showlist($resource, 'table', $template, $template_name));
+                       $resource->closeCursor();
+                               
                        echo '<h2>' . _OVERVIEW_YRDRAFTS . '</h2>';
                        echo '<h2>' . _OVERVIEW_YRDRAFTS . '</h2>';
-                       
-                       $query =  "SELECT ititle, inumber, bshortname"
-                              . " FROM %s,%s"
-                              . ' WHERE iauthor=%d AND iblog=bnumber AND idraft=1;';
+                               
+                       $query = 'SELECT ititle, inumber, bshortname FROM %s, %s '
+                       . 'WHERE iauthor=%d AND iblog=bnumber AND idraft=1;';
                        $query = sprintf($query, sql_table('item'), sql_table('blog'), (integer) $member->getID());
                        $query = sprintf($query, sql_table('item'), sql_table('blog'), (integer) $member->getID());
-                       
-                       $template['content'] = 'draftlist';
-                       
-                       $amountdrafts = Showlist($query, 'table', $template, $templateName);
-                       if ( $amountdrafts == 0 )
+                               
+                       $resource = DB::getResult($query);
+                       if ( $resource->rowCount() > 0 )
+                       {
+                               $template['content'] = 'draftlist';
+                               $this->parser->parse(showlist($resource, 'table', $template, $template_name));
+                       }
+                       else
                        {
                                echo _OVERVIEW_NODRAFTS;
                        }
                }
                        {
                                echo _OVERVIEW_NODRAFTS;
                        }
                }
+               else
+               {
+                       echo _OVERVIEW_NOBLOGS;
+               }
+               $resource->closeCursor();
+
                return;
        }
        
                return;
        }
        
@@ -5013,7 +4561,7 @@ class AdminActions extends BaseActions
        protected function checkCondition($field, $name='', $value = '')
        {
                global $CONF, $archiveprevexists, $archivenextexists, $blog, $catid, $itemidnext, $itemidprev, $manager, $member;
        protected function checkCondition($field, $name='', $value = '')
        {
                global $CONF, $archiveprevexists, $archivenextexists, $blog, $catid, $itemidnext, $itemidprev, $manager, $member;
-               
+
                $condition = 0;
                switch ( $field )
                {
                $condition = 0;
                switch ( $field )
                {
@@ -5137,8 +4685,8 @@ class AdminActions extends BaseActions
         *         -> checks if the option OptionName from plugin PlugName is set to value
         *
         * @param       string  $name   name of plugin
         *         -> checks if the option OptionName from plugin PlugName is set to value
         *
         * @param       string  $name   name of plugin
-        * @param       string  $value  
-        * @return      
+        * @param       string  $value
+        * @return
         */
        private function ifHasPlugin($name, $value)
        {
         */
        private function ifHasPlugin($name, $value)
        {
@@ -5173,7 +4721,7 @@ class AdminActions extends BaseActions
        
        /**
         * AdminActions::beChangePassword()
        
        /**
         * AdminActions::beChangePassword()
-        * 
+        *
         * @param       void
         * @return      void
         */
         * @param       void
         * @return      void
         */
@@ -5185,7 +4733,7 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::ifSkincandidates()
         * Checks if a plugin exists and call its doIf function
        /**
         * AdminActions::ifSkincandidates()
         * Checks if a plugin exists and call its doIf function
-        * 
+        *
         * @param       void
         * @return      void
         * @return      boolean
         * @param       void
         * @return      void
         * @return      boolean
@@ -5200,10 +4748,10 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::ifPlugin()
         * Checks if a plugin exists and call its doIf function
        /**
         * AdminActions::ifPlugin()
         * Checks if a plugin exists and call its doIf function
-        * 
+        *
         * @param       string  $name   name of plugin
         * @param       string  $name   name of plugin
-        * @param       string  $key    
-        * @param       string  $value  
+        * @param       string  $key
+        * @param       string  $value
         * @return      callback
         */
        private function ifPlugin($name, $key = '', $value = '')
         * @return      callback
         */
        private function ifPlugin($name, $key = '', $value = '')
@@ -5215,17 +4763,17 @@ class AdminActions extends BaseActions
                {
                        return;
                }
                {
                        return;
                }
-               
+       
                $params = func_get_args();
                array_shift($params);
                $params = func_get_args();
                array_shift($params);
-               
+
                return call_user_func_array(array(&$plugin, 'doIf'), $params);
        }
                return call_user_func_array(array(&$plugin, 'doIf'), $params);
        }
-
+       
        /**
         * AdminActions::ifCategory()
         *  Different checks for a category
        /**
         * AdminActions::ifCategory()
         *  Different checks for a category
-        * 
+        *
         * @param       string  $key    key for information of category
         * @param       string  $value  value for information of category
         * @return      boolean
         * @param       string  $key    key for information of category
         * @param       string  $value  value for information of category
         * @return      boolean
@@ -5233,13 +4781,13 @@ class AdminActions extends BaseActions
        private function ifCategory($key = '', $value='')
        {
                global $blog, $catid;
        private function ifCategory($key = '', $value='')
        {
                global $blog, $catid;
-               
+
                // when no parameter is defined, just check if a category is selected
                if (($key != 'catname' && $key != 'catid') || ($value == ''))
                {
                        return $blog->isValidCategory($catid);
                }
                // when no parameter is defined, just check if a category is selected
                if (($key != 'catname' && $key != 'catid') || ($value == ''))
                {
                        return $blog->isValidCategory($catid);
                }
-               
+       
                // check category name
                if ( $key == 'catname' )
                {
                // check category name
                if ( $key == 'catname' )
                {
@@ -5249,39 +4797,39 @@ class AdminActions extends BaseActions
                                return $blog->isValidCategory($catid);
                        }
                }
                                return $blog->isValidCategory($catid);
                        }
                }
-               
+       
                // check category id
                if (($key == 'catid') && ($value == $catid))
                {
                        return $blog->isValidCategory($catid);
                }
                // check category id
                if (($key == 'catid') && ($value == $catid))
                {
                        return $blog->isValidCategory($catid);
                }
-               
+       
                return FALSE;
        }
        
        /**
         * AdminActions::ifOnTeam()
         * Checks if a member is on the team of a blog and return his rights
                return FALSE;
        }
        
        /**
         * AdminActions::ifOnTeam()
         * Checks if a member is on the team of a blog and return his rights
-        * 
+        *
         * @param       string  $blogName       name of weblog
         * @return      boolean
         */
        private function ifOnTeam($blogName = '')
        {
                global $blog, $member, $manager;
         * @param       string  $blogName       name of weblog
         * @return      boolean
         */
        private function ifOnTeam($blogName = '')
        {
                global $blog, $member, $manager;
-               
+
                // when no blog found
                if ( ($blogName == '') && !is_object($blog) )
                {
                        return 0;
                }
                // when no blog found
                if ( ($blogName == '') && !is_object($blog) )
                {
                        return 0;
                }
-               
+       
                // explicit blog selection
                if ($blogName != '')
                {
                        $blogid = getBlogIDFromName($blogName);
                }
                // explicit blog selection
                if ($blogName != '')
                {
                        $blogid = getBlogIDFromName($blogName);
                }
-               
+       
                if (($blogName == '') || !$manager->existsBlogID($blogid))
                {
                        // use current blog
                if (($blogName == '') || !$manager->existsBlogID($blogid))
                {
                        // use current blog
@@ -5293,46 +4841,46 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::ifAdmin()
         * Checks if a member is admin of a blog
        /**
         * AdminActions::ifAdmin()
         * Checks if a member is admin of a blog
-        * 
+        *
         * @param       string  $blogName       name of weblog
         * @return      boolean
         */
        private function ifAdmin($blogName = '')
        {
                global $blog, $member, $manager;
         * @param       string  $blogName       name of weblog
         * @return      boolean
         */
        private function ifAdmin($blogName = '')
        {
                global $blog, $member, $manager;
-               
+
                // when no blog found
                if (($blogName == '') && (!is_object($blog)))
                {
                        return 0;
                }
                // when no blog found
                if (($blogName == '') && (!is_object($blog)))
                {
                        return 0;
                }
-               
+       
                // explicit blog selection
                if ($blogName != '')
                {
                        $blogid = getBlogIDFromName($blogName);
                }
                // explicit blog selection
                if ($blogName != '')
                {
                        $blogid = getBlogIDFromName($blogName);
                }
-               
+       
                if (($blogName == '') || !$manager->existsBlogID($blogid))
                {
                        // use current blog
                        $blogid = $blog->getID();
                }
                if (($blogName == '') || !$manager->existsBlogID($blogid))
                {
                        // use current blog
                        $blogid = $blog->getID();
                }
-               
+       
                return $member->isBlogAdmin($blogid);
        }
        
        /**
         * AdminActions::ifAddresscange()
         * Check e-Mail address is changed
                return $member->isBlogAdmin($blogid);
        }
        
        /**
         * AdminActions::ifAddresscange()
         * Check e-Mail address is changed
-        * 
+        *
         * @param       void
         * @return      boolean
         */
        private function ifAddresscange()
        {
                global $manager;
         * @param       void
         * @return      boolean
         */
        private function ifAddresscange()
        {
                global $manager;
-               
+
                $key = $this->objAdmin->sessionVar("{$CONF['CookiePrefix']}ackey");
                if ( !$key )
                {
                $key = $this->objAdmin->sessionVar("{$CONF['CookiePrefix']}ackey");
                if ( !$key )
                {
@@ -5356,120 +4904,49 @@ class AdminActions extends BaseActions
        }
        
        /**
        }
        
        /**
-        * AdminActions::templateEditRow()
-        * Template edit box
-        * 
-        * @param       array   $template       
-        * @param       string  $desc           
-        * @param       string  $name           
-        * @param       string  $help           
-        * @param       integer $tabindex       
-        * @param       boolean $big            
-        * @param       array   $tmplt          
-        * @return      void
-        */
-       private function templateEditRow(&$template, $desc, $name, $help = '', $tabindex = 0, $big = 0, $tplt = '')
-       {
-               global $manager;
-               
-               static $count = 1;
-               
-               if ( !array_key_exists($name, $template) )
-               {
-                       $template[$name] = '';
-               }
-               
-               $tmplt = array();
-               $base  = array();
-               
-               if ( $tplt )
-               {
-                       $tmplt =& $manager->getTemplate($tplt);
-               }
-               
-               $data = array(
-                       'description'   => $desc,
-                       'help'                  => empty($help) ? '' : helpHtml('template' . $help),
-                       'count'                 => $count,
-                       'name'                  => $name,
-                       'tabindex'              => $tabindex,
-                       'rows'                  => $big ? 10 : 5,
-               );
-               
-               if ( !array_key_exists('TEMPLATE_EDIT_ROW_HEAD', $tmplt) || empty($tmplt['TEMPLATE_EDIT_ROW_HEAD']) )
-               {
-                       $base['head'] = "</tr>"
-                                     . "<tr>\n"
-                                     . "<td><%description%><%help%></td>\n"
-                                     . "<td id=\"td<%count%>\">\n"
-                                     . "<textarea class=\"templateedit\" name=\"<%name%>\" tabindex=\"<%tabindex%>\" cols=\"50\" rows=\"<%rows%>\" id=\"textarea<%count%>\">\n";
-               }
-               else
-               {
-                       $base['head'] = $tmplt['TEMPLATE_EDIT_ROW_HEAD'];
-               }
-               
-               if ( !array_key_exists('TEMPLATE_EDIT_ROW_TAIL', $tmplt) || empty($tmplt['TEMPLATE_EDIT_ROW_TAIL']) )
-               {
-                       $base['tail'] = "</textarea>\n"
-                                     . "</td>\n";
-               }
-               else
-               {
-                       $base['tail'] = $tmplt['TEMPLATE_EDIT_ROW_TAIL'];
-               }
-               
-               echo TEMPLATE::fill($base['head'], $data);
-               echo ENTITY::hsc($template[$name]);
-               echo TEMPLATE::fill($base['tail'], $data);
-               
-               $count++;
-               
-               return;
-       }
-       
-       /**
+        * TODO: move
         * AdminActions::customHelp()
         * shows a link to custom help file
         * AdminActions::customHelp()
         * shows a link to custom help file
-        * 
-        * @param       string  $id                     
-        * @param       string  $tplName        
-        * @param       string  $url            
-        * @param       string  $iconURL        
-        * @param       string  $alt            
-        * @param       string  $title          
+        *
+        * @param       string  $id
+        * @param       string  $tplName
+        * @param       string  $url
+        * @param       string  $iconURL
+        * @param       string  $alt
+        * @param       string  $title
         * @param       $onclick
         * @param       $onclick
-        * 
+        *
         */
        private function customHelp($id, $tplName = '', $url = '', $iconURL = '', $alt = '', $title = '', $onclick = '')
        {
         */
        private function customHelp($id, $tplName = '', $url = '', $iconURL = '', $alt = '', $title = '', $onclick = '')
        {
-               echo self::customHelpHtml($id, $tplName, $url, $iconURL, $alt, $title, $onclick);
+               echo $this->customHelpHtml($id, $tplName, $url, $iconURL, $alt, $title, $onclick);
        }
        
        /**
        }
        
        /**
+        * TODO: move
         * AdminActions::customHelp()
         * shows a link to custom help file
         * AdminActions::customHelp()
         * shows a link to custom help file
-        * 
-        * @param       string  $id                     
-        * @param       string  $tplName        
-        * @param       string  $url            
-        * @param       string  $iconURL        
-        * @param       string  $alt            
-        * @param       string  $title          
+        *
+        * @param       string  $id
+        * @param       string  $tplName
+        * @param       string  $url
+        * @param       string  $iconURL
+        * @param       string  $alt
+        * @param       string  $title
         * @param       $onclick
         * @param       $onclick
-        * 
+        *
         */
        static function customHelplink($id, $tplName = '', $url = '', $title = '', $onclick = '')
        {
                global $CONF, $manager;
         */
        static function customHelplink($id, $tplName = '', $url = '', $title = '', $onclick = '')
        {
                global $CONF, $manager;
-               
+
                $templates = array();
                $templates = array();
-               
+
                if ( $tplName )
                {
                        $templates =& $manager->getTemplate($tplName);
                }
                if ( $tplName )
                {
                        $templates =& $manager->getTemplate($tplName);
                }
-               
+       
                if ( !array_key_exists('ADMIN_CUSTOMHELPLINK_ANCHOR', $templates) || empty($templates['ADMIN_CUSTOMHELPLINK_ANCHOR']) )
                {
                        $template = "<a href=\"<%helpurl%>#<%helptarget%>\" title=\"<%title%>\" <%onclick%>>\n";
                if ( !array_key_exists('ADMIN_CUSTOMHELPLINK_ANCHOR', $templates) || empty($templates['ADMIN_CUSTOMHELPLINK_ANCHOR']) )
                {
                        $template = "<a href=\"<%helpurl%>#<%helptarget%>\" title=\"<%title%>\" <%onclick%>>\n";
@@ -5478,12 +4955,12 @@ class AdminActions extends BaseActions
                {
                        $template = $templates['ADMIN_CUSTOMHELPLINK_ANCHOR'];
                }
                {
                        $template = $templates['ADMIN_CUSTOMHELPLINK_ANCHOR'];
                }
-               
+       
                if ( empty($url) )
                {
                        $url = $CONF['AdminURL'] . 'documentation/customHelp.html';
                }
                if ( empty($url) )
                {
                        $url = $CONF['AdminURL'] . 'documentation/customHelp.html';
                }
-               
+       
                if ( empty($onclick) )
                {
                        $onclick = 'onclick="if (event &amp;&amp; event.preventDefault) event.preventDefault(); return help(this.href);"';
                if ( empty($onclick) )
                {
                        $onclick = 'onclick="if (event &amp;&amp; event.preventDefault) event.preventDefault(); return help(this.href);"';
@@ -5496,34 +4973,26 @@ class AdminActions extends BaseActions
                {
                        $onclick = 'onclick="' . $onclick . '"';
                }
                {
                        $onclick = 'onclick="' . $onclick . '"';
                }
-               
+       
                $data = array(
                $data = array(
-                       'helpurl'               => $url,
-                       'helptarget'    => $id,
-                       'onclick'               => $onclick,
-                       'title'                 => (isset($title) && !empty($title)) ? $title : _HELP_TT,
+'helpurl'              => $url,
+'helptarget'   => $id,
+'onclick'              => $onclick,
+'title'                        => (isset($title) && !empty($title)) ? $title : _HELP_TT,
                );
                return Template::fill($template, $data);
        }
        
        /**
                );
                return Template::fill($template, $data);
        }
        
        /**
+        * TODO: move
         * AdminActions::customHelpHtml()
         * AdminActions::customHelpHtml()
-        * 
-        * @param       string  $id                     
-        * @param       string  $tplName        
-        * @param       string  $url            
-        * @param       string  $iconURL        
-        * @param       string  $alt            
-        * @param       string  $title          
-        * @param       string  $onclick        
-        * @return      string  anchor element with help uri
         */
        private function customHelpHtml($id, $tplName = '', $url = '', $iconURL = '', $alt = '', $title = '', $onclick = '')
        {
                global $CONF, $manager;
         */
        private function customHelpHtml($id, $tplName = '', $url = '', $iconURL = '', $alt = '', $title = '', $onclick = '')
        {
                global $CONF, $manager;
-               
+
                $templates = array();
                $templates = array();
-               
+
                if ( $tplName )
                {
                        $templates =& $manager->getTemplate($tplName);
                if ( $tplName )
                {
                        $templates =& $manager->getTemplate($tplName);
@@ -5536,155 +5005,56 @@ class AdminActions extends BaseActions
                {
                        $template = $templates['ADMIN_CUSTOMHELPLINK_ICON'];
                }
                {
                        $template = $templates['ADMIN_CUSTOMHELPLINK_ICON'];
                }
-               
+       
                if ( empty($iconURL) )
                {
                        $iconURL = $CONF['AdminURL'] . 'documentation/icon-help.gif';
                }
                if ( empty($iconURL) )
                {
                        $iconURL = $CONF['AdminURL'] . 'documentation/icon-help.gif';
                }
-               
+       
                if ( function_exists('getimagesize') )
                {
                        $size   = getimagesize($iconURL);
                        $width  = 'width="'  . $size[0] . '" ';
                        $height = 'height="' . $size[1] . '" ';
                }
                if ( function_exists('getimagesize') )
                {
                        $size   = getimagesize($iconURL);
                        $width  = 'width="'  . $size[0] . '" ';
                        $height = 'height="' . $size[1] . '" ';
                }
-               
+       
                $data = array(
                $data = array(
-                       'iconurl'       => $iconURL,
-                       'width'         => $width,
-                       'height'        => $height,
-                       'alt'           => (isset($alt) && !empty($alt))         ? $alt   : _HELP_TT,
-                       'title'         => (isset($title) && !empty($title)) ? $title : _HELP_TT,
+'iconurl'      => $iconURL,
+'width'                => $width,
+'height'       => $height,
+'alt'          => (isset($alt) && !empty($alt))         ? $alt   : _HELP_TT,
+'title'                => (isset($title) && !empty($title)) ? $title : _HELP_TT,
                );
                );
-               
+
                $icon = Template::fill($template, $data);
                $icon = Template::fill($template, $data);
-               $help = self::customHelplink($id, $tplName, $url, $title, $onclick);
-               
+               $help = $this->customHelplink($id, $tplName, $url, $title, $onclick);
+
                return $help . $icon;
        }
        
        /**
                return $help . $icon;
        }
        
        /**
-        * AdminActions::input_yesno
-        * 
-        * @param               $name
-        * @param               $checkedval
-        * @param               $tabindex
-        * @param               $value1
-        * @param               $value2
-        * @param               $yesval
-        * @param               $noval
-        * @param               $isAdmin
-        * @param               $templateName
-        * @param               $showlist
-        */
-       public function input_yesno($name,
-                                                               $checkedval,
-                                                               $tabindex        = 0,
-                                                               $value1    = 1,
-                                                               $value2    = 0,
-                                                               $yesval    = _YES,
-                                                               $noval          = _NO,
-                                                               $isAdmin          = 0,
-                                                               $templateName = '',
-                                                               $showlist        = false)
-       {
-               global $manager;
-               
-               $templates = array();
-               if ( $templateName )
-               {
-                       $templates =& $manager->getTemplate($templateName);
-               }
-               
-               if ( $name == 'admin' )
-               {
-                       if ( !array_key_exists('INPUTYESNO_TEMPLATE_ADMIN', $templates) || empty($templates['INPUTYESNO_TEMPLATE_ADMIN']) )
-                       {
-                               $template = '<input onclick="selectCanLogin(true);" type="radio" name="<%name%>" value="<%yesval%>" <%yescheckedval%> id="<%yesid%>" />' . "\n"
-                                         . '<label for="<%yesid%>"><%yesvaltext%></label>' . "\n"
-                                         . '<input onclick="selectCanLogin(false);" type="radio" name="<%name%>" value="<%noval%>" <%nocheckedval%> id="<%noid%>"<%disabled%> />' . "\n"
-                                         . '<label for="<%noid%>"><%novaltext%></label>' . "\n";
-                       }
-                       else
-                       {
-                               $template = $templates['INPUTYESNO_TEMPLATE_ADMIN'];
-                       }
-               }
-               else
-               {
-                       if ( array_key_exists('INPUTYESNO_TEMPLATE_NORMAL', $templates) && !empty($templates['INPUTYESNO_TEMPLATE_NORMAL']) )
-                       {
-                               $template = $templates['INPUTYESNO_TEMPLATE_NORMAL'];
-                       }
-                       if ( $showlist )
-                       {
-                               if ( array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO', $templates) && !empty($templates['SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO']) )
-                               {
-                                       $template = $templates['SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO'];
-                               }
-                       }
-                       if ( !isset($template) )
-                       {
-                               $template = '<input type="radio" name="<%name%>" value="<%yesval%>" <%yescheckedval%> id="<%yesid%>" />' . "\n"
-                                         . '<label for="<%yesid%>"><%yesvaltext%></label>' . "\n"
-                                         . '<input type="radio" name="<%name%>" value="<%noval%>" <%nocheckedval%> id="<%noid%>"<%disabled%> />' . "\n"
-                                         . '<label for="<%noid%>"><%novaltext%></label>' . "\n";
-                       }
-               }
-               
-               //echo $template;
-               $id             = Entity::hsc($name);
-               $id             = str_replace('[', '-', $id);
-               $id             = str_replace(']', '-', $id);
-               $id1    = $id . Entity::hsc($value1);
-               $id2    = $id . Entity::hsc($value2);
-               $dat = array(
-                       'name'                  => Entity::hsc($name),
-                       'yesval'                => Entity::hsc($value1),
-                       'noval'                 => Entity::hsc($value2),
-                       'yesid'                 => $id1,
-                       'noid'                  => $id2,
-                       'yesvaltext'    => $yesval,
-                       'novaltext'             => $noval,
-                       'yescheckedval' => ($checkedval == $value1) ? ' checked="checked" tabindex="' . $tabindex . '"': '',
-                       'nocheckedval'  => ($checkedval != $value1) ? ' checked="checked" tabindex="' . $tabindex . '"': '',
-                       'disabled'              => ($isAdmin && $name == 'canlogin') ? ' disabled="disabled"' : '',
-               );
-               
-               if ( $showlist )
-               {
-                       return Template::fill($template, $dat);
-               }
-               else
-               {
-                       echo Template::fill($template, $dat);
-               }
-               return;
-       }
-       
-       /**
         * AdminActions::existsNewPlugin()
         * Check exists new plugin
         * AdminActions::existsNewPlugin()
         * Check exists new plugin
-        * 
+        *
         * @param       void
         * @return      boolean exists or not
         */
        private function existsNewPlugin()
        {
                global $DIR_PLUGINS;
         * @param       void
         * @return      boolean exists or not
         */
        private function existsNewPlugin()
        {
                global $DIR_PLUGINS;
-               
+
                $query = "SELECT * FROM %s;";
                $query = sprintf($query, sql_table('plugin'));
                $res  = DB::getResult($query);
                $query = "SELECT * FROM %s;";
                $query = sprintf($query, sql_table('plugin'));
                $res  = DB::getResult($query);
-               
+
                $installed = array();
                foreach( $res as $row )
                {
                        $installed[] = $row['pfile'];
                }
                $installed = array();
                foreach( $res as $row )
                {
                        $installed[] = $row['pfile'];
                }
-               
+       
                $files = scandir($DIR_PLUGINS);
                $files = scandir($DIR_PLUGINS);
-               
+
                $candidates = array();
                foreach ( $files as $file )
                {
                $candidates = array();
                foreach ( $files as $file )
                {
@@ -5703,39 +5073,39 @@ class AdminActions extends BaseActions
        /**
         * AdminActions::pagehead()
         * Output admin page head
        /**
         * AdminActions::pagehead()
         * Output admin page head
-        * 
+        *
         * @param       void
         * @return      void
         */
        public function parse_pagehead()
        {
                global $member, $nucleus, $CONF, $manager;
         * @param       void
         * @return      void
         */
        public function parse_pagehead()
        {
                global $member, $nucleus, $CONF, $manager;
-               
+
                $extrahead = Admin::getAdminextrahead();
                $data = array(
                $extrahead = Admin::getAdminextrahead();
                $data = array(
-                       'extrahead'     => &$extrahead,
-                       'action'        =>  Admin::getAdminAction()
+'extrahead'    => &$extrahead,
+'action'       =>  Admin::getAdminAction()
                );
                $manager->notify('AdminPrePageHead', $data);
                );
                $manager->notify('AdminPrePageHead', $data);
-               
+
                $content = $this->parser->skin->getContentFromDB('pagehead');
                if ( !$content )
                {
                        $baseUrl = Entity::hsc($CONF['SkinsURL']);
                $content = $this->parser->skin->getContentFromDB('pagehead');
                if ( !$content )
                {
                        $baseUrl = Entity::hsc($CONF['SkinsURL']);
-                       
+
                        /*
                         * TODO: obsoleted
                        /*
                         * TODO: obsoleted
-                       if ( !array_key_exists('AdminCSS', $CONF) )
-                       {
-                               DB::execute("INSERT INTO " . sql_table('config') . " VALUES ('AdminCSS', 'original')");
-                               $CONF['AdminCSS'] = 'original';
-                       }
-                       */
-                       
+                        if ( !array_key_exists('AdminCSS', $CONF) )
+                        {
+                        DB::execute("INSERT INTO " . sql_table('config') . " VALUES ('AdminCSS', 'original')");
+                        $CONF['AdminCSS'] = 'original';
+                        }
+                        */
+
                        /* HTTP 1.1 application for no caching */
                        header("Cache-Control: no-cache, must-revalidate");
                        header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");
                        /* HTTP 1.1 application for no caching */
                        header("Cache-Control: no-cache, must-revalidate");
                        header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");
-                       
+
                        $root_element = 'html';
                        $charset = i18n::get_current_charset();
                        $locale = preg_replace('#_#', '-', i18n::get_current_locale());
                        $root_element = 'html';
                        $charset = i18n::get_current_charset();
                        $locale = preg_replace('#_#', '-', i18n::get_current_locale());
@@ -5743,7 +5113,7 @@ class AdminActions extends BaseActions
                        $formal_public_identifier = self::$formal_public_identifier;
                        $system_identifier = self::$system_identifier;
                        $xhtml_namespace = self::$xhtml_namespace;
                        $formal_public_identifier = self::$formal_public_identifier;
                        $system_identifier = self::$system_identifier;
                        $xhtml_namespace = self::$xhtml_namespace;
-                       
+
                        echo "<?xml version=\"{$xml_version_info}\" encoding=\"{$charset}\" ?>\n";
                        echo "<!DOCTYPE {$root_element} PUBLIC \"{$formal_public_identifier}\" \"{$system_identifier}\">\n";
                        echo "<{$root_element} xmlns=\"{$xhtml_namespace}\" xml:lang=\"{$locale}\" lang=\"{$locale}\">\n";
                        echo "<?xml version=\"{$xml_version_info}\" encoding=\"{$charset}\" ?>\n";
                        echo "<!DOCTYPE {$root_element} PUBLIC \"{$formal_public_identifier}\" \"{$system_identifier}\">\n";
                        echo "<{$root_element} xmlns=\"{$xhtml_namespace}\" xml:lang=\"{$locale}\" lang=\"{$locale}\">\n";
@@ -5751,8 +5121,8 @@ class AdminActions extends BaseActions
                        echo '<title>' . Entity::hsc($CONF['SiteName']) . " - Admin</title>\n";
                        /*
                         * TODO: obsoleted
                        echo '<title>' . Entity::hsc($CONF['SiteName']) . " - Admin</title>\n";
                        /*
                         * TODO: obsoleted
-                       echo "<link rel=\"stylesheet\" title=\"Nucleus Admin Default\" type=\"text/css\" href=\"{$baseUrl}admin/defaultadmin/styles/admin_{$CONF["AdminCSS"]}.css\" />\n";
-                       */
+                        echo "<link rel=\"stylesheet\" title=\"Nucleus Admin Default\" type=\"text/css\" href=\"{$baseUrl}admin/defaultadmin/styles/admin_{$CONF["AdminCSS"]}.css\" />\n";
+                        */
                        echo "<link rel=\"stylesheet\" title=\"Nucleus Admin Default\" type=\"text/css\" href=\"{$baseUrl}admin/defaultadmin/styles/addedit.css\" />\n";
                        echo "<script type=\"text/javascript\" src=\"{$baseUrl}javascripts/edit.js\"></script>\n";
                        echo "<script type=\"text/javascript\" src=\"{$baseUrl}javascripts/admin.js\"></script>\n";
                        echo "<link rel=\"stylesheet\" title=\"Nucleus Admin Default\" type=\"text/css\" href=\"{$baseUrl}admin/defaultadmin/styles/addedit.css\" />\n";
                        echo "<script type=\"text/javascript\" src=\"{$baseUrl}javascripts/edit.js\"></script>\n";
                        echo "<script type=\"text/javascript\" src=\"{$baseUrl}javascripts/admin.js\"></script>\n";
@@ -5767,7 +5137,7 @@ class AdminActions extends BaseActions
                        echo "<div id=\"container\">\n";
                        echo "<div id=\"content\">\n";
                        echo "<div class=\"loginname\">\n";
                        echo "<div id=\"container\">\n";
                        echo "<div id=\"content\">\n";
                        echo "<div class=\"loginname\">\n";
-                       
+
                        if ( !$member->isLoggedIn() )
                        {
                                echo '<a href="index.php?action=showlogin" title="Log in">' . _NOTLOGGEDIN . "</a><br />\n";
                        if ( !$member->isLoggedIn() )
                        {
                                echo '<a href="index.php?action=showlogin" title="Log in">' . _NOTLOGGEDIN . "</a><br />\n";
@@ -5777,10 +5147,10 @@ class AdminActions extends BaseActions
                                echo _LOGGEDINAS . ' ' . $member->getDisplayName() ." - <a href='index.php?action=logout'>" . _LOGOUT. "</a><br />\n";
                                echo "<a href='index.php?action=overview'>" . _ADMINHOME . "</a> - ";
                        }
                                echo _LOGGEDINAS . ' ' . $member->getDisplayName() ." - <a href='index.php?action=logout'>" . _LOGOUT. "</a><br />\n";
                                echo "<a href='index.php?action=overview'>" . _ADMINHOME . "</a> - ";
                        }
-                       
+       
                        echo "<a href='".$CONF['IndexURL']."'>"._YOURSITE."</a><br />\n";
                        echo '(';
                        echo "<a href='".$CONF['IndexURL']."'>"._YOURSITE."</a><br />\n";
                        echo '(';
-                       
+
                        if ( !array_key_exists('codename', $nucleus) || empty($nucleus['codename']) )
                        {
                                $codenamestring = '';
                        if ( !array_key_exists('codename', $nucleus) || empty($nucleus['codename']) )
                        {
                                $codenamestring = '';
@@ -5789,16 +5159,16 @@ class AdminActions extends BaseActions
                        {
                                $codenamestring = ' &quot;' . $nucleus['codename'].'&quot;';
                        }
                        {
                                $codenamestring = ' &quot;' . $nucleus['codename'].'&quot;';
                        }
-                       
+       
                        if ( $member->isLoggedIn() && $member->isAdmin() )
                        {
                                $checkURL = sprintf(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_URL, getNucleusVersion(), getNucleusPatchLevel());
                                echo '<a href="' . $checkURL . '" title="' . _ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE . '">Nucleus CMS ' . $nucleus['version'] . $codenamestring . '</a>';
                        if ( $member->isLoggedIn() && $member->isAdmin() )
                        {
                                $checkURL = sprintf(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_URL, getNucleusVersion(), getNucleusPatchLevel());
                                echo '<a href="' . $checkURL . '" title="' . _ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE . '">Nucleus CMS ' . $nucleus['version'] . $codenamestring . '</a>';
-                               
+
                                $newestVersion = getLatestVersion();
                                $newestCompare = str_replace('/', '.', $newestVersion);
                                $currentVersion = str_replace(array('/','v'), array('.',''), $nucleus['version']);
                                $newestVersion = getLatestVersion();
                                $newestCompare = str_replace('/', '.', $newestVersion);
                                $currentVersion = str_replace(array('/','v'), array('.',''), $nucleus['version']);
-                               
+
                                if ( $newestVersion && version_compare($newestCompare, $currentVersion) > 0 )
                                {
                                        echo "<br />\n";
                                if ( $newestVersion && version_compare($newestCompare, $currentVersion) > 0 )
                                {
                                        echo "<br />\n";
@@ -5818,26 +5188,26 @@ class AdminActions extends BaseActions
                {
                        $this->parser->parse($content);
                }
                {
                        $this->parser->parse($content);
                }
-               
+       
                return;
        }
        
        /**
         * AdminActionss::pagefoot()
         * Output admin page foot include quickmenu
                return;
        }
        
        /**
         * AdminActionss::pagefoot()
         * Output admin page foot include quickmenu
-        * 
+        *
         * @param       void
         * @return      void
         */
        public function parse_pagefoot()
        {
         * @param       void
         * @return      void
         */
        public function parse_pagefoot()
        {
-               global $action, $member, $manager;
-               
+               global $action, $member, $manager, $blogid;
+
                $data = array(
                $data = array(
-                       'action' => Admin::getAdminAction()
+               'action' => Admin::getAdminAction()
                );
                $manager->notify('AdminPrePageFoot', $data);
                );
                $manager->notify('AdminPrePageFoot', $data);
-               
+
                $content = $this->parser->skin->getContentFromDB('pagefoot');
                if ( !$content )
                {
                $content = $this->parser->skin->getContentFromDB('pagefoot');
                if ( !$content )
                {
@@ -5849,28 +5219,28 @@ class AdminActions extends BaseActions
                                echo '<li><a href="index.php?action=logout">' .  _LOGOUT . "</a></li>\n";
                                echo "</ul>\n";
                        }
                                echo '<li><a href="index.php?action=logout">' .  _LOGOUT . "</a></li>\n";
                                echo "</ul>\n";
                        }
-                       
+                               
                        echo "<div class=\"foot\">\n";
                        echo '<a href="' . _ADMINPAGEFOOT_OFFICIALURL . '">Nucleus CMS</a> &copy; 2002-' . date('Y') . ' ' . _ADMINPAGEFOOT_COPYRIGHT;
                        echo '-';
                        echo '<a href="' . _ADMINPAGEFOOT_DONATEURL . '">' . _ADMINPAGEFOOT_DONATE . "</a>\n";
                        echo "</div>\n";
                        echo "<div class=\"foot\">\n";
                        echo '<a href="' . _ADMINPAGEFOOT_OFFICIALURL . '">Nucleus CMS</a> &copy; 2002-' . date('Y') . ' ' . _ADMINPAGEFOOT_COPYRIGHT;
                        echo '-';
                        echo '<a href="' . _ADMINPAGEFOOT_DONATEURL . '">' . _ADMINPAGEFOOT_DONATE . "</a>\n";
                        echo "</div>\n";
-                       
+                               
                        echo "<div id=\"quickmenu\">\n";
                        echo "<div id=\"quickmenu\">\n";
-                       
+                               
                        if ( ($action != 'showlogin') && ($member->isLoggedIn()) )
                        {
                                echo "<ul>\n";
                                echo '<li><a href="index.php?action=overview">' . _QMENU_HOME . "</a></li>\n";
                                echo "</ul>\n";
                        if ( ($action != 'showlogin') && ($member->isLoggedIn()) )
                        {
                                echo "<ul>\n";
                                echo '<li><a href="index.php?action=overview">' . _QMENU_HOME . "</a></li>\n";
                                echo "</ul>\n";
-                               
+
                                echo '<h2>' . _QMENU_ADD . "</h2>\n";
                                echo "<form method=\"get\" action=\"index.php\">\n";
                                echo "<p>\n";
                                echo "<input type=\"hidden\" name=\"action\" value=\"createitem\" />\n";
                                echo '<h2>' . _QMENU_ADD . "</h2>\n";
                                echo "<form method=\"get\" action=\"index.php\">\n";
                                echo "<p>\n";
                                echo "<input type=\"hidden\" name=\"action\" value=\"createitem\" />\n";
-                               
+
                                $showAll = requestVar('showall');
                                $showAll = requestVar('showall');
-                               
+
                                if ( ($member->isAdmin()) && ($showAll == 'yes') )
                                {
                                        // Super-Admins have access to all blogs! (no add item support though)
                                if ( ($member->isAdmin()) && ($showAll == 'yes') )
                                {
                                        // Super-Admins have access to all blogs! (no add item support though)
@@ -5885,22 +5255,22 @@ class AdminActions extends BaseActions
                                $template['name']               = 'blogid';
                                $template['tabindex']   = 15000;
                                $template['extra']              = _QMENU_ADD_SELECT;
                                $template['name']               = 'blogid';
                                $template['tabindex']   = 15000;
                                $template['extra']              = _QMENU_ADD_SELECT;
-                               $template['selected']   = -1;
+                               $template['selected']   = $blogid;
                                $template['shorten']    = 10;
                                $template['shortenel']  = '';
                                $template['javascript'] = 'onchange="return form.submit()"';
                                $template['shorten']    = 10;
                                $template['shortenel']  = '';
                                $template['javascript'] = 'onchange="return form.submit()"';
-                               showlist($query, 'select', $template);
-                               
+                               $this->parser->parse(showlist($query, 'select', $template));
+
                                echo "</p>\n";
                                echo "</form>\n";
                                echo "</p>\n";
                                echo "</form>\n";
-                               
+
                                echo "<h2>{$member->getDisplayName()}</h2>\n";
                                echo "<ul>\n";
                                echo '<li><a href="index.php?action=editmembersettings">' . _QMENU_USER_SETTINGS . "</a></li>\n";
                                echo '<li><a href="index.php?action=browseownitems">' . _QMENU_USER_ITEMS . "</a></li>\n";
                                echo '<li><a href="index.php?action=browseowncomments">' . _QMENU_USER_COMMENTS . "</a></li>\n";
                                echo "</ul>\n";
                                echo "<h2>{$member->getDisplayName()}</h2>\n";
                                echo "<ul>\n";
                                echo '<li><a href="index.php?action=editmembersettings">' . _QMENU_USER_SETTINGS . "</a></li>\n";
                                echo '<li><a href="index.php?action=browseownitems">' . _QMENU_USER_ITEMS . "</a></li>\n";
                                echo '<li><a href="index.php?action=browseowncomments">' . _QMENU_USER_COMMENTS . "</a></li>\n";
                                echo "</ul>\n";
-                               
+
                                if ( $member->isAdmin() )
                                {
                                        echo '<h2>' . _QMENU_MANAGE . "</h2>\n";
                                if ( $member->isAdmin() )
                                {
                                        echo '<h2>' . _QMENU_MANAGE . "</h2>\n";
@@ -5913,7 +5283,7 @@ class AdminActions extends BaseActions
                                        echo '<li><a href="index.php?action=backupoverview">' . _QMENU_MANAGE_BACKUPS . "</a></li>\n";
                                        echo '<li><a href="index.php?action=pluginlist">' . _QMENU_MANAGE_PLUGINS . "</a></li>\n";
                                        echo "</ul>\n";
                                        echo '<li><a href="index.php?action=backupoverview">' . _QMENU_MANAGE_BACKUPS . "</a></li>\n";
                                        echo '<li><a href="index.php?action=pluginlist">' . _QMENU_MANAGE_PLUGINS . "</a></li>\n";
                                        echo "</ul>\n";
-                                       
+                                               
                                        echo "<h2>" . _QMENU_LAYOUT . "</h2>\n";
                                        echo "<ul>\n";
                                        echo '<li><a href="index.php?action=skinoverview">' . _QMENU_LAYOUT_SKINS . "</a></li>\n";
                                        echo "<h2>" . _QMENU_LAYOUT . "</h2>\n";
                                        echo "<ul>\n";
                                        echo '<li><a href="index.php?action=skinoverview">' . _QMENU_LAYOUT_SKINS . "</a></li>\n";
@@ -5921,11 +5291,10 @@ class AdminActions extends BaseActions
                                        echo '<li><a href="index.php?action=skinieoverview">' . _QMENU_LAYOUT_IEXPORT . "</a></li>\n";
                                        echo "</ul>\n";
                                }
                                        echo '<li><a href="index.php?action=skinieoverview">' . _QMENU_LAYOUT_IEXPORT . "</a></li>\n";
                                        echo "</ul>\n";
                                }
-                               
+       
                                $data = array('options' => array());
                                $data = array('options' => array());
-                               
                                $manager->notify('QuickMenu', $data);
                                $manager->notify('QuickMenu', $data);
-                               
+
                                if ( count($data['options']) > 0 )
                                {
                                        echo "<h2>" . _QMENU_PLUGINS . "</h2>\n";
                                if ( count($data['options']) > 0 )
                                {
                                        echo "<h2>" . _QMENU_PLUGINS . "</h2>\n";
@@ -5939,26 +5308,26 @@ class AdminActions extends BaseActions
                        }
                        else if ( ($action == 'activate') || ($action == 'activatesetpwd') )
                        {
                        }
                        else if ( ($action == 'activate') || ($action == 'activatesetpwd') )
                        {
-                       
+                                       
                                echo '<h2>' . _QMENU_ACTIVATE . '</h2>' . _QMENU_ACTIVATE_TEXT;
                        }
                        else
                        {
                                echo '<h2>' . _QMENU_INTRO . '</h2>' . _QMENU_INTRO_TEXT;
                        }
                                echo '<h2>' . _QMENU_ACTIVATE . '</h2>' . _QMENU_ACTIVATE_TEXT;
                        }
                        else
                        {
                                echo '<h2>' . _QMENU_INTRO . '</h2>' . _QMENU_INTRO_TEXT;
                        }
-                       
+                               
                        echo "<!-- quickmenu -->\n";
                        echo "</div>\n";
                        echo "<!-- quickmenu -->\n";
                        echo "</div>\n";
-                       
+                               
                        echo "<!-- content -->\n";
                        echo "</div>\n";
                        echo "<!-- content -->\n";
                        echo "</div>\n";
-                       
+                               
                        echo "<!-- container -->\n";
                        echo "</div>\n";
                        echo "<!-- container -->\n";
                        echo "</div>\n";
-                       
+                               
                        echo "<!-- adminwrapper -->\n";
                        echo "</div>\n";
                        echo "<!-- adminwrapper -->\n";
                        echo "</div>\n";
-                       
+                               
                        echo "</body>\n";
                        echo "</html>\n";
                }
                        echo "</body>\n";
                        echo "</html>\n";
                }
@@ -5967,7 +5336,7 @@ class AdminActions extends BaseActions
                        $this->parser->parse($content);
                        exit;
                }
                        $this->parser->parse($content);
                        exit;
                }
-               
+       
                return;
        }
        /**
                return;
        }
        /**
@@ -5976,11 +5345,11 @@ class AdminActions extends BaseActions
         *      mode = 'blog' => shows blognames and values are blogids
         *      mode = 'category' => show category names and values are catids
         *
         *      mode = 'blog' => shows blognames and values are blogids
         *      mode = 'category' => show category names and values are catids
         *
-        * @param       string  $name                           
-        * @param       string  $mode                           
-        * @param       integer $selected                       
-        * @param       integer $tabindex                       
-        * @param       integer $showNewCat                     
+        * @param       string  $name
+        * @param       string  $mode
+        * @param       integer $selected
+        * @param       integer $tabindex
+        * @param       integer $showNewCat
         * @param       integer $iForcedBlogInclude     ID for weblog always included
         * @param $iForcedBlogInclude
         *      ID of a blog that always needs to be included, without checking if the
         * @param       integer $iForcedBlogInclude     ID for weblog always included
         * @param $iForcedBlogInclude
         *      ID of a blog that always needs to be included, without checking if the
@@ -5990,14 +5359,14 @@ class AdminActions extends BaseActions
        private function selectBlog($name, $mode='blog', $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1)
        {
                global $member, $CONF;
        private function selectBlog($name, $mode='blog', $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1)
        {
                global $member, $CONF;
-               
+
                // 0. get IDs of blogs to which member can post items (+ forced blog)
                $aBlogIds = array();
                if ( $iForcedBlogInclude != -1 )
                {
                        $aBlogIds[] = intval($iForcedBlogInclude);
                }
                // 0. get IDs of blogs to which member can post items (+ forced blog)
                $aBlogIds = array();
                if ( $iForcedBlogInclude != -1 )
                {
                        $aBlogIds[] = intval($iForcedBlogInclude);
                }
-               
+       
                if ( $member->isAdmin() && array_key_exists('ShowAllBlogs', $CONF) && $CONF['ShowAllBlogs'] )
                {
                        $query =  "SELECT bnumber FROM %s ORDER BY bname;";
                if ( $member->isAdmin() && array_key_exists('ShowAllBlogs', $CONF) && $CONF['ShowAllBlogs'] )
                {
                        $query =  "SELECT bnumber FROM %s ORDER BY bname;";
@@ -6008,7 +5377,7 @@ class AdminActions extends BaseActions
                        $query =  "SELECT bnumber FROM %s, %s WHERE tblog=bnumber AND tmember=%d;";
                        $query = sprintf($query, sql_table('blog'), sql_table('team'), (integer) $member->getID());
                }
                        $query =  "SELECT bnumber FROM %s, %s WHERE tblog=bnumber AND tmember=%d;";
                        $query = sprintf($query, sql_table('blog'), sql_table('team'), (integer) $member->getID());
                }
-               
+       
                $rblogids = DB::getResult($query);
                foreach ( $rblogids as $row )
                {
                $rblogids = DB::getResult($query);
                foreach ( $rblogids as $row )
                {
@@ -6095,4 +5464,4 @@ class AdminActions extends BaseActions
                echo "</select>\n";
                return;
        }
                echo "</select>\n";
                return;
        }
-}
+}
\ No newline at end of file
diff --git a/nucleus/libs/ENCAPSULATE.php b/nucleus/libs/ENCAPSULATE.php
deleted file mode 100644 (file)
index 93a465b..0000000
+++ /dev/null
@@ -1,287 +0,0 @@
-<?php\r
-/*\r
- * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
- * Copyright (C) 2002-2012 The Nucleus Group\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * (see nucleus/documentation/index.html#license for more info)\r
- */\r
-\r
-/**\r
- * Part of the code for the Nucleus admin area\r
- *\r
- * @license http://nucleuscms.org/license.txt GNU General Public License\r
- * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
- * @version $Id: ENCAPSULATE.php 1624 2012-01-09 11:36:20Z sakamocchi $\r
- */\r
-\r
-class Encapsulate\r
-{\r
-       /**\r
-         * Uses $call to call a function using parameters $params\r
-         * This function should return the amount of entries shown.\r
-         * When entries are show, batch operation handlers are shown too.\r
-         * When no entries were shown, $errormsg is used to display an error\r
-         *\r
-         * Passes on the amount of results found (for further encapsulation)\r
-         */\r
-       function doEncapsulate($call, $params, $errorMessage = _Encapsulate_Encapsulate_NOENTRY)\r
-       {\r
-               if ( isset($params[3]) && !empty($params[3]) )\r
-               {\r
-                       $templateName = $params[3];\r
-               }\r
-               else\r
-               {\r
-                       $templateName = '';\r
-               }\r
-               $params[4] = $errorMessage;\r
-               // start output buffering\r
-               ob_start();\r
-               \r
-               $nbOfRows = call_user_func_array($call, $params);\r
-\r
-               // get list contents and stop buffering\r
-               $list = ob_get_contents();\r
-               ob_end_clean();\r
-\r
-               if ( $nbOfRows > 0 )\r
-               {\r
-                       $this->showHead($templateName);\r
-                       echo $list;\r
-                       $this->showFoot($templateName);\r
-               }\r
-               else\r
-               {\r
-                       echo $errorMessage;\r
-               }\r
-\r
-               return $nbOfRows;\r
-       }\r
-}\r
-\r
-/**\r
-  * A class used to encapsulate a list of some sort inside next/prev buttons\r
-  */\r
-class NavList extends Encapsulate\r
-{\r
-       function __construct($action, $start, $amount, $minamount, $maxamount, $blogid, $search, $itemid)\r
-       {\r
-               $this->action    = $action;\r
-               $this->start     = $start;\r
-               $this->amount    = $amount;\r
-               $this->minamount = $minamount;\r
-               $this->maxamount = $maxamount;\r
-               $this->blogid    = $blogid;\r
-               $this->search    = $search;\r
-               $this->itemid    = $itemid;\r
-       }\r
-\r
-       function showBatchList($batchtype, $query, $type, $template, $errorMessage = _LISTS_NOMORE, $templateName = '')\r
-       {\r
-               $batch = new Batch($batchtype);\r
-\r
-               $this->doEncapsulate(\r
-                               array(&$batch, 'showlist'),\r
-                               array(&$query, $type, $template, $templateName),\r
-                               $errorMessage\r
-               );\r
-\r
-       }\r
-\r
-\r
-       function showHead()\r
-       {\r
-               $this->showNavigation();\r
-       }\r
-       function showFoot()\r
-       {\r
-               $this->showNavigation();\r
-       }\r
-\r
-       /**\r
-         * Displays a next/prev bar for long tables\r
-         */\r
-       function showNavigation()\r
-       {\r
-               $action    = $this->action;\r
-               $start     = $this->start;\r
-               $amount    = $this->amount;\r
-               $minamount = $this->minamount;\r
-               $maxamount = $this->maxamount;\r
-               $blogid    = $this->blogid;\r
-               $search    = Entity::hsc($this->search);\r
-               $itemid    = $this->itemid;\r
-\r
-               $prev = $start - $amount;\r
-               if ( $prev < $minamount )\r
-               {\r
-                       $prev=$minamount;\r
-               }\r
-\r
-               // maxamount not used yet\r
-       //      if ($start + $amount <= $maxamount)\r
-                       $next = $start + $amount;\r
-       //      else\r
-       //              $next = $start;\r
-\r
-       ?>\r
-       <table class="navigation">\r
-       <tr><td>\r
-               <form method="post" action="index.php"><div>\r
-               <input type="submit" value="&lt;&lt; <?php echo  _LISTS_PREV?>" />\r
-               <input type="hidden" name="blogid" value="<?php echo  $blogid; ?>" />\r
-               <input type="hidden" name="itemid" value="<?php echo  $itemid; ?>" />\r
-               <input type="hidden" name="action" value="<?php echo  $action; ?>" />\r
-               <input type="hidden" name="amount" value="<?php echo  $amount; ?>" />\r
-               <input type="hidden" name="search" value="<?php echo  $search; ?>" />\r
-               <input type="hidden" name="start" value="<?php echo  $prev; ?>" />\r
-               </div></form>\r
-       </td><td>\r
-               <form method="post" action="index.php"><div>\r
-               <input type="hidden" name="blogid" value="<?php echo  $blogid; ?>" />\r
-               <input type="hidden" name="itemid" value="<?php echo  $itemid; ?>" />\r
-               <input type="hidden" name="action" value="<?php echo  $action; ?>" />\r
-               <input name="amount" size="3" value="<?php echo  $amount; ?>" /> <?php echo _LISTS_PERPAGE?>\r
-               <input type="hidden" name="start" value="<?php echo  $start; ?>" />\r
-               <input type="hidden" name="search" value="<?php echo  $search; ?>" />\r
-               <input type="submit" value="&gt; <?php echo _LISTS_CHANGE?>" />\r
-               </div></form>\r
-       </td><td>\r
-               <form method="post" action="index.php"><div>\r
-               <input type="hidden" name="blogid" value="<?php echo  $blogid; ?>" />\r
-               <input type="hidden" name="itemid" value="<?php echo  $itemid; ?>" />\r
-               <input type="hidden" name="action" value="<?php echo  $action; ?>" />\r
-               <input type="hidden" name="amount" value="<?php echo  $amount; ?>" />\r
-               <input type="hidden" name="start" value="0" />\r
-               <input type="text" name="search" value="<?php echo  $search; ?>" size="7" />\r
-               <input type="submit" value="&gt; <?php echo  _LISTS_SEARCH?>" />\r
-               </div></form>\r
-       </td><td>\r
-               <form method="post" action="index.php"><div>\r
-               <input type="submit" value="<?php echo _LISTS_NEXT?> &gt; &gt;" />\r
-               <input type="hidden" name="search" value="<?php echo  $search; ?>" />\r
-               <input type="hidden" name="blogid" value="<?php echo  $blogid; ?>" />\r
-               <input type="hidden" name="itemid" value="<?php echo  $itemid; ?>" />\r
-               <input type="hidden" name="action" value="<?php echo  $action; ?>" />\r
-               <input type="hidden" name="amount" value="<?php echo  $amount; ?>" />\r
-               <input type="hidden" name="start" value="<?php echo  $next; ?>" />\r
-               </div></form>\r
-       </td></tr>\r
-       </table>\r
-       <?php   }\r
-\r
-\r
-}\r
-\r
-\r
-/**\r
- * A class used to encapsulate a list of some sort in a batch selection\r
- */\r
-class Batch extends Encapsulate\r
-{\r
-       function __construct($type)\r
-       {\r
-               $this->type = $type;\r
-       }\r
-\r
-       function showHead($templateName = '')\r
-       {\r
-               ?>\r
-                       <form method="post" action="index.php">\r
-               <?php\r
-// TODO: get a list op operations above the list too\r
-// (be careful not to use the same names for the select...)\r
-//             $this->showOperationList();\r
-       }\r
-\r
-       function showFoot($templateName = '')\r
-       {\r
-               $this->showOperationList();\r
-?>\r
-                       </form>\r
-<?php\r
-       }\r
-\r
-       function showOperationList()\r
-       {\r
-               global $manager;\r
-?>\r
-               <div class="batchoperations">\r
-                       <?php echo _BATCH_WITH_SEL ?>\r
-                       <select name="batchaction">\r
-                       <?php                           $options = array();\r
-                               switch($this->type) {\r
-                                       case 'item':\r
-                                               $options = array(\r
-                                                       'delete'        => _BATCH_ITEM_DELETE,\r
-                                                       'move'          => _BATCH_ITEM_MOVE\r
-                                               );\r
-                                               break;\r
-                                       case 'member':\r
-                                               $options = array(\r
-                                                       'delete'        => _BATCH_MEMBER_DELETE,\r
-                                                       'setadmin'      => _BATCH_MEMBER_SET_ADM,\r
-                                                       'unsetadmin' => _BATCH_MEMBER_UNSET_ADM\r
-                                               );\r
-                                               break;\r
-                                       case 'team':\r
-                                               $options = array(\r
-                                                       'delete'        => _BATCH_TEAM_DELETE,\r
-                                                       'setadmin'      => _BATCH_TEAM_SET_ADM,\r
-                                                       'unsetadmin' => _BATCH_TEAM_UNSET_ADM,\r
-                                               );\r
-                                               break;\r
-                                       case 'category':\r
-                                               $options = array(\r
-                                                       'delete'        => _BATCH_CAT_DELETE,\r
-                                                       'move'          => _BATCH_CAT_MOVE,\r
-                                               );\r
-                                               break;\r
-                                       case 'comment':\r
-                                               $options = array(\r
-                                                       'delete'        => _BATCH_COMMENT_DELETE,\r
-                                               );\r
-                                       break;\r
-                               }\r
-                               foreach ($options as $option => $label) {\r
-                                       echo '<option value="',$option,'">',$label,'</option>';\r
-                               }\r
-                       ?>\r
-                       </select>\r
-                       <input type="hidden" name="action" value="batch<?php echo $this->type?>" />\r
-                       <?php\r
-                               $manager->addTicketHidden();\r
-\r
-                               // add hidden fields for 'team' and 'comment' batchlists\r
-                               if ($this->type == 'team')\r
-                               {\r
-                                       echo '<input type="hidden" name="blogid" value="',intRequestVar('blogid'),'" />';\r
-                               }\r
-                               if ($this->type == 'comment')\r
-                               {\r
-                                       echo '<input type="hidden" name="itemid" value="',intRequestVar('itemid'),'" />';\r
-                               }\r
-\r
-                               echo '<input type="submit" value="',_BATCH_EXEC,'" />';\r
-                       ?>(\r
-                        <a href="" onclick="if (event &amp;&amp; event.preventDefault) event.preventDefault(); return batchSelectAll(1); "><?php echo _BATCH_SELECTALL?></a> -\r
-                        <a href="" onclick="if (event &amp;&amp; event.preventDefault) event.preventDefault(); return batchSelectAll(0); "><?php echo _BATCH_DESELECTALL?></a>\r
-                       )\r
-               </div>\r
-               <?php   }\r
-\r
-       // shortcut :)\r
-       function showList($query, $type, $template, $templateName = '', $errorMessage = _LISTS_NOMORE)\r
-       {\r
-               return $this->doEncapsulate(    'showlist',\r
-                                                                       array($query, $type, $template, $templateName),\r
-                                                                       $errorMessage\r
-                                                               );\r
-       }\r
-\r
-}\r
-?>\r
index 5a09e7e..efe6aab 100644 (file)
 \r
 \r
 // can take either an array of objects, or an SQL query\r
 \r
 \r
 // can take either an array of objects, or an SQL query\r
-function showlist($query, $type, $vars, $templateName = '')\r
+function showlist($query, $type, $vars, $template_name = '')\r
 {\r
 {\r
-       if ( is_array($query) )\r
+       $contents = '';\r
+       \r
+       /* count */\r
+       if ( is_string($query) )\r
        {\r
        {\r
-               if ( sizeof($query) == 0 )\r
-               {\r
-                       return 0;\r
-               }\r
-               \r
-               call_user_func("listplug_{$type}", $vars, 'HEAD', $templateName);\r
-               \r
-               foreach ( $query as $currentObj )\r
-               {\r
-                       $vars['current'] = $currentObj;\r
-                       call_user_func("listplug_{$type}", $vars, 'BODY', $templateName);\r
-               }\r
-               \r
-               call_user_func("listplug_{$type}", $vars, 'FOOT', $templateName);\r
-               \r
-               return sizeof($query);\r
+               $resource = DB::getResult($query);\r
        }\r
        else\r
        {\r
        }\r
        else\r
        {\r
-               $res = DB::getResult($query);\r
-               \r
-               // don't do anything if there are no results\r
-               $numrows = $res->rowCount();\r
-               if ( $numrows == 0 )\r
-               {\r
-                       return 0;\r
-               }\r
-               call_user_func("listplug_{$type}", $vars, 'HEAD', $templateName);\r
-               \r
-               while( $vars['current'] = $res->fetchObject() )\r
-               {\r
-                       call_user_func("listplug_{$type}", $vars, 'BODY', $templateName);\r
-               }\r
-               \r
-               call_user_func("listplug_{$type}", $vars, 'FOOT', $templateName);\r
-               \r
-               $res->closeCursor();\r
-               \r
-               // return amount of results\r
-               return $numrows;\r
+               $resource = $query;\r
+       }\r
+       \r
+       /* HEAD */\r
+       $contents .= call_user_func("listplug_{$type}", $vars, 'HEAD', $template_name);\r
+       \r
+       /* BODY */\r
+       foreach ( $resource as $row )\r
+       {\r
+               $vars['current'] = $row;\r
+               $contents .= call_user_func("listplug_{$type}", $vars, 'BODY', $template_name);\r
+       }\r
+       \r
+       /* FOOT */\r
+       $contents .= call_user_func("listplug_{$type}", $vars, 'FOOT', $template_name);\r
+       \r
+       /* close SQL resource */\r
+       if ( is_string($query) )\r
+       {\r
+               $resource->closeCursor();\r
        }\r
        }\r
+       \r
+       return $contents;\r
 }\r
 \r
 }\r
 \r
-function listplug_select($vars, $type, $templateName = '')\r
+function listplug_select($vars, $type, $template_name = '')\r
 {\r
 {\r
-       global $DIR_LIBS, $manager;\r
+       global $manager;\r
        \r
        $templates = array();\r
        \r
        $templates = array();\r
-       if ( !empty($templateName) )\r
+       if ( !empty($template_name) )\r
        {\r
        {\r
-               $templates =& $manager->getTemplate($templateName);\r
+               $templates =& $manager->getTemplate($template_name);\r
        }\r
        \r
        switch( $type )\r
        }\r
        \r
        switch( $type )\r
@@ -81,7 +70,7 @@ function listplug_select($vars, $type, $templateName = '')
                case 'HEAD':\r
                        if ( !array_key_exists('SHOWLIST_LISTPLUG_SELECT_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_SELECT_HEAD']) )\r
                        {\r
                case 'HEAD':\r
                        if ( !array_key_exists('SHOWLIST_LISTPLUG_SELECT_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_SELECT_HEAD']) )\r
                        {\r
-                               $template = "<select<%name%><%tabindex%><%javascript%>>\n"\r
+                               $template = "<select name=\"<%name%>\" tabindex=\"<%tabindex%>\" <%javascript%>>\n"\r
                                          . "<%extraoption%>\n";\r
                        }\r
                        else\r
                                          . "<%extraoption%>\n";\r
                        }\r
                        else\r
@@ -89,36 +78,36 @@ function listplug_select($vars, $type, $templateName = '')
                                $template = $templates['SHOWLIST_LISTPLUG_SELECT_HEAD'];\r
                        }\r
                        $data = array(\r
                                $template = $templates['SHOWLIST_LISTPLUG_SELECT_HEAD'];\r
                        }\r
                        $data = array(\r
-                               'name'                  => isset($vars['name'])                 ? ' name="' . $vars['name'] . '"'                       : '',\r
-                               'tabindex'              => isset($vars['tabindex'])             ? ' tabindex="' . $vars['tabindex'] . '"'       : '',\r
-                               'javascript'    => isset($vars['javascript'])   ? ' ' . $vars['javascript']                                     : '',\r
-                               'extraoption'   => isset($vars['extra'])                ? '<option value="' . $vars['extra'] . '">' . $vars['extra'] . "</option>" : ''\r
+                               'name'                  => $vars['name'],\r
+                               'tabindex'              => $vars['tabindex'],\r
+                               'javascript'    => !array_key_exists('javascript', $vars) ? '' : $vars['javascript'],\r
+                               'extraoption'   => !array_key_exists('extra', $vars) ? '' : "<option value=\"\">{$vars['extra']}</option>"\r
                        );\r
                        break;\r
                case 'BODY':\r
                        $current = $vars['current'];\r
                        if ( !array_key_exists('SHOWLIST_LISTPLUG_SELECT_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_SELECT_BODY']) )\r
                        {\r
                        );\r
                        break;\r
                case 'BODY':\r
                        $current = $vars['current'];\r
                        if ( !array_key_exists('SHOWLIST_LISTPLUG_SELECT_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_SELECT_BODY']) )\r
                        {\r
-                               $template = "<option value=\"<%value%>\"<%selected%><%title%>><%option%></option>\n";\r
+                               $template = "<option value=\"<%value%>\" <%selected%> title=\"<%title%>\"><%option%></option>\n";\r
                        }\r
                        else\r
                        {\r
                                $template = $templates['SHOWLIST_LISTPLUG_SELECT_BODY'];\r
                        }\r
                        $data = array(\r
                        }\r
                        else\r
                        {\r
                                $template = $templates['SHOWLIST_LISTPLUG_SELECT_BODY'];\r
                        }\r
                        $data = array(\r
-                               'value'         => Entity::hsc($current->value),\r
-                               'selected'      => ($vars['selected'] == $current->value) ? ' selected="selected"' : '',\r
+                               'value'         => Entity::hsc($current['value']),\r
+                               'selected'      => ($vars['selected'] == $current['value']) ? 'selected="selected"' : '',\r
                        );\r
                        if ( array_key_exists('shorten', $vars) && $vars['shorten'] > 0 )\r
                        {\r
                        );\r
                        if ( array_key_exists('shorten', $vars) && $vars['shorten'] > 0 )\r
                        {\r
-                               $data['title'] = ' title="' . Entity::hsc($current->text) . '"';\r
-                               $current->text = Entity::hsc(Entity::shorten($current->text, $vars['shorten'], $vars['shortenel']));\r
+                               $data['title'] = Entity::hsc($current['text']);\r
+                               $data['option'] = Entity::hsc(Entity::shorten($current['text'], $vars['shorten'], $vars['shortenel']));\r
                        }\r
                        else\r
                        {\r
                                $data['title'] = '';\r
                        }\r
                        }\r
                        else\r
                        {\r
                                $data['title'] = '';\r
                        }\r
-                       $data['option'] = Entity::hsc($current->text);\r
+                       $data['option'] = Entity::hsc($current['text']);\r
                        break;\r
                case 'FOOT':\r
                        if ( !array_key_exists('SHOWLIST_LISTPLUG_SELECT_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_SELECT_FOOT']) )\r
                        break;\r
                case 'FOOT':\r
                        if ( !array_key_exists('SHOWLIST_LISTPLUG_SELECT_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_SELECT_FOOT']) )\r
@@ -133,27 +122,17 @@ function listplug_select($vars, $type, $templateName = '')
                        break;\r
        }\r
        \r
                        break;\r
        }\r
        \r
-       if ( !class_exists('Actions') )\r
-       {\r
-               include "{$DIR_LIBS}ACTIONS.php";\r
-       }\r
-       $template = Template::fill($template, $data);\r
-       $handler = new Actions('template');\r
-       \r
-       $parser = new Parser($handler);\r
-       $parser->parse($template);\r
-       \r
-       return;\r
+       return Template::fill($template, $data);\r
 }\r
 \r
 }\r
 \r
-function listplug_table($vars, $type, $templateName = '')\r
+function listplug_table($vars, $type, $template_name = '')\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
-       if ( !empty($templateName) )\r
+       if ( !empty($template_name) )\r
        {\r
        {\r
-               $templates =& $manager->getTemplate($templateName);\r
+               $templates =& $manager->getTemplate($template_name);\r
        }\r
        \r
        switch( $type )\r
        }\r
        \r
        switch( $type )\r
@@ -161,7 +140,7 @@ function listplug_table($vars, $type, $templateName = '')
                case 'HEAD':\r
                        if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_HEAD']) )\r
                        {\r
                case 'HEAD':\r
                        if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_HEAD']) )\r
                        {\r
-                               $template = "<table frame=\"box\" rules=\"all\" summary=\"{$templateName}\">\n"\r
+                               $template = "<table frame=\"box\" rules=\"all\" summary=\"{$template_name}\">\n"\r
                                          . "<thead>\n"\r
                                          . "<tr>\n"\r
                                          . "<%typehead%>\n"\r
                                          . "<thead>\n"\r
                                          . "<tr>\n"\r
                                          . "<%typehead%>\n"\r
@@ -174,7 +153,7 @@ function listplug_table($vars, $type, $templateName = '')
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_HEAD'];\r
                        }\r
                        $data = array(\r
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_HEAD'];\r
                        }\r
                        $data = array(\r
-                               'typehead' => call_user_func("listplug_table_" . $vars['content'] , $vars, 'HEAD', $templateName)\r
+                               'typehead' => call_user_func("listplug_table_" . $vars['content'] , $vars, 'HEAD', $template_name)\r
                        );\r
                        break;\r
                case 'BODY':\r
                        );\r
                        break;\r
                case 'BODY':\r
@@ -190,7 +169,7 @@ function listplug_table($vars, $type, $templateName = '')
                        }\r
                        // tabletype specific thingies\r
                        $data = array(\r
                        }\r
                        // tabletype specific thingies\r
                        $data = array(\r
-                               'typebody' => call_user_func("listplug_table_" . $vars['content'] , $vars, 'BODY', $templateName)\r
+                               'typebody' => call_user_func("listplug_table_" . $vars['content'] , $vars, 'BODY', $template_name)\r
                        );\r
                        break;\r
                case 'FOOT':\r
                        );\r
                        break;\r
                case 'FOOT':\r
@@ -206,35 +185,22 @@ function listplug_table($vars, $type, $templateName = '')
                        }\r
                        // tabletype specific thingies\r
                        $data = array(\r
                        }\r
                        // tabletype specific thingies\r
                        $data = array(\r
-                               'typefoot' => call_user_func("listplug_table_" . $vars['content'] , $vars, 'FOOT', $templateName)\r
+                               'typefoot' => call_user_func("listplug_table_" . $vars['content'] , $vars, 'FOOT', $template_name)\r
                        );\r
                        break;\r
        }\r
        \r
                        );\r
                        break;\r
        }\r
        \r
-       $template = Template::fill($template, $data);\r
-       \r
-       if ( !class_exists('Actions') )\r
-       {\r
-               global $DIR_LIBS;\r
-               include $DIR_LIBS . 'ACTIONS.php';\r
-       }\r
-       \r
-       $handler = new Actions('template', $template, $data);\r
-       \r
-       $parser = new PARSER($handler);\r
-       $parser->parse($template);\r
-       \r
-       return;\r
+       return Template::fill($template, $data);\r
 }\r
 \r
 }\r
 \r
-function listplug_table_memberlist($vars, $type, $templateName = '')\r
+function listplug_table_memberlist($vars, $type, $template_name = '')\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
-       if ( !empty($templateName) )\r
+       if ( !empty($template_name) )\r
        {\r
        {\r
-               $templates =& $manager->getTemplate($templateName);\r
+               $templates =& $manager->getTemplate($template_name);\r
        }\r
        \r
        switch( $type )\r
        }\r
        \r
        switch( $type )\r
@@ -284,14 +250,14 @@ function listplug_table_memberlist($vars, $type, $templateName = '')
                        }\r
                        $data = array(\r
                                'id'                    => listplug_nextBatchId(),\r
                        }\r
                        $data = array(\r
                                'id'                    => listplug_nextBatchId(),\r
-                               'memberid'              => $current->mnumber,\r
-                               'mailaddress'   => Entity::hsc($current->memail),\r
+                               'memberid'              => $current['mnumber'],\r
+                               'mailaddress'   => Entity::hsc($current['memail']),\r
                                'tabindex'              => $vars['tabindex'],\r
                                'tabindex'              => $vars['tabindex'],\r
-                               'name'                  => Entity::hsc($current->mname),\r
-                               'realname'              => Entity::hsc($current->mrealname),\r
-                               'url'                   => Entity::hsc($current->murl),\r
-                               'admin'                 => ($current->madmin ? _YES : _NO),\r
-                               'login'                 => ($current->mcanlogin ? _YES : _NO),\r
+                               'name'                  => Entity::hsc($current['mname']),\r
+                               'realname'              => Entity::hsc($current['mrealname']),\r
+                               'url'                   => Entity::hsc($current['murl']),\r
+                               'admin'                 => $current['madmin'] ? _YES : _NO,\r
+                               'login'                 => $current['mcanlogin'] ? _YES : _NO,\r
                                'editbtn'               => _LISTS_EDIT,\r
                                'deletebtn'             => _LISTS_DELETE,\r
                        );\r
                                'editbtn'               => _LISTS_EDIT,\r
                                'deletebtn'             => _LISTS_DELETE,\r
                        );\r
@@ -311,14 +277,14 @@ function listplug_table_memberlist($vars, $type, $templateName = '')
        return Template::fill($template, $data);\r
 }\r
 \r
        return Template::fill($template, $data);\r
 }\r
 \r
-function listplug_table_teamlist($vars, $type, $templateName = '')\r
+function listplug_table_teamlist($vars, $type, $template_name = '')\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
-       if ( !empty($templateName) )\r
+       if ( !empty($template_name) )\r
        {\r
        {\r
-               $templates =& $manager->getTemplate($templateName);\r
+               $templates =& $manager->getTemplate($template_name);\r
        }\r
        \r
        switch( $type )\r
        }\r
        \r
        switch( $type )\r
@@ -360,19 +326,20 @@ function listplug_table_teamlist($vars, $type, $templateName = '')
                        {\r
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_TEAMLIST_BODY'];\r
                        }\r
                        {\r
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_TEAMLIST_BODY'];\r
                        }\r
-                       $url  = 'index.php?action=teamchangeadmin&memberid=' . intval($current->tmember) . '&blogid=' . intval($current->tblog);\r
+                       $url  = 'index.php?action=teamchangeadmin&memberid=' . intval($current['tmember']) . '&blogid=' . intval($current['tblog']);\r
                        $url  = $manager->addTicketToUrl($url);\r
                        $data = array(\r
                                        'id'                    => listplug_nextBatchId(),\r
                        $url  = $manager->addTicketToUrl($url);\r
                        $data = array(\r
                                        'id'                    => listplug_nextBatchId(),\r
-                                       'memberid'              => $current->tmember,\r
-                                       'mailaddress'   => Entity::hsc($current->memail),\r
+                                       'memberid'              => $current['tmember'],\r
+                                       'mailaddress'   => Entity::hsc($current['memail']),\r
                                        'tabindex'              => $vars['tabindex'],\r
                                        'tabindex'              => $vars['tabindex'],\r
-                                       'name'                  => Entity::hsc($current->mname),\r
-                                       'realname'              => Entity::hsc($current->mrealname),\r
-                                       'admin'                 => ($current->tadmin ? _YES : _NO),\r
-                                       'blogid'                => $current->tblog,\r
-                                       'deletebtn'             => _LISTS_DELETE,\r
+                                       'name'                  => Entity::hsc($current['mname']),\r
+                                       'realname'              => Entity::hsc($current['mrealname']),\r
+                                       'admin'                 => ($current['tadmin'] ? _YES : _NO),\r
+                                       'blogid'                => $current['tblog'],\r
+                                       'deletebtn'             => '<%text(_LISTS_DELETE)%>',\r
                                        'chadminurl'    => Entity::hsc($url),\r
                                        'chadminurl'    => Entity::hsc($url),\r
+                                       'chadminbtn'    => '<%text(_LIST_TEAM_CHADMIN)%>'\r
                        );\r
                        break;\r
                case 'FOOT':\r
                        );\r
                        break;\r
                case 'FOOT':\r
@@ -390,15 +357,15 @@ function listplug_table_teamlist($vars, $type, $templateName = '')
        return Template::fill($template, $data);\r
 }\r
 \r
        return Template::fill($template, $data);\r
 }\r
 \r
-function listplug_table_pluginlist($vars, $type, $templateName = '')\r
+function listplug_table_pluginlist($vars, $type, $template_name = '')\r
 {\r
        static $plugins = array();\r
        global $manager;\r
        \r
        $templates = array();\r
 {\r
        static $plugins = array();\r
        global $manager;\r
        \r
        $templates = array();\r
-       if ( !empty($templateName) )\r
+       if ( !empty($template_name) )\r
        {\r
        {\r
-               $templates =& $manager->getTemplate($templateName);\r
+               $templates =& $manager->getTemplate($template_name);\r
        }\r
        \r
        switch( $type )\r
        }\r
        \r
        switch( $type )\r
@@ -422,8 +389,8 @@ function listplug_table_pluginlist($vars, $type, $templateName = '')
                        break;\r
                case 'BODY':\r
                        $current = $vars['current'];\r
                        break;\r
                case 'BODY':\r
                        $current = $vars['current'];\r
-\r
-                       $plug =& $manager->getPlugin($current->pfile);\r
+                       \r
+                       $plug =& $manager->getPlugin($current['pfile']);\r
                        if ( $plug )\r
                        {\r
                                if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY']) )\r
                        if ( $plug )\r
                        {\r
                                if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY']) )\r
@@ -550,7 +517,7 @@ function listplug_table_pluginlist($vars, $type, $templateName = '')
                                                $depList = $preq->getPluginDep();\r
                                                foreach ( $depList as $depName )\r
                                                {\r
                                                $depList = $preq->getPluginDep();\r
                                                foreach ( $depList as $depName )\r
                                                {\r
-                                                       if ( $current->pfile == $depName )\r
+                                                       if ( $current['pfile'] == $depName )\r
                                                        {\r
                                                                $req[] = $plugin['pfile'];\r
                                                        }\r
                                                        {\r
                                                                $req[] = $plugin['pfile'];\r
                                                        }\r
@@ -590,7 +557,7 @@ function listplug_table_pluginlist($vars, $type, $templateName = '')
                                        $template = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE'];\r
                                }\r
                                $data = array(\r
                                        $template = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE'];\r
                                }\r
                                $data = array(\r
-                                       'noplugalert' => sprintf(_PLUGINFILE_COULDNT_BELOADED, Entity::hsc($current->pfile)),\r
+                                       'noplugalert' => sprintf(_PLUGINFILE_COULDNT_BELOADED, Entity::hsc($current['pfile'])),\r
                                );\r
                        }\r
                        if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN']) )\r
                                );\r
                        }\r
                        if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN']) )\r
@@ -609,7 +576,7 @@ function listplug_table_pluginlist($vars, $type, $templateName = '')
                                $template .= $templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN'];\r
                        }\r
                        \r
                                $template .= $templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN'];\r
                        }\r
                        \r
-                       $baseUrl        = 'index.php?plugid=' . $current->pid . '&action=';\r
+                       $baseUrl        = 'index.php?plugid=' . $current['pid'] . '&action=';\r
                        $upUrl          = $manager->addTicketToUrl($baseUrl . 'pluginup');\r
                        $downUrl        = $manager->addTicketToUrl($baseUrl . 'plugindown');\r
                        \r
                        $upUrl          = $manager->addTicketToUrl($baseUrl . 'pluginup');\r
                        $downUrl        = $manager->addTicketToUrl($baseUrl . 'plugindown');\r
                        \r
@@ -618,7 +585,7 @@ function listplug_table_pluginlist($vars, $type, $templateName = '')
                        $data['actiondowntxt']  = _LIST_PLUGS_DOWN;\r
                        $data['actiondownurl']  = Entity::hsc($downUrl);\r
                        $data['actuninsttxt']   = _LIST_PLUGS_UNINSTALL;\r
                        $data['actiondowntxt']  = _LIST_PLUGS_DOWN;\r
                        $data['actiondownurl']  = Entity::hsc($downUrl);\r
                        $data['actuninsttxt']   = _LIST_PLUGS_UNINSTALL;\r
-                       $data['actuninsturl']   = 'index.php?action=plugindelete&amp;plugid=' . $current->pid;\r
+                       $data['actuninsturl']   = 'index.php?action=plugindelete&amp;plugid=' . $current['pid'];\r
                        \r
                        if ( $plug && ($plug->hasAdminArea() > 0) )\r
                        {\r
                        \r
                        if ( $plug && ($plug->hasAdminArea() > 0) )\r
                        {\r
@@ -652,7 +619,7 @@ function listplug_table_pluginlist($vars, $type, $templateName = '')
                                        $subTpl = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP'];\r
                                }\r
                                $subData = array(\r
                                        $subTpl = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP'];\r
                                }\r
                                $subData = array(\r
-                                       'acthelpurl'    => 'index.php?action=pluginhelp&amp;plugid=' . $current->pid,\r
+                                       'acthelpurl'    => 'index.php?action=pluginhelp&amp;plugid=' . $current['pid'],\r
                                        'tabindex'              => $vars['tabindex'],\r
                                        'acthelptxt'    => _LIST_PLUGS_HELP,\r
                                );\r
                                        'tabindex'              => $vars['tabindex'],\r
                                        'acthelptxt'    => _LIST_PLUGS_HELP,\r
                                );\r
@@ -669,7 +636,7 @@ function listplug_table_pluginlist($vars, $type, $templateName = '')
                                  . 'WHERE '\r
                                  . '    ocontext = "global" '\r
                                  . 'AND opid     = %d';\r
                                  . 'WHERE '\r
                                  . '    ocontext = "global" '\r
                                  . 'AND opid     = %d';\r
-                       $pOptions = DB::getValue(sprintf($optQuery, $current->pid));\r
+                       $pOptions = DB::getValue(sprintf($optQuery, $current['pid']));\r
                        if ( $pOptions > 0 )\r
                        {\r
                                if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL']) )\r
                        if ( $pOptions > 0 )\r
                        {\r
                                if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL']) )\r
@@ -681,7 +648,7 @@ function listplug_table_pluginlist($vars, $type, $templateName = '')
                                        $subTpl = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL'];\r
                                }\r
                                $subData = array(\r
                                        $subTpl = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL'];\r
                                }\r
                                $subData = array(\r
-                                       'actoptionurl'  => 'index.php?action=pluginoptions&amp;plugid=' . $current->pid,\r
+                                       'actoptionurl'  => 'index.php?action=pluginoptions&amp;plugid=' . $current['pid'],\r
                                        'tabindex'              => $vars['tabindex'],\r
                                        'actoptiontxt'  => _LIST_PLUGS_OPTIONS,\r
                                );\r
                                        'tabindex'              => $vars['tabindex'],\r
                                        'actoptiontxt'  => _LIST_PLUGS_OPTIONS,\r
                                );\r
@@ -707,14 +674,14 @@ function listplug_table_pluginlist($vars, $type, $templateName = '')
        return Template::fill($template, $data);\r
 }\r
 \r
        return Template::fill($template, $data);\r
 }\r
 \r
-function listplug_table_plugoptionlist($vars, $type, $templateName = '')\r
+function listplug_table_plugoptionlist($vars, $type, $template_name = '')\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
-       if ( !empty($templateName) )\r
+       if ( !empty($template_name) )\r
        {\r
        {\r
-               $templates =& $manager->getTemplate($templateName);\r
+               $templates =& $manager->getTemplate($template_name);\r
        }\r
        \r
        switch( $type )\r
        }\r
        \r
        switch( $type )\r
@@ -736,7 +703,7 @@ function listplug_table_plugoptionlist($vars, $type, $templateName = '')
                        break;\r
                case 'BODY':\r
                        $current = $vars['current'];\r
                        break;\r
                case 'BODY':\r
                        $current = $vars['current'];\r
-                       $template = listplug_plugOptionRow($current, $templateName);\r
+                       $template = listplug_plugOptionRow($current, $template_name);\r
                        $data = array();\r
                        break;\r
                case 'FOOT':\r
                        $data = array();\r
                        break;\r
                case 'FOOT':\r
@@ -763,14 +730,14 @@ function listplug_table_plugoptionlist($vars, $type, $templateName = '')
        return Template::fill($template, $data);\r
 }\r
 \r
        return Template::fill($template, $data);\r
 }\r
 \r
-function listplug_plugOptionRow($current, $templateName = '')\r
+function listplug_plugOptionRow($current, $template_name = '')\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
-       if ( !empty($templateName) )\r
+       if ( !empty($template_name) )\r
        {\r
        {\r
-               $templates =& $manager->getTemplate($templateName);\r
+               $templates =& $manager->getTemplate($template_name);\r
        }\r
        \r
        $varname = "plugoption[{$current['oid']}][{$current['contextid']}]";\r
        }\r
        \r
        $varname = "plugoption[{$current['oid']}][{$current['contextid']}]";\r
@@ -800,7 +767,7 @@ function listplug_plugOptionRow($current, $templateName = '')
                switch($current['type'])\r
                {\r
                        case 'yesno':\r
                switch($current['type'])\r
                {\r
                        case 'yesno':\r
-                               $template .= AdminActions::input_yesno($varname, $current['value'], 0, 'yes', 'no', _YES, _NO, 0, $templateName, 1);\r
+                               $template .= listplug_input_yesno($varname, $current['value'], 0, 'yes', 'no', _YES, _NO, 0, $template_name, 1);\r
                                break;\r
                        case 'password':\r
                                if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD']) )\r
                                break;\r
                        case 'password':\r
                                if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD']) )\r
@@ -957,16 +924,87 @@ function listplug_plugOptionRow($current, $templateName = '')
        return Template::fill($template, $data, 1);\r
 }\r
 \r
        return Template::fill($template, $data, 1);\r
 }\r
 \r
-function listplug_table_itemlist($vars, $type, $templateName = '')\r
+/**\r
+ * listplug_templateEditRow()\r
+ * \r
+ * @param      array   $content                content of target template\r
+ * @param      string  $desc                   description of target template\r
+ * @param      string  $name                   name of target template\r
+ * @param      string  $help                   help text\r
+ * @param      integer $tabindex               a number for tab index\r
+ * @param      boolean $big                    large or small textarea\r
+ * @param      array   $template_name  name of template for filling\r
+ * @return     void\r
+ */\r
+function listplug_templateEditRow($content, $desc, $name, $help = '', $tabindex = 0, $big = 0, $template_name = '')\r
+{\r
+       global $manager;\r
+       \r
+       static $count = 0;\r
+       \r
+       $tmplt = array();\r
+       $base  = array();\r
+       \r
+       $templates = array();\r
+       if ( $template_name )\r
+       {\r
+               $templates =& $manager->getTemplate($template_name);\r
+       }\r
+       \r
+       $data = array(\r
+               'description'   => $desc,\r
+               'help'                  => empty($help) ? '' : helpHtml('template' . $help),\r
+               'count'                 => $count++,\r
+               'name'                  => $name,\r
+               'tabindex'              => $tabindex,\r
+               'rows'                  => $big ? 10 : 5,\r
+       );\r
+       \r
+       $message = '';\r
+       \r
+       /* row head */\r
+       if ( !array_key_exists('TEMPLATE_EDIT_ROW_HEAD', $templates) || empty($tmplt['TEMPLATE_EDIT_ROW_HEAD']) )\r
+       {\r
+               $template = "</tr>"\r
+                         . "<tr>\n"\r
+                         . "<td><%description%><%help%></td>\n"\r
+                         . "<td id=\"td<%count%>\">\n"\r
+                         . "<textarea class=\"templateedit\" name=\"<%name%>\" tabindex=\"<%tabindex%>\" cols=\"50\" rows=\"<%rows%>\" id=\"textarea<%count%>\">";\r
+       }\r
+       else\r
+       {\r
+               $template = $tmplt['TEMPLATE_EDIT_ROW_HEAD'];\r
+       }\r
+       $message .= TEMPLATE::fill($template, $data);\r
+       \r
+       /* row content */\r
+       $message .= ENTITY::hsc($content);\r
+       \r
+       /* row tail */\r
+       if ( !array_key_exists('TEMPLATE_EDIT_ROW_TAIL', $templates) || empty($tmplt['TEMPLATE_EDIT_ROW_TAIL']) )\r
+       {\r
+               $template = "</textarea>\n"\r
+                         . "</td>\n";\r
+       }\r
+       else\r
+       {\r
+               $template = $tmplt['TEMPLATE_EDIT_ROW_TAIL'];\r
+       }\r
+       $message .= TEMPLATE::fill($template, $data);\r
+       \r
+       return $message;\r
+}\r
+\r
+function listplug_table_itemlist($vars, $type, $template_name = '')\r
 {\r
        global $manager;\r
        \r
        $cssclass  = '';\r
        \r
        $templates = array();\r
 {\r
        global $manager;\r
        \r
        $cssclass  = '';\r
        \r
        $templates = array();\r
-       if ( !empty($templateName) )\r
+       if ( !empty($template_name) )\r
        {\r
        {\r
-               $templates =& $manager->getTemplate($templateName);\r
+               $templates =& $manager->getTemplate($template_name);\r
        }\r
        \r
        switch( $type )\r
        }\r
        \r
        switch( $type )\r
@@ -991,7 +1029,7 @@ function listplug_table_itemlist($vars, $type, $templateName = '')
                case 'BODY':\r
                        $current = $vars['current'];\r
                        // string -> unix timestamp\r
                case 'BODY':\r
                        $current = $vars['current'];\r
                        // string -> unix timestamp\r
-                       $current->itime = strtotime($current->itime);\r
+                       $current['itime'] = strtotime($current['itime']);\r
                        if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY']) )\r
                        {\r
                                $template = "<td<%cssclass%>>\n"\r
                        if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY']) )\r
                        {\r
                                $template = "<td<%cssclass%>>\n"\r
@@ -1001,10 +1039,12 @@ function listplug_table_itemlist($vars, $type, $templateName = '')
                                          . "<%itemdatelabel%> <%itemdateval%><br />\n"\r
                                          . "<%itemtimelabel%> <%itemtimeval%>\n"\r
                                          . "</td>\n"\r
                                          . "<%itemdatelabel%> <%itemdateval%><br />\n"\r
                                          . "<%itemtimelabel%> <%itemtimeval%>\n"\r
                                          . "</td>\n"\r
-                                         . "<td><input type=\"checkbox\" id=\"batch<%batchid%>\" name=\"batch[<%batchid%>]\" value=\"<%itemid%>\" />\n"\r
+                                         . "<td<%cssclass%>>\n"\r
+                                         . "<input type=\"checkbox\" id=\"batch<%batchid%>\" name=\"batch[<%batchid%>]\" value=\"<%itemid%>\" />\n"\r
                                          . "<label for=\"batch<%batchid%>\"><b><%itemtitle%></b></label><br />\n"\r
                                          . "<%itembody%>\n"\r
                                          . "<label for=\"batch<%batchid%>\"><b><%itemtitle%></b></label><br />\n"\r
                                          . "<%itembody%>\n"\r
-                                         . "</td><td>"\r
+                                         . "</td>\n"\r
+                                         . "<td<%cssclass%>>\n"\r
                                          . "<a href=\"index.php?action=itemedit&amp;itemid=<%itemid%>\"><%editbtn%></a><br />\n"\r
                                          . "<%camount%>\n"\r
                                          . "<a href=\"index.php?action=itemmove&amp;itemid=<%itemid%>\"><%movebtn%></a><br />\n"\r
                                          . "<a href=\"index.php?action=itemedit&amp;itemid=<%itemid%>\"><%editbtn%></a><br />\n"\r
                                          . "<%camount%>\n"\r
                                          . "<a href=\"index.php?action=itemmove&amp;itemid=<%itemid%>\"><%movebtn%></a><br />\n"\r
@@ -1016,48 +1056,48 @@ function listplug_table_itemlist($vars, $type, $templateName = '')
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY'];\r
                        }\r
                        $cssclass  = '';\r
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY'];\r
                        }\r
                        $cssclass  = '';\r
-       \r
-                       if ( $current->idraft == 1 )\r
+                       \r
+                       if ( $current['idraft'] == 1 )\r
                        {\r
                                $cssclass = ' class="draft"';\r
                        }\r
                        \r
                        // (can't use offset time since offsets might vary between blogs)\r
                        {\r
                                $cssclass = ' class="draft"';\r
                        }\r
                        \r
                        // (can't use offset time since offsets might vary between blogs)\r
-                       if ( $current->itime > $vars['now'] )\r
+                       if ( $current['itime'] > $vars['now'] )\r
                        {\r
                                $cssclass = ' class="future"';\r
                        }\r
                        {\r
                                $cssclass = ' class="future"';\r
                        }\r
-                       $body = strip_tags($current->ibody);\r
+                       $body = strip_tags($current['ibody']);\r
                        $data = array(\r
                                'cssclass'                      => $cssclass,\r
                                'bshortlabel'           => _LIST_ITEM_BLOG,\r
                        $data = array(\r
                                'cssclass'                      => $cssclass,\r
                                'bshortlabel'           => _LIST_ITEM_BLOG,\r
-                               'bshortnameval'         => Entity::hsc($current->bshortname),\r
+                               'bshortnameval'         => Entity::hsc($current['bshortname']),\r
                                'categorylabel'         => _LIST_ITEM_CAT,\r
                                'categorylabel'         => _LIST_ITEM_CAT,\r
-                               'categorynameval'       => Entity::hsc($current->cname),\r
+                               'categorynameval'       => Entity::hsc($current['cname']),\r
                                'authorlabel'           => _LIST_ITEM_AUTHOR,\r
                                'authorlabel'           => _LIST_ITEM_AUTHOR,\r
-                               'authornameval'         => Entity::hsc($current->mname),\r
+                               'authornameval'         => Entity::hsc($current['mname']),\r
                                'itemdatelabel'         => _LIST_ITEM_DATE,\r
                                'itemdatelabel'         => _LIST_ITEM_DATE,\r
-                               'itemdateval'           => date("Y-m-d",$current->itime),\r
+                               'itemdateval'           => date("Y-m-d",$current['itime']),\r
                                'itemdatelabel'         => _LIST_ITEM_TIME,\r
                                'itemdatelabel'         => _LIST_ITEM_TIME,\r
-                               'itemdateval'           => date("H:i",$current->itime),\r
+                               'itemdateval'           => date("H:i",$current['itime']),\r
                                'batchid'                       => listplug_nextBatchId(),\r
                                'batchid'                       => listplug_nextBatchId(),\r
-                               'itemid'                        => $current->inumber,\r
-                               'itemtitle'                     => Entity::hsc(strip_tags($current->ititle)),\r
+                               'itemid'                        => $current['inumber'],\r
+                               'itemtitle'                     => Entity::hsc(strip_tags($current['ititle'])),\r
                                'itembody'                      => Entity::hsc(Entity::shorten($body, 300, '...')),\r
                                'editbtn'                       => _LISTS_EDIT,\r
                                'movebtn'                       => _LISTS_MOVE,\r
                                'delbtn'                        => _LISTS_DELETE,\r
                        );\r
                        // evaluate amount of comments for the item\r
                                'itembody'                      => Entity::hsc(Entity::shorten($body, 300, '...')),\r
                                'editbtn'                       => _LISTS_EDIT,\r
                                'movebtn'                       => _LISTS_MOVE,\r
                                'delbtn'                        => _LISTS_DELETE,\r
                        );\r
                        // evaluate amount of comments for the item\r
-                       $comment = new Comments($current->inumber);\r
+                       $comment = new Comments($current['inumber']);\r
                        $camount = $comment->amountComments();\r
                        if ( $camount > 0 )\r
                        {\r
                        $camount = $comment->amountComments();\r
                        if ( $camount > 0 )\r
                        {\r
-                               $data['camount'] = "<a href=\"index.php?action=itemcommentlist&amp;itemid={$current->inumber}\">(" . sprintf(_LIST_ITEM_COMMENTS, $comment->amountComments()) . ")</a><br />\n";\r
+                               $data['camount'] = "<a href=\"index.php?action=itemcommentlist&amp;itemid={$current['inumber']}\">(" . sprintf(_LIST_ITEM_COMMENTS, $comment->amountComments()) . ")</a><br />\n";\r
                        }\r
                        else\r
                        {\r
                        }\r
                        else\r
                        {\r
-                               $data['camount'] = _LIST_ITEM_NOCONTENT . "\n";\r
+                               $data['camount'] = _LIST_ITEM_NOCONTENT . "<br />\n";\r
                        }\r
                        break;\r
                case 'FOOT':\r
                        }\r
                        break;\r
                case 'FOOT':\r
@@ -1082,14 +1122,14 @@ function listplug_nextBatchId()
        return $id++;\r
 }\r
 \r
        return $id++;\r
 }\r
 \r
-function listplug_table_commentlist($vars, $type, $templateName = '')\r
+function listplug_table_commentlist($vars, $type, $template_name = '')\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
-       if ( !empty($templateName) )\r
+       if ( !empty($template_name) )\r
        {\r
        {\r
-               $templates =& $manager->getTemplate($templateName);\r
+               $templates =& $manager->getTemplate($template_name);\r
        }\r
        \r
        switch( $type )\r
        }\r
        \r
        switch( $type )\r
@@ -1115,12 +1155,16 @@ function listplug_table_commentlist($vars, $type, $templateName = '')
                        if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY']) )\r
                        {\r
                                $template = "<td><%commentdate%><br /><%commentator%><br /><%commentsite%><br /><%commentmail%><br /></td>\n"\r
                        if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY']) )\r
                        {\r
                                $template = "<td><%commentdate%><br /><%commentator%><br /><%commentsite%><br /><%commentmail%><br /></td>\n"\r
-                                         . "<td><input type=\"checkbox\" id=\"batch<%batchid%>\" name=\"batch[<%batchid%>]\" value=\"<%commentid%>\" />"\r
-                                         . "<label for=\"batch<%batchid%>\"><%commentbody%></label></td>\n"\r
-                                         . "<td style=\"white-space:nowrap\">"\r
-                                         . "<a href=\"index.php?action=commentedit&amp;commentid=<%commentid%>\"><%editbtn%></a></td>\n"\r
-                                         . "<td style=\"white-space:nowrap\">"\r
-                                         . "<a href=\"index.php?action=commentdelete&amp;commentid=<%commentid%>\"><%delbtn%></a></td>\n"\r
+                                         . "<td>\n"\r
+                                         . "<input type=\"checkbox\" id=\"batch<%batchid%>\" name=\"batch[<%batchid%>]\" value=\"<%commentid%>\" />"\r
+                                         . "<label for=\"batch<%batchid%>\"><%commentbody%></label>\n"\r
+                                         . "</td>\n"\r
+                                         . "<td style=\"white-space:nowrap\">\n"\r
+                                         . "<a href=\"index.php?action=commentedit&amp;commentid=<%commentid%>\"><%editbtn%></a>\n"\r
+                                         . "</td>\n"\r
+                                         . "<td style=\"white-space:nowrap\">\n"\r
+                                         . "<a href=\"index.php?action=commentdelete&amp;commentid=<%commentid%>\"><%delbtn%></a>\n"\r
+                                         . "</td>\n"\r
                                          . "<%addbanlist%>";\r
                        }\r
                        else\r
                                          . "<%addbanlist%>";\r
                        }\r
                        else\r
@@ -1128,34 +1172,34 @@ function listplug_table_commentlist($vars, $type, $templateName = '')
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY'];\r
                        }\r
                        $current = $vars['current'];\r
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY'];\r
                        }\r
                        $current = $vars['current'];\r
-                       $body = strip_tags($current->cbody);\r
+                       $body = strip_tags($current['cbody']);\r
                        $data = array(\r
                        $data = array(\r
-                               'commentdate'   => date("Y-m-d@H:i", strtotime($current->ctime)),\r
+                               'commentdate'   => date("Y-m-d@H:i", strtotime($current['ctime'])),\r
                                'batchid'               => listplug_nextBatchId(),\r
                                'batchid'               => listplug_nextBatchId(),\r
-                               'commentid'             => $current->cnumber,\r
-                               'commentbody'   => Entity::hsc(Entity::shorten($current->cbody, 300, '...')),\r
+                               'commentid'             => $current['cnumber'],\r
+                               'commentbody'   => Entity::hsc(Entity::shorten($current['cbody'], 300, '...')),\r
                                'editbtn'               => _LISTS_EDIT,\r
                                'delbtn'                => _LISTS_DELETE,\r
                        );\r
                                'editbtn'               => _LISTS_EDIT,\r
                                'delbtn'                => _LISTS_DELETE,\r
                        );\r
-                       if ( isset($current->mname) )\r
+                       if ( isset($current['mname']) )\r
                        {\r
                        {\r
-                               $data['commentator'] = Entity::hsc($current->mname) . ' ' . _LIST_COMMENTS_MEMBER;\r
+                               $data['commentator'] = Entity::hsc($current['mname']) . ' ' . _LIST_COMMENTS_MEMBER;\r
                        }\r
                        else\r
                        {\r
                        }\r
                        else\r
                        {\r
-                               $data['commentator'] = Entity::hsc($current->cuser);\r
+                               $data['commentator'] = Entity::hsc($current['cuser']);\r
                        }\r
                        }\r
-                       if ( isset($current->cmail) && $current->cmail )\r
+                       if ( isset($current['cmail']) && $current['cmail'] )\r
                        {\r
                        {\r
-                               $data['commentsite'] = Entity::hsc($current->cmail);\r
+                               $data['commentsite'] = Entity::hsc($current['cmail']);\r
                        }\r
                                else\r
                        {\r
                                $data['commentsite'] = '';\r
                        }\r
                        }\r
                                else\r
                        {\r
                                $data['commentsite'] = '';\r
                        }\r
-                       if ( isset($current->cemail) && $current->cemail )\r
+                       if ( isset($current['cemail']) && $current['cemail'] )\r
                        {\r
                        {\r
-                               $data['commentmail'] = Entity::hsc($current->cemail);\r
+                               $data['commentmail'] = Entity::hsc($current['cemail']);\r
                        }\r
                                else\r
                        {\r
                        }\r
                                else\r
                        {\r
@@ -1165,15 +1209,17 @@ function listplug_table_commentlist($vars, $type, $templateName = '')
                        {\r
                                if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN']) )\r
                                {\r
                        {\r
                                if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN']) )\r
                                {\r
-                                       $subTpl = "<td style=\"white-space:nowrap\"><a href=\"index.php?action=banlistnewfromitem&amp;itemid=<%itemid%>&amp;ip=<%banip%>\" title=\"<%banhost%>\"><%banbtn%></a></td>\n";\r
+                                       $subTpl = "<td style=\"white-space:nowrap\">"\r
+                                               . "<a href=\"index.php?action=banlistnewfromitem&amp;itemid=<%itemid%>&amp;ip=<%banip%>\" title=\"<%banhost%>\"><%banbtn%></a>"\r
+                                               . "</td>\n";\r
                                }\r
                                else\r
                                {\r
                                        $subTpl = $templates['SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN'];\r
                                }\r
                                $subData = array(\r
                                }\r
                                else\r
                                {\r
                                        $subTpl = $templates['SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN'];\r
                                }\r
                                $subData = array(\r
-                                       'itemid'        => $current->citem,\r
-                                       'banip'         => Entity::hsc($current->cip),\r
+                                       'itemid'        => $current['citem'],\r
+                                       'banip'         => Entity::hsc($current['cip']),\r
                                        'banbtn'        => _LIST_COMMENT_BANIP,\r
                                );\r
                                $data['addbanlist'] = Template::fill($subTpl, $subData);\r
                                        'banbtn'        => _LIST_COMMENT_BANIP,\r
                                );\r
                                $data['addbanlist'] = Template::fill($subTpl, $subData);\r
@@ -1194,14 +1240,14 @@ function listplug_table_commentlist($vars, $type, $templateName = '')
        return Template::fill($template, $data);\r
 }\r
 \r
        return Template::fill($template, $data);\r
 }\r
 \r
-function listplug_table_bloglist($vars, $type, $templateName = '')\r
+function listplug_table_bloglist($vars, $type, $template_name = '')\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
-       if ( !empty($templateName) )\r
+       if ( !empty($template_name) )\r
        {\r
        {\r
-               $templates =& $manager->getTemplate($templateName);\r
+               $templates =& $manager->getTemplate($template_name);\r
        }\r
        \r
        switch( $type )\r
        }\r
        \r
        switch( $type )\r
@@ -1237,10 +1283,10 @@ function listplug_table_bloglist($vars, $type, $templateName = '')
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY'];\r
                        }\r
                        $data = array(\r
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY'];\r
                        }\r
                        $data = array(\r
-                               'blogid'                => $current->bnumber,\r
-                               'shortname'             => Entity::hsc($current->bshortname),\r
-                               'blogurl'               => $current->burl,\r
-                               'blogname'              => Entity::hsc($current->bname),\r
+                               'blogid'                => $current['bnumber'],\r
+                               'shortname'             => Entity::hsc($current['bshortname']),\r
+                               'blogurl'               => $current['burl'],\r
+                               'blogname'              => Entity::hsc($current['bname']),\r
                                'ttaddtext'             => _BLOGLIST_TT_ADD,\r
                                'addtext'               => _BLOGLIST_ADD,\r
                                'ttedittext'    => _BLOGLIST_TT_EDIT,\r
                                'ttaddtext'             => _BLOGLIST_TT_ADD,\r
                                'addtext'               => _BLOGLIST_ADD,\r
                                'ttedittext'    => _BLOGLIST_TT_EDIT,\r
@@ -1250,12 +1296,12 @@ function listplug_table_bloglist($vars, $type, $templateName = '')
                                'ttbmlettext'   => _BLOGLIST_TT_BMLET,\r
                                'bmlettext'             => _BLOGLIST_BMLET,\r
                        );\r
                                'ttbmlettext'   => _BLOGLIST_TT_BMLET,\r
                                'bmlettext'             => _BLOGLIST_BMLET,\r
                        );\r
-                       if ( $current->tadmin == 1 )\r
+                       if ( $current['tadmin'] == 1 )\r
                        {\r
                                if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM']) )\r
                                {\r
                                        $template .= "<td><a href=\"index.php?action=blogsettings&amp;blogid=<%blogid%>\" title=\"<%ttsettingtext%>\"><%settingtext%></a></td>\n"\r
                        {\r
                                if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM']) )\r
                                {\r
                                        $template .= "<td><a href=\"index.php?action=blogsettings&amp;blogid=<%blogid%>\" title=\"<%ttsettingtext%>\"><%settingtext%></a></td>\n"\r
-                                                 . "<td><a href=\"index.php?action=banlist&amp;blogid=<%blogid%>\" title=\"<%ttbanstext%>\"><%banstext%></a></td>\n";\r
+                                                  . "<td><a href=\"index.php?action=banlist&amp;blogid=<%blogid%>\" title=\"<%ttbanstext%>\"><%banstext%></a></td>\n";\r
                                }\r
                                else\r
                                {\r
                                }\r
                                else\r
                                {\r
@@ -1282,7 +1328,6 @@ function listplug_table_bloglist($vars, $type, $templateName = '')
                        }\r
                        break;\r
                case 'FOOT':\r
                        }\r
                        break;\r
                case 'FOOT':\r
-                       $current = $vars['current'];\r
                        if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_BLOGLIST_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_BLOGLIST_FOOT']) )\r
                        {\r
                                $template = "\n";\r
                        if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_BLOGLIST_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_BLOGLIST_FOOT']) )\r
                        {\r
                                $template = "\n";\r
@@ -1297,14 +1342,14 @@ function listplug_table_bloglist($vars, $type, $templateName = '')
        return Template::fill($template, $data);\r
 }\r
 \r
        return Template::fill($template, $data);\r
 }\r
 \r
-function listplug_table_shortblognames($vars, $type, $templateName = '')\r
+function listplug_table_shortblognames($vars, $type, $template_name = '')\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
-       if ( !empty($templateName) )\r
+       if ( !empty($template_name) )\r
        {\r
        {\r
-               $templates =& $manager->getTemplate($templateName);\r
+               $templates =& $manager->getTemplate($template_name);\r
        }\r
        \r
        switch( $type )\r
        }\r
        \r
        switch( $type )\r
@@ -1336,8 +1381,8 @@ function listplug_table_shortblognames($vars, $type, $templateName = '')
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_BODY'];\r
                        }\r
                        $data = array(\r
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_BODY'];\r
                        }\r
                        $data = array(\r
-                               'bshortname' => Entity::hsc($current->bshortname),\r
-                               'blogname'   => Entity::hsc($current->bname),\r
+                               'bshortname' => Entity::hsc($current['bshortname']),\r
+                               'blogname'   => Entity::hsc($current['bname']),\r
                        );\r
                        break;\r
                case 'FOOT':\r
                        );\r
                        break;\r
                case 'FOOT':\r
@@ -1356,14 +1401,14 @@ function listplug_table_shortblognames($vars, $type, $templateName = '')
        return Template::fill($template, $data);\r
 }\r
 \r
        return Template::fill($template, $data);\r
 }\r
 \r
-function listplug_table_shortnames($vars, $type, $templateName = '')\r
+function listplug_table_shortnames($vars, $type, $template_name = '')\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
-       if ( !empty($templateName) )\r
+       if ( !empty($template_name) )\r
        {\r
        {\r
-               $templates =& $manager->getTemplate($templateName);\r
+               $templates =& $manager->getTemplate($template_name);\r
        }\r
        \r
        switch( $type )\r
        }\r
        \r
        switch( $type )\r
@@ -1395,8 +1440,8 @@ function listplug_table_shortnames($vars, $type, $templateName = '')
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_SHORTNAM_BODY'];\r
                        }\r
                        $data = array(\r
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_SHORTNAM_BODY'];\r
                        }\r
                        $data = array(\r
-                               'name' => Entity::hsc($current->name),\r
-                               'desc' => Entity::hsc($current->description),\r
+                               'name' => Entity::hsc($current['name']),\r
+                               'desc' => Entity::hsc($current['description']),\r
                        );\r
                        break;\r
                case 'FOOT':\r
                        );\r
                        break;\r
                case 'FOOT':\r
@@ -1415,14 +1460,14 @@ function listplug_table_shortnames($vars, $type, $templateName = '')
        return Template::fill($template, $data);\r
 }\r
 \r
        return Template::fill($template, $data);\r
 }\r
 \r
-function listplug_table_categorylist($vars, $type, $templateName = '')\r
+function listplug_table_categorylist($vars, $type, $template_name = '')\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
-       if ( !empty($templateName) )\r
+       if ( !empty($template_name) )\r
        {\r
        {\r
-               $templates =& $manager->getTemplate($templateName);\r
+               $templates =& $manager->getTemplate($template_name);\r
        }\r
        \r
        switch( $type )\r
        }\r
        \r
        switch( $type )\r
@@ -1463,10 +1508,10 @@ function listplug_table_categorylist($vars, $type, $templateName = '')
                        \r
                        $data = array(\r
                                'batchid'       => listplug_nextBatchId(),\r
                        \r
                        $data = array(\r
                                'batchid'       => listplug_nextBatchId(),\r
-                               'catid'         => intval($current->catid),\r
-                               'catname'       => Entity::hsc($current->cname),\r
-                               'catdesc'       => Entity::hsc($current->cdesc),\r
-                               'blogid'        => intval($current->cblog),\r
+                               'catid'         => intval($current['catid']),\r
+                               'catname'       => Entity::hsc($current['cname']),\r
+                               'catdesc'       => Entity::hsc($current['cdesc']),\r
+                               'blogid'        => intval($current['cblog']),\r
                                'tabindex'      => intval($vars['tabindex']),\r
                                'editbtn'       => _LISTS_EDIT,\r
                                'delbtn'        => _LISTS_DELETE,\r
                                'tabindex'      => intval($vars['tabindex']),\r
                                'editbtn'       => _LISTS_EDIT,\r
                                'delbtn'        => _LISTS_DELETE,\r
@@ -1487,14 +1532,14 @@ function listplug_table_categorylist($vars, $type, $templateName = '')
        return Template::fill($template, $data);\r
 }\r
 \r
        return Template::fill($template, $data);\r
 }\r
 \r
-function listplug_table_templatelist($vars, $type, $templateName = '')\r
+function listplug_table_templatelist($vars, $type, $template_name = '')\r
 {\r
        global $manager, $CONF;\r
        \r
        $templates = array();\r
 {\r
        global $manager, $CONF;\r
        \r
        $templates = array();\r
-       if ( !empty($templateName) )\r
+       if ( !empty($template_name) )\r
        {\r
        {\r
-               $templates =& $manager->getTemplate($templateName);\r
+               $templates =& $manager->getTemplate($template_name);\r
        }\r
        \r
        switch( $type )\r
        }\r
        \r
        switch( $type )\r
@@ -1537,22 +1582,23 @@ function listplug_table_templatelist($vars, $type, $templateName = '')
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY'];\r
                        }\r
                        \r
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY'];\r
                        }\r
                        \r
-                       $deleteurl      = "{$CONF['AdminURL']}index.php?action=templatedelete&templateid={$current->tdnumber}";\r
-                       $editurl        = "{$CONF['AdminURL']}index.php?action=templateedit&templateid={$current->tdnumber}";\r
-                       $cloneurl       = "{$CONF['AdminURL']}index.php?action=templateclone&templateid={$current->tdnumber}";\r
-                       \r
                        $data = array(\r
                        $data = array(\r
-                               'templatename'  => Entity::hsc($current->tdname),\r
-                               'templatedesc'  => Entity::hsc($current->tddesc),\r
-                               'templateid'    => (integer) $current->tdnumber,\r
+                               'templatename'  => Entity::hsc($current['tdname']),\r
+                               'templatedesc'  => Entity::hsc($current['tddesc']),\r
+                               'templateid'    => (integer) $current['tdnumber'],\r
                                'tabindex'              => (integer) $vars['tabindex'],\r
                                'tabindex'              => (integer) $vars['tabindex'],\r
-                               'deleteurl'             => Entity::hsc($manager->addTicketToUrl($deleteurl)),\r
-                               'editurl'               => Entity::hsc($manager->addTicketToUrl($editurl)),\r
-                               'cloneurl'              => Entity::hsc($manager->addTicketToUrl($cloneurl)),\r
-                               'editbtn'               => _LISTS_EDIT,\r
+                               \r
                                'clonebtn'              => _LISTS_CLONE,\r
                                'clonebtn'              => _LISTS_CLONE,\r
+                               'cloneaction'   => $vars['cloneaction'],\r
+                               'cloneurl'              => "{$CONF['AdminURL']}index.php?action={$vars['cloneaction']}&amp;templateid={$current['tdnumber']}",\r
+                               \r
                                'delbtn'                => _LISTS_DELETE,\r
                                'delbtn'                => _LISTS_DELETE,\r
-                               'adminflg'              => '',\r
+                               'deleteaction'  => $vars['deleteaction'],\r
+                               'deleteurl'             => "{$CONF['AdminURL']}index.php?action={$vars['deleteaction']}&amp;templateid={$current['tdnumber']}",\r
+                               \r
+                               'editbtn'               => _LISTS_EDIT,\r
+                               'editaction'    => $vars['editaction'],\r
+                               'editurl'               => "{$CONF['AdminURL']}index.php?action={$vars['editaction']}&amp;templateid={$current['tdnumber']}"\r
                        );\r
                        break;\r
                case 'FOOT':\r
                        );\r
                        break;\r
                case 'FOOT':\r
@@ -1570,14 +1616,14 @@ function listplug_table_templatelist($vars, $type, $templateName = '')
        return Template::fill($template, $data);\r
 }\r
 \r
        return Template::fill($template, $data);\r
 }\r
 \r
-function listplug_table_skinlist($vars, $type, $templateName = '')\r
+function listplug_table_skinlist($vars, $type, $template_name = '')\r
 {\r
        global $CONF, $DIR_SKINS, $manager;\r
        \r
        $templates = array();\r
 {\r
        global $CONF, $DIR_SKINS, $manager;\r
        \r
        $templates = array();\r
-       if ( !empty($templateName) )\r
+       if ( !empty($template_name) )\r
        {\r
        {\r
-               $templates =& $manager->getTemplate($templateName);\r
+               $templates =& $manager->getTemplate($template_name);\r
        }\r
        \r
        switch( $type )\r
        }\r
        \r
        switch( $type )\r
@@ -1611,73 +1657,78 @@ function listplug_table_skinlist($vars, $type, $templateName = '')
                                          . "<%readme%></td>\n"\r
                                          . "<td class=\"availableSkinTypes\"><%skindesc%><%skinparts%></td>\n"\r
                                          . "<td style=\"white-space:nowrap\">"\r
                                          . "<%readme%></td>\n"\r
                                          . "<td class=\"availableSkinTypes\"><%skindesc%><%skinparts%></td>\n"\r
                                          . "<td style=\"white-space:nowrap\">"\r
-                                         . "<a href=\"index.php?action=skinedit&amp;skinid=<%skinid%>\" tabindex=\"<%tabindex%>\"><%editbtn%>"\r
-                                         . "</a></td>\n"\r
+                                         . "<a href=\"index.php?action=skinedit&amp;skinid=<%skinid%>\" tabindex=\"<%tabindex%>\"><%editbtn%></a>"\r
+                                         . "</td>\n"\r
                                          . "<td style=\"white-space:nowrap\">"\r
                                          . "<td style=\"white-space:nowrap\">"\r
-                                         . "<a href=\"<%cloneurl%>\" tabindex=\"<%tabindex%>\"><%clonebtn%>"\r
-                                         . "</a></td>\n"\r
+                                         . "<a href=\"<%cloneurl%>\" tabindex=\"<%tabindex%>\"><%clonebtn%></a>"\r
+                                         . "</td>\n"\r
                                          . "<td style=\"white-space:nowrap\">"\r
                                          . "<td style=\"white-space:nowrap\">"\r
-                                         . "<a href=\"index.php?action=skindelete&amp;skinid=<%skinid%>\" tabindex=\"<%tabindex%>\"><%delbtn%>"\r
-                                         . "</a></td>\n";\r
+                                         . "<a href=\"index.php?action=skindelete&amp;skinid=<%skinid%>\" tabindex=\"<%tabindex%>\"><%delbtn%></a>"\r
+                                         . "</td>\n";\r
                        }\r
                        else\r
                        {\r
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY'];\r
                        }\r
                        \r
                        }\r
                        else\r
                        {\r
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY'];\r
                        }\r
                        \r
-                       $editurl        = "{$CONF['AdminURL']}index.php?action=skinedit&skinid={$current->sdnumber}";\r
-                       $cloneurl       = "{$CONF['AdminURL']}index.php?action=skinclone&skinid={$current->sdnumber}";\r
-                       $deleteurl      = "{$CONF['AdminURL']}index.php?action=skindelete&skinid={$current->sdnumber}";\r
-                       \r
                        $data = array(\r
                        $data = array(\r
+                               'tabindex'              => $vars['tabindex']++,\r
+                               \r
+                               'skinid'                => (integer) $current['sdnumber'],\r
+                               'skindesc'              => Entity::hsc($current['sddesc']),\r
+                               \r
                                'skintypelabel' => _LISTS_TYPE,\r
                                'skintypelabel' => _LISTS_TYPE,\r
-                               'skintype'              => Entity::hsc($current->sdtype),\r
+                               'skintype'              => Entity::hsc($current['sdtype']),\r
+                               \r
                                'incmodelabel'  => _LIST_SKINS_INCMODE,\r
                                'incmodelabel'  => _LIST_SKINS_INCMODE,\r
-                               'incmode'               => ($current->sdincmode == 'skindir') ? _PARSER_INCMODE_SKINDIR : _PARSER_INCMODE_NORMAL,\r
-                               'incpreflabel'  => ($current->sdincpref) ? _LIST_SKINS_INCMODE : '',\r
-                               'incpref'               => ($current->sdincpref) ? Entity::hsc($current->sdincpref) : '',\r
-                               'skindesc'              => Entity::hsc($current->sddesc),\r
-                               'skinid'                => (integer) $current->sdnumber,\r
-                               'tabindex'              => $vars['tabindex'],\r
-                               'editurl'               => Entity::hsc($manager->addTicketToUrl($editurl)),\r
-                               'cloneurl'              => Entity::hsc($manager->addTicketToUrl($cloneurl)),\r
-                               'deleteurl'             => Entity::hsc($manager->addTicketToUrl($deleteurl)),\r
+                               'incmode'               => ($current['sdincmode'] == 'skindir') ? _PARSER_INCMODE_SKINDIR : _PARSER_INCMODE_NORMAL,\r
+                               \r
+                               'incpreflabel'  => ($current['sdincpref']) ? _LIST_SKINS_INCMODE : '',\r
+                               'incpref'               => ($current['sdincpref']) ? Entity::hsc($current['sdincpref']) : '',\r
+                               \r
                                'editbtn'               => _LISTS_EDIT,\r
                                'editbtn'               => _LISTS_EDIT,\r
+                               'editaction'    => $vars['editaction'],\r
+                               'editurl'               => "{$CONF['AdminURL']}index.php?action={$vars['editaction']}&skinid={$current['sdnumber']}",\r
+                               \r
                                'clonebtn'              => _LISTS_CLONE,\r
                                'clonebtn'              => _LISTS_CLONE,\r
+                               'cloneaction'   => $vars['cloneaction'],\r
+                               'cloneurl'              => "{$CONF['AdminURL']}index.php?action={$vars['cloneaction']}&skinid={$current['sdnumber']}",\r
+                               \r
                                'delbtn'                => _LISTS_DELETE,\r
                                'delbtn'                => _LISTS_DELETE,\r
+                               'deleteaction'  => $vars['deleteaction'],\r
+                               'deleteurl'             => "{$CONF['AdminURL']}index.php?action={$vars['deleteaction']}&skinid={$current['sdnumber']}"\r
                        );\r
                        \r
                        );\r
                        \r
-                       // use a special style for the default skin\r
-                       if ( $current->sdnumber != $CONF['BaseSkin'] )\r
+                       if ( $current['sdnumber'] != $vars['default'] )\r
                        {\r
                        {\r
-                               $data['skinname'] = Entity::hsc($current->sdname);\r
+                               $data['skinname'] = Entity::hsc($current['sdname']);\r
                        }\r
                        else\r
                        {\r
                        }\r
                        else\r
                        {\r
-                               $data['skinname'] = '<strong>' . Entity::hsc($current->sdname) . '</strong>';\r
+                               $data['skinname'] = '<strong>' . Entity::hsc($current['sdname']) . '</strong>';\r
                        }\r
                        \r
                        // add preview image when present\r
                        }\r
                        \r
                        // add preview image when present\r
-                       if ( $current->sdincpref && @file_exists("{$DIR_SKINS}{$current->sdincpref}preview.png") )\r
+                       if ( $current['sdincpref'] && @file_exists("{$DIR_SKINS}{$current['sdincpref']}preview.png") )\r
                        {\r
                                $data['skinthumb'] = "<p>\n";\r
                                \r
                        {\r
                                $data['skinthumb'] = "<p>\n";\r
                                \r
-                               $alternatve_text = sprintf(_LIST_SKIN_PREVIEW, $current->sdname);\r
-                               $has_enlargement = @file_exists($DIR_SKINS . $current->sdincpref . 'preview-large.png');\r
+                               $alternatve_text = sprintf(_LIST_SKIN_PREVIEW, $current['sdname']);\r
+                               $has_enlargement = @file_exists($DIR_SKINS . $current['sdincpref'] . 'preview-large.png');\r
                                if ( $has_enlargement )\r
                                {\r
                                if ( $has_enlargement )\r
                                {\r
-                                       $data['skinthumb'] .= '<a href="' . $CONF['SkinsURL'] . Entity::hsc($current->sdincpref) . 'preview-large.png" title="' . _LIST_SKIN_PREVIEW_VIEWLARGER . "\">\n";\r
+                                       $data['skinthumb'] .= '<a href="' . $CONF['SkinsURL'] . Entity::hsc($current['sdincpref']) . 'preview-large.png" title="' . _LIST_SKIN_PREVIEW_VIEWLARGER . "\">\n";\r
                                }\r
                                }\r
-                               $data['skinthumb'] .= '<img class="skinpreview" src="' . $CONF['SkinsURL'] . Entity::hsc($current->sdincpref) . 'preview.png" width="100" height="75" alt="' . $alternatve_text . "\" />\n";\r
+                               $data['skinthumb'] .= '<img class="skinpreview" src="' . $CONF['SkinsURL'] . Entity::hsc($current['sdincpref']) . 'preview.png" width="100" height="75" alt="' . $alternatve_text . "\" />\n";\r
                                if ( $has_enlargement )\r
                                {\r
                                        $data['skinthumb'] .= "</a><br />\n";\r
                                }\r
                                \r
                                if ( $has_enlargement )\r
                                {\r
                                        $data['skinthumb'] .= "</a><br />\n";\r
                                }\r
                                \r
-                               if ( @file_exists("{$DIR_SKINS}{$current->sdincpref}readme.html") )\r
+                               if ( @file_exists("{$DIR_SKINS}{$current['sdincpref']}readme.html") )\r
                                {\r
                                {\r
-                                       $url = $CONF['SkinsURL'] . Entity::hsc($current->sdincpref) . 'readme.html';\r
-                                       $title = sprintf(_LIST_SKIN_README, $current->sdname);\r
+                                       $url = $CONF['SkinsURL'] . Entity::hsc($current['sdincpref']) . 'readme.html';\r
+                                       $title = sprintf(_LIST_SKIN_README, $current['sdname']);\r
                                        $data['readme'] = "<a href=\"{$url}\" title=\"{$title}\">" . _LIST_SKIN_README_TXT . "</a>\n";\r
                                }\r
                                else\r
                                        $data['readme'] = "<a href=\"{$url}\" title=\"{$title}\">" . _LIST_SKIN_README_TXT . "</a>\n";\r
                                }\r
                                else\r
@@ -1688,16 +1739,23 @@ function listplug_table_skinlist($vars, $type, $templateName = '')
                                $data['skinthumb'] .=  "</p>\n";\r
                        }\r
                        \r
                                $data['skinthumb'] .=  "</p>\n";\r
                        }\r
                        \r
-                       $skin = new Skin($current->sdnumber);\r
-                       $available_skin_types = $skin->getAvailableTypes();\r
+                       if ( !preg_match('#^admin#', $current['sdname']) )\r
+                       {\r
+                               $skin = new Skin($current['sdnumber']);\r
+                       }\r
+                       else\r
+                       {\r
+                               $skin = new Skin($current['sdnumber'], 'AdminActions');\r
+                       }\r
+                       $available_types = $skin->getAvailableTypes();\r
                        \r
                        \r
-                       $data['skinparts']  = _LIST_SKINS_DEFINED;\r
-                       $data['skinparts'] .= "<ul>\n";\r
-                       foreach ( $available_skin_types as $type => $friendlyName )\r
+                       $data['skinparts'] = _LIST_SKINS_DEFINED\r
+                                          . "<ul>\n";\r
+                       foreach ( $available_types as $type => $label )\r
                        {\r
                        {\r
-                               if ( $friendlyName === FALSE )\r
+                               if ( $label === FALSE )\r
                                {\r
                                {\r
-                                       $friendlyName = ucfirst($type);\r
+                                       $label = ucfirst($type);\r
                                        $article = 'skinpartspecial';\r
                                }\r
                                else\r
                                        $article = 'skinpartspecial';\r
                                }\r
                                else\r
@@ -1706,8 +1764,8 @@ function listplug_table_skinlist($vars, $type, $templateName = '')
                                }\r
                                $data['skinparts'] .= "<li>\n"\r
                                                   . helpHtml($article) . "\n"\r
                                }\r
                                $data['skinparts'] .= "<li>\n"\r
                                                   . helpHtml($article) . "\n"\r
-                                                  . "<a href=\"index.php?action=skinedittype&amp;skinid={$current->sdnumber}&amp;type={$type}\" tabindex=\"{$vars['tabindex']}\">"\r
-                                                  . Entity::hsc($friendlyName)\r
+                                                  . "<a href=\"{$CONF['AdminURL']}index.php?action={$vars['edittypeaction']}&amp;skinid={$current['sdnumber']}&amp;type={$type}\" tabindex=\"{$vars['tabindex']}\">"\r
+                                                  . Entity::hsc($label)\r
                                                   . "</a>\n"\r
                                                   . "</li>\n";\r
                        }\r
                                                   . "</a>\n"\r
                                                   . "</li>\n";\r
                        }\r
@@ -1728,14 +1786,14 @@ function listplug_table_skinlist($vars, $type, $templateName = '')
        return Template::fill($template, $data);\r
 }\r
 \r
        return Template::fill($template, $data);\r
 }\r
 \r
-function listplug_table_draftlist($vars, $type, $templateName = '')\r
+function listplug_table_draftlist($vars, $type, $template_name = '')\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
-       if ( !empty($templateName) )\r
+       if ( !empty($template_name) )\r
        {\r
        {\r
-               $templates =& $manager->getTemplate($templateName);\r
+               $templates =& $manager->getTemplate($template_name);\r
        }\r
        switch( $type )\r
        {\r
        }\r
        switch( $type )\r
        {\r
@@ -1770,9 +1828,9 @@ function listplug_table_draftlist($vars, $type, $templateName = '')
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_DRFTLIST_BODY'];\r
                        }\r
                        $data = array(\r
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_DRFTLIST_BODY'];\r
                        }\r
                        $data = array(\r
-                               'bshortname'    => Entity::hsc($current->bshortname),\r
-                               'ititle'                => Entity::hsc(strip_tags($current->ititle)),\r
-                               'itemid'                => intval($current->inumber),\r
+                               'bshortname'    => Entity::hsc($current['bshortname']),\r
+                               'ititle'                => Entity::hsc(strip_tags($current['ititle'])),\r
+                               'itemid'                => intval($current['inumber']),\r
                                'editbtn'               => _LISTS_EDIT,\r
                                'delbtn'                => _LISTS_DELETE,\r
                        );\r
                                'editbtn'               => _LISTS_EDIT,\r
                                'delbtn'                => _LISTS_DELETE,\r
                        );\r
@@ -1792,14 +1850,14 @@ function listplug_table_draftlist($vars, $type, $templateName = '')
        return Template::fill($template, $data);\r
 }\r
 \r
        return Template::fill($template, $data);\r
 }\r
 \r
-function listplug_table_otherdraftlist($vars, $type, $templateName = '')\r
+function listplug_table_otherdraftlist($vars, $type, $template_name = '')\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
-       if ( !empty($templateName) )\r
+       if ( !empty($template_name) )\r
        {\r
        {\r
-               $templates =& $manager->getTemplate($templateName);\r
+               $templates =& $manager->getTemplate($template_name);\r
        }\r
        \r
        switch( $type )\r
        }\r
        \r
        switch( $type )\r
@@ -1838,10 +1896,10 @@ function listplug_table_otherdraftlist($vars, $type, $templateName = '')
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_ODRFTLIST_BODY'];\r
                        }\r
                        $data = array(\r
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_ODRFTLIST_BODY'];\r
                        }\r
                        $data = array(\r
-                               'bshortname'    => Entity::hsc($current->bshortname),\r
-                               'ititle'                => Entity::hsc(strip_tags($current->ititle)),\r
-                               'iauthor'               => Entity::hsc(strip_tags($current->mname)),\r
-                               'itemid'                => intval($current->inumber),\r
+                               'bshortname'    => Entity::hsc($current['bshortname']),\r
+                               'ititle'                => Entity::hsc(strip_tags($current['ititle'])),\r
+                               'iauthor'               => Entity::hsc(strip_tags($current['mname'])),\r
+                               'itemid'                => intval($current['inumber']),\r
                                'editbtn'               => _LISTS_EDIT,\r
                                'delbtn'                => _LISTS_DELETE,\r
                        );\r
                                'editbtn'               => _LISTS_EDIT,\r
                                'delbtn'                => _LISTS_DELETE,\r
                        );\r
@@ -1861,14 +1919,14 @@ function listplug_table_otherdraftlist($vars, $type, $templateName = '')
        return Template::fill($template, $data);\r
 }\r
 \r
        return Template::fill($template, $data);\r
 }\r
 \r
-function listplug_table_actionlist($vars, $type, $templateName = '')\r
+function listplug_table_actionlist($vars, $type, $template_name = '')\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
-       if ( !empty($templateName) )\r
+       if ( !empty($template_name) )\r
        {\r
        {\r
-               $templates =& $manager->getTemplate($templateName);\r
+               $templates =& $manager->getTemplate($template_name);\r
        }\r
        \r
        switch( $type )\r
        }\r
        \r
        switch( $type )\r
@@ -1900,8 +1958,8 @@ function listplug_table_actionlist($vars, $type, $templateName = '')
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_ACTNLIST_BODY'];\r
                        }\r
                        $data = array(\r
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_ACTNLIST_BODY'];\r
                        }\r
                        $data = array(\r
-                               'timestamp'     => Entity::hsc($current->timestamp),\r
-                               'message'       => Entity::hsc($current->message),\r
+                               'timestamp'     => Entity::hsc($current['timestamp']),\r
+                               'message'       => Entity::hsc($current['message']),\r
                        );\r
                        break;\r
                case 'FOOT':\r
                        );\r
                        break;\r
                case 'FOOT':\r
@@ -1920,14 +1978,14 @@ function listplug_table_actionlist($vars, $type, $templateName = '')
        return Template::fill($template, $data);\r
 }\r
 \r
        return Template::fill($template, $data);\r
 }\r
 \r
-function listplug_table_banlist($vars, $type, $templateName = '')\r
+function listplug_table_banlist($vars, $type, $template_name = '')\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
 {\r
        global $manager;\r
        \r
        $templates = array();\r
-       if ( !empty($templateName) )\r
+       if ( !empty($template_name) )\r
        {\r
        {\r
-               $templates =& $manager->getTemplate($templateName);\r
+               $templates =& $manager->getTemplate($template_name);\r
        }\r
        \r
        switch( $type )\r
        }\r
        \r
        switch( $type )\r
@@ -1962,9 +2020,9 @@ function listplug_table_banlist($vars, $type, $templateName = '')
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY'];\r
                        }\r
                        $data = array(\r
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY'];\r
                        }\r
                        $data = array(\r
-                               'iprange'       => Entity::hsc($current->iprange),\r
-                               'reason'        => Entity::hsc($current->reason),\r
-                               'blogid'        => intval($current->blogid),\r
+                               'iprange'       => Entity::hsc($current['iprange']),\r
+                               'reason'        => Entity::hsc($current['reason']),\r
+                               'blogid'        => intval($current['blogid']),\r
                                'delbtn'        => _LISTS_DELETE,\r
                        );\r
                        break;\r
                                'delbtn'        => _LISTS_DELETE,\r
                        );\r
                        break;\r
@@ -1984,243 +2042,409 @@ function listplug_table_banlist($vars, $type, $templateName = '')
        return Template::fill($template, $data);\r
 }\r
 \r
        return Template::fill($template, $data);\r
 }\r
 \r
-function listplug_table_adminskinlist($vars, $type, $templateName = '')\r
+/**\r
+ * listplug_list_normalskinlist()\r
+ * \r
+ * @param      array   $vars                   array for variables\r
+ * @param      string  $type                   HEAD/BODY/FOOT\r
+ * @param      string  $template_name  name of template\r
+ * @return     string  marked-up string\r
+ */\r
+function listplug_list_normalskinlist($vars, $type, $template_name = '')\r
 {\r
 {\r
-       global $CONF, $DIR_SKINS, $DIR_NUCLEUS, $manager;\r
+       global $manager, $CONF;\r
        \r
        \r
-       $adminSkinURL  = $CONF['SkinsURL'] . 'admin/';\r
-       $adminSkinDir  = $DIR_SKINS . 'admin/';\r
+       /* available variables as a default */\r
+       $data = array(\r
+               'skinid'        => (integer) $vars['skinid'],\r
+               'skinname'      => Entity::hsc($vars['skinname']),\r
+       );\r
        \r
        $templates = array();\r
        \r
        $templates = array();\r
-       if ( !empty($templateName) )\r
+       if ( $template_name )\r
        {\r
        {\r
-               $templates =& $manager->getTemplate($templateName);\r
+               $templates =& $manager->getTemplate($template_name);\r
        }\r
        }\r
-       switch( $type )\r
+       \r
+       switch ( $type )\r
        {\r
                case 'HEAD':\r
        {\r
                case 'HEAD':\r
-                       if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD']) )\r
+                       if ( !array_key_exists('NORMALSKINLIST_HEAD', $templates) || empty($templates['NORMALSKINLIST_HEAD']) )\r
                        {\r
                        {\r
-                               $template = "<th><%colname%></th>\n"\r
-                                         . "<th><%coldesc%></th>\n"\r
-                                         . "<th colspan=\"3\"><%colact%></th>\n";\r
+                               $template = "<ul>\n";\r
                        }\r
                        else\r
                        {\r
                        }\r
                        else\r
                        {\r
-                               $template = $templates['SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD'];\r
+                               $template = $templates['NORMALSKINLIST_HEAD'];\r
                        }\r
                        }\r
-                       $data = array(\r
-                                       'colname'       => _LISTS_NAME,\r
-                                       'coldesc'       => _LISTS_DESC,\r
-                                       'colact'        => _LISTS_ACTIONS,\r
-                       );\r
+                       \r
                        break;\r
                case 'BODY':\r
                        $current = $vars['current'];\r
                        break;\r
                case 'BODY':\r
                        $current = $vars['current'];\r
-                       if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY']) )\r
+                       if ( !array_key_exists('NORMALSKINLIST_BODY', $templates) || empty($templates['NORMALSKINLIST_BODY']) )\r
                        {\r
                        {\r
-                               $template = "<td><%skinname%><br /><br />\n"\r
-                               . "<%skintypelabel%> <%skintype%><br />\n"\r
-                               . "<%incmodelabel%> <%incmode%><br />\n"\r
-                               . "<%incpreflabel%> <%incpref%><br />\n"\r
-                               . "<%skinthumb%>"\r
-                               . "<%readme%></td>\n"\r
-                               . "<td class=\"availableSkinTypes\"><%skindesc%><%skinparts%></td>\n"\r
-                               . "<td style=\"white-space:nowrap\">"\r
-                               . "<a href=\"index.php?action=adminskinedit&amp;skinid=<%skinid%>\" tabindex=\"<%tabindex%>\"><%editbtn%>"\r
-                               . "</a></td>\n"\r
-                               . "<td style=\"white-space:nowrap\">"\r
-                               . "<a href=\"<%cloneurl%>\" tabindex=\"<%tabindex%>\"><%clonebtn%>"\r
-                               . "</a></td>\n"\r
-                               . "<td style=\"white-space:nowrap\">"\r
-                               . "<a href=\"index.php?action=adminskindelete&amp;skinid=<%skinid%>\" tabindex=\"<%tabindex%>\"><%delbtn%>"\r
-                               . "</a></td>\n";\r
+                               $template = "<li>"\r
+                                         . "<a href=\"<%editurl%>\" tabindex=\"<%tabindex%>\"><%skintypename%></a>"\r
+                                         . " <%help%>"\r
+                                         . "</li>\n";\r
                        }\r
                        else\r
                        {\r
                        }\r
                        else\r
                        {\r
-                               $template = $templates['SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY'];\r
+                               $template = $templates['NORMALSKINLIST_BODY'];\r
                        }\r
                        \r
                        }\r
                        \r
-                       $editurl        = "{$CONF['AdminURL']}index.php?action=adminskinedit&skinid={$current->sdnumber}";\r
-                       $cloneurl       = "{$CONF['AdminURL']}index.php?action=adminskinclone&skinid={$current->sdnumber}";\r
-                       $deleteurl      = "{$CONF['AdminURL']}index.php?action=adminskindelete&skinid={$current->sdnumber}";\r
-                       \r
-                       $data = array(\r
-                               'skintypelabel' => _LISTS_TYPE,\r
-                               'skintype'              => Entity::hsc($current->sdtype),\r
-                               'incmodelabel'  => _LIST_SKINS_INCMODE,\r
-                               'incmode'               => ($current->sdincmode == 'skindir') ? _PARSER_INCMODE_SKINDIR : _PARSER_INCMODE_NORMAL,\r
-                               'incpreflabel'  => ($current->sdincpref) ? _LIST_SKINS_INCMODE : '',\r
-                               'incpref'               => ($current->sdincpref) ? Entity::hsc($current->sdincpref) : '',\r
-                               'skindesc'              => Entity::hsc($current->sddesc),\r
-                               'skinid'                => (integer) $current->sdnumber,\r
-                               'tabindex'              => $vars['tabindex'],\r
-                               'editurl'               => Entity::hsc($manager->addTicketToUrl($editurl)),\r
-                               'cloneurl'              => Entity::hsc($manager->addTicketToUrl($cloneurl)),\r
-                               'deleteurl'             => Entity::hsc($manager->addTicketToUrl($deleteurl)),\r
-                               'editbtn'               => _LISTS_EDIT,\r
-                               'clonebtn'              => _LISTS_CLONE,\r
-                               'delbtn'                => _LISTS_DELETE,\r
-                       );\r
-                       \r
-                       // use a special style for the default skin\r
-                       if ( $current->sdnumber != $CONF['AdminSkin'] )\r
-                       {\r
-                               $data['skinname'] = Entity::hsc($current->sdname);\r
-                       }\r
-                       else\r
-                       {\r
-                               $data['skinname'] = '<strong>' . Entity::hsc($current->sdname) . '</strong>';\r
-                       }\r
-                       \r
-                       // add preview image when present\r
-                       if ( $current->sdincpref && @file_exists("{$adminSkinDir}{$current->sdincpref}preview.png") )\r
-                       {\r
-                               $data['skinthumb'] = "<p>\n";\r
-                               \r
-                               $alternatve_text = sprintf(_LIST_SKIN_PREVIEW, $current->sdname);\r
-                               $has_enlargement = @file_exists($adminSkinDir . $current->sdincpref . 'preview-large.png');\r
-                               if ( $has_enlargement )\r
-                               {\r
-                                       $data['skinthumb'] .= '<a href="' . $adminSkinURL . Entity::hsc($current->sdincpref) . 'preview-large.png" title="' . _LIST_SKIN_PREVIEW_VIEWLARGER . "\">\n";\r
-                               }\r
-                               $data['skinthumb'] .= '<img class="skinpreview" src="' . $adminSkinURL . Entity::hsc($current->sdincpref) . 'preview.png" width="100" height="75" alt="' . $alternatve_text . "\" />\n";\r
-                               if ( $has_enlargement )\r
-                               {\r
-                                       $data['skinthumb'] .= "</a><br />\n";\r
-                               }\r
-                               \r
-                               if ( @file_exists("{$DIR_SKINS}{$current->sdincpref}readme.html") )\r
-                               {\r
-                                       $url = $adminSkinURL . Entity::hsc($current->sdincpref) . 'readme.html';\r
-                                       $title = sprintf(_LIST_SKIN_README, $current->sdname);\r
-                                       $data['readme'] = "<a href=\"{$url}\" title=\"{$title}\">" . _LIST_SKIN_README_TXT . "</a>\n";\r
-                               }\r
-                               else\r
-                               {\r
-                                       $data['readme'] ="";\r
-                               }\r
-                               \r
-                               $data['skinthumb'] .=  "</p>\n";\r
-                       }\r
-                       \r
-                       $skin = new Skin($current->sdnumber, 'AdminActions');\r
-                       $available_skin_types = $skin->getAvailableTypes();\r
-                       \r
-                       $data['skinparts']  = _LIST_SKINS_DEFINED;\r
-                       $data['skinparts'] .= "<ul>\n";\r
-                       foreach ( $available_skin_types as $type => $friendlyName )\r
-                       {\r
-                               if ( $friendlyName === FALSE )\r
-                               {\r
-                                       $friendlyName = ucfirst($type);\r
-                                       $article = 'skinpartspecial';\r
-                               }\r
-                               else\r
-                               {\r
-                                       $article = "skinpart{$type}";\r
-                               }\r
-                               $data['skinparts'] .= "<li>\n"\r
-                                                  . helpHtml($article) . "\n"\r
-                                                  . "<a href=\"index.php?action=adminskinedittype&amp;skinid={$current->sdnumber}&amp;type={$type}\" tabindex=\"{$vars['tabindex']}\">"\r
-                                                  . Entity::hsc($friendlyName)\r
-                                                  . "</a>\n"\r
-                                                  . "</li>\n";\r
-                       }\r
-                       $data['skinparts'] .= "</ul>\n";\r
+                       $data['tabindex']               = $vars['tabindex']++;\r
+                       $data['skintype']               = $current['skintype'];\r
+                       $data['skintypename']   = $current['skintypename'];\r
+                       $data['editaction']             = $vars['editaction'];\r
+                       $data['editurl']                = "{$CONF['AdminURL']}?action={$vars['editaction']}&amp;skinid={$vars['skinid']}&amp;type={$current['skintype']}";\r
+                       /* TODO: removeaction? */\r
+                       /* TODO: customHelpHtml("skinpart{$skintype}-{$template_name}") */\r
+                       $data['help']                   = '';\r
                        break;\r
                case 'FOOT':\r
                        break;\r
                case 'FOOT':\r
-                       if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_SKINLIST_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_SKINLIST_FOOT']) )\r
+                       if ( !array_key_exists('NORMALSKINLIST_FOOT', $templates) || empty($templates['NORMALSKINLIST_FOOT']) )\r
                        {\r
                        {\r
-                               $template = "";\r
+                               $template = "</ul>\n";\r
                        }\r
                        else\r
                        {\r
                        }\r
                        else\r
                        {\r
-                               $template = $templates['SHOWLIST_LISTPLUG_TABLE_SKINLIST_FOOT'];\r
+                               $template = $templates['NORMALSKINLIST_FOOT'];\r
                        }\r
                        }\r
-                       $data = array();\r
+                       \r
                        break;\r
        }\r
                        break;\r
        }\r
+       \r
        return Template::fill($template, $data);\r
 }\r
 \r
        return Template::fill($template, $data);\r
 }\r
 \r
-function listplug_table_admintemplatelist($vars, $type, $templateName = '')\r
+/**\r
+ * listplug_list_specialskinlist()\r
+ * \r
+ * @param      array   $vars                   array for variables\r
+ * @param      string  $type                   HEAD/BODY/FOOT\r
+ * @param      string  $template_name  name of template\r
+ * @return     string  marked-up string\r
+ */\r
+function listplug_list_specialskinlist($vars, $type, $template_name = '')\r
 {\r
        global $manager, $CONF;\r
        \r
 {\r
        global $manager, $CONF;\r
        \r
+       /* available variables as a default */\r
+       $data = array(\r
+               'skinid'        => (integer) $vars['skinid'],\r
+               'skinname'      => Entity::hsc($vars['skinname']),\r
+       );\r
+       \r
+       /* retrieve templates */\r
        $templates = array();\r
        $templates = array();\r
-       if ( !empty($templateName) )\r
+       if ( $template_name )\r
        {\r
        {\r
-               $templates =& $manager->getTemplate($templateName);\r
+               $templates =& $manager->getTemplate($template_name);\r
        }\r
        \r
        }\r
        \r
-       switch( $type )\r
+       switch ( $type )\r
        {\r
                case 'HEAD':\r
        {\r
                case 'HEAD':\r
-                       if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD']) )\r
+                       if ( !array_key_exists('SPECIALSKINLIST_HEAD', $templates) || empty($templates['SPECIALSKINLIST_HEAD']) )\r
                        {\r
                        {\r
-                               $template = "<th><%colname%></th>\n"\r
-                                         . "<th><%coldesc%></th>\n"\r
-                                         . "<th colspan=\"3\"><%colact%></th>\n";\r
+                               $template = "<ul>\n";\r
                        }\r
                        else\r
                        {\r
                        }\r
                        else\r
                        {\r
-                               $template = $templates['SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD'];\r
+                               $template = $templates['SPECIALSKINLIST_HEAD'];\r
                        }\r
                        }\r
-                       $data = array(\r
-                               'colname'       => _LISTS_NAME,\r
-                               'coldesc'       => _LISTS_DESC,\r
-                               'colact'        => _LISTS_ACTIONS,\r
-                       );\r
                        break;\r
                case 'BODY':\r
                        $current = $vars['current'];\r
                        break;\r
                case 'BODY':\r
                        $current = $vars['current'];\r
-                       if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY']) )\r
+                       if ( !array_key_exists('SPECIALSKINLIST_BODY', $templates) || empty($templates['SPECIALSKINLIST_BODY']) )\r
                        {\r
                        {\r
-                               $template = "<td><%templatename%></td>\n"\r
-                                         . "<td><%templatedesc%></td>\n"\r
-                                         . "<td style=\"white-space:nowrap\">"\r
-                                         . "<a href=\"<%editurl%>\" tabindex=\"<%tabindex%>\"><%editbtn%></a>\n"\r
-                                         . "</td>\n"\r
-                                         . "<td style=\"white-space:nowrap\">\n"\r
-                                         . "<a href=\"<%cloneurl%>\" tabindex=\"<%tabindex%>\"><%clonebtn%></a>\n"\r
-                                         . "</td>\n"\r
-                                         . "<td style=\"white-space:nowrap\">\n"\r
-                                         . "<a href=\"<%deleteurl%>\" tabindex=\"<%tabindex%>\"><%delbtn%></a>\n"\r
-                                         . "</td>\n";\r
+                               $template = "<li>"\r
+                                         . "<a href=\"<%editurl%>\" tabindex=\"<%tabindex%>\">"\r
+                                         . "<%skintype%>"\r
+                                         . "</a>"\r
+                                         . " ("\r
+                                         . "<a href=\"<%removeurl%>\" tabindex=\"<%tabindex%>\" >"\r
+                                         . "<%text(_LISTS_DELETE)%>"\r
+                                         . "</a>"\r
+                                         . ")"\r
+                                         . "</li>\n";\r
                        }\r
                        else\r
                        {\r
                        }\r
                        else\r
                        {\r
-                               $template = $templates['SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY'];\r
+                               $template = $templates['SPECIALSKINLIST_BODY'];\r
                        }\r
                        }\r
-                       $deleteurl      = "{$CONF['AdminURL']}index.php?action=admintemplatedelete&templateid={$current->tdnumber}";\r
-                       $editurl        = "{$CONF['AdminURL']}index.php?action=admintemplateedit&templateid={$current->tdnumber}";\r
-                       $cloneurl       = "{$CONF['AdminURL']}index.php?action=admintemplateclone&templateid={$current->tdnumber}";\r
-                       $data = array(\r
-                               'templatename'  => Entity::hsc($current->tdname),\r
-                               'templatedesc'  => Entity::hsc($current->tddesc),\r
-                               'templateid'    => (integer) $current->tdnumber,\r
-                               'tabindex'              => (integer) $vars['tabindex'],\r
-                               'deleteurl'             => Entity::hsc($manager->addTicketToUrl($deleteurl)),\r
-                               'editurl'               => Entity::hsc($manager->addTicketToUrl($editurl)),\r
-                               'cloneurl'              => Entity::hsc($manager->addTicketToUrl($cloneurl)),\r
-                               'editbtn'               => _LISTS_EDIT,\r
-                               'clonebtn'              => _LISTS_CLONE,\r
-                               'delbtn'                => _LISTS_DELETE,\r
-                               'adminflg'              => 'admin',\r
-                       );\r
+                       \r
+                       $data['tabindex']               = (integer) $vars['tabindex']++;\r
+                       $data['skintype']               = Entity::hsc($current['skintype']);\r
+                       $data['skintypename']   = Entity::hsc($current['skintypename']);\r
+                       $data['editaction']             = $vars['editaction'];\r
+                       $data['editurl']                = "{$CONF['AdminURL']}?action={$vars['editaction']}&amp;skinid={$vars['skinid']}&amp;type={$current['skintype']}";\r
+                       $data['removeaction']   = $vars['editaction'];\r
+                       $data['removeurl']              = "{$CONF['AdminURL']}?action={$vars['removeaction']}&amp;skinid={$vars['skinid']}&amp;type={$current['skintype']}";\r
+                       \r
                        break;\r
                case 'FOOT':\r
                        break;\r
                case 'FOOT':\r
-                       if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_TPLTLIST_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_TPLTLIST_FOOT']) )\r
+                       if ( !array_key_exists('SPECIALSKINLIST_FOOT', $templates) || empty($templates['SPECIALSKINLIST_FOOT']) )\r
                        {\r
                        {\r
-                               $template = "\n";\r
+                               $template = "</ul>\n";\r
                        }\r
                        else\r
                        {\r
                        }\r
                        else\r
                        {\r
-                               $template = $templates['SHOWLIST_LISTPLUG_TABLE_TPLTLIST_FOOT'];\r
+                               $template = $templates['SPECIALSKINLIST_FOOT'];\r
                        }\r
                        }\r
-                       $data = array();\r
                        break;\r
        }\r
                        break;\r
        }\r
+       \r
        return Template::fill($template, $data);\r
 }\r
        return Template::fill($template, $data);\r
 }\r
+\r
+/**\r
+ * listplug_input_yesno()\r
+ *\r
+ * @param      string  $name                   name of input element with radio type attribute\r
+ * @param      string  $checkedval             value which should be checked\r
+ * @param      integer $tabindex               tabindex number\r
+ * @param      string  $value1                 value of radio 1\r
+ * @param      string  $value2                 value of radio 2\r
+ * @param      string  $yesval                 label for yes\r
+ * @param      string  $noval                  label for no\r
+ * @param      boolean $isAdmin                super admin or not\r
+ * @param      string  $template_name  name of template\r
+ * @param      boolean $showlist               used in showlist or not\r
+ * @return     string  marked-up string\r
+ */\r
+function listplug_input_yesno($name, $checkedval, $tabindex = 0,\r
+       $value1 = 1, $value2 = 0, $yesval = _YES, $noval = _NO,\r
+       $isAdmin = 0, $template_name = '', $showlist = FALSE)\r
+{\r
+       global $manager;\r
+       \r
+       $templates = array();\r
+       if ( $template_name )\r
+       {\r
+               $templates =& $manager->getTemplate($template_name);\r
+       }\r
+       \r
+       if ( $name == 'admin' )\r
+       {\r
+               if ( !array_key_exists('INPUTYESNO_TEMPLATE_ADMIN', $templates) || empty($templates['INPUTYESNO_TEMPLATE_ADMIN']) )\r
+               {\r
+                       $template = "<input type=\"radio\" id=\"<%yesid%>\" name=\"<%name%>\" value=\"<%yesval%>\" <%yescheckedval%> onclick=\"selectCanLogin(true);\" />\n"\r
+                                 . "<label for=\"<%yesid%>\"><%yesvaltext%></label>\n"\r
+                                 . "<input type=\"radio\" id=\"<%noid%>\" name=\"<%name%>\" value=\"<%noval%>\" <%nocheckedval%> <%disabled%> onclick=\"selectCanLogin(false);\" />\n"\r
+                                 . "<label for=\"<%noid%>\"><%novaltext%></label>\n";\r
+               }\r
+               else\r
+               {\r
+                       $template = $templates['INPUTYESNO_TEMPLATE_ADMIN'];\r
+               }\r
+       }\r
+       else\r
+       {\r
+               if ( array_key_exists('INPUTYESNO_TEMPLATE_NORMAL', $templates) && !empty($templates['INPUTYESNO_TEMPLATE_NORMAL']) )\r
+               {\r
+                       $template = $templates['INPUTYESNO_TEMPLATE_NORMAL'];\r
+               }\r
+               else if ( $showlist && array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO', $templates) && !empty($templates['SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO']) )\r
+               {\r
+                       $template = $templates['SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO'];\r
+               }\r
+               else\r
+               {\r
+               $template = "<input type=\"radio\" id=\"<%yesid%>\" name=\"<%name%>\" value=\"<%yesval%>\" <%yescheckedval%> />\n"\r
+                         . "<label for=\"<%yesid%>\"><%yesvaltext%></label>\n"\r
+                         . "<input type=\"radio\" id=\"<%noid%>\" name=\"<%name%>\" value=\"<%noval%>\" <%nocheckedval%> <%disabled%> />\n"\r
+                         . "<label for=\"<%noid%>\"><%novaltext%></label>\n";\r
+               }\r
+       }\r
+       \r
+       $id             = preg_replace('#[|]#', '-', $name);\r
+       $id1    = $id . $value1;\r
+       $id2    = $id . $value2;\r
+       $dat = array(\r
+               'name'                  => Entity::hsc($name),\r
+               'yesval'                => Entity::hsc($value1),\r
+               'noval'                 => Entity::hsc($value2),\r
+               'yesid'                 => Entity::hsc($id1),\r
+               'noid'                  => Entity::hsc($id2),\r
+               'yesvaltext'    => $yesval,\r
+               'novaltext'             => $noval,\r
+               'yescheckedval' => ($checkedval == $value1) ? 'checked="checked" tabindex="' . $tabindex . '"': '',\r
+               'nocheckedval'  => ($checkedval != $value1) ? 'checked="checked" tabindex="' . $tabindex . '"': '',\r
+               'disabled'              => ($isAdmin && $name == 'canlogin') ? ' disabled="disabled"' : '',\r
+       );\r
+       \r
+       return Template::fill($template, $dat);\r
+}\r
+\r
+/**\r
+ * listplug_batchlist()\r
+ * \r
+ * @param      string          $attr   item/member/team/category/comment\r
+ * @param      resource        $query  SQL resorce\r
+ * @param      string          $type   type for showlist()\r
+ * @param      array           $vars   array for variables\r
+ */\r
+function listplug_batchlist($attr, $query, $type, $vars)\r
+{\r
+       global $manager;\r
+       \r
+       /* HEAD */\r
+       $content = "<form method=\"post\" action=\"index.php\">\n";\r
+       \r
+       /* BODY */\r
+       $content .= showlist($query, $type, $vars);\r
+       \r
+       /* FOOT */\r
+       switch ( $attr )\r
+       {\r
+               case 'item':\r
+                       $options = array(\r
+                               'delete'        => _BATCH_ITEM_DELETE,\r
+                               'move'          => _BATCH_ITEM_MOVE\r
+                       );\r
+                       break;\r
+               case 'member':\r
+                       $options = array(\r
+                               'delete'        => _BATCH_MEMBER_DELETE,\r
+                               'setadmin'      => _BATCH_MEMBER_SET_ADM,\r
+                               'unsetadmin' => _BATCH_MEMBER_UNSET_ADM\r
+                       );\r
+                       break;\r
+               case 'team':\r
+                       $options = array(\r
+                               'delete'        => _BATCH_TEAM_DELETE,\r
+                               'setadmin'      => _BATCH_TEAM_SET_ADM,\r
+                               'unsetadmin' => _BATCH_TEAM_UNSET_ADM,\r
+                       );\r
+                       break;\r
+               case 'category':\r
+                       $options = array(\r
+                               'delete'        => _BATCH_CAT_DELETE,\r
+                               'move'          => _BATCH_CAT_MOVE,\r
+                       );\r
+                       break;\r
+               case 'comment':\r
+                       $options = array(\r
+                               'delete'        => _BATCH_COMMENT_DELETE,\r
+                       );\r
+                       break;\r
+               default:\r
+                       $options = array();\r
+                       break;\r
+       }\r
+       \r
+       $content .= "<p class=\"batchoperations\">\n"\r
+                  . _BATCH_WITH_SEL\r
+                  . "<select name=\"batchaction\">\n";\r
+       \r
+       foreach ( $options as $option => $label )\r
+       {\r
+               $content .= "<option value=\"{$option}\">{$label}</option>\n";\r
+       }\r
+       $content .= "</select>\n";\r
+       \r
+       if ( $attr == 'team' )\r
+       {\r
+               $content .= '<input type="hidden" name="blogid" value="' . intRequestVar('blogid') . '" />';\r
+       }\r
+       else if ( $attr == 'comment' )\r
+       {\r
+               $content .= '<input type="hidden" name="itemid" value="' . intRequestVar('itemid') . '" />';\r
+       }\r
+       \r
+       $content .= '<input type="submit" value="' . _BATCH_EXEC . '" />'\r
+                  . "("\r
+                  . "<a href=\"\" onclick=\"if( event &amp;&amp; event.preventDefault ) event.preventDefault(); return batchSelectAll(1); \">" . _BATCH_SELECTALL . "</a>"\r
+                  . " - "\r
+                  . "<a href=\"\" onclick=\"if( event &amp;&amp; event.preventDefault ) event.preventDefault(); return batchSelectAll(0); \">" . _BATCH_DESELECTALL . "</a>"\r
+                  . ")\n"\r
+                  . "<input type=\"hidden\" name=\"action\" value=\"batch{$attr}\" />\n"\r
+                  . '<input type="hidden" name="ticket" value="' . Entity::hsc($manager->getNewTicket()) . '" />' . "\n"\r
+                  . "</p>\n"\r
+                  . "</form>\n";\r
+       \r
+       return $content;\r
+}\r
+\r
+/**\r
+ * listplug_navlist()\r
+ * \r
+ * @param      string          $attr   item/member/team/category/comment\r
+ * @param      resource        $query  SQL resorce\r
+ * @param      string          $type   type for showlist()\r
+ * @param      array           $vars   array for variables\r
+ */\r
+function listplug_navlist($attribute, $query, $type, $vars)\r
+{\r
+       global $CONF;\r
+       \r
+       $prev = $vars['start'] - $vars['amount'];\r
+       if ( $prev < $vars['minamount'] )\r
+       {\r
+               $prev = $vars['minamount'];\r
+       }\r
+       \r
+       $next = $vars['start'] + $vars['amount'];\r
+       \r
+       $navi = "\n";\r
+       $navi .= "<table frame=\"box\" rules=\"all\" sumamry=\"navigation actions\" class=\"navigation\">\n"\r
+              . "<tr>\n";\r
+       $navi .= "<td>\n"\r
+              . "<form method=\"post\" action=\"{$CONF['AdminURL']}\">\n"\r
+              . "<input type=\"hidden\" name=\"start\" value=\"{$prev}\" />\n"\r
+              . "<button type=\"submit\" name=\"action\" value=\"{$vars['action']}\">&lt; &lt; " . _LISTS_PREV . "</button>\n"\r
+              . "<input type=\"hidden\" name=\"blogid\" value=\"{$vars['blogid']}\" />\n"\r
+              . "<input type=\"hidden\" name=\"itemid\" value=\"{$vars['itemid']}\" />\n"\r
+              . "<input type=\"hidden\" name=\"search\" value=\"{$vars['search']}\" />\n"\r
+              . "<input type=\"hidden\" name=\"amount\" value=\"{$vars['amount']}\" />\n"\r
+              . "</form>\n"\r
+              . "</td>\n";\r
+       $navi .= "<td>\n"\r
+              . "<form method=\"post\" action=\"{$CONF['AdminURL']}\">\n"\r
+              . "<input type=\"text\" name=\"amount\" size=\"3\" value=\"{$vars['amount']}\" />\n"\r
+              . _LISTS_PERPAGE\r
+              . "<input type=\"hidden\" name=\"start\" value=\"0\" />\n"\r
+              . "<button type=\"submit\" name=\"action\" value=\"{$vars['action']}\">&gt; " . _LISTS_CHANGE . "</button>\n"\r
+              . "<input type=\"hidden\" name=\"blogid\" value=\"{$vars['blogid']}\" />\n"\r
+              . "<input type=\"hidden\" name=\"itemid\" value=\"{$vars['itemid']}\" />\n"\r
+              . "<input type=\"hidden\" name=\"search\" value=\"{$vars['search']}\" />\n"\r
+              . "<input type=\"hidden\" name=\"amount\" value=\"{$vars['amount']}\" />\n"\r
+              . "</form>\n"\r
+              . "</td>\n";\r
+       $navi .= "<td>\n"\r
+              . "<form method=\"post\" action=\"{$CONF['AdminURL']}\">\n"\r
+              . "<input type=\"text\" name=\"search\" value=\"{$vars['search']}\" size=\"7\" />\n"\r
+              . "<input type=\"hidden\" name=\"start\" value=\"0\" />\n"\r
+              . "<button type=\"submit\" name=\"action\" value=\"{$vars['action']}\">&gt; " . _LISTS_SEARCH . "</button>\n"\r
+              . "<input type=\"hidden\" name=\"blogid\" value=\"{$vars['blogid']}\" />\n"\r
+              . "<input type=\"hidden\" name=\"itemid\" value=\"{$vars['itemid']}\" />\n"\r
+              . "<input type=\"hidden\" name=\"search\" value=\"{$vars['search']}\" />\n"\r
+              . "<input type=\"hidden\" name=\"amount\" value=\"{$vars['amount']}\" />\n"\r
+              . "</form>\n"\r
+              . "</td>\n";\r
+       $navi .= "<td>\n"\r
+              . "<form method=\"post\" action=\"{$CONF['AdminURL']}\">\n"\r
+              . "<input type=\"hidden\" name=\"start\" value=\"{$next}\" />\n"\r
+              . "<button type=\"submit\" name=\"action\" value=\"{$vars['action']}\">" . _LISTS_NEXT . "&gt; &gt; </button>\n"\r
+              . "<input type=\"hidden\" name=\"blogid\" value=\"{$vars['blogid']}\" />\n"\r
+              . "<input type=\"hidden\" name=\"itemid\" value=\"{$vars['itemid']}\" />\n"\r
+              . "<input type=\"hidden\" name=\"search\" value=\"{$vars['search']}\" />\n"\r
+              . "<input type=\"hidden\" name=\"amount\" value=\"{$vars['amount']}\" />\n"\r
+              . "</form>\n"\r
+              . "</td>\n";\r
+       $navi .= "</tr>\n"\r
+              . "</table>\n";\r
+       \r
+       /* HEAD */\r
+       $template = $navi;\r
+       \r
+       /* BODY */\r
+       $template .= listplug_batchlist($attribute, $query, $type, $vars);\r
+       \r
+       /* FOOT */\r
+       $template .= $navi;\r
+       \r
+       return $template;\r
+}\r
index 92d6ff4..ed680c4 100644 (file)
@@ -83,9 +83,9 @@ define('_ADM_SKPRT_FORGOTPASSWORD',                         '[' . _FORGOTPASSWOR
 \r
 // ADMIN-template template types\r
 \r
 \r
 // ADMIN-template template types\r
 \r
-define('_ADM_TPLPT_ADMINSKINTYPELIST_HEAD',                 _SKINABLEADMIN_ADMINSKINVAR_STR . ' [defaultadminskintypes]' . _SKINABLEADMIN_HEAD_STR);\r
-define('_ADM_TPLPT_ADMINSKINTYPELIST_BODY',                 _SKINABLEADMIN_ADMINSKINVAR_STR . ' [defaultadminskintypes]' . _SKINABLEADMIN_BODY_STR);\r
-define('_ADM_TPLPT_ADMINSKINTYPELIST_FOOT',                 _SKINABLEADMIN_ADMINSKINVAR_STR . ' [defaultadminskintypes]' . _SKINABLEADMIN_FOOT_STR);\r
+define('_ADM_TPLPT_NORMALSKINLIST_HEAD',                 _SKINABLEADMIN_ADMINSKINVAR_STR . ' [defaultadminskintypes]' . _SKINABLEADMIN_HEAD_STR);\r
+define('_ADM_TPLPT_NORMALSKINLIST_BODY',                 _SKINABLEADMIN_ADMINSKINVAR_STR . ' [defaultadminskintypes]' . _SKINABLEADMIN_BODY_STR);\r
+define('_ADM_TPLPT_NORMALSKINLIST_FOOT',                 _SKINABLEADMIN_ADMINSKINVAR_STR . ' [defaultadminskintypes]' . _SKINABLEADMIN_FOOT_STR);\r
 define('_ADM_TPLPT_ADMIN_CUSTOMHELPLINK_ICON',              _SKINABLEADMIN_ADMINSKINVAR_STR . ' [customhelplink] ' . _SKINABLEADMIN_HELPICONURL_STR);\r
 define('_ADM_TPLPT_ADMIN_CUSTOMHELPLINK_ANCHOR',            _SKINABLEADMIN_ADMINSKINVAR_STR . ' [customhelplink] ' . _SKINABLEADMIN_HELPFILEURL_STR);\r
 define('_ADM_TPLPT_ADMIN_BLOGLINK',                         _SKINABLEADMIN_ADMINSKINVAR_STR . ' [adminbloglink]');\r
 define('_ADM_TPLPT_ADMIN_CUSTOMHELPLINK_ICON',              _SKINABLEADMIN_ADMINSKINVAR_STR . ' [customhelplink] ' . _SKINABLEADMIN_HELPICONURL_STR);\r
 define('_ADM_TPLPT_ADMIN_CUSTOMHELPLINK_ANCHOR',            _SKINABLEADMIN_ADMINSKINVAR_STR . ' [customhelplink] ' . _SKINABLEADMIN_HELPFILEURL_STR);\r
 define('_ADM_TPLPT_ADMIN_BLOGLINK',                         _SKINABLEADMIN_ADMINSKINVAR_STR . ' [adminbloglink]');\r
index 841cf93..a077554 100644 (file)
 <?xml version="1.0"?>\r
 <nucleusskin>\r
 <?xml version="1.0"?>\r
 <nucleusskin>\r
-  <meta>\r
-    <skin name="admin/default"/>\r
-    <template name="admin/default"/>\r
-    <info><![CDATA[20120414]]></info>\r
-  </meta>\r
-  <skin name="admin/default" type="text/html" includeMode="skindir" includePrefix="admin/default">\r
-    <description><![CDATA[ADMIN Area Default skin]]></description>\r
-    <part name="actionlog"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
-        <h2><%text(_ACTIONLOG_CLEAR_TITLE)%></h2>\r
-        <p><a href="<%adminurl%><%addtickettourl(index.php?action=clearactionlog)%>"><%text(_ACTIONLOG_CLEAR_TEXT)%></a></p>\r
-        <h2><%text(_ACTIONLOG_TITLE)%></h2>\r
-        <%actionloglist(admin/default)%><%pagefoot%>]]></part>\r
-    <part name="activate"><![CDATA[<%pagehead%><h2><%activationmessage(title)%></h2>\r
-             <p><%activationmessage(text)%></p>\r
-             <p class="error"><%headmessage%></p>\r
-             <%if(bechangepass)%><div>\r
-                <form action="<%adminurl%>index.php" method="post">\r
-                    <input type="hidden" name="action" value="activatesetpwd" />\r
-                    <%ticket%>\r
-                    <input type="hidden" name="key" value="<%activationmessage(ackey)%>" />\r
-                    <table>\r
-                        <tr>\r
-                            <td><%text(_MEMBERS_PWD)%></td>\r
-                            <td><input type="password" maxlength="40" size="16" name="password" /></td>\r
-                        </tr><tr>\r
-                            <td><%text(_MEMBERS_REPPWD)%></td>\r
-                            <td><input type="password" maxlength="40" size="16" name="repeatpassword" /></td>\r
-                            <%eventformextra(activation)%>\r
-                        </tr><tr>\r
-                            <td><%text(_MEMBERS_SETPWD)%></td>\r
-                            <td><input type="submit" value="<%text(_MEMBERS_SETPWD_BTN)%>" /></td>\r
-                        </tr>\r
-                    </table>\r
-                </form>\r
-             </div><%endif%><%pagefoot%>]]></part>\r
-    <part name="activatesetpwd"><![CDATA[<%pagehead%><h2><%text(_ACTIVATE_SUCCESS_TITLE)%></h2>\r
-<p><%text(_ACTIVATE_SUCCESS_TEXT)%></p><%pagefoot%>]]></part>\r
-    <part name="addnewlog"><![CDATA[<%pagehead%><h2><%text(_BLOGCREATED_TITLE)%></h2>\r
-        <p><%sprinttext(_BLOGCREATED_ADDEDTXT,<|%createdblogsetting(name)%|>)%></p>\r
-        <ol>\r
-            <li><a href="#index_php"><%sprinttext(_BLOGCREATED_SIMPLEWAY,<|%getblogsetting(short)%|>)%></a></li>\r
-            <li><a href="#skins"><%text(_BLOGCREATED_ADVANCEDWAY)%></a></li>\r
-        </ol>\r
-        <h3><a id="index_php"><%sprinttext(_BLOGCREATED_SIMPLEDESC1,<|%getblogsetting(short)%|>)%></a></h3>\r
-        <p><%sprinttext(_BLOGCREATED_SIMPLEDESC2,<|%getblogsetting(short)%|>)%></p>\r
-<pre><code>&lt;?php\r
-\r
-$CONF['Self'] = '<b><%blogsetting(short)%>.php</b>';\r
-\r
-include('<i>./config.php</i>');\r
-\r
-selectBlog('<b><%blogsetting(short)%></b>');\r
-selector();\r
-\r
-?&gt;</code></pre>\r
-        <p><%text(_BLOGCREATED_SIMPLEDESC3)%></p>\r
-        <p><%text(_BLOGCREATED_SIMPLEDESC4)%></p>\r
-        <form action="<%adminurl%>index.php" method="post">\r
-            <div>\r
-                <input type="hidden" name="action" value="addnewlog2" />\r
-                <%ticket%>\r
-                <input type="hidden" name="blogid" value="<%requestblogid%>" />\r
-                <table>\r
-                    <tr>\r
-                        <td><%text(_EBLOG_URL)%></td>\r
-                        <td><input name="url" maxlength="100" size="40" value="<%sitevar(url)%><%blogsetting(short)%>.php" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_CREATE)%></td>\r
-                        <td><input type="submit" value="<%text(_EBLOG_CREATE_BTN)%>" onclick="return checkSubmit();" /></td>\r
-                    </tr>\r
-                </table>\r
-            </div>\r
-        </form>\r
-        <h3><a id="skins"><%text(_BLOGCREATED_ADVANCEDWAY2)%></a></h3>\r
-        <p><%text(_BLOGCREATED_ADVANCEDWAY3)%></p>\r
-        <form action="<%adminurl%>index.php" method="post">\r
-            <div>\r
-                <input type="hidden" name="action" value="addnewlog2" />\r
-                <%ticket%>\r
-                <input type="hidden" name="blogid" value="<%requestblogid%>" />\r
-                <table>\r
-                    <tr>\r
-                        <td><%text(_EBLOG_URL)%></td>\r
-                        <td><input name="url" maxlength="100" size="40" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_CREATE)%></td>\r
-                        <td><input type="submit" value="<%text(_EBLOG_CREATE_BTN)%>" onclick="return checkSubmit();" /></td>\r
-                    </tr>\r
-                </table>\r
-            </div>\r
-        </form><%pagefoot%>]]></part>\r
-    <part name="adminerrorpage"><![CDATA[<%pagehead%>        <h2>Error!</h2>\r
-        <%headmessage%>\r
-        <br />\r
-        <a href="<%adminurl%>index.php" onclick="history.back()"><%text(_BACK)%></a>\r
-<%pagefoot%>]]></part>\r
-    <part name="adminskindelete"><![CDATA[<%pagehead%><h2><%text(_DELETE_CONFIRM)%></h2>\r
-            <p><%text(_CONFIRMTXT_SKIN)%><b><%editadminskintype(name)%></b> (<%editadminskintype(desc)%>)</p>\r
-            <form method="post" action="<%adminurl%>index.php">\r
-                <div>\r
-                    <input type="hidden" name="action" value="adminskindeleteconfirm" />\r
-                    <%ticket%>\r
-                    <input type="hidden" name="skinid" value="<%editadminskintype(id)%>" />\r
-                    <input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
-                </div>\r
-            </form><%pagefoot%>]]></part>\r
-    <part name="adminskinedit"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=adminskinoverview">(<%text(_SKIN_BACK)%>)</a></p>\r
-        <h2><%text(_SKIN_EDITONE_TITLE)%> '<%editadminskin(name)%>'</h2>\r
-        <h3><%text(_SKIN_PARTS_TITLE)%></h3>\r
-        <%text(_SKIN_PARTS_MSG)%>\r
-<%defaultadminskintypes(10,admin/default)%>\r
-        <h3><%text(_SKIN_PARTS_SPECIAL)%></h3>\r
-        <form method="get" action="<%adminurl%>index.php">\r
-            <input type="hidden" name="action" value="adminskinedittype" />\r
-            <input type="hidden" name="skinid" value="<%editadminskin(id)%>" />\r
-            <input name="type" tabindex="89" size="30" maxlength="64" />\r
-            <input type="submit" tabindex="140" value="<%text(_SKIN_CREATE)%>" onclick="return checkSubmit();" />\r
-        </form>\r
-        <%adminspecialskinlist(admin/default)%>\r
-        <h3><%text(_SKIN_GENSETTINGS_TITLE)%></h3>\r
-        <form method="post" action="<%adminurl%>index.php">\r
-            <div>\r
-                <input type="hidden" name="action" value="adminskineditgeneral" />\r
-                <%ticket%>\r
-                <input type="hidden" name="skinid" value="<%editadminskin(id)%>" />\r
-                <table>\r
-                    <tr>\r
-                        <td><%text(_SKIN_NAME)%> <%helplink(shortnames)%></td>\r
-                        <td><input name="name" tabindex="90" value="<%editadminskin(name)%>" maxlength="64" size="30" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SKIN_DESC)%></td>\r
-                        <td><input name="desc" tabindex="100" value="<%editadminskin(desc)%>" maxlength="200" size="50" /></td>\r
-                </tr><tr>\r
-                    <td><%text(_SKIN_TYPE)%></td>\r
-                    <td><input name="type" tabindex="110" value="<%editadminskin(type)%>" maxlength="40" size="20" /></td>\r
-                </tr><tr>\r
-                    <td><%text(_SKIN_INCLUDE_MODE)%> <%helplink(includemode)%></td>\r
-                    <td><%editadminskin(mode)%></td>\r
-                </tr><tr>\r
-                    <td><%text(_SKIN_INCLUDE_PREFIX)%> <%helplink(includeprefix)%></td>\r
-                    <td><input name="inc_prefix" tabindex="130" value="<%editadminskin(prefix)%>" maxlength="40" size="20" /></td>\r
-                </tr><tr>\r
-                    <td><%text(_SKIN_CHANGE)%></td>\r
-                    <td><input type="submit" tabindex="140" value="<%text(_SKIN_CHANGE_BTN)%>" onclick="return checkSubmit();" /></td>\r
-                </tr></table>\r
-            </div>\r
-        </form><%pagefoot%>]]></part>\r
-    <part name="adminskinedittype"><![CDATA[<%pagehead%><p>(<a href="<%adminurl%>index.php?action=adminskinoverview"><%text(_SKIN_GOBACK)%></a>)</p>\r
-        <h2><%text(_SKIN_EDITPART_TITLE)%> '<%editadminskintype(name)%>': <%editadminskintype(skintype)%></h2>\r
-        <%headmessage%>\r
-        <form method="post" action="<%adminurl%>index.php">\r
-            <div>\r
-                <input type="hidden" name="action" value="adminskinupdate" />\r
-                <%ticket%>\r
-                <input type="hidden" name="skinid" value="<%editadminskintype(id)%>" />\r
-                <input type="hidden" name="type" value="<%editadminskintype(skintyperaw)%>" />\r
-                <input type="submit" value="<%text(_SKIN_UPDATE_BTN)%>" onclick="return checkSubmit();" />\r
-                <input type="reset" value="<%text(_SKIN_RESET_BTN)%>" />\r
-                (skin type: <%editadminskintype(skintype)%>)<%skintypehelp%><br />\r
-                <textarea class="skinedit" tabindex="10" rows="20" cols="80" name="content"><%editadminskintype(content)%></textarea><br />\r
-                <input type="submit" tabindex="20" value="<%text(_SKIN_UPDATE_BTN)%>" onclick="return checkSubmit();" />\r
-                <input type="reset" value="<%text(_SKIN_RESET_BTN)%>" />\r
-                (skin type: <%editadminskintype(skintype)%>)\r
-                <br /><br />\r
-                <%text(_SKIN_ALLOWEDVARS)%>\r
-                <%allowedadminskinactions%><br /><br />\r
-                <%text(_SKINEDIT_ALLOWEDTEMPLATESS)%>\r
-                <%adminskineditallowedlist(template)%><br />\r
-            </div>\r
-        </form><%pagefoot%>]]></part>\r
-    <part name="adminskiniedoimport"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
-        <h2><%text(_SKINIE_DONE)%></h2>\r
-\r
-        <ul>\r
-            <li><p><strong><%text(_SKINIE_INFO_GENERAL)%></strong> <%importskininfo(info)%></p></li>\r
-            <li><p><strong><%text(_SKINIE_INFO_IMPORTEDSKINS)%></strong> <%importskininfo(snames)%></p></li>\r
-            <li><p><strong><%text(_SKINIE_INFO_IMPORTEDTEMPLS)%></strong> <%importskininfo(tnames)%></p></li>\r
-        </ul><%pagefoot%>]]></part>\r
-    <part name="adminskinieimport"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=adminskinieoverview">(<%text(_BACK)%>)</a></p>\r
-        <h2><%text(_SKINIE_CONFIRM_TITLE)%></h2>\r
-\r
-        <ul>\r
-            <li><p><strong><%text(_SKINIE_INFO_GENERAL)%></strong> <%importskininfo(info)%></p></li>\r
-            <li><p><strong><%text(_SKINIE_INFO_SKINS)%></strong> <%importskininfo(snames)%></p></li>\r
-            <li><p><strong><%text(_SKINIE_INFO_TEMPLATES)%></strong> <%importskininfo(tnames)%></p></li>\r
-            <%if(nameclashes)%><li><p><strong style="color: red;"><%text(_SKINIE_INFO_SKINCLASH)%></strong> <%importskininfo(sclashes)%></p></li>\r
-            <li><p><strong style="color: red;"><%text(_SKINIE_INFO_TEMPLCLASH)%></strong> <%importskininfo(tclashes)%></p></li><%endif%>\r
-        </ul>\r
-\r
-        <form method="post" action="<%adminurl%>index.php"><div>\r
-            <input type="hidden" name="action" value="adminskiniedoimport" />\r
-            <%ticket%>\r
-            <input type="hidden" name="skinfile" value="<%importskininfo(skinfile)%>" />\r
-            <input type="hidden" name="mode" value="<%importskininfo(mode)%>" />\r
-            <input type="submit" value="<%text(_SKINIE_CONFIRM_IMPORT)%>" />\r
-            <%if(nameclashes)%><br />\r
-            <input type="checkbox" name="overwrite" value="1" id="cb_overwrite" /><label for="cb_overwrite"><%text(_SKINIE_CONFIRM_OVERWRITE)%></label><%endif%>\r
-        </div></form><%pagefoot%>]]></part>\r
-    <part name="adminskinieoverview"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
-        <h2><%text(_SKINIE_TITLE_IMPORT)%></h2>\r
-        <p>\r
-            <label for="skinie_import_local"><%text(_SKINIE_LOCAL)%></label>\r
-            <%if(superadmin)%><form method="post" action="<%adminurl%>index.php">\r
-                <div>\r
-                    <input type="hidden" name="action" value="adminskinieimport" />\r
-                    <%ticket%>\r
-                    <input type="hidden" name="mode" value="file" />\r
-                    <select name="skinfile" id="skinie_import_local">\r
-                        <%selectlocaladminskinfiles%>\r
-                    </select>\r
-                    <input type="submit" value="<%text(_SKINIE_BTN_IMPORT)%>" />\r
-                </div>\r
-            </form><%else%><%text(_SKINIE_NOCANDIDATES)%><%endif%>\r
-        </p>\r
-        <p><em><%text(_OR)%></em></p>\r
-        <form method="post" action="<%adminurl%>index.php">\r
-            <p>\r
-                <%ticket%>\r
-                <input type="hidden" name="action" value="adminskinieimport" />\r
-                <input type="hidden" name="mode" value="url" />\r
-                <label for="skinie_import_url"><%text(_SKINIE_FROMURL)%></label>\r
-                <input type="text" name="skinfile" id="skinie_import_url" size="60" value="http://" />\r
-                <input type="submit" value="<%text(_SKINIE_BTN_IMPORT)%>" />\r
-            </p>\r
-        </form>\r
-        <h2><%text(_SKINIE_TITLE_EXPORT)%></h2>\r
-        <form method="post" action="<%adminurl%>index.php">\r
-            <div>\r
-                <input type="hidden" name="action" value="adminskinieexport" />\r
-                <%ticket%>\r
-                <p><%text(_SKINIE_EXPORT_INTRO)%></p>\r
-                <table>\r
-                    <tr>\r
-                        <th colspan="2"><%text(_SKINIE_EXPORT_SKINS)%></th>\r
-                    </tr><tr>\r
-                        <%adminskinielist(skin,admin/default)%>\r
-                        <th colspan="2"><%text(_SKINIE_EXPORT_TEMPLATES)%></th>\r
-                    </tr><tr>\r
-                        <%adminskinielist(template,admin/default)%>\r
-                        <th colspan="2"><%text(_SKINIE_EXPORT_EXTRA)%></th>\r
-                    </tr><tr>\r
-                        <td colspan="2"><textarea cols="40" rows="5" name="info"></textarea></td>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_SKINIE_TITLE_EXPORT)%></th>\r
-                    </tr><tr>\r
-                        <td colspan="2"><input type="submit" value="<%text(_SKINIE_BTN_EXPORT)%>" /></td>\r
-                    </tr>\r
-                </table>\r
-            </div>\r
-        </form><%pagefoot%>]]></part>\r
-    <part name="adminskinoverview"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
-        <h2><%text(_SKIN_EDIT_TITLE)%></h2>\r
-        <h3><%text(_SKIN_AVAILABLE_TITLE)%></h3>\r
-        <%adminskinoverview(admin/default)%>\r
-        <h3><%text(_SKIN_NEW_TITLE)%></h3>\r
-        <form method="post" action="<%adminurl%>index.php">\r
-            <div>\r
-                <input name="action" value="adminskinnew" type="hidden" />\r
-                <%ticket%>\r
-                <table>\r
-                    <tr>\r
-                        <td><%text(_SKIN_NAME)%> <%helplink(shortnames)%></td>\r
-                        <td><input name="name" tabindex="10010" maxlength="20" size="20" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SKIN_DESC)%></td>\r
-                        <td><input name="desc" tabindex="10020" maxlength="200" size="50" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SKIN_CREATE)%></td>\r
-                        <td><input type="submit" tabindex="10030" value="<%text(_SKIN_CREATE_BTN)%>" onclick="return checkSubmit();" /></td>\r
-                    </tr>\r
-                </table>\r
-            </div>\r
-        </form><%pagefoot%>]]></part>\r
-    <part name="adminskinremovetype"><![CDATA[<%pagehead%><h2><%text(_DELETE_CONFIRM)%></h2>\r
-            <p><%text(_CONFIRMTXT_SKIN_PARTS_SPECIAL)%><br />\r
-            <b><%editadminskintype(skintype)%> (<%editadminskintype(name)%>)</b> (<%editadminskintype(desc)%>)</p>\r
-            <form method="post" action="<%adminurl%>index.php">\r
-                <div>\r
-                    <input type="hidden" name="action" value="adminskinremovetypeconfirm" />\r
-                    <%ticket%>\r
-                    <input type="hidden" name="skinid" value="<%editadminskintype(id)%>" />\r
-                    <input type="hidden" name="type" value="<%editadminskintype(skintype)%>" />\r
-                    <input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
-                </div>\r
-            </form><%pagefoot%>]]></part>\r
-    <part name="admintemplatedelete"><![CDATA[<%pagehead%><h2><%text(_DELETE_CONFIRM)%></h2>\r
-            <p><%text(_CONFIRMTXT_TEMPLATE)%><b><%editadmintemplateinfo(name)%></b> (<%editadmintemplateinfo(desc)%>)</p>\r
-            <form method="post" action="<%adminurl%>index.php">\r
-                <div>\r
-                    <input type="hidden" name="action" value="admintemplatedeleteconfirm" />\r
-                    <%ticket%>\r
-                    <input type="hidden" name="templateid" value="<%editadmintemplateinfo(id)%>" />\r
-                    <input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
-                </div>\r
-            </form><%pagefoot%>]]></part>\r
-    <part name="admintemplateedit"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=admintemplateoverview">(<%text(_TEMPLATE_BACK)%>)</a></p>\r
-\r
-        <h2><%text(_TEMPLATE_EDIT_TITLE)%> '<%editadmintemplateinfo(name)%>'</h2>\r
-        <%headmessage%>\r
-        <p><%text(_TEMPLATE_EDIT_MSG)%></p>\r
-        <form method="post" action="<%adminurl%>index.php">\r
-            <div>\r
-                <input type="hidden" name="action" value="admintemplateupdate" />\r
-                <%ticket%>\r
-                <input type="hidden" name="templateid" value="<%editadmintemplateinfo(id)%>" />\r
-                <table>\r
-                    <tr>\r
-                        <th colspan="2"><%text(_TEMPLATE_SETTINGS)%></th>\r
-                    </tr><tr>\r
-                        <td><%text(_TEMPLATE_NAME)%> <%helplink(shortnames)%></td>\r
-                        <td><input name="tname" tabindex="4" size="20" maxlength="20" value="<%editadmintemplateinfo(name)%>" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_TEMPLATE_DESC)%></td>\r
-                        <td><input name="tdesc" tabindex="5" size="50" maxlength="200" value="<%editadmintemplateinfo(desc)%>" /></td>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_TEMPLATE_UPDATE)%></th>\r
-                    </tr><tr>\r
-                        <td><%text(_TEMPLATE_UPDATE)%></td>\r
-                        <td>\r
-                            <input type="submit" tabindex="6" value="<%text(_TEMPLATE_UPDATE_BTN)%>" onclick="return checkSubmit();" />\r
-                            <input type="reset" tabindex="7" value="<%text(_TEMPLATE_RESET_BTN)%>" />\r
-                        </td>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_QMENU_LAYOUT_SKINS)%></th>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_ADMINSKINTYPELIST_HEAD, ADMINSKINTYPELIST_HEAD, ,8)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_ADMINSKINTYPELIST_BODY, ADMINSKINTYPELIST_BODY, ,9)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_ADMINSKINTYPELIST_FOOT, ADMINSKINTYPELIST_FOOT, ,10)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SPECIALSKINLIST_HEAD, SPECIALSKINLIST_HEAD, , 11)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SPECIALSKINLIST_BODY, SPECIALSKINLIST_BODY, , 12)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SPECIALSKINLIST_FOOT, SPECIALSKINLIST_FOOT, , 13)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_ADMIN_SPECIALSKINLIST_HEAD, ADMIN_SPECIALSKINLIST_HEAD, , 14)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_ADMIN_SPECIALSKINLIST_BODY, ADMIN_SPECIALSKINLIST_BODY, , 15)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_ADMIN_SPECIALSKINLIST_FOOT, ADMIN_SPECIALSKINLIST_FOOT, , 16)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SKINIE_EXPORT_LIST, SKINIE_EXPORT_LIST, , 17)%>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_QMENU_LAYOUT_TEMPL)%></th>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_TEMPLATE_EDIT_EXPLUGNAME, TEMPLATE_EDIT_EXPLUGNAME, , 18)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_TEMPLATE_EDIT_ROW_HEAD, TEMPLATE_EDIT_ROW_HEAD, , 19)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_TEMPLATE_EDIT_ROW_TAIL, TEMPLATE_EDIT_ROW_TAIL, , 20)%>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_SKINABLEADMIN_ADMINAREAHEADLINK)%></th>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_ADMIN_BLOGLINK, ADMIN_BLOGLINK, , 21)%>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_SKINABLEADMIN_BATCH)%></th>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_ADMIN_BATCHLIST, ADMIN_BATCHLIST, , 22)%>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_QMENU_ACTIVATE)%></th>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_ACTIVATE_FORGOT_TITLE, ACTIVATE_FORGOT_TITLE, , 23)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_ACTIVATE_FORGOT_TEXT, ACTIVATE_FORGOT_TEXT, , 24)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_ACTIVATE_REGISTER_TITLE, ACTIVATE_REGISTER_TITLE, , 25)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_ACTIVATE_REGISTER_TEXT, ACTIVATE_REGISTER_TEXT, , 26)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_ACTIVATE_CHANGE_TITLE, ACTIVATE_CHANGE_TITLE, , 27)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_ACTIVATE_CHANGE_TEXT, ACTIVATE_CHANGE_TEXT, , 28)%>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_QMENU_MANAGE_SYSTEM)%></th>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SYSTEMINFO_GDSETTINGS, SYSTEMINFO_GDSETTINGS, , 29)%>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_BLOGLIST_BANS)%></th>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_BANLIST_DELETED_LIST, BANLIST_DELETED_LIST, , 30)%>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_SKINABLEADMIN_TPLSETTING_INGENERAL)%></th>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_INSERT_PLUGOPTION_TITLE, INSERT_PLUGOPTION_TITLE, , 31)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_INSERT_PLUGOPTION_BODY, INSERT_PLUGOPTION_BODY, , 32)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_INPUTYESNO_TEMPLATE_ADMIN, INPUTYESNO_TEMPLATE_ADMIN, , 33)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_INPUTYESNO_TEMPLATE_NORMAL, INPUTYESNO_TEMPLATE_NORMAL, , 34)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_ADMIN_CUSTOMHELPLINK_ICON, ADMIN_CUSTOMHELPLINK_ICON, , 35)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_ADMIN_CUSTOMHELPLINK_ANCHOR, ADMIN_CUSTOMHELPLINK_ANCHOR, , 36)%>\r
-\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT)%></th>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_SELECT_HEAD, SHOWLIST_LISTPLUG_SELECT_HEAD, , 37)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_SELECT_BODY, SHOWLIST_LISTPLUG_SELECT_BODY, , 38)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_SELECT_FOOT, SHOWLIST_LISTPLUG_SELECT_FOOT, , 39)%>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE)%></th>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_HEAD, SHOWLIST_LISTPLUG_TABLE_HEAD, , 40)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BODY, SHOWLIST_LISTPLUG_TABLE_BODY, , 41)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_FOOT, SHOWLIST_LISTPLUG_TABLE_FOOT, , 42)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_MEMBLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_MEMBLIST_HEAD, , 43)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_MEMBLIST_BODY, SHOWLIST_LISTPLUG_TABLE_MEMBLIST_BODY, , 44)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_MEMBLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_MEMBLIST_FOOT, , 45)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_TEAMLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_TEAMLIST_HEAD, , 46)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_TEAMLIST_BODY, SHOWLIST_LISTPLUG_TABLE_TEAMLIST_BODY, , 47)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_TEAMLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_TEAMLIST_FOOT, , 48)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HEAD, , 49)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY, SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY, , 50)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL, SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL, , 51)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST, SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST, , 52)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE, SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE, , 53)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND, SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND, , 54)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ, SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ, , 55)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE, SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE, , 56)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN, SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN, , 57)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN, SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN, , 58)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP, SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP, , 59)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL, SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL, , 60)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_PLUGLIST_FOOT, , 61)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_POPTLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_POPTLIST_HEAD, , 62)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_POPTLIST_BODY, SHOWLIST_LISTPLUG_TABLE_POPTLIST_BODY, , 63)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO, SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO, , 64)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD, SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD, , 65)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEP, SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEP, , 66)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEO, SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEO, , 67)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEC, SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEC, , 68)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLGOPT_OTAREA, SHOWLIST_LISTPLUG_TABLE_PLGOPT_OTAREA, , 69)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLGOPT_OITEXT, SHOWLIST_LISTPLUG_TABLE_PLGOPT_OITEXT, , 70)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTN_FOOT, SHOWLIST_LISTPLUG_TABLE_PLUGOPTN_FOOT, , 71)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_POPTLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_POPTLIST_FOOT, , 72)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_ITEMLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_ITEMLIST_HEAD, , 73)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY, SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY, , 74)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_ITEMLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_ITEMLIST_FOOT, , 75)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_CMNTLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_CMNTLIST_HEAD, , 76)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY, SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY, , 77)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN, SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN, , 78)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_CMNTLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_CMNTLIST_FOOT, , 79)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLOGLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_BLOGLIST_HEAD, , 80)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY, SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY, , 81)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM, SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM, , 82)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM, SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM, , 83)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLOGLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_BLOGLIST_FOOT, , 84)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_HEAD, SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_HEAD, , 85)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_BODY, SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_BODY, , 86)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_FOOT, SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_FOOT, , 87)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_SHORTNAM_HEAD, SHOWLIST_LISTPLUG_TABLE_SHORTNAM_HEAD, , 88)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_SHORTNAM_BODY, SHOWLIST_LISTPLUG_TABLE_SHORTNAM_BODY, , 89)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_SHORTNAM_FOOT, SHOWLIST_LISTPLUG_TABLE_SHORTNAM_FOOT, , 90)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_CATELIST_HEAD, SHOWLIST_LISTPLUG_TABLE_CATELIST_HEAD, , 91)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_CATELIST_BODY, SHOWLIST_LISTPLUG_TABLE_CATELIST_BODY, , 92)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_CATELIST_FOOT, SHOWLIST_LISTPLUG_TABLE_CATELIST_FOOT, , 93)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD, , 94)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY, SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY, , 95)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_TPLTLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_TPLTLIST_FOOT, , 96)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD, , 97)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY, SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY, , 98)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_SKINLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_SKINLIST_FOOT, , 99)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_DRFTLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_DRFTLIST_HEAD, , 100)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_DRFTLIST_BODY, SHOWLIST_LISTPLUG_TABLE_DRFTLIST_BODY, , 101)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_DRFTLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_DRFTLIST_FOOT, , 102)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD, , 103)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_ACTNLIST_BODY, SHOWLIST_LISTPLUG_TABLE_ACTNLIST_BODY, , 104)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_ACTNLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_ACTNLIST_FOOT, , 105)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD, , 106)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY, SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY, , 107)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT, , 108)%>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_SKINABLEADMIN_PLUGIN_QUICKMENU)%></th>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_PLUGIN_QUICKMENU_TITLE, PLUGIN_QUICKMENU_TITLE, , 109)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_PLUGIN_QUICKMENU_HEAD, PLUGIN_QUICKMENU_HEAD, , 110)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_PLUGIN_QUICKMENU_BODY, PLUGIN_QUICKMENU_BODY, , 111)%>\r
-                    <%editadmintemplateinfo(row, _ADM_TPLPT_PLUGIN_QUICKMENU_FOOT, PLUGIN_QUICKMENU_FOOT, , 112)%>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_TEMPLATE_PLUGIN_FIELDS)%></th>\r
-                    <%editadmintemplateinfo(extratemplate,admin/default)%>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_TEMPLATE_UPDATE)%></th>\r
-                    </tr><tr>\r
-                        <td><%text(_TEMPLATE_UPDATE)%></td>\r
-                        <td>\r
-                            <input type="submit" tabindex="800" value="<%text(_TEMPLATE_UPDATE_BTN)%>" onclick="return checkSubmit();" />\r
-                            <input type="reset" tabindex="810" value="<%text(_TEMPLATE_RESET_BTN)%>" />\r
-                        </td>\r
-                    </tr>\r
-                </table>\r
-            </div>\r
-        </form><%pagefoot%>]]></part>\r
-    <part name="admntemplateoverview"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
-        <h2><%text(_TEMPLATE_TITLE)%></h2>\r
-        <h3><%text(_TEMPLATE_AVAILABLE_TITLE)%></h3>\r
-        <%admintemplateoverview(admin/default)%>\r
-        <h3><%text(_TEMPLATE_NEW_TITLE)%></h3>\r
-        <form method="post" action="<%adminurl%>index.php">\r
-            <div>\r
-                <input name="action" value="admintemplatenew" type="hidden" />\r
-                <%ticket%>\r
-                <table>\r
-                    <tr>\r
-                        <td><%text(_TEMPLATE_NAME)%> <%helplink(shortnames)%></td>\r
-                        <td><input name="name" tabindex="10010" maxlength="20" size="20" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_TEMPLATE_DESC)%></td>\r
-                        <td><input name="desc" tabindex="10020" maxlength="200" size="50" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_TEMPLATE_CREATE)%></td>\r
-                        <td><input type="submit" tabindex="10030" value="<%text(_TEMPLATE_CREATE_BTN)%>" onclick="return checkSubmit();" /></td>\r
-                    </tr>\r
-                </table>\r
-            </div>\r
-        </form><%pagefoot%>]]></part>\r
-    <part name="backupoverview"><![CDATA[<%pagehead%>        <p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
-        <h2><%text(_BACKUPS_TITLE)%></h2>\r
-        <h3><%text(_BACKUP_TITLE)%></h3>\r
-        <p><%text(_BACKUP_INTRO)%></p>\r
-        <form method="post" action="<%adminurl%>index.php">\r
-            <p>\r
-                <input type="hidden" name="action" value="backupcreate" />\r
-                <%ticket%>\r
-                <input type="radio" name="gzip" value="1" checked="checked" id="gzip_yes" tabindex="10" /><label for="gzip_yes"><%text(_BACKUP_ZIP_YES)%></label><br />\r
-                <input type="radio" name="gzip" value="0" id="gzip_no" tabindex="10" /><label for="gzip_no" ><%text(_BACKUP_ZIP_NO)%></label><br /><br />\r
-                <input type="submit" value="<%text(_BACKUP_BTN)%>" tabindex="20" />\r
-            </p>\r
-        </form>\r
-        <div class="note"><%text(_BACKUP_NOTE)%></div>\r
-        <h3><%text(_RESTORE_TITLE)%></h3>\r
-        <div class="note"><%text(_RESTORE_NOTE)%></div>\r
-        <p><%text(_RESTORE_INTRO)%></p>\r
-        <form method="post" action="<%adminurl%>index.php" enctype="multipart/form-data">\r
-            <p>\r
-                <input type="hidden" name="action" value="backuprestore" />\r
-                <%ticket%>\r
-                <input name="backup_file" type="file" tabindex="30" />\r
-                <br /><br />\r
-                <input type="submit" value="<%text(_RESTORE_BTN)%>" tabindex="40" /><br />\r
-                <input type="checkbox" name="letsgo" value="1" id="letsgo" tabindex="50" /><label for="letsgo"><%text(_RESTORE_IMSURE)%></label><br />\r
-                <%text(_RESTORE_WARNING)%>\r
-            </p>\r
-        </form>\r
-<%pagefoot%>]]></part>\r
-    <part name="backuprestore"><![CDATA[<%pagehead%>        <h2><%text(_RESTORE_COMPLETE)%></h2>\r
-<%pagefoot%>]]></part>\r
-    <part name="banlist"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=overview">(<%text(_BACKHOME)%>)</a></p>\r
-        <h2><%text(_BAN_TITLE)%> '<%adminbloglink(admin/default)%>'</h2>\r
-        <%adminbanlist%>\r
-        <h2><%text(_BAN_NEW_TITLE)%></h2>\r
-        <p><a href="<%adminurl%>index.php?action=banlistnew&amp;blogid=<%requestblogid%>"><%text(_BAN_NEW_TEXT)%></a></p><%pagefoot%>]]></part>\r
-    <part name="banlistdelete"><![CDATA[<%pagehead%>            <h2><%text(_BAN_REMOVE_TITLE)%></h2>\r
-\r
-            <form method="post" action="<%adminurl%>index.php">\r
-\r
-            <h3><%text(_BAN_IPRANGE)%></h3>\r
-\r
-            <p>\r
-                <%text(_CONFIRMTXT_BAN)%> <%requestiprange%>\r
-                <input name="iprange" type="hidden" value="<%requestiprange%>" />\r
-            </p>\r
-\r
-            <h3><%text(_BAN_BLOGS)%></h3>\r
-\r
-            <div>\r
-                <input type="hidden" name="blogid" value="<%requestblogid%>" />\r
-                <input name="allblogs" type="radio" value="0" id="allblogs_one" />\r
-                <label for="allblogs_one"><%sprinttext(_BAN_BANBLOGNAME,<|%getblogsetting(name)%|>)%></label>\r
-                <br />\r
-                <input name="allblogs" type="radio" value="1" checked="checked" id="allblogs_all" /><label for="allblogs_all"><%text(_BAN_ALLBLOGS)%></label>\r
-            </div>\r
-\r
-            <h3><%text(_BAN_DELETE_TITLE)%></h3>\r
-\r
-            <div>\r
-                <%ticket%>\r
-                <input type="hidden" name="action" value="banlistdeleteconfirm" />\r
-                <input type="submit" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
-            </div>\r
-\r
-            </form>\r
-<%pagefoot%>]]></part>\r
-    <part name="banlistdeleteconfirm"><![CDATA[<%pagehead%>        <a href="<%adminurl%>index.php?action=banlist&amp;blogid=<%requestblogid%>">(<%text(_BACK)%>)</a>\r
-        <h2><%text(_BAN_REMOVED_TITLE)%></h2>\r
-        <p><%text(_BAN_REMOVED_TEXT)%></p>\r
-        <ul>\r
-        <%banlistdeletedlist%>\r
-        </ul>\r
-<%pagefoot%>]]></part>\r
-    <part name="banlistnew"><![CDATA[<%pagehead%>        <h2><%text(_BAN_ADD_TITLE)%></h2>\r
-        <form method="post" action="<%adminurl%>index.php">\r
-            <h3><%text(_BAN_IPRANGE)%></h3>\r
-            <p><%text(_BAN_IPRANGE_TEXT)%></p>\r
-            <div class="note">\r
-                <strong><%text(_BAN_EXAMPLE_TITLE)%></strong>\r
-                <%text(_BAN_EXAMPLE_TEXT)%>\r
-            </div>\r
-            <div>\r
-            <%iprangeinput%>\r
-            </div>\r
-            <h3><%text(_BAN_BLOGS)%></h3>\r
-            <p><%text(_BAN_BLOGS_TEXT)%></p>\r
-            <div>\r
-                <input type="hidden" name="blogid" value="<%requestblogid%>" />\r
-                <input name="allblogs" type="radio" value="0" id="allblogs_one" /><label for="allblogs_one">'<%blogsetting(name)%>'</label><br />\r
-                <input name="allblogs" type="radio" value="1" checked="checked" id="allblogs_all" /><label for="allblogs_all"><%text(_BAN_ALLBLOGS)%></label>\r
-            </div>\r
-            <h3><%text(_BAN_REASON_TITLE)%></h3>\r
-            <p><%text(_BAN_REASON_TEXT)%></p>\r
-            <div><textarea name="reason" cols="40" rows="5"></textarea></div>\r
-            <h3><%text(_BAN_ADD_TITLE)%></h3>\r
-            <div>\r
-                <input name="action" type="hidden" value="banlistadd" />\r
-                <%ticket%>\r
-                <input type="submit" value="<%text(_BAN_ADD_BTN)%>" />\r
-            </div>\r
-        </form>\r
-<%pagefoot%>]]></part>\r
-    <part name="batchcategory"><![CDATA[<%pagehead%><a href="<%adminurl%>index.php?action=overview"><%text(_BACKHOME)%></a>\r
-        <h2><%text(_BATCH_CATEGORIES)%></h2>\r
-        <p><%text(_BATCH_EXECUTING)%><b><%adminbatchaction%></b></p>\r
-        <ul>\r
-        <%adminbatchlist%>\r
-\r
-\r
-        </ul>\r
-        <b><%text(_BATCH_DONE)%></b><%pagefoot%>]]></part>\r
-    <part name="batchcomment"><![CDATA[<%pagehead%><a href="<%adminurl%>index.php?action=overview"><%text(_BACKHOME)%></a>\r
-        <h2><%text(_BATCH_COMMENTS)%></h2>\r
-        <p><%text(_BATCH_EXECUTING)%><b><%adminbatchaction%></b></p>\r
-        <ul>\r
-        <%adminbatchlist%>\r
-        </ul>\r
-        <b><%text(_BATCH_DONE)%></b><%pagefoot%>]]></part>\r
-    <part name="batchdelete"><![CDATA[<%pagehead%><h2><%text(_BATCH_DELETE_CONFIRM)%></h2>\r
-        <form method="post" action="<%adminurl%>index.php">\r
-            <div>\r
-                <input type="hidden" name="action" value="<%batchdeletetype%>" />\r
-                <input type="hidden" name="batchaction" value="delete" />\r
-                <input type="hidden" name="confirmation" value="yes" />\r
-                <%ticket%>\r
-                <%batchdeletelist%>\r
-                <input type="submit" value="<%text(_BATCH_DELETE_CONFIRM_BTN)%>" onclick="return checkSubmit();" />\r
-            </div>\r
-        </form><%pagefoot%>]]></part>\r
-    <part name="batchitem"><![CDATA[<%pagehead%><a href="<%adminurl%>index.php?action=overview"><%text(_BACKHOME)%></a>\r
-        <h2><%text(_BATCH_ITEMS)%></h2>\r
-        <p><%text(_BATCH_EXECUTING)%><b><%adminbatchaction%></b></p>\r
-        <ul>\r
-        <%adminbatchlist%>\r
-        </ul>\r
-        <b><%text(_BATCH_DONE)%></b><%pagefoot%>]]></part>\r
-    <part name="batchmember"><![CDATA[<%pagehead%><a href="<%adminurl%>index.php?action=usermanagement"><%text(_MEMBERS_BACKTOOVERVIEW)%></a>\r
-        <h2><%text(_BATCH_MEMBERS)%></h2>\r
-        <p><%text(_BATCH_EXECUTING)%><b><%adminbatchaction%></b></p>\r
-        <ul>\r
-        <%adminbatchlist%>\r
-        </ul>\r
-        <b><%text(_BATCH_DONE)%></b><%pagefoot%>]]></part>\r
-    <part name="batchmove"><![CDATA[<%pagehead%><h2><%text(_MOVE_TITLE)%></h2>\r
-        <form method="post" action="<%adminurl%>index.php">\r
-            <div>\r
-                <input type="hidden" name="action" value="<%batchmovetype%>" />\r
-                <input type="hidden" name="batchaction" value="move" />\r
-                <%ticket%>\r
-                <%batchmovelist%>\r
-                <%movedistselect%>\r
-                <input type="submit" value="<%batchmovebtn%>" onclick="return checkSubmit();" />\r
-            </div>\r
-        </form><%pagefoot%>]]></part>\r
-    <part name="batchmovecat"><![CDATA[<%pagehead%><h2><%text(_MOVECAT_TITLE)%></h2>\r
-        <form method="post" action="<%adminurl%>index.php">\r
-            <div>\r
-                <input type="hidden" name="action" value="<%batchmovetype%>" />\r
-                <input type="hidden" name="batchaction" value="move" />\r
-                <%ticket%>\r
-                <%batchmovelist%>\r
-                <%movedistselect%>\r
-                <input type="submit" value="<%batchmovebtn%>" onclick="return checkSubmit();" />\r
-            </div>\r
-        </form><%pagefoot%>]]></part>\r
-    <part name="batchteam"><![CDATA[<%pagehead%><a href="<%adminurl%>index.php?action=manageteam&amp;blogid=<%requestblogid%>"><%text(_BACK)%></a>\r
-        <h2><%text(_BATCH_TEAM)%></h2>\r
-        <p><%text(_BATCH_EXECUTING)%><b><%adminbatchaction%></b></p>\r
-        <ul>\r
-        <%adminbatchlist%>\r
-        </ul>\r
-        <b><%text(_BATCH_DONE)%></b><%pagefoot%>]]></part>\r
-    <part name="blogcommentlist"><![CDATA[<%pagehead%><p>(<a href="<%adminurl%>index.php?action=overview"><%text(_BACKHOME)%></a>)</p>\r
-        <h2><%text(_COMMENTS_BLOG)%> <%adminbloglink(admin/default)%></h2>\r
-        <%commentnavlist(admin/default)%><%pagefoot%>]]></part>\r
-    <part name="blogsettings"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=overview">(<%text(_BACKHOME)%>)</a></p>\r
-        <h2><%text(_EBLOG_TITLE)%>: '<%adminbloglink(admin/default)%>'</h2>\r
-\r
-        <h3><%text(_EBLOG_TEAM_TITLE)%></h3>\r
-\r
-        <p>\r
-            <%text(_EBLOG_CURRENT_TEAM_MEMBER)%>\r
-            <%blogteammembers%>\r
-        </p>\r
-        <p><a href="<%adminurl%>index.php?action=manageteam&amp;blogid=<%requestblogid%>"><%text(_EBLOG_TEAM_TEXT)%></a></p>\r
-        <h3><%text(_EBLOG_SETTINGS_TITLE)%></h3>\r
-        <form method="post" action="<%adminurl%>index.php">\r
-            <div>\r
-                <input type="hidden" name="action" value="blogsettingsupdate" />\r
-                <%ticket%>\r
-                <input type="hidden" name="blogid" value="<%requestblogid%>" />\r
-                <table>\r
-                    <tr>\r
-                        <td><%text(_EBLOG_NAME)%></td>\r
-                        <td><input name="name" tabindex="10" size="40" maxlength="60" value="<%blogsetting(name)%>" /></td>\r
-                    </tr><tr>\r
-                        <td>\r
-                            <%text(_EBLOG_SHORTNAME)%> <%helplink(shortblogname)%>\r
-                            <%text(_EBLOG_SHORTNAME_EXTRA)%>\r
-                        </td>\r
-                        <td><input name="shortname" tabindex="20" maxlength="15" size="15" value="<%blogsetting(short)%>" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_DESC)%></td>\r
-                        <td><input name="desc" tabindex="30" maxlength="200" size="40" value="<%blogsetting(desc)%>" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_URL)%></td>\r
-                        <td><input name="url" tabindex="40" size="40" maxlength="100" value="<%blogsetting(url)%>" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_DEFSKIN)%><%helplink(blogdefaultskin)%></td>\r
-                        <td><%defskinselect(blog)%></td>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_LINEBREAKS)%> <%helplink(convertbreaks)%></td>\r
-                        <td><%blogsettingyesno(convertbreaks)%></td>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_ALLOWPASTPOSTING)%> <%helplink(allowpastposting)%></td>\r
-                        <td><%blogsettingyesno(allowpastposting)%></td>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_DISABLECOMMENTS)%></td>\r
-                        <td><%blogsettingyesno(comments)%></td>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_ANONYMOUS)%></td>\r
-                        <td><%blogsettingyesno(public)%></td>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_REQUIREDEMAIL)%></td>\r
-                        <td><%blogsettingyesno(reqemail)%></td>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_NOTIFY)%> <%helplink(blognotify)%></td>\r
-                        <td><input name="notify" tabindex="80" maxlength="60" size="40" value="<%blogsetting(notifyaddress)%>" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_NOTIFY_ON)%></td>\r
-                        <td>\r
-                            <input name="notifyComment" value="3" type="checkbox" tabindex="81" id="notifyComment"<%blognotifysetting(comment)%> />\r
-                            <label for="notifyComment"><%text(_EBLOG_NOTIFY_COMMENT)%></label><br />\r
-                            <input name="notifyVote" value="5" type="checkbox" tabindex="82" id="notifyVote"<%blognotifysetting(vote)%> />\r
-                            <label for="notifyVote"><%text(_EBLOG_NOTIFY_KARMA)%></label><br />\r
-                            <input name="notifyNewItem" value="7" type="checkbox" tabindex="83" id="notifyNewItem"<%blognotifysetting(newitem)%> />\r
-                            <label for="notifyNewItem"><%text(_EBLOG_NOTIFY_ITEM)%></label>\r
-                        </td>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_MAXCOMMENTS)%> <%helplink(blogmaxcomments)%></td>\r
-                        <td><input name="maxcomments" tabindex="90" size="3" value="<%blogsetting(maxcomments)%>" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_UPDATE)%> <%helplink(blogupdatefile)%></td>\r
-                        <td><input name="update" tabindex="100" size="40" maxlength="60" value="<%blogsetting(updatefile)%>" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_DEFCAT)%></td>\r
-                        <td><%defcatselect%></td>\r
-                    </tr><tr>\r
-                        <td>\r
-                            <%text(_EBLOG_OFFSET)%> <%helplink(blogtimeoffset)%><br />\r
-                            <%text(_EBLOG_STIME)%> <b><%blogtime(servertime,"%H:%M")%></b><br />\r
-                            <%text(_EBLOG_BTIME)%> <b><%blogtime(blogtime,"%H:%M")%></b>\r
-                        </td>\r
-                        <td><input name="timeoffset" tabindex="120" size="3" value="<%blogsetting(timeoffset)%>" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_SEARCH)%> <%helplink(blogsearchable)%></td>\r
-                        <td><%blogsettingyesno(searchable)%></td>\r
-                    </tr>\r
-                    <%pluginoptions(blog)%>\r
-                    <tr>\r
-                        <th colspan="2"><%text(_EBLOG_CHANGE)%></th>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_CHANGE)%></td>\r
-                        <td><input type="submit" tabindex="130" value="<%text(_EBLOG_CHANGE_BTN)%>" onclick="return checkSubmit();" /></td>\r
-                    </tr>\r
-                </table>\r
-            </div>\r
-        </form>\r
-        <h3><%text(_EBLOG_CAT_TITLE)%></h3>\r
-        <%blogcatlist%>\r
-        <form action="<%adminurl%>index.php" method="post">\r
-            <div>\r
-                <input name="action" value="categorynew" type="hidden" />\r
-                <%ticket%>\r
-                <input name="blogid" value="<%blogsetting(id)%>" type="hidden" />\r
-                <table>\r
-                    <tr>\r
-                        <th colspan="2"><%text(_EBLOG_CAT_CREATE)%></th>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_CAT_NAME)%></td>\r
-                        <td><input name="cname" size="40" maxlength="40" tabindex="300" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_CAT_DESC)%></td>\r
-                        <td><input name="cdesc" size="40" maxlength="200" tabindex="310" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_CAT_CREATE)%></td>\r
-                        <td><input type="submit" value="<%text(_EBLOG_CAT_CREATE)%>" tabindex="320" /></td>\r
-                    </tr>\r
-                </table>\r
-            </div>\r
-        </form>\r
-        <h3><%text(_PLUGINS_EXTRA)%></h3>\r
-        <%pluginextras(blog)%><%pagefoot%>]]></part>\r
-    <part name="bookmarklet"><![CDATA[<%pagehead%>        <p><a href="<%adminurl%>index.php?action=overview">(<%text(_BACKHOME)%>)</a></p>\r
-        <h2><%text(_BOOKMARKLET_TITLE)%></h2>\r
-        <p><%text(_BOOKMARKLET_DESC1)%><%text(_BOOKMARKLET_DESC2)%><%text(_BOOKMARKLET_DESC3)%><%text(_BOOKMARKLET_DESC4)%><%text(_BOOKMARKLET_DESC5)%></p>\r
-        <h3><%text(_BOOKMARKLET_BOOKARKLET)%></h3>\r
-        <p>\r
-            <%text(_BOOKMARKLET_BMARKTEXT)%><small><%text(_BOOKMARKLET_BMARKTEST)%></small>\r
-            <br />\r
-            <br />\r
-            <a href="<%bookmarkletadmin(url)%>"><%sprinttext(_BOOKMARKLET_ANCHOR,<|%getblogsetting(name)%|>)%></a><%text(_BOOKMARKLET_BMARKFOLLOW)%>\r
-        </p>\r
-<%pagefoot%>]]></part>\r
-    <part name="browseowncomments"><![CDATA[<%pagehead%><p>(<a href="<%adminurl%>index.php?action=overview"><%text(_BACKHOME)%></a>)</p>\r
-        <h2><%text(_COMMENTS_YOUR)%></h2>\r
-        <%commentnavlist(admin/default)%><%pagefoot%>]]></part>\r
-    <part name="browseownitems"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=overview"><%text(_BACKHOME)%></a></p>\r
-        <h2><%text(_ITEMLIST_YOUR)%></h2>\r
-        <%itemnavlist(admin/default)%><%pagefoot%>]]></part>\r
-    <part name="categorydelete"><![CDATA[<%pagehead%><h2><%text(_DELETE_CONFIRM)%></h2>\r
-            <div>\r
-                <%text(_CONFIRMTXT_CATEGORY)%><b><%categorysetting(name)%></b>\r
-            </div>\r
-            <form method="post" action="<%adminurl%>index.php">\r
-                <div>\r
-                    <input type="hidden" name="action" value="categorydeleteconfirm" />\r
-                    <%ticket%>\r
-                    <input type="hidden" name="blogid" value="<%requestblogid%>" />\r
-                    <input type="hidden" name="catid" value="<%categorysetting(id)%>" />\r
-                    <input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
-                </div>\r
-            </form><%pagefoot%>]]></part>\r
-    <part name="categoryedit"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=blogsettings&amp;blogid=<%requestblogid%>">(<%text(_BACK_TO_BLOGSETTINGS)%>)</a></p>\r
-        <h2><%text(_EBLOG_CAT_UPDATE)%> '<%categorysetting(name)%>'</h2>\r
-        <form method='post' action='<%adminurl%>index.php'>\r
-            <div>\r
-                <input name="blogid" type="hidden" value="<%requestblogid%>" />\r
-                <input name="catid" type="hidden" value="<%categorysetting(id)%>" />\r
-                <input name="desturl" type="hidden" value="<%editdesturl%>" />\r
-                <input name="action" type="hidden" value="categoryupdate" />\r
-                <%ticket%>\r
-                <table>\r
-                    <tr>\r
-                        <th colspan="2"><%text(_EBLOG_CAT_UPDATE)%></th>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_CAT_NAME)%></td>\r
-                        <td><input type="text" name="cname" value="<%categorysetting(name)%>" size="40" maxlength="40" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_CAT_DESC)%></td>\r
-                        <td><input type="text" name="cdesc" value="<%categorysetting(desc)%>" size="40" maxlength="200" /></td>\r
-                    </tr>\r
-                    <%pluginoptions(category)%>\r
-                    <tr>\r
-                        <th colspan="2"><%text(_EBLOG_CAT_UPDATE)%></th>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_CAT_UPDATE)%></td>\r
-                        <td><input type="submit" value="<%text(_EBLOG_CAT_UPDATE_BTN)%>" /></td>\r
-                    </tr>\r
-                </table>\r
-            </div>\r
-        </form><%pagefoot%>]]></part>\r
-    <part name="commentdelete"><![CDATA[<%pagehead%><h2><%text(_DELETE_CONFIRM)%></h2>\r
-            <p><%text(_CONFIRMTXT_COMMENT)%></p>\r
-            <div class="note">\r
-            <b><%text(_EDITC_WHO)%>:</b> <%deletecomment(author)%>\r
-            <br />\r
-            <b><%text(_EDITC_TEXT)%>:</b> <%deletecomment(body)%>\r
-            </div>\r
-            <form method="post" action="<%adminurl%>index.php"><div>\r
-                <input type="hidden" name="action" value="commentdeleteconfirm" />\r
-                <%ticket%>\r
-                <input type="hidden" name="commentid" value="<%deletecomment(id)%>" />\r
-                <input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
-            </div></form><%pagefoot%>]]></part>\r
-    <part name="commentedit"><![CDATA[<%pagehead%><h2><%text(_EDITC_TITLE)%></h2>\r
-            <form method="post" action="<%adminurl%>index.php">\r
-                <div>\r
-                    <input type="hidden" name="action" value="commentupdate" />\r
-                    <%ticket%>\r
-                    <input type="hidden" name="commentid" value="<%editcomment(id)%>" />\r
-                    <table>\r
-                        <tr>\r
-                            <th colspan="2"><%text(_EDITC_TITLE)%></th>\r
-                        </tr>\r
-                        <tr>\r
-                            <td><%text(_EDITC_WHO)%></td>\r
-                            <td><%editcomment(user)%></td>\r
-                        </tr>\r
-                        <tr>\r
-                            <td><%text(_EDITC_WHEN)%></td>\r
-                            <td><%editcomment(date)%></td>\r
-                        </tr>\r
-                        <tr>\r
-                            <td><%text(_EDITC_HOST)%></td>\r
-                            <td><%editcomment(host)%></td>\r
-                        </tr>\r
-                        <tr>\r
-                            <td><%text(_EDITC_URL)%></td>\r
-                            <td><input type="text" name="url" size="30" tabindex="6" value="<%editcomment(url)%>" /></td>\r
-                        </tr>\r
-                        <tr>\r
-                            <td><%text(_EDITC_EMAIL)%></td>\r
-                            <td><input type="text" name="email" size="30" tabindex="8" value="<%editcomment(email)%>" /></td>\r
-                        </tr>\r
-                        <tr>\r
-                            <td><%text(_EDITC_TEXT)%></td>\r
-                            <td><textarea name="body" tabindex="10" rows="10" cols="50"><%editcomment(body)%></textarea></td>\r
-                        </tr>\r
-                        <tr>\r
-                            <td><%text(_EDITC_EDIT)%></td>\r
-                            <td><input type="submit"  tabindex="20" value="<%text(_EDITC_EDIT)%>" onclick="return checkSubmit();" /></td>\r
-                        </tr>\r
-                    </table>\r
-                </div>\r
-            </form><%pagefoot%>]]></part>\r
-    <part name="createitem"><![CDATA[<%pagehead%><h2><%text(_ADD_ADDTO)%> '<%adminbloglink(admin/default)%>'</h2>\r
-\r
-<%init%>\r
-<script type="text/javascript" src="<%skinfile(/javascripts/numbercheck.js)%>"></script>\r
-<%if(autosave)%><script type="text/javascript" src="<%skinfile(/javascripts/xmlhttprequest.js)%>"></script><%endif%>\r
+<meta>\r
+<skin name="admin/default"/>\r
+<template name="admin/default"/>\r
+<info><![CDATA[\r
+20120525]]></info>\r
+</meta>\r
+<skin name="admin/default" type="text/html" includeMode="skindir" includePrefix="admin/default">\r
+<description><![CDATA[\r
+ADMIN Area Default skin]]></description>\r
+<part name="actionlog"><![CDATA[\r
+       <%pagehead%>\r
+       \r
+       <p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
+       \r
+       <h2><%text(_ACTIONLOG_CLEAR_TITLE)%></h2>\r
+       <p><a href="<%adminurl%><%addtickettourl(index.php?action=clearactionlog)%>"><%text(_ACTIONLOG_CLEAR_TEXT)%></a></p>\r
+       \r
+       <h2><%text(_ACTIONLOG_TITLE)%></h2>\r
+       <%actionloglist(admin/default)%>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="activate"><![CDATA[\r
+       <%pagehead%>\r
+       <h2><%activationmessage(title)%></h2>\r
+       <p><%activationmessage(text)%></p>\r
+       <p class="error"><%headmessage%></p>\r
+       <%if(bechangepass)%>\r
+               <form action="<%adminurl%>index.php" method="post">\r
+               <p>\r
+               <input type="hidden" name="action" value="activatesetpwd" />\r
+               <%ticket%>\r
+               <input type="hidden" name="key" value="<%activationmessage(ackey)%>" />\r
+               </p>\r
+               <table frame="box" rules="all" summary="<%text(_MEMBERS_SETPWD_BTN)%>">\r
+               <tr>\r
+               <td><%text(_MEMBERS_PWD)%></td>\r
+               <td><input type="password" maxlength="40" size="16" name="password" /></td>\r
+               </tr>\r
+               <tr>\r
+               <td><%text(_MEMBERS_REPPWD)%></td>\r
+               <td><input type="password" maxlength="40" size="16" name="repeatpassword" /></td>\r
+               <%eventformextra(activation)%>\r
+               </tr>\r
+               <tr>\r
+               <td><%text(_MEMBERS_SETPWD)%></td>\r
+               <td><input type="submit" value="<%text(_MEMBERS_SETPWD_BTN)%>" /></td>\r
+               </tr>\r
+               </table>\r
+               </form>\r
+               <%endif%>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="activatesetpwd"><![CDATA[\r
+       <%pagehead%>\r
+       <h2><%text(_ACTIVATE_SUCCESS_TITLE)%></h2>\r
+       <p><%text(_ACTIVATE_SUCCESS_TEXT)%></p>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="addnewlog"><![CDATA[\r
+       <%pagehead%>\r
+       <h2><%text(_BLOGCREATED_TITLE)%></h2>\r
+       <p><%sprinttext(_BLOGCREATED_ADDEDTXT,<|%createdblogsetting(name)%|>)%></p>\r
+       <ol>\r
+       <li><a href="#index_php"><%sprinttext(_BLOGCREATED_SIMPLEWAY,<|%getblogsetting(short)%|>)%></a></li>\r
+       <li><a href="#skins"><%text(_BLOGCREATED_ADVANCEDWAY)%></a></li>\r
+       </ol>\r
+       <h3><a id="index_php"><%sprinttext(_BLOGCREATED_SIMPLEDESC1,<|%getblogsetting(short)%|>)%></a></h3>\r
+       <p><%sprinttext(_BLOGCREATED_SIMPLEDESC2,<|%getblogsetting(short)%|>)%></p>\r
+       <pre><code>&lt;?php\r
+       \r
+       $CONF['Self'] = '<b><%blogsetting(short)%>.php</b>';\r
+       \r
+       include('<i>./config.php</i>');\r
+       \r
+       selectBlog('<b><%blogsetting(short)%></b>');\r
+       selector();\r
+       \r
+       ?&gt;</code></pre>\r
+       <p><%text(_BLOGCREATED_SIMPLEDESC3)%></p>\r
+       <p><%text(_BLOGCREATED_SIMPLEDESC4)%></p>\r
+       <form action="<%adminurl%>index.php" method="post">\r
+       <p>\r
+       <input type="hidden" name="action" value="addnewlog2" />\r
+       <%ticket%>\r
+       <input type="hidden" name="blogid" value="<%requestblogid%>" />\r
+       </p>\r
+       <table>\r
+       <tr>\r
+       <td><%text(_EBLOG_URL)%></td>\r
+       <td><input name="url" maxlength="100" size="40" value="<%sitevar(url)%><%blogsetting(short)%>.php" /></td>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_EBLOG_CREATE)%></td>\r
+       <td><input type="submit" value="<%text(_EBLOG_CREATE_BTN)%>" onclick="return checkSubmit();" /></td>\r
+       </tr>\r
+       </table>\r
+       </form>\r
+       \r
+       <h3><a id="skins"><%text(_BLOGCREATED_ADVANCEDWAY2)%></a></h3>\r
+       <p><%text(_BLOGCREATED_ADVANCEDWAY3)%></p>\r
+       \r
+       <form action="<%adminurl%>index.php" method="post">\r
+       <p>\r
+       <input type="hidden" name="action" value="addnewlog2" />\r
+       <%ticket%>\r
+       <input type="hidden" name="blogid" value="<%requestblogid%>" />\r
+       </p>\r
+       <table frame="box" rules="all" summary="<%text(_BLOGCREATED_ADVANCEDWAY2)%>">\r
+       <tr>\r
+       <td><%text(_EBLOG_URL)%></td>\r
+       <td><input name="url" maxlength="100" size="40" /></td>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_EBLOG_CREATE)%></td>\r
+       <td><input type="submit" value="<%text(_EBLOG_CREATE_BTN)%>" onclick="return checkSubmit();" /></td>\r
+       </tr>\r
+       </table>\r
+       </div>\r
+       </form><%pagefoot%>\r
+]]></part>\r
+<part name="adminerrorpage"><![CDATA[\r
+       <%pagehead%>\r
+       <h2>Error!</h2>\r
+       <%headmessage%><br />\r
+       <a href="<%adminurl%>index.php" onclick="history.back()"><%text(_BACK)%></a>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="adminskindelete"><![CDATA[\r
+       <%pagehead%>\r
+       <h2><%text(_DELETE_CONFIRM)%></h2>\r
+       \r
+       <form method="post" action="<%adminurl%>index.php">\r
+       <p><%text(_CONFIRMTXT_SKIN)%><b><%editskintype(name)%></b> (<%editskintype(desc)%>)</p>\r
+       <input type="hidden" name="action" value="adminskindeleteconfirm" />\r
+       <%ticket%>\r
+       <input type="hidden" name="skinid" value="<%editskintype(id)%>" />\r
+       <input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
+       </p>\r
+       </form>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="adminskinedit"><![CDATA[\r
+       <%pagehead%>\r
+       <p><a href="<%adminurl%>index.php?action=adminskinoverview">(<%text(_SKIN_BACK)%>)</a></p>\r
+       \r
+       <h2><%text(_SKIN_EDITONE_TITLE)%> '<%editskin(name)%>'</h2>\r
+       \r
+       <h3><%text(_SKIN_PARTS_TITLE)%></h3>\r
+       <%text(_SKIN_PARTS_MSG)%>\r
+       <%normalskinlist(admin/default)%>\r
+       \r
+       <h3><%text(_SKIN_PARTS_SPECIAL)%></h3>\r
+       <form method="get" action="<%adminurl%>index.php">\r
+       <p>\r
+       <input type="hidden" name="action" value="adminskinedittype" />\r
+       <input type="hidden" name="skinid" value="<%editskin(id)%>" />\r
+       <input name="type" tabindex="89" size="30" maxlength="64" />\r
+       <input type="submit" tabindex="140" value="<%text(_SKIN_CREATE)%>" onclick="return checkSubmit();" />\r
+       </p>\r
+       </form>\r
+       <%specialskinlist(admin/default)%>\r
+       \r
+       <h3><%text(_SKIN_GENSETTINGS_TITLE)%></h3>\r
+       <form method="post" action="<%adminurl%>index.php">\r
+       <p>\r
+       <input type="hidden" name="action" value="adminskineditgeneral" />\r
+       <%ticket%>\r
+       <input type="hidden" name="skinid" value="<%editskin(id)%>" />\r
+       <table frame="box" rules="all" summary="<%text(_SKIN_GENSETTINGS_TITLE)%>">\r
+       <tr>\r
+       <td><%text(_SKIN_NAME)%> <%helplink(shortnames)%></td>\r
+       <td><input name="name" value="<%editskin(name)%>" maxlength="64" size="30" tabindex="90" /></td>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_SKIN_DESC)%></td>\r
+       <td><input name="desc" value="<%editskin(desc)%>" maxlength="200" size="50" tabindex="100" /></td>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_SKIN_TYPE)%></td>\r
+       <td><input name="type" value="<%editskin(type)%>" maxlength="40" size="20" tabindex="110" /></td>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_SKIN_INCLUDE_MODE)%> <%helplink(includemode)%></td>\r
+       <td><%editskin(mode)%></td>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_SKIN_INCLUDE_PREFIX)%> <%helplink(includeprefix)%></td>\r
+       <td><input name="inc_prefix" value="<%editskin(prefix)%>" maxlength="40" size="20" tabindex="130" /></td>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_SKIN_CHANGE)%></td>\r
+       <td><input type="submit" value="<%text(_SKIN_CHANGE_BTN)%>" onclick="return checkSubmit();" tabindex="140" /></td>\r
+       </tr>\r
+       </table>\r
+       </p>\r
+       </form>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="adminskinedittype"><![CDATA[\r
+       <%pagehead%>\r
+       <p>(<a href="<%adminurl%>index.php?action=adminskinoverview"><%text(_SKIN_GOBACK)%></a>)</p>\r
+       \r
+       <h2><%text(_SKIN_EDITPART_TITLE)%> '<%editskintype(name)%>': <%editskintype(skintype)%></h2>\r
+       <%headmessage%>\r
+       \r
+       <form method="post" action="<%adminurl%>index.php">\r
+       <p>\r
+       <input type="hidden" name="action" value="adminskinupdate" />\r
+       <%ticket%>\r
+       <input type="hidden" name="skinid" value="<%editskintype(id)%>" />\r
+       <input type="hidden" name="type" value="<%editskintype(skintyperaw)%>" />\r
+       <input type="submit" value="<%text(_SKIN_UPDATE_BTN)%>" onclick="return checkSubmit();" />\r
+       <input type="reset" value="<%text(_SKIN_RESET_BTN)%>" />\r
+       (skin type: <%editskintype(skintype)%>)<%skintypehelp%><br />\r
+       <textarea class="skinedit" tabindex="10" rows="20" cols="80" name="content"><%editskintype(content)%></textarea><br />\r
+       <input type="submit" tabindex="20" value="<%text(_SKIN_UPDATE_BTN)%>" onclick="return checkSubmit();" />\r
+       <input type="reset" value="<%text(_SKIN_RESET_BTN)%>" />\r
+       (skin type: <%editskintype(skintype)%>)\r
+       <br />\r
+       <br />\r
+       <%text(_SKIN_ALLOWEDVARS)%>\r
+       <%allowedskinactions%><br /><br />\r
+       <%text(_SKINEDIT_ALLOWEDTEMPLATESS)%>\r
+       <%skineditallowedlist(template)%><br />\r
+       </p>\r
+       </form>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="adminskiniedoimport"><![CDATA[\r
+       <%pagehead%>\r
+       <p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
+       \r
+       <h2><%text(_SKINIE_DONE)%></h2>\r
+       \r
+       <ul>\r
+       <li><p><strong><%text(_SKINIE_INFO_GENERAL)%></strong> <%importskininfo(info)%></p></li>\r
+       <li><p><strong><%text(_SKINIE_INFO_IMPORTEDSKINS)%></strong> <%importskininfo(snames)%></p></li>\r
+       <li><p><strong><%text(_SKINIE_INFO_IMPORTEDTEMPLS)%></strong> <%importskininfo(tnames)%></p></li>\r
+       </ul>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="adminskinieimport"><![CDATA[\r
+       <%pagehead%>\r
+       <p><a href="<%adminurl%>index.php?action=adminskinieoverview">(<%text(_BACK)%>)</a></p>\r
+       <h2><%text(_SKINIE_CONFIRM_TITLE)%></h2>\r
+       \r
+       <ul>\r
+       <li><strong><%text(_SKINIE_INFO_GENERAL)%></strong> <%importskininfo(info)%></li>\r
+       <li><strong><%text(_SKINIE_INFO_SKINS)%></strong> <%importskininfo(snames)%></li>\r
+       <li><strong><%text(_SKINIE_INFO_TEMPLATES)%></strong> <%importskininfo(tnames)%></li>\r
+       <%if(nameclashes)%>\r
+               <li><strong style="color: red;"><%text(_SKINIE_INFO_SKINCLASH)%></strong> <%importskininfo(sclashes)%></li>\r
+               <li><strong style="color: red;"><%text(_SKINIE_INFO_TEMPLCLASH)%></strong> <%importskininfo(tclashes)%></li>\r
+       <%endif%>\r
+       </ul>\r
+       \r
+       <form method="post" action="<%adminurl%>index.php">\r
+       <p>\r
+       <input type="hidden" name="action" value="adminskiniedoimport" />\r
+       <%ticket%>\r
+       <input type="hidden" name="skinfile" value="<%importskininfo(skinfile)%>" />\r
+       <input type="hidden" name="mode" value="<%importskininfo(mode)%>" />\r
+       <input type="submit" value="<%text(_SKINIE_CONFIRM_IMPORT)%>" />\r
+       <%if(nameclashes)%>\r
+               <br />\r
+               <input type="checkbox" name="overwrite" value="1" id="cb_overwrite" />\r
+               <label for="cb_overwrite"><%text(_SKINIE_CONFIRM_OVERWRITE)%></label>\r
+       <%endif%>\r
+       </p>\r
+       </form>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="adminskinieoverview"><![CDATA[\r
+       <%pagehead%>\r
+       <p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
+       \r
+       <h2><%text(_SKINIE_TITLE_IMPORT)%></h2>\r
+       \r
+       <p>\r
+       <label for="skinie_import_local"><%text(_SKINIE_LOCAL)%></label>\r
+       </p>\r
+       \r
+       <%if(superadmin)%>\r
+               <form method="post" action="<%adminurl%>index.php">\r
+               <input type="hidden" name="action" value="adminskinieimport" />\r
+               <%ticket%>\r
+               <input type="hidden" name="mode" value="file" />\r
+               <select name="skinfile" id="skinie_import_local">\r
+               <%selectlocalskinfiles%>\r
+               </select>\r
+               <input type="submit" value="<%text(_SKINIE_BTN_IMPORT)%>" />\r
+               </form>\r
+       <%else%>\r
+               <%text(_SKINIE_NOCANDIDATES)%>\r
+       <%endif%>\r
+       </p>\r
+       \r
+       <form method="post" action="<%adminurl%>index.php">\r
+       <p>\r
+       <em><%text(_OR)%></em>\r
+       <%ticket%>\r
+       <input type="hidden" name="action" value="adminskinieimport" />\r
+       <input type="hidden" name="mode" value="url" />\r
+       <label for="skinie_import_url"><%text(_SKINIE_FROMURL)%></label>\r
+       <input type="text" name="skinfile" id="skinie_import_url" size="60" value="http://" />\r
+       <input type="submit" value="<%text(_SKINIE_BTN_IMPORT)%>" />\r
+       </p>\r
+       </form>\r
+       \r
+       <h2><%text(_SKINIE_TITLE_EXPORT)%></h2>\r
+       <form method="post" action="<%adminurl%>index.php">\r
+       <p>\r
+       <input type="hidden" name="action" value="adminskinieexport" />\r
+       <%ticket%>\r
+       <%text(_SKINIE_EXPORT_INTRO)%>\r
+       </p>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_SKINIE_TITLE_EXPORT)%>">\r
+       <tr>\r
+       <th colspan="2"><%text(_SKINIE_EXPORT_SKINS)%></th>\r
+       </tr>\r
+       <tr>\r
+       <%skinielist(skin,admin/default)%>\r
+       <th colspan="2"><%text(_SKINIE_EXPORT_TEMPLATES)%></th>\r
+       </tr>\r
+       <tr>\r
+       <%skinielist(template,admin/default)%>\r
+       <th colspan="2"><%text(_SKINIE_EXPORT_EXTRA)%></th>\r
+       </tr>\r
+       <tr>\r
+       <td colspan="2"><textarea cols="40" rows="5" name="info"></textarea></td>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2"><%text(_SKINIE_TITLE_EXPORT)%></th>\r
+       </tr>\r
+       <tr>\r
+       <td colspan="2"><input type="submit" value="<%text(_SKINIE_BTN_EXPORT)%>" /></td>\r
+       </tr>\r
+       </table>\r
+       </form>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="adminskinoverview"><![CDATA[\r
+       <%pagehead%>\r
+       <p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
+       <h2><%text(_SKIN_EDIT_TITLE)%></h2>\r
+       \r
+       <h3><%text(_SKIN_AVAILABLE_TITLE)%></h3>\r
+       <%skinoverview(admin/default)%>\r
+       \r
+       <h3><%text(_SKIN_NEW_TITLE)%></h3>\r
+       <form method="post" action="<%adminurl%>">\r
+       <p>\r
+       <input type="hidden" name="action" value="adminskinnew" />\r
+       <%ticket%>\r
+       <table frame="box" rules="all" summary="<%text(_SKIN_NEW_TITLE)%>">\r
+       <tr>\r
+       <td><%text(_SKIN_NAME)%> <%helplink(shortnames)%></td>\r
+       <td><input name="name" tabindex="10010" maxlength="20" size="20" /></td>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_SKIN_DESC)%></td>\r
+       <td><input name="desc" tabindex="10020" maxlength="200" size="50" /></td>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_SKIN_CREATE)%></td>\r
+       <td><input type="submit" tabindex="10030" value="<%text(_SKIN_CREATE_BTN)%>" onclick="return checkSubmit();" /></td>\r
+       </tr>\r
+       </table>\r
+       </p>\r
+       </form>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="adminskinremovetype"><![CDATA[\r
+       <%pagehead%>\r
+       <h2><%text(_DELETE_CONFIRM)%></h2>\r
+       <p><%text(_CONFIRMTXT_SKIN_PARTS_SPECIAL)%><br />\r
+       <b><%editskintype(skintype)%> (<%editskintype(name)%>)</b> (<%editskintype(desc)%>)</p>\r
+       <form method="post" action="<%adminurl%>index.php">\r
+       <p>\r
+       <input type="hidden" name="action" value="adminskinremovetypeconfirm" />\r
+       <%ticket%>\r
+       <input type="hidden" name="skinid" value="<%editskintype(id)%>" />\r
+       <input type="hidden" name="type" value="<%editskintype(skintype)%>" />\r
+       <input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
+       </p>\r
+       </form>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="admintemplatedelete"><![CDATA[\r
+       <%pagehead%>\r
+       <h2><%text(_DELETE_CONFIRM)%></h2>\r
+       <p><%text(_CONFIRMTXT_TEMPLATE)%><b><%edittemplateinfo(name)%></b> (<%edittemplateinfo(desc)%>)</p>\r
+       <form method="post" action="<%adminurl%>index.php">\r
+       <p>\r
+       <input type="hidden" name="action" value="admintemplatedeleteconfirm" />\r
+       <%ticket%>\r
+       <input type="hidden" name="templateid" value="<%edittemplateinfo(id)%>" />\r
+       <input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
+       </p>\r
+       </form>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="admintemplateedit"><![CDATA[\r
+       <%pagehead%>\r
+       <p><a href="<%adminurl%>index.php?action=admintemplateoverview">(<%text(_TEMPLATE_BACK)%>)</a></p>\r
+       \r
+       <h2><%text(_TEMPLATE_EDIT_TITLE)%> '<%edittemplateinfo(name)%>'</h2>\r
+       <%headmessage%>\r
+       \r
+       <p><%text(_TEMPLATE_EDIT_MSG)%></p>\r
+       \r
+       <form method="post" action="<%adminurl%>index.php">\r
+       <p>\r
+       <input type="hidden" name="action" value="admintemplateupdate" />\r
+       <%ticket%>\r
+       <input type="hidden" name="templateid" value="<%edittemplateinfo(id)%>" />\r
+       </p>\r
+       <table frame="box" rules="all" summary="<%text(_TEMPLATE_EDIT_TITLE)%>">\r
+       <tr>\r
+       <th colspan="2"><%text(_TEMPLATE_SETTINGS)%></th>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_TEMPLATE_NAME)%> <%helplink(shortnames)%></td>\r
+       <td><input name="tname" tabindex="4" size="20" maxlength="20" value="<%edittemplateinfo(name)%>" /></td>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_TEMPLATE_DESC)%></td>\r
+       <td><input name="tdesc" tabindex="5" size="50" maxlength="200" value="<%edittemplateinfo(desc)%>" /></td>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2"><%text(_TEMPLATE_UPDATE)%></th>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_TEMPLATE_UPDATE)%></td>\r
+       <td>\r
+       <input type="submit" tabindex="6" value="<%text(_TEMPLATE_UPDATE_BTN)%>" onclick="return checkSubmit();" />\r
+       <input type="reset" tabindex="7" value="<%text(_TEMPLATE_RESET_BTN)%>" />\r
+       </td>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2"><%text(_QMENU_LAYOUT_SKINS)%></th>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_NORMALSKINLIST_HEAD, NORMALSKINLIST_HEAD, ,8)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_NORMALSKINLIST_BODY, NORMALSKINLIST_BODY, ,9)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_NORMALSKINLIST_FOOT, NORMALSKINLIST_FOOT, ,10)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SPECIALSKINLIST_HEAD, SPECIALSKINLIST_HEAD, , 11)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SPECIALSKINLIST_BODY, SPECIALSKINLIST_BODY, , 12)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SPECIALSKINLIST_FOOT, SPECIALSKINLIST_FOOT, , 13)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SKINIE_EXPORT_LIST, SKINIE_EXPORT_LIST, , 17)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2"><%text(_QMENU_LAYOUT_TEMPL)%></th>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_TEMPLATE_EDIT_EXPLUGNAME, TEMPLATE_EDIT_EXPLUGNAME, , 18)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_TEMPLATE_EDIT_ROW_HEAD, TEMPLATE_EDIT_ROW_HEAD, , 19)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_TEMPLATE_EDIT_ROW_TAIL, TEMPLATE_EDIT_ROW_TAIL, , 20)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2"><%text(_SKINABLEADMIN_ADMINAREAHEADLINK)%></th>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_ADMIN_BLOGLINK, ADMIN_BLOGLINK, , 21)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2"><%text(_SKINABLEADMIN_BATCH)%></th>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_ADMIN_BATCHLIST, ADMIN_BATCHLIST, , 22)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2"><%text(_QMENU_ACTIVATE)%></th>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_ACTIVATE_FORGOT_TITLE, ACTIVATE_FORGOT_TITLE, , 23)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_ACTIVATE_FORGOT_TEXT, ACTIVATE_FORGOT_TEXT, , 24)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_ACTIVATE_REGISTER_TITLE, ACTIVATE_REGISTER_TITLE, , 25)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_ACTIVATE_REGISTER_TEXT, ACTIVATE_REGISTER_TEXT, , 26)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_ACTIVATE_CHANGE_TITLE, ACTIVATE_CHANGE_TITLE, , 27)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_ACTIVATE_CHANGE_TEXT, ACTIVATE_CHANGE_TEXT, , 28)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2"><%text(_QMENU_MANAGE_SYSTEM)%></th>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SYSTEMINFO_GDSETTINGS, SYSTEMINFO_GDSETTINGS, , 29)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2"><%text(_BLOGLIST_BANS)%></th>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_BANLIST_DELETED_LIST, BANLIST_DELETED_LIST, , 30)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2"><%text(_SKINABLEADMIN_TPLSETTING_INGENERAL)%></th>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_INSERT_PLUGOPTION_TITLE, INSERT_PLUGOPTION_TITLE, , 31)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_INSERT_PLUGOPTION_BODY, INSERT_PLUGOPTION_BODY, , 32)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_INPUTYESNO_TEMPLATE_ADMIN, INPUTYESNO_TEMPLATE_ADMIN, , 33)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_INPUTYESNO_TEMPLATE_NORMAL, INPUTYESNO_TEMPLATE_NORMAL, , 34)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_ADMIN_CUSTOMHELPLINK_ICON, ADMIN_CUSTOMHELPLINK_ICON, , 35)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_ADMIN_CUSTOMHELPLINK_ANCHOR, ADMIN_CUSTOMHELPLINK_ANCHOR, , 36)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2"><%text(_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT)%></th>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_SELECT_HEAD, SHOWLIST_LISTPLUG_SELECT_HEAD, , 37)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_SELECT_BODY, SHOWLIST_LISTPLUG_SELECT_BODY, , 38)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_SELECT_FOOT, SHOWLIST_LISTPLUG_SELECT_FOOT, , 39)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2"><%text(_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE)%></th>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_HEAD, SHOWLIST_LISTPLUG_TABLE_HEAD, , 40)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BODY, SHOWLIST_LISTPLUG_TABLE_BODY, , 41)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_FOOT, SHOWLIST_LISTPLUG_TABLE_FOOT, , 42)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_MEMBLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_MEMBLIST_HEAD, , 43)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_MEMBLIST_BODY, SHOWLIST_LISTPLUG_TABLE_MEMBLIST_BODY, , 44)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_MEMBLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_MEMBLIST_FOOT, , 45)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_TEAMLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_TEAMLIST_HEAD, , 46)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_TEAMLIST_BODY, SHOWLIST_LISTPLUG_TABLE_TEAMLIST_BODY, , 47)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_TEAMLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_TEAMLIST_FOOT, , 48)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HEAD, , 49)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY, SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY, , 50)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL, SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL, , 51)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST, SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST, , 52)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE, SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE, , 53)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND, SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND, , 54)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ, SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ, , 55)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE, SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE, , 56)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN, SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN, , 57)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN, SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN, , 58)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP, SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP, , 59)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL, SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL, , 60)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_PLUGLIST_FOOT, , 61)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_POPTLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_POPTLIST_HEAD, , 62)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_POPTLIST_BODY, SHOWLIST_LISTPLUG_TABLE_POPTLIST_BODY, , 63)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO, SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO, , 64)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD, SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD, , 65)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEP, SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEP, , 66)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEO, SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEO, , 67)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEC, SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEC, , 68)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLGOPT_OTAREA, SHOWLIST_LISTPLUG_TABLE_PLGOPT_OTAREA, , 69)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLGOPT_OITEXT, SHOWLIST_LISTPLUG_TABLE_PLGOPT_OITEXT, , 70)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTN_FOOT, SHOWLIST_LISTPLUG_TABLE_PLUGOPTN_FOOT, , 71)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_POPTLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_POPTLIST_FOOT, , 72)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_ITEMLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_ITEMLIST_HEAD, , 73)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY, SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY, , 74)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_ITEMLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_ITEMLIST_FOOT, , 75)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_CMNTLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_CMNTLIST_HEAD, , 76)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY, SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY, , 77)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN, SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN, , 78)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_CMNTLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_CMNTLIST_FOOT, , 79)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLOGLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_BLOGLIST_HEAD, , 80)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY, SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY, , 81)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM, SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM, , 82)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM, SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM, , 83)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLOGLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_BLOGLIST_FOOT, , 84)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_HEAD, SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_HEAD, , 85)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_BODY, SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_BODY, , 86)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_FOOT, SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_FOOT, , 87)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_SHORTNAM_HEAD, SHOWLIST_LISTPLUG_TABLE_SHORTNAM_HEAD, , 88)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_SHORTNAM_BODY, SHOWLIST_LISTPLUG_TABLE_SHORTNAM_BODY, , 89)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_SHORTNAM_FOOT, SHOWLIST_LISTPLUG_TABLE_SHORTNAM_FOOT, , 90)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_CATELIST_HEAD, SHOWLIST_LISTPLUG_TABLE_CATELIST_HEAD, , 91)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_CATELIST_BODY, SHOWLIST_LISTPLUG_TABLE_CATELIST_BODY, , 92)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_CATELIST_FOOT, SHOWLIST_LISTPLUG_TABLE_CATELIST_FOOT, , 93)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD, , 94)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY, SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY, , 95)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_TPLTLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_TPLTLIST_FOOT, , 96)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD, , 97)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY, SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY, , 98)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_SKINLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_SKINLIST_FOOT, , 99)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_DRFTLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_DRFTLIST_HEAD, , 100)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_DRFTLIST_BODY, SHOWLIST_LISTPLUG_TABLE_DRFTLIST_BODY, , 101)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_DRFTLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_DRFTLIST_FOOT, , 102)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD, , 103)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_ACTNLIST_BODY, SHOWLIST_LISTPLUG_TABLE_ACTNLIST_BODY, , 104)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_ACTNLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_ACTNLIST_FOOT, , 105)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD, SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD, , 106)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY, SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY, , 107)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT, SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT, , 108)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2"><%text(_SKINABLEADMIN_PLUGIN_QUICKMENU)%></th>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_PLUGIN_QUICKMENU_TITLE, PLUGIN_QUICKMENU_TITLE, , 109)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_PLUGIN_QUICKMENU_HEAD, PLUGIN_QUICKMENU_HEAD, , 110)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_PLUGIN_QUICKMENU_BODY, PLUGIN_QUICKMENU_BODY, , 111)%>\r
+       <%edittemplateinfo(row, _ADM_TPLPT_PLUGIN_QUICKMENU_FOOT, PLUGIN_QUICKMENU_FOOT, , 112)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2"><%text(_TEMPLATE_PLUGIN_FIELDS)%></th>\r
+       <%edittemplateinfo(extratemplate,admin/default)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2"><%text(_TEMPLATE_UPDATE)%></th>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_TEMPLATE_UPDATE)%></td>\r
+       <td>\r
+       <input type="submit" tabindex="800" value="<%text(_TEMPLATE_UPDATE_BTN)%>" onclick="return checkSubmit();" />\r
+       <input type="reset" tabindex="810" value="<%text(_TEMPLATE_RESET_BTN)%>" />\r
+       </td>\r
+       </tr>\r
+       </table>\r
+       </form>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="admntemplateoverview"><![CDATA[\r
+       <%pagehead%>\r
+       <p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
+       <h2><%text(_TEMPLATE_TITLE)%></h2>\r
+       \r
+       <h3><%text(_TEMPLATE_AVAILABLE_TITLE)%></h3>\r
+       <%templateoverview(admin/default)%>\r
+       \r
+       <h3><%text(_TEMPLATE_NEW_TITLE)%></h3>\r
+       <form method="post" action="<%adminurl%>index.php">\r
+       <div>\r
+       <input name="action" value="admintemplatenew" type="hidden" />\r
+       <%ticket%>\r
+       <table frame="box" rules="all" summary="<%text(_TEMPLATE_NEW_TITLE)%>">\r
+       <tr>\r
+       <td><%text(_TEMPLATE_NAME)%> <%helplink(shortnames)%></td>\r
+       <td><input name="name" tabindex="10010" maxlength="20" size="20" /></td>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_TEMPLATE_DESC)%></td>\r
+       <td><input name="desc" tabindex="10020" maxlength="200" size="50" /></td>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_TEMPLATE_CREATE)%></td>\r
+       <td><input type="submit" tabindex="10030" value="<%text(_TEMPLATE_CREATE_BTN)%>" onclick="return checkSubmit();" /></td>\r
+       </tr>\r
+       </table>\r
+       </div>\r
+       </form>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="backupoverview"><![CDATA[\r
+       <%pagehead%>\r
+       <p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
+       <h2><%text(_BACKUPS_TITLE)%></h2>\r
+       <h3><%text(_BACKUP_TITLE)%></h3>\r
+       <p><%text(_BACKUP_INTRO)%></p>\r
+       <form method="post" action="<%adminurl%>index.php">\r
+       <p>\r
+       <input type="hidden" name="action" value="backupcreate" />\r
+       <%ticket%>\r
+       <input type="radio" name="gzip" value="1" checked="checked" id="gzip_yes" tabindex="10" /><label for="gzip_yes"><%text(_BACKUP_ZIP_YES)%></label><br />\r
+       <input type="radio" name="gzip" value="0" id="gzip_no" tabindex="10" /><label for="gzip_no" ><%text(_BACKUP_ZIP_NO)%></label><br /><br />\r
+       <input type="submit" value="<%text(_BACKUP_BTN)%>" tabindex="20" />\r
+       </p>\r
+       </form>\r
+       <div class="note"><%text(_BACKUP_NOTE)%></div>\r
+       <h3><%text(_RESTORE_TITLE)%></h3>\r
+       <div class="note"><%text(_RESTORE_NOTE)%></div>\r
+       <p><%text(_RESTORE_INTRO)%></p>\r
+       <form method="post" action="<%adminurl%>index.php" enctype="multipart/form-data">\r
+       <p>\r
+       <input type="hidden" name="action" value="backuprestore" />\r
+       <%ticket%>\r
+       <input name="backup_file" type="file" tabindex="30" />\r
+       <br /><br />\r
+       <input type="submit" value="<%text(_RESTORE_BTN)%>" tabindex="40" /><br />\r
+       <input type="checkbox" name="letsgo" value="1" id="letsgo" tabindex="50" /><label for="letsgo"><%text(_RESTORE_IMSURE)%></label><br />\r
+       <%text(_RESTORE_WARNING)%>\r
+       </p>\r
+       </form>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="backuprestore"><![CDATA[\r
+       <%pagehead%>\r
+       <h2><%text(_RESTORE_COMPLETE)%></h2>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="banlist"><![CDATA[\r
+       <%pagehead%>\r
+       <p><a href="<%adminurl%>index.php?action=overview">(<%text(_BACKHOME)%>)</a></p>\r
+       <h2><%text(_BAN_TITLE)%> '<%adminbloglink(admin/default)%>'</h2>\r
+       <%adminbanlist%>\r
+       <h2><%text(_BAN_NEW_TITLE)%></h2>\r
+       <p><a href="<%adminurl%>index.php?action=banlistnew&amp;blogid=<%requestblogid%>"><%text(_BAN_NEW_TEXT)%></a></p><%pagefoot%>\r
+]]></part>\r
+<part name="banlistdelete"><![CDATA[\r
+       <%pagehead%>\r
+       <h2><%text(_BAN_REMOVE_TITLE)%></h2>\r
+       \r
+       <form method="post" action="<%adminurl%>index.php">\r
+       \r
+       <h3><%text(_BAN_IPRANGE)%></h3>\r
+       \r
+       <p>\r
+       <%text(_CONFIRMTXT_BAN)%> <%requestiprange%>\r
+       <input name="iprange" type="hidden" value="<%requestiprange%>" />\r
+       </p>\r
+       \r
+       <h3><%text(_BAN_BLOGS)%></h3>\r
+       \r
+       <div>\r
+       <input type="hidden" name="blogid" value="<%requestblogid%>" />\r
+       <input name="allblogs" type="radio" value="0" id="allblogs_one" />\r
+       <label for="allblogs_one"><%sprinttext(_BAN_BANBLOGNAME,<|%getblogsetting(name)%|>)%></label>\r
+       <br />\r
+       <input name="allblogs" type="radio" value="1" checked="checked" id="allblogs_all" /><label for="allblogs_all"><%text(_BAN_ALLBLOGS)%></label>\r
+       </div>\r
+       \r
+       <h3><%text(_BAN_DELETE_TITLE)%></h3>\r
+       \r
+       <div>\r
+       <%ticket%>\r
+       <input type="hidden" name="action" value="banlistdeleteconfirm" />\r
+       <input type="submit" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
+       </div>\r
+       \r
+       </form>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="banlistdeleteconfirm"><![CDATA[\r
+       <%pagehead%>\r
+       <a href="<%adminurl%>index.php?action=banlist&amp;blogid=<%requestblogid%>">(<%text(_BACK)%>)</a>\r
+       <h2><%text(_BAN_REMOVED_TITLE)%></h2>\r
+       <p><%text(_BAN_REMOVED_TEXT)%></p>\r
+       <ul>\r
+       <%banlistdeletedlist%>\r
+       </ul>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="banlistnew"><![CDATA[\r
+       <%pagehead%>\r
+       <h2><%text(_BAN_ADD_TITLE)%></h2>\r
+       <form method="post" action="<%adminurl%>index.php">\r
+       <h3><%text(_BAN_IPRANGE)%></h3>\r
+       <p><%text(_BAN_IPRANGE_TEXT)%></p>\r
+       <div class="note">\r
+       <strong><%text(_BAN_EXAMPLE_TITLE)%></strong>\r
+       <%text(_BAN_EXAMPLE_TEXT)%>\r
+       </div>\r
+       <div>\r
+       <%iprangeinput%>\r
+       </div>\r
+       <h3><%text(_BAN_BLOGS)%></h3>\r
+       <p><%text(_BAN_BLOGS_TEXT)%></p>\r
+       <div>\r
+       <input type="hidden" name="blogid" value="<%requestblogid%>" />\r
+       <input name="allblogs" type="radio" value="0" id="allblogs_one" /><label for="allblogs_one">'<%blogsetting(name)%>'</label><br />\r
+       <input name="allblogs" type="radio" value="1" checked="checked" id="allblogs_all" /><label for="allblogs_all"><%text(_BAN_ALLBLOGS)%></label>\r
+       </div>\r
+       <h3><%text(_BAN_REASON_TITLE)%></h3>\r
+       <p><%text(_BAN_REASON_TEXT)%></p>\r
+       <div><textarea name="reason" cols="40" rows="5"></textarea></div>\r
+       <h3><%text(_BAN_ADD_TITLE)%></h3>\r
+       <div>\r
+       <input name="action" type="hidden" value="banlistadd" />\r
+       <%ticket%>\r
+       <input type="submit" value="<%text(_BAN_ADD_BTN)%>" />\r
+       </div>\r
+       </form>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="batchcategory"><![CDATA[\r
+       <%pagehead%>\r
+       <a href="<%adminurl%>index.php?action=overview"><%text(_BACKHOME)%></a>\r
+       <h2><%text(_BATCH_CATEGORIES)%></h2>\r
+       <p><%text(_BATCH_EXECUTING)%><b><%adminbatchaction%></b></p>\r
+       <ul>\r
+       <%adminbatchlist%>\r
+       </ul>\r
+       <b><%text(_BATCH_DONE)%></b>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="batchcomment"><![CDATA[\r
+       <%pagehead%>\r
+       <a href="<%adminurl%>index.php?action=overview"><%text(_BACKHOME)%></a>\r
+       <h2><%text(_BATCH_COMMENTS)%></h2>\r
+       <p><%text(_BATCH_EXECUTING)%><b><%adminbatchaction%></b></p>\r
+       <ul>\r
+       <%adminbatchlist%>\r
+       </ul>\r
+       <b><%text(_BATCH_DONE)%></b><%pagefoot%>\r
+]]></part>\r
+<part name="batchdelete"><![CDATA[\r
+       <%pagehead%>\r
+       <h2><%text(_BATCH_DELETE_CONFIRM)%></h2>\r
+       <form method="post" action="<%adminurl%>index.php">\r
+       <div>\r
+       <input type="hidden" name="action" value="<%batchdeletetype%>" />\r
+       <input type="hidden" name="batchaction" value="delete" />\r
+       <input type="hidden" name="confirmation" value="yes" />\r
+       <%ticket%>\r
+       <%batchdeletelist%>\r
+       <input type="submit" value="<%text(_BATCH_DELETE_CONFIRM_BTN)%>" onclick="return checkSubmit();" />\r
+       </div>\r
+       </form>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="batchitem"><![CDATA[\r
+       <%pagehead%>\r
+       <a href="<%adminurl%>index.php?action=overview"><%text(_BACKHOME)%></a>\r
+       <h2><%text(_BATCH_ITEMS)%></h2>\r
+       <p><%text(_BATCH_EXECUTING)%><b><%adminbatchaction%></b></p>\r
+       <ul>\r
+       <%adminbatchlist%>\r
+       </ul>\r
+       <b><%text(_BATCH_DONE)%></b><%pagefoot%>\r
+]]></part>\r
+<part name="batchmember"><![CDATA[\r
+       <%pagehead%>\r
+       <a href="<%adminurl%>index.php?action=usermanagement"><%text(_MEMBERS_BACKTOOVERVIEW)%></a>\r
+       <h2><%text(_BATCH_MEMBERS)%></h2>\r
+       <p><%text(_BATCH_EXECUTING)%><b><%adminbatchaction%></b></p>\r
+       <ul>\r
+       <%adminbatchlist%>\r
+       </ul>\r
+       <b><%text(_BATCH_DONE)%></b><%pagefoot%>\r
+]]></part>\r
+<part name="batchmove"><![CDATA[\r
+       <%pagehead%>\r
+       <h2><%text(_MOVE_TITLE)%></h2>\r
+       <form method="post" action="<%adminurl%>index.php">\r
+       <div>\r
+       <input type="hidden" name="action" value="<%batchmovetype%>" />\r
+       <input type="hidden" name="batchaction" value="move" />\r
+       <%ticket%>\r
+       <%batchmovelist%>\r
+       <%movedistselect%>\r
+       <input type="submit" value="<%batchmovebtn%>" onclick="return checkSubmit();" />\r
+       </div>\r
+       </form>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="batchmovecat"><![CDATA[\r
+       <%pagehead%>\r
+       <h2><%text(_MOVECAT_TITLE)%></h2>\r
+       <form method="post" action="<%adminurl%>index.php">\r
+       <div>\r
+       <input type="hidden" name="action" value="<%batchmovetype%>" />\r
+       <input type="hidden" name="batchaction" value="move" />\r
+       <%ticket%>\r
+       <%batchmovelist%>\r
+       <%movedistselect%>\r
+       <input type="submit" value="<%batchmovebtn%>" onclick="return checkSubmit();" />\r
+       </div>\r
+       </form>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="batchteam"><![CDATA[\r
+<%pagehead%>\r
+<a href="<%adminurl%>index.php?action=manageteam&amp;blogid=<%requestblogid%>"><%text(_BACK)%></a>\r
+<h2><%text(_BATCH_TEAM)%></h2>\r
+<p><%text(_BATCH_EXECUTING)%><b><%adminbatchaction%></b></p>\r
+<ul>\r
+<%adminbatchlist%>\r
+</ul>\r
+<b><%text(_BATCH_DONE)%></b><%pagefoot%>\r
+]]></part>\r
+<part name="blogcommentlist"><![CDATA[\r
+<%pagehead%>\r
+<p>(<a href="<%adminurl%>index.php?action=overview"><%text(_BACKHOME)%></a>)</p>\r
+<h2><%text(_COMMENTS_BLOG)%> <%adminbloglink(admin/default)%></h2>\r
+<%commentnavlist(admin/default)%><%pagefoot%>\r
+]]></part>\r
+<part name="blogsettings"><![CDATA[\r
+<%pagehead%>\r
+<p><a href="<%adminurl%>index.php?action=overview">(<%text(_BACKHOME)%>)</a></p>\r
+<h2><%text(_EBLOG_TITLE)%>: '<%adminbloglink(admin/default)%>'</h2>\r
 \r
 \r
-<form id="addform" method="post" action="<%adminurl%>index.php" >\r
+<h3><%text(_EBLOG_TEAM_TITLE)%></h3>\r
 \r
 \r
+<p>\r
+<%text(_EBLOG_CURRENT_TEAM_MEMBER)%>\r
+<%blogteammembers%>\r
+</p>\r
+<p><a href="<%adminurl%>index.php?action=manageteam&amp;blogid=<%requestblogid%>"><%text(_EBLOG_TEAM_TEXT)%></a></p>\r
+<h3><%text(_EBLOG_SETTINGS_TITLE)%></h3>\r
+<form method="post" action="<%adminurl%>index.php">\r
+<div>\r
+<input type="hidden" name="action" value="blogsettingsupdate" />\r
+<%ticket%>\r
+<input type="hidden" name="blogid" value="<%requestblogid%>" />\r
+<table>\r
+<tr>\r
+<td><%text(_EBLOG_NAME)%></td>\r
+<td><input name="name" tabindex="10" size="40" maxlength="60" value="<%blogsetting(name)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td>\r
+<%text(_EBLOG_SHORTNAME)%> <%helplink(shortblogname)%>\r
+<%text(_EBLOG_SHORTNAME_EXTRA)%>\r
+</td>\r
+<td><input name="shortname" tabindex="20" maxlength="15" size="15" value="<%blogsetting(short)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_DESC)%></td>\r
+<td><input name="desc" tabindex="30" maxlength="200" size="40" value="<%blogsetting(desc)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_URL)%></td>\r
+<td><input name="url" tabindex="40" size="40" maxlength="100" value="<%blogsetting(url)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_DEFSKIN)%><%helplink(blogdefaultskin)%></td>\r
+<td><%defskinselect(blog)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_LINEBREAKS)%> <%helplink(convertbreaks)%></td>\r
+<td><%blogsettingyesno(convertbreaks)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_ALLOWPASTPOSTING)%> <%helplink(allowpastposting)%></td>\r
+<td><%blogsettingyesno(allowpastposting)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_DISABLECOMMENTS)%></td>\r
+<td><%blogsettingyesno(comments)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_ANONYMOUS)%></td>\r
+<td><%blogsettingyesno(public)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_REQUIREDEMAIL)%></td>\r
+<td><%blogsettingyesno(reqemail)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_NOTIFY)%> <%helplink(blognotify)%></td>\r
+<td><input name="notify" tabindex="80" maxlength="60" size="40" value="<%blogsetting(notifyaddress)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_NOTIFY_ON)%></td>\r
+<td>\r
+<input name="notifyComment" value="3" type="checkbox" tabindex="81" id="notifyComment"<%blognotifysetting(comment)%> />\r
+<label for="notifyComment"><%text(_EBLOG_NOTIFY_COMMENT)%></label><br />\r
+<input name="notifyVote" value="5" type="checkbox" tabindex="82" id="notifyVote"<%blognotifysetting(vote)%> />\r
+<label for="notifyVote"><%text(_EBLOG_NOTIFY_KARMA)%></label><br />\r
+<input name="notifyNewItem" value="7" type="checkbox" tabindex="83" id="notifyNewItem"<%blognotifysetting(newitem)%> />\r
+<label for="notifyNewItem"><%text(_EBLOG_NOTIFY_ITEM)%></label>\r
+</td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_MAXCOMMENTS)%> <%helplink(blogmaxcomments)%></td>\r
+<td><input name="maxcomments" tabindex="90" size="3" value="<%blogsetting(maxcomments)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_UPDATE)%> <%helplink(blogupdatefile)%></td>\r
+<td><input name="update" tabindex="100" size="40" maxlength="60" value="<%blogsetting(updatefile)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_DEFCAT)%></td>\r
+<td><%defcatselect%></td>\r
+</tr>\r
+<tr>\r
+<td>\r
+<%text(_EBLOG_OFFSET)%> <%helplink(blogtimeoffset)%><br />\r
+<%text(_EBLOG_STIME)%> <b><%blogtime(servertime,"%H:%M")%></b><br />\r
+<%text(_EBLOG_BTIME)%> <b><%blogtime(blogtime,"%H:%M")%></b>\r
+</td>\r
+<td><input name="timeoffset" tabindex="120" size="3" value="<%blogsetting(timeoffset)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_SEARCH)%> <%helplink(blogsearchable)%></td>\r
+<td><%blogsettingyesno(searchable)%></td>\r
+</tr>\r
+<%pluginoptions(blog)%>\r
+<tr>\r
+<th colspan="2"><%text(_EBLOG_CHANGE)%></th>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_CHANGE)%></td>\r
+<td><input type="submit" tabindex="130" value="<%text(_EBLOG_CHANGE_BTN)%>" onclick="return checkSubmit();" /></td>\r
+</tr>\r
+</table>\r
+</div>\r
+</form>\r
+<h3><%text(_EBLOG_CAT_TITLE)%></h3>\r
+<%blogcatlist%>\r
+<form action="<%adminurl%>index.php" method="post">\r
+<div>\r
+<input name="action" value="categorynew" type="hidden" />\r
+<%ticket%>\r
+<input name="blogid" value="<%blogsetting(id)%>" type="hidden" />\r
+<table>\r
+<tr>\r
+<th colspan="2"><%text(_EBLOG_CAT_CREATE)%></th>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_CAT_NAME)%></td>\r
+<td><input name="cname" size="40" maxlength="40" tabindex="300" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_CAT_DESC)%></td>\r
+<td><input name="cdesc" size="40" maxlength="200" tabindex="310" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_CAT_CREATE)%></td>\r
+<td><input type="submit" value="<%text(_EBLOG_CAT_CREATE)%>" tabindex="320" /></td>\r
+</tr>\r
+</table>\r
+</div>\r
+</form>\r
+<h3><%text(_PLUGINS_EXTRA)%></h3>\r
+<%pluginextras(blog)%><%pagefoot%>\r
+]]></part>\r
+<part name="bookmarklet"><![CDATA[\r
+<%pagehead%>\r
+<p><a href="<%adminurl%>index.php?action=overview">(<%text(_BACKHOME)%>)</a></p>\r
+<h2><%text(_BOOKMARKLET_TITLE)%></h2>\r
+<p><%text(_BOOKMARKLET_DESC1)%><%text(_BOOKMARKLET_DESC2)%><%text(_BOOKMARKLET_DESC3)%><%text(_BOOKMARKLET_DESC4)%><%text(_BOOKMARKLET_DESC5)%></p>\r
+<h3><%text(_BOOKMARKLET_BOOKARKLET)%></h3>\r
+<p>\r
+<%text(_BOOKMARKLET_BMARKTEXT)%><small><%text(_BOOKMARKLET_BMARKTEST)%></small>\r
+<br />\r
+<br />\r
+<a href="<%bookmarkletadmin(url)%>"><%sprinttext(_BOOKMARKLET_ANCHOR,<|%getblogsetting(name)%|>)%></a><%text(_BOOKMARKLET_BMARKFOLLOW)%>\r
+</p>\r
+<%pagefoot%>\r
+]]></part>\r
+<part name="browseowncomments"><![CDATA[\r
+<%pagehead%>\r
+<p>(<a href="<%adminurl%>index.php?action=overview"><%text(_BACKHOME)%></a>)</p>\r
+<h2><%text(_COMMENTS_YOUR)%></h2>\r
+<%commentnavlist(admin/default)%><%pagefoot%>\r
+]]></part>\r
+<part name="browseownitems"><![CDATA[\r
+<%pagehead%>\r
+<p><a href="<%adminurl%>index.php?action=overview"><%text(_BACKHOME)%></a></p>\r
+<h2><%text(_ITEMLIST_YOUR)%></h2>\r
+<%itemnavlist(admin/default)%><%pagefoot%>\r
+]]></part>\r
+<part name="categorydelete"><![CDATA[\r
+<%pagehead%>\r
+<h2><%text(_DELETE_CONFIRM)%></h2>\r
+<div>\r
+<%text(_CONFIRMTXT_CATEGORY)%><b><%categorysetting(name)%></b>\r
+</div>\r
+<form method="post" action="<%adminurl%>index.php">\r
+<div>\r
+<input type="hidden" name="action" value="categorydeleteconfirm" />\r
+<%ticket%>\r
+<input type="hidden" name="blogid" value="<%requestblogid%>" />\r
+<input type="hidden" name="catid" value="<%categorysetting(id)%>" />\r
+<input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
+</div>\r
+</form><%pagefoot%>\r
+]]></part>\r
+<part name="categoryedit"><![CDATA[\r
+<%pagehead%>\r
+<p><a href="<%adminurl%>index.php?action=blogsettings&amp;blogid=<%requestblogid%>">(<%text(_BACK_TO_BLOGSETTINGS)%>)</a></p>\r
+<h2><%text(_EBLOG_CAT_UPDATE)%> '<%categorysetting(name)%>'</h2>\r
+<form method='post' action='<%adminurl%>index.php'>\r
+<div>\r
+<input name="blogid" type="hidden" value="<%requestblogid%>" />\r
+<input name="catid" type="hidden" value="<%categorysetting(id)%>" />\r
+<input name="desturl" type="hidden" value="<%editdesturl%>" />\r
+<input name="action" type="hidden" value="categoryupdate" />\r
+<%ticket%>\r
+<table>\r
+<tr>\r
+<th colspan="2"><%text(_EBLOG_CAT_UPDATE)%></th>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_CAT_NAME)%></td>\r
+<td><input type="text" name="cname" value="<%categorysetting(name)%>" size="40" maxlength="40" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_CAT_DESC)%></td>\r
+<td><input type="text" name="cdesc" value="<%categorysetting(desc)%>" size="40" maxlength="200" /></td>\r
+</tr>\r
+<%pluginoptions(category)%>\r
+<tr>\r
+<th colspan="2"><%text(_EBLOG_CAT_UPDATE)%></th>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_CAT_UPDATE)%></td>\r
+<td><input type="submit" value="<%text(_EBLOG_CAT_UPDATE_BTN)%>" /></td>\r
+</tr>\r
+</table>\r
+</div>\r
+</form><%pagefoot%>\r
+]]></part>\r
+<part name="commentdelete"><![CDATA[\r
+<%pagehead%>\r
+<h2><%text(_DELETE_CONFIRM)%></h2>\r
+<p><%text(_CONFIRMTXT_COMMENT)%></p>\r
+<div class="note">\r
+<b><%text(_EDITC_WHO)%>:</b> <%deletecomment(author)%>\r
+<br />\r
+<b><%text(_EDITC_TEXT)%>:</b> <%deletecomment(body)%>\r
+</div>\r
+<form method="post" action="<%adminurl%>index.php"><div>\r
+<input type="hidden" name="action" value="commentdeleteconfirm" />\r
+<%ticket%>\r
+<input type="hidden" name="commentid" value="<%deletecomment(id)%>" />\r
+<input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
+</div></form><%pagefoot%>\r
+]]></part>\r
+<part name="commentedit"><![CDATA[\r
+<%pagehead%>\r
+<h2><%text(_EDITC_TITLE)%></h2>\r
+<form method="post" action="<%adminurl%>index.php">\r
 <div>\r
 <div>\r
-\r
-<input type="hidden" name="action" value="additem" />\r
-<input name="blogid" value="<%blogid%>" type="hidden" />\r
-<input type="hidden" name="draftid" value="0" />\r
+<input type="hidden" name="action" value="commentupdate" />\r
 <%ticket%>\r
 <%ticket%>\r
-\r
+<input type="hidden" name="commentid" value="<%editcomment(id)%>" />\r
 <table>\r
 <table>\r
+<tr>\r
+<th colspan="2"><%text(_EDITC_TITLE)%></th>\r
+</tr>\r
+<tr>\r
+<td><%text(_EDITC_WHO)%></td>\r
+<td><%editcomment(user)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EDITC_WHEN)%></td>\r
+<td><%editcomment(date)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EDITC_HOST)%></td>\r
+<td><%editcomment(host)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EDITC_URL)%></td>\r
+<td><input type="text" name="url" size="30" tabindex="6" value="<%editcomment(url)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EDITC_EMAIL)%></td>\r
+<td><input type="text" name="email" size="30" tabindex="8" value="<%editcomment(email)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EDITC_TEXT)%></td>\r
+<td><textarea name="body" tabindex="10" rows="10" cols="50"><%editcomment(body)%></textarea></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EDITC_EDIT)%></td>\r
+<td><input type="submit"  tabindex="20" value="<%text(_EDITC_EDIT)%>" onclick="return checkSubmit();" /></td>\r
+</tr>\r
+</table>\r
+</div>\r
+</form><%pagefoot%>\r
+]]></part>\r
+<part name="createitem"><![CDATA[\r
+       <%pagehead%>\r
+       <h2><%text(_ADD_ADDTO)%> '<%adminbloglink(admin/default)%>'</h2>\r
+       \r
+       <%init%>\r
+       <script type="text/javascript" src="<%skinfile(/javascripts/numbercheck.js)%>"></script>\r
+       <%if(autosave)%><script type="text/javascript" src="<%skinfile(/javascripts/xmlhttprequest.js)%>"></script><%endif%>\r
+       \r
+       <form id="addform" method="post" action="<%adminurl%>index.php" >\r
+       \r
+       <div>\r
+       \r
+       <input type="hidden" name="action" value="additem" />\r
+       <input name="blogid" value="<%blogid%>" type="hidden" />\r
+       <input type="hidden" name="draftid" value="0" />\r
+       <%ticket%>\r
+       \r
+       <table>\r
+               <tr>\r
+                       <th colspan="2"><%text(_ADD_CREATENEW)%></th>\r
+               </tr>\r
+               <%if(autosave)%><tr>\r
+                       <td><%text(_AUTOSAVEDRAFT)%></td>\r
+                       <td><span id="info"><%text(_AUTOSAVEDRAFT_NOTYETSAVED)%></span></td>\r
+               </tr><%endif%>\r
+               <tr>\r
+                       <td><%text(_ADD_TITLE)%></td>\r
+                       <td><input id="inputtitle" onkeyup="storeCaret(this); updPreview(title); doMonitor();" onclick="storeCaret(this);" onselect="storeCaret(this);"\r
+                               name="title"\r
+                               tabindex="10"\r
+                               size="60" \r
+                               maxlength="160" \r
+                               value="<%contents(title)%>"\r
+                               /></td>\r
+               </tr>\r
        <tr>\r
        <tr>\r
-               <th colspan="2"><%text(_ADD_CREATENEW)%></th>\r
-       </tr>\r
-       <%if(autosave)%><tr>\r
-               <td><%text(_AUTOSAVEDRAFT)%></td>\r
-               <td><span id="info"><%text(_AUTOSAVEDRAFT_NOTYETSAVED)%></span></td>\r
-       </tr><%endif%>\r
+                       <td>\r
+                               <%text(_ADD_BODY)%> <%helplink(additem)%>\r
+                       </td>\r
+                       <td>\r
+                       <div class="jsbuttonbar">\r
+       <!--[if IE]>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="cutThis()">\r
+                                       <img src="<%skinfile(/images/button-cut.gif)%>" title="<%text(_ADD_CUT_TT)%>(Ctrl + X)" alt="<%text(_ADD_CUT_TT)%>(Ctrl + X)" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="copyThis()">\r
+                                       <img src="<%skinfile(/images/button-copy.gif)%>" title="<%text(_ADD_COPY_TT)%>(Ctrl + C)" alt="<%text(_ADD_COPY_TT)%>(Ctrl + C)" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="pasteThis()">\r
+                                       <img src="<%skinfile(/images/button-paste.gif)%>" title="<%text(_ADD_PASTE_TT)%>(Ctrl + V)" alt="<%text(_ADD_PASTE_TT)%>(Ctrl + V)" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbuttonspacer">&nbsp;</span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="boldThis()">\r
+                                       <img src="<%skinfile(/images/button-bold.gif)%>" title="<%text(_ADD_BOLD_TT)%>(Ctrl + Shift + B)" alt="<%text(_ADD_BOLD_TT)%>(Ctrl + Shift + B)" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="italicThis()">\r
+                                       <img src="<%skinfile(/images/button-italic.gif)%>" title="<%text(_ADD_ITALIC_TT)%>(Ctrl + Shift + I)" alt="<%text(_ADD_ITALIC_TT)%>(Ctrl + Shift + I)" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="ahrefThis()">\r
+                                       <img src="<%skinfile(/images/button-link.gif)%>" title="<%text(_ADD_HREF_TT)%>(Ctrl + Shift + A)" alt="<%text(_ADD_HREF_TT)%>(Ctrl + Shift + A)" width="16" height="16" />\r
+                               </span>\r
+       <![endif]-->\r
+       <!--[if ! IE]>-->\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="boldThis()">\r
+                                       <img src="<%skinfile(/images/button-bold.gif)%>" title="<%text(_ADD_BOLD_TT)%>" alt="<%text(_ADD_BOLD_TT)%>" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="italicThis()">\r
+                                       <img src="<%skinfile(/images/button-italic.gif)%>" title="<%text(_ADD_ITALIC_TT)%>" alt="<%text(_ADD_ITALIC_TT)%>" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="ahrefThis()">\r
+                                       <img src="<%skinfile(/images/button-link.gif)%>" title="<%text(_ADD_HREF_TT)%>" alt="<%text(_ADD_HREF_TT)%>" width="16" height="16" />\r
+                               </span>\r
+       <!--<![endif]-->\r
+                               <span class="jsbuttonspacer">&nbsp;</span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="alignleftThis()">\r
+                                       <img src="<%skinfile(/images/button-alignleft.gif)%>" title="<%text(_ADD_ALIGNLEFT_TT)%>" alt="<%text(_ADD_ALIGNLEFT_TT)%>" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="alignrightThis()">\r
+                                       <img src="<%skinfile(/images/button-alignright.gif)%>" title="<%text(_ADD_ALIGNRIGHT_TT)%>" alt="<%text(_ADD_ALIGNRIGHT_TT)%>" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="aligncenterThis()">\r
+                                       <img src="<%skinfile(/images/button-aligncenter.gif)%>" title="<%text(_ADD_ALIGNCENTER_TT)%>" alt="<%text(_ADD_ALIGNCENTER_TT)%>" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbuttonspacer">&nbsp;</span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="leftThis()">\r
+                                       <img src="<%skinfile(/images/button-left.gif)%>" title="<%text(_ADD_LEFT_TT)%>" alt="<%text(_ADD_LEFT_TT)%>" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="rightThis()">\r
+                                       <img src="<%skinfile(/images/button-right.gif)%>" title="<%text(_ADD_RIGHT_TT)%>" alt="<%text(_ADD_RIGHT_TT)%>" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbuttonspacer">&nbsp;</span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="addMedia()">\r
+                                       <img src="<%skinfile(/images/button-media.gif)%>" title="<%text(_ADD_MEDIA_TT)%>" alt="<%text(_ADD_MEDIA_TT)%>" width="16" height="16" />\r
+                               </span>\r
+       <!--[if IE]>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="showedit()">\r
+                                       <img src="<%skinfile(/images/button-preview.gif)%>" title="<%text(_ADD_PREVIEW_TT)%>" alt="<%text(_ADD_PREVIEW_TT)%>" width="16" height="16" />\r
+                               </span>\r
+       <![endif]-->\r
+                               <div class="jsbuttonend"></div>\r
+                       </div>\r
+                               <textarea id="inputbody" onkeyup="storeCaret(this); updPreview(body); doMonitor();" onclick="storeCaret(this);" onselect="storeCaret(this);"\r
+                                       name="body"\r
+                                       tabindex="20"\r
+                                       cols="60"\r
+                                       rows="20"><%contents(body)%></textarea>\r
+                       </td>\r
+               </tr><tr id="edit" style="display:none;">\r
+                       <td><%text(_ADD_PREVIEW)%></td>\r
+                       <td><b><span id="prevtitle">&#160;</span></b><br />\r
+                               <span id="prevbody">&#160;</span><br />\r
+                               <span id="prevmore">&#160;</span><br />\r
+                       </td>\r
+               </tr>\r
        <tr>\r
        <tr>\r
-               <td><%text(_ADD_TITLE)%></td>\r
-               <td><input id="inputtitle" onkeyup="storeCaret(this); updPreview(title); doMonitor();" onclick="storeCaret(this);" onselect="storeCaret(this);"\r
-                       name="title"\r
-                       tabindex="10"\r
-                       size="60" \r
-                       maxlength="160" \r
-                       value="<%contents(title)%>"\r
-                       /></td>\r
-       </tr><tr>\r
-               <td>\r
-                       <%text(_ADD_BODY)%> <%helplink(additem)%>\r
-               </td>\r
-               <td>\r
-               <div class="jsbuttonbar">\r
-<!--[if IE]>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="cutThis()">\r
-                               <img src="<%skinfile(/images/button-cut.gif)%>" title="<%text(_ADD_CUT_TT)%>(Ctrl + X)" alt="<%text(_ADD_CUT_TT)%>(Ctrl + X)" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="copyThis()">\r
-                               <img src="<%skinfile(/images/button-copy.gif)%>" title="<%text(_ADD_COPY_TT)%>(Ctrl + C)" alt="<%text(_ADD_COPY_TT)%>(Ctrl + C)" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="pasteThis()">\r
-                               <img src="<%skinfile(/images/button-paste.gif)%>" title="<%text(_ADD_PASTE_TT)%>(Ctrl + V)" alt="<%text(_ADD_PASTE_TT)%>(Ctrl + V)" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbuttonspacer">&nbsp;</span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="boldThis()">\r
-                               <img src="<%skinfile(/images/button-bold.gif)%>" title="<%text(_ADD_BOLD_TT)%>(Ctrl + Shift + B)" alt="<%text(_ADD_BOLD_TT)%>(Ctrl + Shift + B)" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="italicThis()">\r
-                               <img src="<%skinfile(/images/button-italic.gif)%>" title="<%text(_ADD_ITALIC_TT)%>(Ctrl + Shift + I)" alt="<%text(_ADD_ITALIC_TT)%>(Ctrl + Shift + I)" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="ahrefThis()">\r
-                               <img src="<%skinfile(/images/button-link.gif)%>" title="<%text(_ADD_HREF_TT)%>(Ctrl + Shift + A)" alt="<%text(_ADD_HREF_TT)%>(Ctrl + Shift + A)" width="16" height="16" />\r
-                       </span>\r
-<![endif]-->\r
-<!--[if ! IE]>-->\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="boldThis()">\r
-                               <img src="<%skinfile(/images/button-bold.gif)%>" title="<%text(_ADD_BOLD_TT)%>" alt="<%text(_ADD_BOLD_TT)%>" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="italicThis()">\r
-                               <img src="<%skinfile(/images/button-italic.gif)%>" title="<%text(_ADD_ITALIC_TT)%>" alt="<%text(_ADD_ITALIC_TT)%>" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="ahrefThis()">\r
-                               <img src="<%skinfile(/images/button-link.gif)%>" title="<%text(_ADD_HREF_TT)%>" alt="<%text(_ADD_HREF_TT)%>" width="16" height="16" />\r
-                       </span>\r
-<!--<![endif]-->\r
-                       <span class="jsbuttonspacer">&nbsp;</span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="alignleftThis()">\r
-                               <img src="<%skinfile(/images/button-alignleft.gif)%>" title="<%text(_ADD_ALIGNLEFT_TT)%>" alt="<%text(_ADD_ALIGNLEFT_TT)%>" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="alignrightThis()">\r
-                               <img src="<%skinfile(/images/button-alignright.gif)%>" title="<%text(_ADD_ALIGNRIGHT_TT)%>" alt="<%text(_ADD_ALIGNRIGHT_TT)%>" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="aligncenterThis()">\r
-                               <img src="<%skinfile(/images/button-aligncenter.gif)%>" title="<%text(_ADD_ALIGNCENTER_TT)%>" alt="<%text(_ADD_ALIGNCENTER_TT)%>" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbuttonspacer">&nbsp;</span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="leftThis()">\r
-                               <img src="<%skinfile(/images/button-left.gif)%>" title="<%text(_ADD_LEFT_TT)%>" alt="<%text(_ADD_LEFT_TT)%>" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="rightThis()">\r
-                               <img src="<%skinfile(/images/button-right.gif)%>" title="<%text(_ADD_RIGHT_TT)%>" alt="<%text(_ADD_RIGHT_TT)%>" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbuttonspacer">&nbsp;</span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="addMedia()">\r
-                               <img src="<%skinfile(/images/button-media.gif)%>" title="<%text(_ADD_MEDIA_TT)%>" alt="<%text(_ADD_MEDIA_TT)%>" width="16" height="16" />\r
-                       </span>\r
-<!--[if IE]>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="showedit()">\r
-                               <img src="<%skinfile(/images/button-preview.gif)%>" title="<%text(_ADD_PREVIEW_TT)%>" alt="<%text(_ADD_PREVIEW_TT)%>" width="16" height="16" />\r
-                       </span>\r
-<![endif]-->\r
-                       <div class="jsbuttonend"></div>\r
-               </div>\r
-                       <textarea id="inputbody" onkeyup="storeCaret(this); updPreview(body); doMonitor();" onclick="storeCaret(this);" onselect="storeCaret(this);"\r
-                               name="body"\r
-                               tabindex="20"\r
-                               cols="60"\r
-                               rows="20"><%contents(body)%></textarea>\r
-               </td>\r
-       </tr><tr id="edit" style="display:none;">\r
-               <td><%text(_ADD_PREVIEW)%></td>\r
-               <td><b><span id="prevtitle">&#160;</span></b><br />\r
-                       <span id="prevbody">&#160;</span><br />\r
-                       <span id="prevmore">&#160;</span><br />\r
-               </td>\r
-       </tr><tr>\r
+               \r
+       <%if(blogsetting, bcomments)%>\r
+                       <td><%text(_ADD_DISABLE_COMMENTS)%></td>\r
+                       <td>\r
+                               <input name="closed" type="radio" tabindex="30" value="1" id="closed_yes" /><label for="closed_yes"><%text(_YES)%></label>\r
+                               <input name="closed" type="radio" tabindex="30" value="0" checked="checked" id="closed_no" /><label for="closed_no"><%text(_NO)%></label>\r
+                       </td>\r
+               </tr>\r
+       <tr>\r
+       <%endif%>\r
        \r
        \r
-<%if(blogsetting, bcomments)%>\r
-               <td><%text(_ADD_DISABLE_COMMENTS)%></td>\r
-               <td>\r
-                       <input name="closed" type="radio" tabindex="30" value="1" id="closed_yes" /><label for="closed_yes"><%text(_YES)%></label>\r
-                       <input name="closed" type="radio" tabindex="30" value="0" checked="checked" id="closed_no" /><label for="closed_no"><%text(_NO)%></label>\r
-               </td>\r
-       </tr><tr>\r
-<%endif%>\r
-\r
-\r
-               <td><%text(_ADD_CATEGORY)%></td>\r
-               <td><%categories(40)%></td>\r
-       </tr><tr>\r
-               <td><%text(_SUBMIT)%></td>\r
-               <td>\r
-                       <input tabindex="60" type="submit" value="<%text(_ADD_ADDITEM)%>" \r
-                               onclick="return checkSubmit();" />\r
-\r
-                       <br /><br />\r
-\r
-                       <input name="actiontype" value="addnow" type="radio" checked='checked' id="act_now" tabindex="61" /><label for="act_now"><%text(_ADD_ADDNOW)%></label>\r
-                       <br />\r
-                       <input name="actiontype" value="addfuture" type="radio" id="act_future" tabindex="61" /><label for="act_future" ><%text(_ADD_ADDLATER)%></label> <%helplink(future)%>\r
-                       <div class="indent">\r
-                               <%text(_ADD_PLACE_ON)%>\r
-                               <input id="inputyear" name="year" tabindex="63" size="4" value="<%currenttime(year)%>" onchange="document.forms[0].act_future.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_YEAR)%>\r
-                               <input id="inputmonth" name="month" tabindex="64" size="2" value="<%currenttime(mon)%>" onchange="document.forms[0].act_future.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_MONTH)%>\r
-                               <input id="inputday" name="day" tabindex="65" size="2" value="<%currenttime(mday)%>" onchange="document.forms[0].act_future.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_DAY)%>\r
-                                \r
-                               <input id="inputhour" name="hour" tabindex="66" size="2" value="<%currenttime(hours)%>" onchange="document.forms[0].act_future.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_HOUR)%>\r
-                               <input id="inputminutes" name="minutes" tabindex="67" size="2" value="<%currenttime(minutes)%>" onchange="document.forms[0].act_future.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_MINUTE)%>\r
-                               <br /><%text(_ITEM_ADDEDITTEMPLATE_FORMAT)%>(yyyy)<%text(_ITEM_ADDEDITTEMPLATE_YEAR)%>(mm)<%text(_ITEM_ADDEDITTEMPLATE_MONTH)%>(dd)<%text(_ITEM_ADDEDITTEMPLATE_DAY)%> (hh)<%text(_ITEM_ADDEDITTEMPLATE_HOUR)%>(mm)<%text(_ITEM_ADDEDITTEMPLATE_MINUTE)%>\r
-                               \r
-                               <%if(blogsetting, ballowpast,0)%>\r
-                                       <br />\r
-                                       <%text(_ADD_NOPASTDATES)%>\r
-                               <%endif%>\r
+       \r
+                       <td><%text(_ADD_CATEGORY)%></td>\r
+                       <td><%categories(40)%></td>\r
+               </tr>\r
+       <tr>\r
+                       <td><%text(_SUBMIT)%></td>\r
+                       <td>\r
+                               <input tabindex="60" type="submit" value="<%text(_ADD_ADDITEM)%>" \r
+                                       onclick="return checkSubmit();" />\r
+       \r
+                               <br /><br />\r
+       \r
+                               <input name="actiontype" value="addnow" type="radio" checked='checked' id="act_now" tabindex="61" /><label for="act_now"><%text(_ADD_ADDNOW)%></label>\r
+                               <br />\r
+                               <input name="actiontype" value="addfuture" type="radio" id="act_future" tabindex="61" /><label for="act_future" ><%text(_ADD_ADDLATER)%></label> <%helplink(future)%>\r
+                               <div class="indent">\r
+                                       <%text(_ADD_PLACE_ON)%>\r
+                                       <input id="inputyear" name="year" tabindex="63" size="4" value="<%currenttime(year)%>" onchange="document.forms[0].act_future.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_YEAR)%>\r
+                                       <input id="inputmonth" name="month" tabindex="64" size="2" value="<%currenttime(mon)%>" onchange="document.forms[0].act_future.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_MONTH)%>\r
+                                       <input id="inputday" name="day" tabindex="65" size="2" value="<%currenttime(mday)%>" onchange="document.forms[0].act_future.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_DAY)%>\r
+                                        \r
+                                       <input id="inputhour" name="hour" tabindex="66" size="2" value="<%currenttime(hours)%>" onchange="document.forms[0].act_future.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_HOUR)%>\r
+                                       <input id="inputminutes" name="minutes" tabindex="67" size="2" value="<%currenttime(minutes)%>" onchange="document.forms[0].act_future.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_MINUTE)%>\r
+                                       <br /><%text(_ITEM_ADDEDITTEMPLATE_FORMAT)%>(yyyy)<%text(_ITEM_ADDEDITTEMPLATE_YEAR)%>(mm)<%text(_ITEM_ADDEDITTEMPLATE_MONTH)%>(dd)<%text(_ITEM_ADDEDITTEMPLATE_DAY)%> (hh)<%text(_ITEM_ADDEDITTEMPLATE_HOUR)%>(mm)<%text(_ITEM_ADDEDITTEMPLATE_MINUTE)%>\r
+                                       \r
+                                       <%if(blogsetting, ballowpast,0)%>\r
+                                               <br />\r
+                                               <%text(_ADD_NOPASTDATES)%>\r
+                                       <%endif%>\r
+                               </div>\r
+                               <input name="actiontype" tabindex="61" value="adddraft" type="radio" id="act_draft" /><label for="act_draft"><%text(_ADD_ADDDRAFT)%></label> <%helplink(draft)%>\r
+                       </td>\r
+               </tr>\r
+       <tr>\r
+                       <td><%text(_ADD_PLUGIN_EXTRAS)%></td>\r
+                       <td>\r
+                               <%pluginextras%>\r
+                       </td>\r
+               </tr>\r
+                               <%pluginoptions(item)%> \r
+       <tr>\r
+               <th colspan="2"><%text(_ADD_MORE)%></th>\r
+               </tr>\r
+       <tr>\r
+                       <td><%text(_ADD_MORE)%>\r
+                               <br /><%helplink(extended)%>\r
+                       </td>\r
+                       <td>\r
+                       <div class="jsbuttonbar">\r
+       <!--[if IE]>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="cutThis()">\r
+                                       <img src="<%skinfile(/images/button-cut.gif)%>" title="<%text(_ADD_CUT_TT)%>(Ctrl + X)" alt="<%text(_ADD_CUT_TT)%>(Ctrl + X)" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="copyThis()">\r
+                                       <img src="<%skinfile(/images/button-copy.gif)%>" title="<%text(_ADD_COPY_TT)%>(Ctrl + C)" alt="<%text(_ADD_COPY_TT)%>(Ctrl + C)" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="pasteThis()">\r
+                                       <img src="<%skinfile(/images/button-paste.gif)%>" title="<%text(_ADD_PASTE_TT)%>(Ctrl + V)" alt="<%text(_ADD_PASTE_TT)%>(Ctrl + V)" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbuttonspacer">&nbsp;</span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="boldThis()">\r
+                                       <img src="<%skinfile(/images/button-bold.gif)%>" title="<%text(_ADD_BOLD_TT)%>(Ctrl + Shift + B)" alt="<%text(_ADD_BOLD_TT)%>(Ctrl + Shift + B)" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="italicThis()">\r
+                                       <img src="<%skinfile(/images/button-italic.gif)%>" title="<%text(_ADD_ITALIC_TT)%>(Ctrl + Shift + I)" alt="<%text(_ADD_ITALIC_TT)%>(Ctrl + Shift + I)" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="ahrefThis()">\r
+                                       <img src="<%skinfile(/images/button-link.gif)%>" title="<%text(_ADD_HREF_TT)%>(Ctrl + Shift + A)" alt="<%text(_ADD_HREF_TT)%>(Ctrl + Shift + A)" width="16" height="16" />\r
+                               </span>\r
+       <![endif]-->\r
+       <!--[if ! IE]>-->\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="boldThis()">\r
+                                       <img src="<%skinfile(/images/button-bold.gif)%>" title="<%text(_ADD_BOLD_TT)%>" alt="<%text(_ADD_BOLD_TT)%>" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="italicThis()">\r
+                                       <img src="<%skinfile(/images/button-italic.gif)%>" title="<%text(_ADD_ITALIC_TT)%>" alt="<%text(_ADD_ITALIC_TT)%>" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="ahrefThis()">\r
+                                       <img src="<%skinfile(/images/button-link.gif)%>" title="<%text(_ADD_HREF_TT)%>" alt="<%text(_ADD_HREF_TT)%>" width="16" height="16" />\r
+                               </span>\r
+       <!--<![endif]-->\r
+                               <span class="jsbuttonspacer">&nbsp;</span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="alignleftThis()">\r
+                                       <img src="<%skinfile(/images/button-alignleft.gif)%>" title="<%text(_ADD_ALIGNLEFT_TT)%>" alt="<%text(_ADD_ALIGNLEFT_TT)%>" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="alignrightThis()">\r
+                                       <img src="<%skinfile(/images/button-alignright.gif)%>" title="<%text(_ADD_ALIGNRIGHT_TT)%>" alt="<%text(_ADD_ALIGNRIGHT_TT)%>" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="aligncenterThis()">\r
+                                       <img src="<%skinfile(/images/button-aligncenter.gif)%>" title="<%text(_ADD_ALIGNCENTER_TT)%>" alt="<%text(_ADD_ALIGNCENTER_TT)%>" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbuttonspacer">&nbsp;</span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="leftThis()">\r
+                                       <img src="<%skinfile(/images/button-left.gif)%>" title="<%text(_ADD_LEFT_TT)%>" alt="<%text(_ADD_LEFT_TT)%>" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="rightThis()">\r
+                                       <img src="<%skinfile(/images/button-right.gif)%>" title="<%text(_ADD_RIGHT_TT)%>" alt="<%text(_ADD_RIGHT_TT)%>" width="16" height="16" />\r
+                               </span>\r
+                               <span class="jsbuttonspacer">&nbsp;</span>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="addMedia()">\r
+                                       <img src="<%skinfile(/images/button-media.gif)%>" title="<%text(_ADD_MEDIA_TT)%>" alt="<%text(_ADD_MEDIA_TT)%>" width="16" height="16" />\r
+                               </span>\r
+       <!--[if IE]>\r
+                               <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="showedit()">\r
+                                       <img src="<%skinfile(/images/button-preview.gif)%>" title="<%text(_ADD_PREVIEW_TT)%>" alt="<%text(_ADD_PREVIEW_TT)%>" width="16" height="16" />\r
+                               </span>\r
+       <![endif]-->\r
                        </div>\r
                        </div>\r
-                       <input name="actiontype" tabindex="61" value="adddraft" type="radio" id="act_draft" /><label for="act_draft"><%text(_ADD_ADDDRAFT)%></label> <%helplink(draft)%>\r
-               </td>\r
-       </tr><tr>\r
-               <td><%text(_ADD_PLUGIN_EXTRAS)%></td>\r
-               <td>\r
-                       <%pluginextras%>\r
-               </td>\r
-       </tr>\r
-                       <%pluginoptions(item)%> \r
-    <tr>\r
-       <th colspan="2"><%text(_ADD_MORE)%></th>\r
-       </tr><tr>\r
-               <td><%text(_ADD_MORE)%>\r
-                       <br /><%helplink(extended)%>\r
-               </td>\r
-               <td>\r
-               <div class="jsbuttonbar">\r
-<!--[if IE]>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="cutThis()">\r
-                               <img src="<%skinfile(/images/button-cut.gif)%>" title="<%text(_ADD_CUT_TT)%>(Ctrl + X)" alt="<%text(_ADD_CUT_TT)%>(Ctrl + X)" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="copyThis()">\r
-                               <img src="<%skinfile(/images/button-copy.gif)%>" title="<%text(_ADD_COPY_TT)%>(Ctrl + C)" alt="<%text(_ADD_COPY_TT)%>(Ctrl + C)" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="pasteThis()">\r
-                               <img src="<%skinfile(/images/button-paste.gif)%>" title="<%text(_ADD_PASTE_TT)%>(Ctrl + V)" alt="<%text(_ADD_PASTE_TT)%>(Ctrl + V)" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbuttonspacer">&nbsp;</span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="boldThis()">\r
-                               <img src="<%skinfile(/images/button-bold.gif)%>" title="<%text(_ADD_BOLD_TT)%>(Ctrl + Shift + B)" alt="<%text(_ADD_BOLD_TT)%>(Ctrl + Shift + B)" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="italicThis()">\r
-                               <img src="<%skinfile(/images/button-italic.gif)%>" title="<%text(_ADD_ITALIC_TT)%>(Ctrl + Shift + I)" alt="<%text(_ADD_ITALIC_TT)%>(Ctrl + Shift + I)" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="ahrefThis()">\r
-                               <img src="<%skinfile(/images/button-link.gif)%>" title="<%text(_ADD_HREF_TT)%>(Ctrl + Shift + A)" alt="<%text(_ADD_HREF_TT)%>(Ctrl + Shift + A)" width="16" height="16" />\r
-                       </span>\r
-<![endif]-->\r
-<!--[if ! IE]>-->\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="boldThis()">\r
-                               <img src="<%skinfile(/images/button-bold.gif)%>" title="<%text(_ADD_BOLD_TT)%>" alt="<%text(_ADD_BOLD_TT)%>" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="italicThis()">\r
-                               <img src="<%skinfile(/images/button-italic.gif)%>" title="<%text(_ADD_ITALIC_TT)%>" alt="<%text(_ADD_ITALIC_TT)%>" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="ahrefThis()">\r
-                               <img src="<%skinfile(/images/button-link.gif)%>" title="<%text(_ADD_HREF_TT)%>" alt="<%text(_ADD_HREF_TT)%>" width="16" height="16" />\r
-                       </span>\r
-<!--<![endif]-->\r
-                       <span class="jsbuttonspacer">&nbsp;</span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="alignleftThis()">\r
-                               <img src="<%skinfile(/images/button-alignleft.gif)%>" title="<%text(_ADD_ALIGNLEFT_TT)%>" alt="<%text(_ADD_ALIGNLEFT_TT)%>" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="alignrightThis()">\r
-                               <img src="<%skinfile(/images/button-alignright.gif)%>" title="<%text(_ADD_ALIGNRIGHT_TT)%>" alt="<%text(_ADD_ALIGNRIGHT_TT)%>" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="aligncenterThis()">\r
-                               <img src="<%skinfile(/images/button-aligncenter.gif)%>" title="<%text(_ADD_ALIGNCENTER_TT)%>" alt="<%text(_ADD_ALIGNCENTER_TT)%>" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbuttonspacer">&nbsp;</span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="leftThis()">\r
-                               <img src="<%skinfile(/images/button-left.gif)%>" title="<%text(_ADD_LEFT_TT)%>" alt="<%text(_ADD_LEFT_TT)%>" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="rightThis()">\r
-                               <img src="<%skinfile(/images/button-right.gif)%>" title="<%text(_ADD_RIGHT_TT)%>" alt="<%text(_ADD_RIGHT_TT)%>" width="16" height="16" />\r
-                       </span>\r
-                       <span class="jsbuttonspacer">&nbsp;</span>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="addMedia()">\r
-                               <img src="<%skinfile(/images/button-media.gif)%>" title="<%text(_ADD_MEDIA_TT)%>" alt="<%text(_ADD_MEDIA_TT)%>" width="16" height="16" />\r
-                       </span>\r
-<!--[if IE]>\r
-                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="showedit()">\r
-                               <img src="<%skinfile(/images/button-preview.gif)%>" title="<%text(_ADD_PREVIEW_TT)%>" alt="<%text(_ADD_PREVIEW_TT)%>" width="16" height="16" />\r
-                       </span>\r
-<![endif]-->\r
-               </div>\r
-                       <textarea id="inputmore" onkeyup="storeCaret(this); updPreview(more); doMonitor();" onclick="storeCaret(this);" onselect="storeCaret(this);"\r
-                               name="more"\r
-                               tabindex="70"\r
-                               cols="60"\r
-                               rows="20"\r
-                               ><%contents(more)%></textarea>\r
-               </td>\r
-       </tr><tr>\r
-               <td><%text(_SUBMIT)%></td>\r
-               <td>\r
-                       <input tabindex="60" type="submit" value="<%text(_ADD_ADDITEM)%>" \r
-                               onclick="return checkSubmit();" />\r
-                       <%if(autosave)%>\r
-                       <input tabindex="80" type="button" name="autosavenow" value="<%text(_AUTOSAVEDRAFT_NOW)%>"\r
-                               onclick="autoSaveDraft();" />\r
-                       <%endif%>\r
-               </td>\r
-       </tr>\r
+                               <textarea id="inputmore" onkeyup="storeCaret(this); updPreview(more); doMonitor();" onclick="storeCaret(this);" onselect="storeCaret(this);"\r
+                                       name="more"\r
+                                       tabindex="70"\r
+                                       cols="60"\r
+                                       rows="20"\r
+                                       ><%contents(more)%></textarea>\r
+                       </td>\r
+               </tr>\r
+       <tr>\r
+                       <td><%text(_SUBMIT)%></td>\r
+                       <td>\r
+                               <input tabindex="60" type="submit" value="<%text(_ADD_ADDITEM)%>" \r
+                                       onclick="return checkSubmit();" />\r
+                               <%if(autosave)%>\r
+                               <input tabindex="80" type="button" name="autosavenow" value="<%text(_AUTOSAVEDRAFT_NOW)%>"\r
+                                       onclick="autoSaveDraft();" />\r
+                               <%endif%>\r
+                       </td>\r
+               </tr>\r
+       </table>\r
+       \r
+       </div>\r
+       </form>\r
+       <%if(autosave)%>\r
+               <script type="text/javascript">\r
+                       var xmlhttprequest = new Array();\r
+                       xmlhttprequest[0] = createHTTPHandler(); // AutoDraft handler\r
+                       xmlhttprequest[1] = createHTTPHandler(); // UpdateTicket handler\r
+                       var seconds = now(); // Last AutoDraft time\r
+                       var checks = 0; // Number of checks since last AutoDraft\r
+                       var addform = document.getElementById('addform'); // The form id\r
+                       var goal = document.getElementById('info'); // The html div id where 'Last saved: date time' must come\r
+                       var goalurl = '../action.php'; // The PHP file where the content must be posted to\r
+                       var lastsavedtext = '<%text(_AUTOSAVEDRAFT_LASTSAVED)%>'; // The language variable for 'Last saved'\r
+                       var formtype = 'add'; // Add or edit form\r
+               </script>       \r
+       <%endif%>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="createnewlog"><![CDATA[\r
+<%pagehead%>\r
+<p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
+<h2><%text(_EBLOG_CREATE_TITLE)%></h2>\r
+<h3><%text(_ADMIN_NOTABILIA)%></h3>\r
+<p><%text(_ADMIN_PLEASE_READ)%></p>\r
+<p><%text(_ADMIN_HOW_TO_ACCESS)%></p>\r
+<ol>\r
+<li><%text(_ADMIN_SIMPLE_WAY)%></li>\r
+<li><%text(_ADMIN_ADVANCED_WAY)%></li>\r
+</ol>\r
+<h3><%text(_ADMIN_HOW_TO_CREATE)%></h3>\r
+<p><%text(_EBLOG_CREATE_TEXT)%></p>\r
+<form method="post" action="<%adminurl%>index.php">\r
+<div>\r
+<input type="hidden" name="action" value="addnewlog" />\r
+<%ticket%>\r
+<table>\r
+<tr>\r
+<td><%text(_EBLOG_NAME)%></td>\r
+<td><input name="name" tabindex="10" size="40" maxlength="60" /></td>\r
+</tr>\r
+<tr>\r
+<td>\r
+<%text(_EBLOG_SHORTNAME)%>\r
+<%helplink(shortblogname)%>\r
+</td>\r
+<td><input name="shortname" tabindex="20" maxlength="15" size="15" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_DESC)%></td>\r
+<td><input name="desc" tabindex="30" maxlength="200" size="40" /></td>\r
+</tr>\r
+<tr>\r
+<td>\r
+<%text(_EBLOG_DEFSKIN)%>\r
+<%helplink(blogdefaultskin)%>\r
+</td>\r
+<td><%defskinselect(blog,admin/default)%></td>\r
+</tr>\r
+<tr>\r
+<td>\r
+<%text(_EBLOG_OFFSET)%>\r
+<%helplink(blogtimeoffset)%><br />\r
+<%text(_EBLOG_STIME)%> <b><%blogtime(servertime,"%H:%M")%></b>\r
+</td>\r
+<td><input name="timeoffset" tabindex="110" size="3" value="0" /></td>\r
+</tr>\r
+<tr>\r
+<td>\r
+<%text(_EBLOG_ADMIN)%>\r
+<%helplink(teamadmin)%>\r
+</td>\r
+<td><%text(_EBLOG_ADMIN_MSG)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_EBLOG_CREATE)%></td>\r
+<td><input type="submit" tabindex="120" value="<%text(_EBLOG_CREATE_BTN)%>" onclick="return checkSubmit();" /></td>\r
+</tr>\r
+</table>\r
+</div>\r
+</form><%pagefoot%>\r
+]]></part>\r
+<part name="deleteblog"><![CDATA[\r
+<%pagehead%>\r
+<h2><%text(_DELETE_CONFIRM)%></h2>\r
+<p><%text(_WARNINGTXT_BLOGDEL)%>\r
+</p>\r
+<div>\r
+<%text(_CONFIRMTXT_BLOG)%><b><%blogsetting(name)%></b>\r
+</div>\r
+<form method="post" action="<%adminurl%>index.php"><div>\r
+<input type="hidden" name="action" value="deleteblogconfirm" />\r
+<%ticket%>\r
+<input type="hidden" name="blogid" value="<%requestblogid%>" />\r
+<input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
+</div></form><%pagefoot%>\r
+]]></part>\r
+<part name="editmembersettings"><![CDATA[\r
+<%pagehead%>\r
+<%if(superadmin)%><a href="<%adminurl%>index.php?action=usermanagement">(<%text(_MEMBERS_BACKTOOVERVIEW)%>)<%else%><a href="<%adminurl%>index.php?action=overview">(<%text(_BACKHOME)%>)<%endif%></a>\r
+<h2><%text(_MEMBERS_EDIT)%></h2>\r
+<form method="post" action="<%adminurl%>index.php" name="memberedit">\r
+<div>\r
+<input type="hidden" name="action" value="changemembersettings" />\r
+<input type="hidden" name="memberid" value="<%editmember(id)%>" />\r
+<%ticket%>\r
+<table>\r
+<tr>\r
+<th colspan="2"><%text(_MEMBERS_EDIT)%></th>\r
+</tr>\r
+<tr>\r
+<td>\r
+<%text(_MEMBERS_DISPLAY)%> <%helplink(shortnames)%>\r
+<br /><small><%text(_MEMBERS_DISPLAY_INFO)%></small>\r
+</td>\r
+<td><%editmember(displayname)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_MEMBERS_REALNAME)%></td>\r
+<td><input name="realname" tabindex="20" maxlength="60" size="40" value="<%editmember(realname)%>" /></td>\r
+</tr>\r
+<tr><%if(allowloginedit)%>\r
+<td><%text(_MEMBERS_PWD)%></td>\r
+<td><input type="password" tabindex="30" maxlength="40" size="16" name="password" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_MEMBERS_REPPWD)%></td>\r
+<td><input type="password" tabindex="35" maxlength="40" size="16" name="repeatpassword" /></td>\r
+</tr>\r
+<tr><%endif%>\r
+<td>\r
+<%text(_MEMBERS_EMAIL)%>\r
+<br /><small><%text(_MEMBERS_EMAIL_EDIT)%></small>\r
+</td>\r
+<td><input name="email" tabindex="40" size="40" maxlength="60" value="<%editmember(email)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_MEMBERS_URL)%></td>\r
+<td><input name="url" tabindex="50" size="40" maxlength="100" value="<%editmember(url)%>" /></td>\r
+<%if(superadmin)%></tr>\r
+<tr>\r
+<td><%text(_MEMBERS_SUPERADMIN)%> <%helplink(superadmin)%></td>\r
+<td><%editmember(admin)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_MEMBERS_CANLOGIN)%> <%helplink(canlogin)%></td>\r
+<td><%editmember(canlogin)%></td><%endif%>\r
+</tr>\r
+<tr>\r
+<td><%text(_MEMBERS_NOTES)%></td>\r
+<td><input name="notes" tabindex="80" size="40" maxlength="100" value="<%editmember(notes)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_MEMBERS_LOCALE)%> <%helplink(locale)%></td>\r
+<td>\r
+<select name="locale" tabindex="85">\r
+<%localeselectoptions%>\r
+</select>\r
+</td>\r
+</tr>\r
+<tr>\r
+<td><%text(_MEMBERS_USEAUTOSAVE)%> <%helplink(autosave)%></td>\r
+<td><%editmember(autosave)%></td>\r
+</tr><%if(superadmin)%><tr>\r
+<td><%text(_SKINABLEADMIN_MEMBERS_ADMINSKIN)%> <%customhelplink(useadminskin)%></td>\r
+<td>\r
+<%defskinselect(admin/default)%>\r
+</td>\r
+</tr><%endif%>\r
+<%pluginoptions(member)%>\r
+<tr>\r
+<th colspan="2"><%text(_MEMBERS_EDIT)%></th>\r
+</tr>\r
+<tr>\r
+<td><%text(_MEMBERS_EDIT)%></td>\r
+<td><input type="submit" tabindex="90" value="<%text(_MEMBERS_EDIT_BTN)%>" onclick="return checkSubmit();" /></td>\r
+</tr>\r
 </table>\r
 </table>\r
-\r
 </div>\r
 </form>\r
 </div>\r
 </form>\r
-<%if(autosave)%>\r
-<script type="text/javascript">\r
-       var xmlhttprequest = new Array();\r
-       xmlhttprequest[0] = createHTTPHandler(); // AutoDraft handler\r
-       xmlhttprequest[1] = createHTTPHandler(); // UpdateTicket handler\r
-       var seconds = now(); // Last AutoDraft time\r
-       var checks = 0; // Number of checks since last AutoDraft\r
-       var addform = document.getElementById('addform'); // The form id\r
-       var goal = document.getElementById('info'); // The html div id where 'Last saved: date time' must come\r
-       var goalurl = '../action.php'; // The PHP file where the content must be posted to\r
-       var lastsavedtext = '<%text(_AUTOSAVEDRAFT_LASTSAVED)%>'; // The language variable for 'Last saved'\r
-       var formtype = 'add'; // Add or edit form\r
-</script>      \r
-<%endif%><%pagefoot%>]]></part>\r
-    <part name="createnewlog"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
-        <h2><%text(_EBLOG_CREATE_TITLE)%></h2>\r
-        <h3><%text(_ADMIN_NOTABILIA)%></h3>\r
-        <p><%text(_ADMIN_PLEASE_READ)%></p>\r
-        <p><%text(_ADMIN_HOW_TO_ACCESS)%></p>\r
-        <ol>\r
-            <li><%text(_ADMIN_SIMPLE_WAY)%></li>\r
-            <li><%text(_ADMIN_ADVANCED_WAY)%></li>\r
-        </ol>\r
-        <h3><%text(_ADMIN_HOW_TO_CREATE)%></h3>\r
-        <p><%text(_EBLOG_CREATE_TEXT)%></p>\r
-        <form method="post" action="<%adminurl%>index.php">\r
-            <div>\r
-                <input type="hidden" name="action" value="addnewlog" />\r
-                <%ticket%>\r
-                <table>\r
-                    <tr>\r
-                        <td><%text(_EBLOG_NAME)%></td>\r
-                        <td><input name="name" tabindex="10" size="40" maxlength="60" /></td>\r
-                    </tr><tr>\r
-                        <td>\r
-                            <%text(_EBLOG_SHORTNAME)%>\r
-                            <%helplink(shortblogname)%>\r
-                        </td>\r
-                        <td><input name="shortname" tabindex="20" maxlength="15" size="15" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_DESC)%></td>\r
-                        <td><input name="desc" tabindex="30" maxlength="200" size="40" /></td>\r
-                    </tr><tr>\r
-                        <td>\r
-                            <%text(_EBLOG_DEFSKIN)%>\r
-                            <%helplink(blogdefaultskin)%>\r
-                        </td>\r
-                        <td><%defskinselect(blog,admin/default)%></td>\r
-                    </tr><tr>\r
-                        <td>\r
-                            <%text(_EBLOG_OFFSET)%>\r
-                            <%helplink(blogtimeoffset)%><br />\r
-                            <%text(_EBLOG_STIME)%> <b><%blogtime(servertime,"%H:%M")%></b>\r
-                        </td>\r
-                        <td><input name="timeoffset" tabindex="110" size="3" value="0" /></td>\r
-                    </tr><tr>\r
-                        <td>\r
-                            <%text(_EBLOG_ADMIN)%>\r
-                            <%helplink(teamadmin)%>\r
-                        </td>\r
-                        <td><%text(_EBLOG_ADMIN_MSG)%></td>\r
-                    </tr><tr>\r
-                        <td><%text(_EBLOG_CREATE)%></td>\r
-                        <td><input type="submit" tabindex="120" value="<%text(_EBLOG_CREATE_BTN)%>" onclick="return checkSubmit();" /></td>\r
-                    </tr>\r
-                </table>\r
-            </div>\r
-        </form><%pagefoot%>]]></part>\r
-    <part name="deleteblog"><![CDATA[<%pagehead%><h2><%text(_DELETE_CONFIRM)%></h2>\r
-            <p><%text(_WARNINGTXT_BLOGDEL)%>\r
-            </p>\r
-            <div>\r
-            <%text(_CONFIRMTXT_BLOG)%><b><%blogsetting(name)%></b>\r
-            </div>\r
-            <form method="post" action="<%adminurl%>index.php"><div>\r
-            <input type="hidden" name="action" value="deleteblogconfirm" />\r
-            <%ticket%>\r
-            <input type="hidden" name="blogid" value="<%requestblogid%>" />\r
-            <input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
-            </div></form><%pagefoot%>]]></part>\r
-    <part name="editmembersettings"><![CDATA[<%pagehead%><%if(superadmin)%><a href="<%adminurl%>index.php?action=usermanagement">(<%text(_MEMBERS_BACKTOOVERVIEW)%>)<%else%><a href="<%adminurl%>index.php?action=overview">(<%text(_BACKHOME)%>)<%endif%></a>\r
-            <h2><%text(_MEMBERS_EDIT)%></h2>\r
-            <form method="post" action="<%adminurl%>index.php" name="memberedit">\r
-                <div>\r
-                    <input type="hidden" name="action" value="changemembersettings" />\r
-                    <input type="hidden" name="memberid" value="<%editmember(id)%>" />\r
-                    <%ticket%>\r
-                    <table>\r
-                        <tr>\r
-                            <th colspan="2"><%text(_MEMBERS_EDIT)%></th>\r
-                        </tr><tr>\r
-                            <td>\r
-                                <%text(_MEMBERS_DISPLAY)%> <%helplink(shortnames)%>\r
-                                <br /><small><%text(_MEMBERS_DISPLAY_INFO)%></small>\r
-                            </td>\r
-                            <td><%editmember(displayname)%></td>\r
-                        </tr><tr>\r
-                            <td><%text(_MEMBERS_REALNAME)%></td>\r
-                            <td><input name="realname" tabindex="20" maxlength="60" size="40" value="<%editmember(realname)%>" /></td>\r
-                        </tr><tr><%if(allowloginedit)%>\r
-                            <td><%text(_MEMBERS_PWD)%></td>\r
-                            <td><input type="password" tabindex="30" maxlength="40" size="16" name="password" /></td>\r
-                        </tr><tr>\r
-                            <td><%text(_MEMBERS_REPPWD)%></td>\r
-                            <td><input type="password" tabindex="35" maxlength="40" size="16" name="repeatpassword" /></td>\r
-                        </tr><tr><%endif%>\r
-                            <td>\r
-                                <%text(_MEMBERS_EMAIL)%>\r
-                                <br /><small><%text(_MEMBERS_EMAIL_EDIT)%></small>\r
-                            </td>\r
-                            <td><input name="email" tabindex="40" size="40" maxlength="60" value="<%editmember(email)%>" /></td>\r
-                        </tr><tr>\r
-                            <td><%text(_MEMBERS_URL)%></td>\r
-                            <td><input name="url" tabindex="50" size="40" maxlength="100" value="<%editmember(url)%>" /></td>\r
-                        <%if(superadmin)%></tr><tr>\r
-                            <td><%text(_MEMBERS_SUPERADMIN)%> <%helplink(superadmin)%></td>\r
-                            <td><%editmember(admin)%></td>\r
-                        </tr><tr>\r
-                            <td><%text(_MEMBERS_CANLOGIN)%> <%helplink(canlogin)%></td>\r
-                            <td><%editmember(canlogin)%></td><%endif%>\r
-                        </tr><tr>\r
-                            <td><%text(_MEMBERS_NOTES)%></td>\r
-                            <td><input name="notes" tabindex="80" size="40" maxlength="100" value="<%editmember(notes)%>" /></td>\r
-                        </tr><tr>\r
-                            <td><%text(_MEMBERS_LOCALE)%> <%helplink(locale)%></td>\r
-                            <td>\r
-                                <select name="locale" tabindex="85">\r
-                                    <%localeselectoptions%>\r
-                                </select>\r
-                            </td>\r
-                        </tr><tr>\r
-                            <td><%text(_MEMBERS_USEAUTOSAVE)%> <%helplink(autosave)%></td>\r
-                            <td><%editmember(autosave)%></td>\r
-                        </tr><%if(superadmin)%><tr>\r
-                            <td><%text(_SKINABLEADMIN_MEMBERS_ADMINSKIN)%> <%customhelplink(useadminskin)%></td>\r
-                            <td>\r
-                                    <%adminskinselectoptions(admin/default)%>\r
-                            </td>\r
-                        </tr><%endif%>\r
-                        <%pluginoptions(member)%>\r
-                        <tr>\r
-                            <th colspan="2"><%text(_MEMBERS_EDIT)%></th>\r
-                        </tr><tr>\r
-                            <td><%text(_MEMBERS_EDIT)%></td>\r
-                            <td><input type="submit" tabindex="90" value="<%text(_MEMBERS_EDIT_BTN)%>" onclick="return checkSubmit();" /></td>\r
-                        </tr>\r
-                    </table>\r
-                </div>\r
-            </form>\r
-            <h3><%text(_PLUGINS_EXTRA)%></h3>\r
-            <%pluginextras(member)%><%pagefoot%>]]></part>\r
-    <part name="itemcommentlist"><![CDATA[<%pagehead%><p>(<a href="<%adminurl%>index.php?action=itemlist&amp;blogid=<%requestblogid%>"><%text(_BACKTOOVERVIEW)%></a>)</p>\r
-        <h2><%text(_COMMENTS)%></h2>\r
-        <%commentnavlist(admin/default)%><%pagefoot%>]]></part>\r
-    <part name="itemdelete"><![CDATA[<%pagehead%><h2><%text(_DELETE_CONFIRM)%></h2>\r
-        <p><%text(_CONFIRMTXT_ITEM)%></p>\r
-            <div class="note">\r
-                <b>"<%deleteitemtitle%>"</b>\r
-                <br />\r
-                <%deleteitembody%>\r
-            </div>\r
-            <form method="post" action="<%adminurl%>index.php"><div>\r
-                <input type="hidden" name="action" value="itemdeleteconfirm" />\r
-                <%ticket%>\r
-                <input type="hidden" name="itemid" value="<%deleteitemid%>" />\r
-                <input type="submit" value="<%text(_DELETE_CONFIRM_BTN)%>" tabindex="10" />\r
-            </div></form><%pagefoot%>]]></part>\r
-    <part name="itemedit"><![CDATA[<%pagehead%><h2><%text(_EDIT_ITEM)%></h2>\r
+<h3><%text(_PLUGINS_EXTRA)%></h3>\r
+<%pluginextras(member)%><%pagefoot%>\r
+]]></part>\r
+<part name="itemcommentlist"><![CDATA[\r
+<%pagehead%>\r
+<p>(<a href="<%adminurl%>index.php?action=itemlist&amp;blogid=<%requestblogid%>"><%text(_BACKTOOVERVIEW)%></a>)</p>\r
+<h2><%text(_COMMENTS)%></h2>\r
+<%commentnavlist(admin/default)%><%pagefoot%>\r
+]]></part>\r
+<part name="itemdelete"><![CDATA[\r
+<%pagehead%>\r
+<h2><%text(_DELETE_CONFIRM)%></h2>\r
+<p><%text(_CONFIRMTXT_ITEM)%></p>\r
+<div class="note">\r
+<b>"<%deleteitemtitle%>"</b>\r
+<br />\r
+<%deleteitembody%>\r
+</div>\r
+<form method="post" action="<%adminurl%>index.php"><div>\r
+<input type="hidden" name="action" value="itemdeleteconfirm" />\r
+<%ticket%>\r
+<input type="hidden" name="itemid" value="<%deleteitemid%>" />\r
+<input type="submit" value="<%text(_DELETE_CONFIRM_BTN)%>" tabindex="10" />\r
+</div></form><%pagefoot%>\r
+]]></part>\r
+<part name="itemedit"><![CDATA[\r
+<%pagehead%>\r
+<h2><%text(_EDIT_ITEM)%></h2>\r
 \r
 <%init%>\r
 <script type="text/javascript" src="<%skinfile(/javascripts/numbercheck.js)%>"></script>\r
 \r
 <%init%>\r
 <script type="text/javascript" src="<%skinfile(/javascripts/numbercheck.js)%>"></script>\r
@@ -1334,7 +1610,8 @@ selector();
 <tr>\r
        <td><%text(_EDIT_ORIG_AUTHOR)%></td>\r
        <td><%contents(author)%></td>\r
 <tr>\r
        <td><%text(_EDIT_ORIG_AUTHOR)%></td>\r
        <td><%contents(author)%></td>\r
-</tr><tr>\r
+</tr>\r
+<tr>\r
        <td><%text(_ADD_TITLE)%></td>\r
        <td><input id="inputtitle" onkeyup="storeCaret(this); updPreview(title); doMonitor();" onclick="storeCaret(this);" onselect="storeCaret(this);"\r
                        name="title"\r
        <td><%text(_ADD_TITLE)%></td>\r
        <td><input id="inputtitle" onkeyup="storeCaret(this); updPreview(title); doMonitor();" onclick="storeCaret(this);" onselect="storeCaret(this);"\r
                        name="title"\r
@@ -1343,7 +1620,8 @@ selector();
                        maxlength="160" \r
                        value="<%contents(title)%>" />\r
        </td>\r
                        maxlength="160" \r
                        value="<%contents(title)%>" />\r
        </td>\r
-</tr><tr>\r
+</tr>\r
+<tr>\r
        <td>\r
                <%text(_ADD_BODY)%>\r
        </td>\r
        <td>\r
                <%text(_ADD_BODY)%>\r
        </td>\r
@@ -1420,7 +1698,8 @@ selector();
                <span id="prevbody">&#160;</span><br />\r
                <span id="prevmore">&#160;</span><br />\r
        </td>\r
                <span id="prevbody">&#160;</span><br />\r
                <span id="prevmore">&#160;</span><br />\r
        </td>\r
-</tr><tr>\r
+</tr>\r
+<tr>\r
 \r
 <%if(blogsetting, bcomments)%>\r
                <td>\r
 \r
 <%if(blogsetting, bcomments)%>\r
                <td>\r
@@ -1432,12 +1711,14 @@ selector();
                        <br />\r
                        <small><%text(_EDIT_COMMENTSNOTE)%></small>     \r
                </td>\r
                        <br />\r
                        <small><%text(_EDIT_COMMENTSNOTE)%></small>     \r
                </td>\r
-       </tr><tr>                               \r
+       </tr>\r
+<tr>                           \r
 <%endif%>\r
 \r
        <td><%text(_ADD_CATEGORY)%></td>\r
        <td><%categories(40)%></td>\r
 <%endif%>\r
 \r
        <td><%text(_ADD_CATEGORY)%></td>\r
        <td><%categories(40)%></td>\r
-</tr><tr>\r
+</tr>\r
+<tr>\r
        <td><%text(_EDIT_SUBMIT)%></td>\r
        <td>\r
 \r
        <td><%text(_EDIT_SUBMIT)%></td>\r
        <td>\r
 \r
@@ -1489,7 +1770,8 @@ selector();
 <%endif%>\r
 \r
        </td>\r
 <%endif%>\r
 \r
        </td>\r
-</tr><tr>\r
+</tr>\r
+<tr>\r
        <td><%text(_ADD_PLUGIN_EXTRAS)%></td>\r
        <td>\r
                <%pluginextras%>\r
        <td><%text(_ADD_PLUGIN_EXTRAS)%></td>\r
        <td>\r
                <%pluginextras%>\r
@@ -1570,7 +1852,8 @@ selector();
                        cols="60" \r
                        rows="20"><%contents(more)%></textarea>\r
        </td>\r
                        cols="60" \r
                        rows="20"><%contents(more)%></textarea>\r
        </td>\r
-</tr><tr>\r
+</tr>\r
+<tr>\r
                <td><%text(_SUBMIT)%></td>\r
                <td>\r
                        <input tabindex="60" type="submit" value="<%text(_EDIT_SUBMIT)%>" \r
                <td><%text(_SUBMIT)%></td>\r
                <td>\r
                        <input tabindex="60" type="submit" value="<%text(_EDIT_SUBMIT)%>" \r
@@ -1595,92 +1878,113 @@ selector();
        var goalurl = '../action.php'; // The PHP file where the content must be posted to\r
        var lastsavedtext = '<%text(_AUTOSAVEDRAFT_LASTSAVED)%>'; // The language variable for 'Last saved'\r
        var formtype = 'edit'; // Add or edit form\r
        var goalurl = '../action.php'; // The PHP file where the content must be posted to\r
        var lastsavedtext = '<%text(_AUTOSAVEDRAFT_LASTSAVED)%>'; // The language variable for 'Last saved'\r
        var formtype = 'edit'; // Add or edit form\r
-</script><%endif%><%pagefoot%>]]></part>\r
-    <part name="itemlist"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=overview">(<%text(_BACKHOME)%>)</a></p>\r
-        <h2><%text(_ITEMLIST_BLOG)%><%adminbloglink(admin/default)%></h2>\r
-        <%ilistaddnew%>\r
-        <%itemnavlist(admin/default)%><%pagefoot%>]]></part>\r
-    <part name="itemmove"><![CDATA[<%pagehead%><h2><%text(_MOVE_TITLE)%></h2>\r
-            <form method="post" action="<%adminurl%>index.php"><div>\r
-                <input type="hidden" name="action" value="itemmoveto" />\r
-                <input type="hidden" name="itemid" value="<%moveitemid%>" />\r
-                <%ticket%>\r
-                <%movedistselect%>\r
-                <input type="submit" value="<%text(_MOVE_BTN)%>" tabindex="10000" onclick="return checkSubmit();" />\r
-            </div></form><%pagefoot%>]]></part>\r
-    <part name="manage"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=overview">(<%text(_BACKHOME)%>)</a></p>\r
-        <%headmessage%>\r
-        <h2><%text(_MANAGE_GENERAL)%></h2>\r
+</script><%endif%><%pagefoot%>\r
+]]></part>\r
+<part name="itemlist"><![CDATA[\r
+<%pagehead%>\r
+<p><a href="<%adminurl%>index.php?action=overview">(<%text(_BACKHOME)%>)</a></p>\r
+<h2><%text(_ITEMLIST_BLOG)%><%adminbloglink(admin/default)%></h2>\r
+<%ilistaddnew%>\r
+<%itemnavlist(admin/default)%><%pagefoot%>\r
+]]></part>\r
+<part name="itemmove"><![CDATA[\r
+<%pagehead%>\r
+<h2><%text(_MOVE_TITLE)%></h2>\r
+<form method="post" action="<%adminurl%>index.php"><div>\r
+<input type="hidden" name="action" value="itemmoveto" />\r
+<input type="hidden" name="itemid" value="<%moveitemid%>" />\r
+<%ticket%>\r
+<%movedistselect%>\r
+<input type="submit" value="<%text(_MOVE_BTN)%>" tabindex="10000" onclick="return checkSubmit();" />\r
+</div></form><%pagefoot%>\r
+]]></part>\r
+<part name="manage"><![CDATA[\r
+<%pagehead%>\r
+<p><a href="<%adminurl%>index.php?action=overview">(<%text(_BACKHOME)%>)</a></p>\r
+<%headmessage%>\r
+<h2><%text(_MANAGE_GENERAL)%></h2>\r
 \r
 \r
-        <ul>\r
-            <li><a href="<%adminurl%>index.php?action=createnewlog"><%text(_OVERVIEW_NEWLOG)%></a></li>\r
-            <li><a href="<%adminurl%>index.php?action=settingsedit"><%text(_OVERVIEW_SETTINGS)%></a></li>\r
-            <li><a href="<%adminurl%>index.php?action=usermanagement"><%text(_OVERVIEW_MEMBERS)%></a></li>\r
-            <li><a href="<%adminurl%>index.php?action=actionlog"><%text(_OVERVIEW_VIEWLOG)%></a></li>\r
-        </ul>\r
+<ul>\r
+<li><a href="<%adminurl%>index.php?action=createnewlog"><%text(_OVERVIEW_NEWLOG)%></a></li>\r
+<li><a href="<%adminurl%>index.php?action=settingsedit"><%text(_OVERVIEW_SETTINGS)%></a></li>\r
+<li><a href="<%adminurl%>index.php?action=usermanagement"><%text(_OVERVIEW_MEMBERS)%></a></li>\r
+<li><a href="<%adminurl%>index.php?action=actionlog"><%text(_OVERVIEW_VIEWLOG)%></a></li>\r
+</ul>\r
 \r
 \r
-        <h2><%text(_MANAGE_SKINS)%></h2>\r
-        <ul>\r
-            <li><a href="<%adminurl%>index.php?action=skinoverview"><%text(_OVERVIEW_SKINS)%></a></li>\r
-            <li><a href="<%adminurl%>index.php?action=templateoverview"><%text(_OVERVIEW_TEMPLATES)%></a></li>\r
-            <li><a href="<%adminurl%>index.php?action=skinieoverview"><%text(_OVERVIEW_SKINIMPORT)%></a></li>\r
-        </ul>\r
+<h2><%text(_MANAGE_SKINS)%></h2>\r
+<ul>\r
+<li><a href="<%adminurl%>index.php?action=skinoverview"><%text(_OVERVIEW_SKINS)%></a></li>\r
+<li><a href="<%adminurl%>index.php?action=templateoverview"><%text(_OVERVIEW_TEMPLATES)%></a></li>\r
+<li><a href="<%adminurl%>index.php?action=skinieoverview"><%text(_OVERVIEW_SKINIMPORT)%></a></li>\r
+</ul>\r
 \r
 \r
-        <h2><%text(_MANAGE_EXTRA)%></h2>\r
-        <ul>\r
-            <li><a href="<%adminurl%>index.php?action=backupoverview"><%text(_OVERVIEW_BACKUP)%></a></li>\r
-            <li><a href="<%adminurl%>index.php?action=pluginlist"><%text(_OVERVIEW_PLUGINS)%></a></li>\r
-        </ul><%pagefoot%>]]></part>\r
-    <part name="manageteam"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=blogsettings&amp;blogid=<%requestblogid%>">(<%text(_BACK_TO_BLOGSETTINGS)%>)</a></p>\r
-        <h2><%text(_TEAM_TITLE)%><%blogsetting(name)%></h2>\r
-        <h3><%text(_TEAM_CURRENT)%></h3>\r
-        <%blogteamlist(admin/default)%>\r
-        <h3><%text(_TEAM_ADDNEW)%></h3>\r
-        <form method='post' action='<%adminurl%>index.php'>\r
-            <div>\r
-                <input type='hidden' name='action' value='teamaddmember' />\r
-                <input type='hidden' name='blogid' value='<%requestblogid%>' />\r
+<h2><%text(_MANAGE_EXTRA)%></h2>\r
+<ul>\r
+<li><a href="<%adminurl%>index.php?action=backupoverview"><%text(_OVERVIEW_BACKUP)%></a></li>\r
+<li><a href="<%adminurl%>index.php?action=pluginlist"><%text(_OVERVIEW_PLUGINS)%></a></li>\r
+</ul><%pagefoot%>\r
+]]></part>\r
+<part name="manageteam"><![CDATA[\r
+<%pagehead%>\r
+<p><a href="<%adminurl%>index.php?action=blogsettings&amp;blogid=<%requestblogid%>">(<%text(_BACK_TO_BLOGSETTINGS)%>)</a></p>\r
+<h2><%text(_TEAM_TITLE)%><%blogsetting(name)%></h2>\r
+<h3><%text(_TEAM_CURRENT)%></h3>\r
+<%blogteamlist(admin/default)%>\r
+<h3><%text(_TEAM_ADDNEW)%></h3>\r
+<form method='post' action='<%adminurl%>index.php'>\r
+<div>\r
+<input type='hidden' name='action' value='teamaddmember' />\r
+<input type='hidden' name='blogid' value='<%requestblogid%>' />\r
 \r
 \r
 \r
 \r
-                <%ticket%>\r
-                <table>\r
-                    <tr>\r
-                        <td><%text(_TEAM_CHOOSEMEMBER)%></td>\r
-                        <td><%newmemberselect%></td>\r
-                    </tr><tr>\r
-                        <td><%text(_TEAM_ADMIN)%><%helplink(teamadmin)%></td>\r
-                        <td><%inputyesno(admin,0,10020)%></td>\r
-                    </tr><tr>\r
-                        <td><%text(_TEAM_ADD)%></td>\r
-                        <td><input type='submit' value='<%text(_TEAM_ADD_BTN)%>' tabindex="10030" /></td>\r
-                    </tr>\r
-                </table>\r
-            </div>\r
-        </form><%pagefoot%>]]></part>\r
-    <part name="memberdelete"><![CDATA[<%pagehead%><h2><%text(_DELETE_CONFIRM)%></h2>\r
-            <p><%text(_CONFIRMTXT_MEMBER%><b><%editmember(displayname)%></b></p>\r
-            <p><%text(_WARNINGTXT_NOTDELMEDIAFILES)%></p>\r
-            <form method="post" action="<%adminurl%>index.php">\r
-                <div>\r
-                    <input type="hidden" name="action" value="memberdeleteconfirm" />\r
-                    <%ticket%>\r
-                    <input type="hidden" name="memberid" value="<%editmember(id)%>" />\r
-                    <input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
-                </div>\r
-            </form><%pagefoot%>]]></part>\r
-    <part name="overview"><![CDATA[<%pagehead%><%headmessage%>\r
-        <h2><%text(_OVERVIEW_YRBLOGS)%></h2>\r
-        <%yrbloglist(admin/default)%>\r
-        <h2><%text(_OVERVIEW_YRSETTINGS)%></h2>\r
-        <ul>\r
-            <li><a href="<%adminurl%>index.php?action=editmembersettings"><%text(_OVERVIEW_EDITSETTINGS)%></a></li>\r
-            <li><a href="<%adminurl%>index.php?action=browseownitems"><%text(_OVERVIEW_BROWSEITEMS)%></a></li>\r
-            <li><a href="<%adminurl%>index.php?action=browseowncomments"><%text(_OVERVIEW_BROWSECOMM)%></a></li>\r
-        </ul>\r
-        <%if(superadmin)%><h2><%text(_OVERVIEW_MANAGEMENT)%></h2>\r
-        <ul>\r
-            <li><a href="<%adminurl%>index.php?action=manage"><%text(_OVERVIEW_MANAGE)%></a></li>\r
-        </ul><%pagefoot%>]]></part>\r
+<%ticket%>\r
+<table>\r
+<tr>\r
+<td><%text(_TEAM_CHOOSEMEMBER)%></td>\r
+<td><%newmemberselect%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_TEAM_ADMIN)%><%helplink(teamadmin)%></td>\r
+<td><%inputyesno(admin,0,10020)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_TEAM_ADD)%></td>\r
+<td><input type='submit' value='<%text(_TEAM_ADD_BTN)%>' tabindex="10030" /></td>\r
+</tr>\r
+</table>\r
+</div>\r
+</form><%pagefoot%>\r
+]]></part>\r
+<part name="memberdelete"><![CDATA[\r
+<%pagehead%>\r
+<h2><%text(_DELETE_CONFIRM)%></h2>\r
+<p><%text(_CONFIRMTXT_MEMBER%><b><%editmember(displayname)%></b></p>\r
+<p><%text(_WARNINGTXT_NOTDELMEDIAFILES)%></p>\r
+<form method="post" action="<%adminurl%>index.php">\r
+<div>\r
+<input type="hidden" name="action" value="memberdeleteconfirm" />\r
+<%ticket%>\r
+<input type="hidden" name="memberid" value="<%editmember(id)%>" />\r
+<input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
+</div>\r
+</form><%pagefoot%>\r
+]]></part>\r
+<part name="overview"><![CDATA[\r
+<%pagehead%>\r
+<%headmessage%>\r
+<h2><%text(_OVERVIEW_YRBLOGS)%></h2>\r
+<%yrbloglist(admin/default)%>\r
+<h2><%text(_OVERVIEW_YRSETTINGS)%></h2>\r
+<ul>\r
+<li><a href="<%adminurl%>index.php?action=editmembersettings"><%text(_OVERVIEW_EDITSETTINGS)%></a></li>\r
+<li><a href="<%adminurl%>index.php?action=browseownitems"><%text(_OVERVIEW_BROWSEITEMS)%></a></li>\r
+<li><a href="<%adminurl%>index.php?action=browseowncomments"><%text(_OVERVIEW_BROWSECOMM)%></a></li>\r
+</ul>\r
+<%if(superadmin)%><h2><%text(_OVERVIEW_MANAGEMENT)%></h2>\r
+<ul>\r
+<li><a href="<%adminurl%>index.php?action=manage"><%text(_OVERVIEW_MANAGE)%></a></li>\r
+</ul><%pagefoot%>\r
+]]></part>\r
 <part name="pagefoot"><![CDATA[\r
        <%if(loggedin)%>\r
                <%ifnot(adminaction,showlogin)%>\r
 <part name="pagefoot"><![CDATA[\r
        <%if(loggedin)%>\r
                <%ifnot(adminaction,showlogin)%>\r
@@ -1742,7 +2046,7 @@ selector();
                                <h2><%text(_SKINABLEADMIN_QMENU_LAYOUT)%></h2>\r
                                <ul>\r
                                <li><a href="<%adminurl%>index.php?action=adminskinoverview"><%text(_QMENU_LAYOUT_SKINS)%></a></li>\r
                                <h2><%text(_SKINABLEADMIN_QMENU_LAYOUT)%></h2>\r
                                <ul>\r
                                <li><a href="<%adminurl%>index.php?action=adminskinoverview"><%text(_QMENU_LAYOUT_SKINS)%></a></li>\r
-                               <li><a href="<%adminurl%>index.php?action=admntemplateoverview"><%text(_QMENU_LAYOUT_TEMPL)%></a></li>\r
+                               <li><a href="<%adminurl%>index.php?action=admintemplateoverview"><%text(_QMENU_LAYOUT_TEMPL)%></a></li>\r
                                <li><a href="<%adminurl%>index.php?action=adminskinieoverview"><%text(_QMENU_LAYOUT_IEXPORT)%></a></li>\r
                                </ul>\r
                        <%endif%>\r
                                <li><a href="<%adminurl%>index.php?action=adminskinieoverview"><%text(_QMENU_LAYOUT_IEXPORT)%></a></li>\r
                                </ul>\r
                        <%endif%>\r
@@ -1778,722 +2082,901 @@ selector();
 <part name="pagehead"><![CDATA[\r
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja-JP" lang="ja-JP">\r
 <part name="pagehead"><![CDATA[\r
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja-JP" lang="ja-JP">\r
-    <head>\r
-        <meta http-equiv="Content-Type" content="text/html; charset=<%charset%>" />\r
-        <title><%sitevar(name)%> - Admin</title>\r
-        <link rel="stylesheet" title="Nucleus Admin Default" type="text/css" href="<%skinfile(/styles/admin_contemporary_jp.css)%>" />\r
-        <link rel="stylesheet" title="Nucleus Admin Default" type="text/css" href="<%skinfile(/styles/addedit.css)%>" />\r
-\r
-        <script type="text/javascript" src="<%skinfile(/javascripts/edit.js)%>"></script>\r
-        <script type="text/javascript" src="<%skinfile(/javascripts/admin.js)%>"></script>\r
-        <script type="text/javascript" src="<%skinfile(/javascripts/compatibility.js)%>"></script>\r
-\r
-        <meta http-equiv='Pragma' content='no-cache' />\r
-        <meta http-equiv='Cache-Control' content='no-cache, must-revalidate' />\r
-        <meta http-equiv='Expires' content='-1' />\r
-        <%extrahead%>\r
-    </head>\r
-    <body>\r
-        <div id="adminwrapper">\r
-            <div class="header">\r
-                <h1><%sitevar(name)%></h1>\r
-            </div>\r
-            <div id="container">\r
-                <div id="content">\r
-                    <div class="loginname">\r
-                        <%if(loggedin)%><%text(_LOGGEDINAS)%> <%member(yourrealname)%> - <a href="<%adminurl%>index.php?action=logout"><%text(_LOGOUT)%></a><br /><a href="<%adminurl%>index.php?action=overview"><%text(_ADMINHOME)%></a> - <%else%><a href="<%adminurl%>index.php?action=showlogin" title="Log in"><%text(_NOTLOGGEDIN)%></a><br /><%endif%>\r
-                        <a href="<%sitevar(url)%>"><%text(_YOURSITE)%></a><br />\r
-                        (<%if(superadmin)%><a href="<%versioncheckurl%>" title="<%text(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE)%>"><%version%><%codename%></a><%newestcompare%><%else%><%version%><%codename%><%endif%>)\r
-                    </div>]]></part>\r
-    <part name="plugindelete"><![CDATA[<%pagehead%>            <h2><%text(_DELETE_CONFIRM)%></h2>\r
+<head>\r
+<meta http-equiv="Content-Type" content="text/html; charset=<%charset%>" />\r
+<title><%sitevar(name)%> - Admin</title>\r
+<link rel="stylesheet" title="Nucleus Admin Default" type="text/css" href="<%skinfile(/styles/admin_contemporary_jp.css)%>" />\r
+<link rel="stylesheet" title="Nucleus Admin Default" type="text/css" href="<%skinfile(/styles/addedit.css)%>" />\r
 \r
 \r
-            <p><%text(_CONFIRMTXT_PLUGIN)%> <strong><%editpluginfo(name)%></strong>?</p>\r
-            <form method="post" action="<%adminurl%>index.php"><div>\r
-            <%ticket%>\r
-            <input type="hidden" name="action" value="plugindeleteconfirm" />\r
-            <input type="hidden" name="plugid" value="<%editpluginfo(id)%>" />\r
-            <input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
-            </div></form>\r
-<%pagefoot%>]]></part>\r
-    <part name="pluginhelp"><![CDATA[<p><a href="<%adminurl%>index.php?action=pluginlist">(<%text(_PLUGS_BACK)%>)</a></p>\r
-        <h2><%text(_PLUGS_HELP_TITLE)%>: <%helpplugname%></h2>\r
-        <%pluginhelp%>\r
-]]></part>\r
-    <part name="pluginlist"><![CDATA[<%pagehead%>        <p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
-        <h2><%text(_PLUGS_TITLE_MANAGE)%><%helplink(plugins)%></h2>\r
-        <h3><%text(_PLUGS_TITLE_INSTALLED)%> &nbsp;&nbsp;<span style="font-size:smaller"><%helplink('getplugins')%><%text(_PLUGS_TITLE_GETPLUGINS)%></a></span></h3>\r
-        <%pluginlistlist(admin/default)%>\r
-        <h3><%text(_PLUGS_TITLE_UPDATE)%></h3>\r
-        <p><%text(_PLUGS_TEXT_UPDATE)%></p>\r
-        <form method="post" action="<%adminurl%>index.php">\r
-            <div>\r
-                <input type="hidden" name="action" value="pluginupdate" />\r
-                <%ticket%>\r
-                <input type="submit" value="<%text(_PLUGS_BTN_UPDATE)%>" tabindex="20" />\r
-            </div>\r
-        </form>\r
-        <h3><%text(_PLUGS_TITLE_NEW)%></h3>\r
-        <%if(existsnewplugin)%><p><%text(_PLUGS_ADD_TEXT)%></p>\r
-        <form method='post' action='index.php'>\r
+<script type="text/javascript" src="<%skinfile(/javascripts/edit.js)%>"></script>\r
+<script type="text/javascript" src="<%skinfile(/javascripts/admin.js)%>"></script>\r
+<script type="text/javascript" src="<%skinfile(/javascripts/compatibility.js)%>"></script>\r
 \r
 \r
-            <div>\r
-                <input type='hidden' name='action' value='pluginadd' />\r
-                <%ticket%>\r
-                <select name="filename" tabindex="30">\r
-                <%newpluginlist%>\r
-                </select>\r
-                <input type='submit' tabindex="40" value='<%text(_PLUGS_BTN_INSTALL)%>' />\r
-            </div></form><%else%><p><%text(_PLUGS_NOCANDIDATES)%></p><%endif%><%pagefoot%>]]></part>\r
-    <part name="pluginoptions"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=pluginlist">(<%text(_PLUGS_BACK)%>)</a></p>\r
-            <h2><%sprinttext(_PLUGIN_OPTIONS_TITLE,<|%geteditpluginfo(name)%|>)%></h2>\r
-            <%headmessage%>\r
-            <form action="<%adminurl%>index.php" method="post">\r
+<meta http-equiv='Pragma' content='no-cache' />\r
+<meta http-equiv='Cache-Control' content='no-cache, must-revalidate' />\r
+<meta http-equiv='Expires' content='-1' />\r
+<%extrahead%>\r
+</head>\r
+<body>\r
+<div id="adminwrapper">\r
+<div class="header">\r
+<h1><%sitevar(name)%></h1>\r
+</div>\r
+<div id="container">\r
+<div id="content">\r
+<div class="loginname">\r
+<%if(loggedin)%><%text(_LOGGEDINAS)%> <%member(yourrealname)%> - <a href="<%adminurl%>index.php?action=logout"><%text(_LOGOUT)%></a><br /><a href="<%adminurl%>index.php?action=overview"><%text(_ADMINHOME)%></a> - <%else%><a href="<%adminurl%>index.php?action=showlogin" title="Log in"><%text(_NOTLOGGEDIN)%></a><br /><%endif%>\r
+<a href="<%sitevar(url)%>"><%text(_YOURSITE)%></a><br />\r
+(<%if(superadmin)%><a href="<%versioncheckurl%>" title="<%text(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE)%>"><%version%><%codename%></a><%newestcompare%><%else%><%version%><%codename%><%endif%>)\r
+</div>\r
+]]></part>\r
+<part name="plugindelete"><![CDATA[\r
+<%pagehead%>\r
+<h2><%text(_DELETE_CONFIRM)%></h2>\r
 \r
 \r
-                <div>\r
-                    <input type="hidden" name="action" value="pluginoptionsupdate" />\r
-                    <input type="hidden" name="plugid" value="<%editpluginfo(id)%>" />\r
-                    <%ticket%>\r
-                    <%editplugoptionslist(admin/default)%>\r
-                </div>\r
-            </form><%pagefoot%>]]></part>\r
-    <part name="settingsedit"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
-        <h2><%text(_SETTINGS_TITLE)%></h2>\r
-        <form action="<%adminurl%>index.php" method="post">\r
-            <div>\r
-                <input type="hidden" name="action" value="settingsupdate" />\r
-                <%ticket%>\r
-                <table>\r
-                    <tr>\r
-                        <th colspan="2"><%text(_SETTINGS_SUB_GENERAL)%></th>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_DEFBLOG)%> <%helplink(defaultblog)%></td>\r
-                        <td><%defblogselect(admin/default)%></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_BASESKIN)%> <%helplink(baseskin)%></td>\r
-                        <td><%defskinselect(,admin/default)%></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_ADMINMAIL)%></td>\r
-                        <td><input name="AdminEmail" tabindex="10010" size="40" value="<%configsettingsedit(AdminEmail)%>" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_SITENAME)%></td>\r
-                        <td><input name="SiteName" tabindex="10020" size="40" value="<%configsettingsedit(SiteName)%>" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_SITEURL)%></td>\r
-                        <td><input name="IndexURL" tabindex="10030" size="40" value="<%configsettingsedit(IndexURL)%>" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_ADMINURL)%></td>\r
-                        <td><input name="AdminURL" tabindex="10040" size="40" value="<%configsettingsedit(AdminURL)%>" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_PLUGINURL)%> <%helplink(pluginurl)%></td>\r
-                        <td><input name="PluginURL" tabindex="10045" size="40" value="<%configsettingsedit(PluginURL)%>" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_SKINSURL)%> <%helplink(skinsurl)%></td>\r
-                        <td><input name="SkinsURL" tabindex="10046" size="40" value="<%configsettingsedit(SkinsURL)%>" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_ACTIONSURL)%> <%helplink(actionurl)%></td>\r
-                        <td><input name="ActionURL" tabindex="10047" size="40" value="<%configsettingsedit(ActionURL)%>" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_LOCALE)%> <%helplink(locale)%></td>\r
-                        <td><select name="Locale" tabindex="10050"><%localeselectoptions%></select></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_DISABLESITE)%> <%helplink(disablesite)%></td>\r
-                        <td>\r
-                            <%configsettingsyesno(DisableSite, 10060)%><br />\r
-                            <%text(_SETTINGS_DISABLESITEURL)%> <input name="DisableSiteURL" tabindex="10070" size="40" value="<%configsettingsedit(DisableSiteURL)%>" />\r
-                        </td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_DIRS)%></td>\r
-                        <td><%outputspecialdirs(nucleusdir)%><i><%text(_SETTINGS_SEECONFIGPHP)%></i></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_DBLOGIN)%></td>\r
-                        <td><i><%text(_SETTINGS_SEECONFIGPHP)%></i></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_JSTOOLBAR)%></td>\r
-                        <td>\r
-                            <select name="DisableJsTools" tabindex="10075">\r
-                                <%jstoolbaroptions%>\r
-                            </select>\r
-                        </td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_URLMODE)%> <%helplink(urlmode)%></td>\r
-                        <td><%configsettingsedit(URLMode)%> <%text(_SETTINGS_URLMODE_HELP)%></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_DEBUGVARS)%> <%helplink(debugvars)%></td>\r
-                        <td><%configsettingsyesno(DebugVars, 10078)%></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_DEFAULTLISTSIZE)%> <%helplink(defaultlistsize)%></td>\r
-                        <td><input name="DefaultListSize" tabindex="10079" size="40" value="<%configsettingsedit(DefaultListSize)%>" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_ADMINCSS)%></td>\r
-                        <td><select name="AdminCSS" tabindex="10080"><%adminstyleselectoptions%></select></td>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_SETTINGS_MEDIA)%> <%helplink(media)%></th>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_MEDIADIR)%></td>\r
-                        <td>\r
-                            <%outputspecialdirs(mediadir)%>\r
-                            <i><%text(_SETTINGS_SEECONFIGPHP)%></i><%mediadirwarning%>\r
-                        </td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_MEDIAURL)%></td>\r
-                        <td><input name="MediaURL" tabindex="10080" size="40" value="<%configsettingsedit(MediaURL)%>" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_ALLOWUPLOAD)%></td>\r
-                        <td><%configsettingsyesno(AllowUpload, 10090)%></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_ALLOWUPLOADTYPES)%></td>\r
-                        <td><input name="AllowedTypes" tabindex="10100" size="40" value="<%configsettingsedit(AllowedTypes)%>" />\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_MAXUPLOADSIZE)%></td>\r
-                        <td><input name="MaxUploadSize" tabindex="10105" size="40" value="<%configsettingsedit(MaxUploadSize)%>" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_MEDIAPREFIX)%></td>\r
-                        <td><%configsettingsyesno(MediaPrefix, 10110)%></td>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_SETTINGS_MEMBERS)%></th>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_CHANGELOGIN)%></td>\r
-                        <td><%configsettingsyesno(AllowLoginEdit, 10120)%></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_ALLOWCREATE)%> <%helplink(allowaccountcreation)%>\r
-                        </td>\r
-                        <td><%configsettingsyesno(AllowMemberCreate, 10130)%></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_NEWLOGIN)%> <%helplink(allownewmemberlogin)%><br /><%text(_SETTINGS_NEWLOGIN2)%></td>\r
-                        <td><%configsettingsyesno(NewMemberCanLogon, 10140)%></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_MEMBERMSGS)%> <%helplink(messageservice)%></td>\r
-                        <td><%configsettingsyesno(AllowMemberMail, 10150)%></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_NONMEMBERMSGS)%> <%helplink(messageservice)%></td>\r
-                        <td><%configsettingsyesno(NonmemberMail, 10155%></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_PROTECTMEMNAMES)%> <%helplink(protectmemnames)%></td>\r
-                        <td><%configsettingsyesno(ProtectMemNames, 10156)%></td>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_SETTINGS_COOKIES_TITLE)%> <%helplink(cookies)%></th>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_COOKIEPREFIX)%></td>\r
-                        <td><input name="CookiePrefix" tabindex="10159" size="40" value="<%configsettingsedit(CookiePrefix)%>" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_COOKIEDOMAIN)%></td>\r
-                        <td><input name="CookieDomain" tabindex="10160" size="40" value="<%configsettingsedit(CookieDomain)%>" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_COOKIEPATH)%></td>\r
-                        <td><input name="CookiePath" tabindex="10170" size="40" value="<%configsettingsedit(CookiePath)%>" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_COOKIESECURE)%></td>\r
-                        <td><%configsettingsyesno(CookieSecure, 10180)%></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_COOKIELIFE)%></td>\r
-                        <td><%configsettingsedit(SessionCookie)%></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_LASTVISIT)%></td>\r
-                        <td><%configsettingsyesno(LastVisit, 10200)%></td>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_SETTINGS_UPDATE)%></th>\r
-                    </tr><tr>\r
-                        <td><%text(_SETTINGS_UPDATE)%></td>\r
-                        <td><input type="submit" tabindex="10210" value="<%text(_SETTINGS_UPDATE_BTN)%>" onclick="return checkSubmit();" /></td>\r
-                    </tr>\r
-                </table>\r
-            </div>\r
-        </form>\r
-        <h2><%text(_PLUGINS_EXTRA)%></h2>\r
-        <%pluginextras%><%pagefoot%>]]></part>\r
-    <part name="showlogin"><![CDATA[<%pagehead%><h2><%text(_LOGIN)%></h2>\r
-        <%headmessage%>\r
-        <form action="<%adminurl%>index.php" method="post"><p>\r
-            <%text(_LOGIN_NAME)%> <br /><input name="login"  tabindex="10" />\r
-            <br />\r
-            <%text(_LOGIN_PASSWORD)%> <br /><input name="password"  tabindex="20" type="password" />\r
-            <br />\r
-            <input name="action" value="login" type="hidden" />\r
-            <br />\r
-            <input type="submit" value="<%text(_LOGIN)%>" tabindex="30" />\r
-            <br />\r
-            <small>\r
-                <input type="checkbox" value="1" name="shared" tabindex="40" id="shared" /><label for="shared"><%text(_LOGIN_SHARED)%></label>\r
-                <br /><a href="forgotpassword.php"><%text(_LOGIN_FORGOT)%></a>\r
-            </small>\r
-            <%passrequestvars%>\r
-        </p></form><%pagefoot%>]]></part>\r
-    <part name="skindelete"><![CDATA[<%pagehead%><h2><%text(_DELETE_CONFIRM)%></h2>\r
-            <p><%text(_CONFIRMTXT_SKIN)%><b><%editskintype(name)%></b> (<%editskintype(desc)%>)</p>\r
-            <form method="post" action="<%adminurl%>index.php">\r
-                <div>\r
-                    <input type="hidden" name="action" value="skindeleteconfirm" />\r
-                    <%ticket%>\r
-                    <input type="hidden" name="skinid" value="<%editskintype(id)%>" />\r
-                    <input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
-                </div>\r
-            </form><%pagefoot%>]]></part>\r
-    <part name="skinedit"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=skinoverview">(<%text(_SKIN_BACK)%>)</a></p>\r
-        <h2><%text(_SKIN_EDITONE_TITLE)%> '<%editskin(name)%>'</h2>\r
-        <h3><%text(_SKIN_PARTS_TITLE)%></h3>\r
-        <%text(_SKIN_PARTS_MSG)%>\r
-        <ul>\r
-            <li><a tabindex="10" href="<%adminurl%>index.php?action=skinedittype&amp;skinid=<%editskin(id)%>&amp;type=index"><%text(_SKIN_PART_MAIN)%></a> <%helplink(skinpartindex)%></li>\r
-            <li><a tabindex="20" href="<%adminurl%>index.php?action=skinedittype&amp;skinid=<%editskin(id)%>&amp;type=item"><%text(_SKIN_PART_ITEM)%></a> <%helplink(skinpartitem)%></li>\r
-            <li><a tabindex="30" href="<%adminurl%>index.php?action=skinedittype&amp;skinid=<%editskin(id)%>&amp;type=archivelist"><%text(_SKIN_PART_ALIST)%></a> <%helplink(skinpartarchivelist)%></li>\r
-            <li><a tabindex="40" href="<%adminurl%>index.php?action=skinedittype&amp;skinid=<%editskin(id)%>&amp;type=archive"><%text(_SKIN_PART_ARCHIVE)%></a> <%helplink(skinpartarchive)%></li>\r
-            <li><a tabindex="50" href="<%adminurl%>index.php?action=skinedittype&amp;skinid=<%editskin(id)%>&amp;type=search"><%text(_SKIN_PART_SEARCH)%></a> <%helplink(skinpartsearch)%></li>\r
-            <li><a tabindex="60" href="<%adminurl%>index.php?action=skinedittype&amp;skinid=<%editskin(id)%>&amp;type=error"><%text(_SKIN_PART_ERROR)%></a> <%helplink(skinparterror)%></li>\r
-            <li><a tabindex="70" href="<%adminurl%>index.php?action=skinedittype&amp;skinid=<%editskin(id)%>&amp;type=member"><%text(_SKIN_PART_MEMBER)%></a> <%helplink(skinpartmember)%></li>\r
-            <li><a tabindex="75" href="<%adminurl%>index.php?action=skinedittype&amp;skinid=<%editskin(id)%>&amp;type=imagepopup"><%text(_SKIN_PART_POPUP)%></a> <%helplink(skinpartimagepopup)%></li>\r
-        </ul>\r
-        <h3><%text(_SKIN_PARTS_SPECIAL)%></h3>\r
-        <form method="get" action="<%adminurl%>index.php">\r
-            <input type="hidden" name="action" value="skinedittype" />\r
-            <input type="hidden" name="skinid" value="<%editskin(id)%>" />\r
-            <input name="type" tabindex="89" size="20" maxlength="20" />\r
-            <input type="submit" tabindex="140" value="<%text(_SKIN_CREATE)%>" onclick="return checkSubmit();" />\r
-        </form>\r
-        <%specialskinlist(admin/default)%>\r
-        <h3><%text(_SKIN_GENSETTINGS_TITLE)%></h3>\r
-        <form method="post" action="<%adminurl%>index.php">\r
-            <div>\r
-                <input type="hidden" name="action" value="skineditgeneral" />\r
-                <%ticket%>\r
-                <input type="hidden" name="skinid" value="<%editskin(id)%>" />\r
-                <table>\r
-                    <tr>\r
-                        <td><%text(_SKIN_NAME)%> <%helplink(shortnames)%></td>\r
-                        <td><input name="name" tabindex="90" value="<%editskin(name)%>" maxlength="20" size="20" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SKIN_DESC)%></td>\r
-                        <td><input name="desc" tabindex="100" value="<%editskin(desc)%>" maxlength="200" size="50" /></td>\r
-                </tr><tr>\r
-                    <td><%text(_SKIN_TYPE)%></td>\r
-                    <td><input name="type" tabindex="110" value="<%editskin(type)%>" maxlength="40" size="20" /></td>\r
-                </tr><tr>\r
-                    <td><%text(_SKIN_INCLUDE_MODE)%> <%helplink(includemode)%></td>\r
-                    <td><%editskin(mode)%></td>\r
-                </tr><tr>\r
-                    <td><%text(_SKIN_INCLUDE_PREFIX)%> <%helplink(includeprefix)%></td>\r
-                    <td><input name="inc_prefix" tabindex="130" value="<%editskin(prefix)%>" maxlength="40" size="20" /></td>\r
-                </tr><tr>\r
-                    <td><%text(_SKIN_CHANGE)%></td>\r
-                    <td><input type="submit" tabindex="140" value="<%text(_SKIN_CHANGE_BTN)%>" onclick="return checkSubmit();" /></td>\r
-                </tr></table>\r
-            </div>\r
-        </form><%pagefoot%>]]></part>\r
-    <part name="skinedittype"><![CDATA[<%pagehead%><p>(<a href="<%adminurl%>index.php?action=skinoverview"><%text(_SKIN_GOBACK)%></a>)</p>\r
-        <h2><%text(_SKIN_EDITPART_TITLE)%> '<%editskintype(name)%>': <%editskintype(skintype)%></h2>\r
-        <%headmessage%>\r
-        <form method="post" action="<%adminurl%>index.php">\r
-            <div>\r
-                <input type="hidden" name="action" value="skinupdate" />\r
+<p><%text(_CONFIRMTXT_PLUGIN)%> <strong><%editpluginfo(name)%></strong>?</p>\r
+<form method="post" action="<%adminurl%>index.php"><div>\r
+<%ticket%>\r
+<input type="hidden" name="action" value="plugindeleteconfirm" />\r
+<input type="hidden" name="plugid" value="<%editpluginfo(id)%>" />\r
+<input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
+</div></form>\r
+<%pagefoot%>\r
+]]></part>\r
+<part name="pluginhelp"><![CDATA[\r
+<p><a href="<%adminurl%>index.php?action=pluginlist">(<%text(_PLUGS_BACK)%>)</a></p>\r
+<h2><%text(_PLUGS_HELP_TITLE)%>: <%helpplugname%></h2>\r
+<%pluginhelp%>\r
+]]></part>\r
+<part name="pluginlist"><![CDATA[\r
+<%pagehead%>\r
+<p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
+<h2><%text(_PLUGS_TITLE_MANAGE)%><%helplink(plugins)%></h2>\r
+<h3><%text(_PLUGS_TITLE_INSTALLED)%> &nbsp;&nbsp;<span style="font-size:smaller"><%helplink('getplugins')%><%text(_PLUGS_TITLE_GETPLUGINS)%></a></span></h3>\r
+<%pluginlistlist(admin/default)%>\r
+<h3><%text(_PLUGS_TITLE_UPDATE)%></h3>\r
+<p><%text(_PLUGS_TEXT_UPDATE)%></p>\r
+<form method="post" action="<%adminurl%>index.php">\r
+<div>\r
+<input type="hidden" name="action" value="pluginupdate" />\r
+<%ticket%>\r
+<input type="submit" value="<%text(_PLUGS_BTN_UPDATE)%>" tabindex="20" />\r
+</div>\r
+</form>\r
+<h3><%text(_PLUGS_TITLE_NEW)%></h3>\r
+<%if(existsnewplugin)%><p><%text(_PLUGS_ADD_TEXT)%></p>\r
+<form method='post' action='index.php'>\r
 \r
 \r
-                <%ticket%>\r
-                <input type="hidden" name="skinid" value="<%editskintype(id)%>" />\r
-                <input type="hidden" name="type" value="<%editskintype(skintyperaw)%>" />\r
-                <input type="submit" value="<%text(_SKIN_UPDATE_BTN)%>" onclick="return checkSubmit();" />\r
-                <input type="reset" value="<%text(_SKIN_RESET_BTN)%>" />\r
-                (skin type: <%editskintype(skintype)%>)<%skintypehelp%><br />\r
-                <textarea class="skinedit" tabindex="10" rows="20" cols="80" name="content"><%editskintype(content)%></textarea><br />\r
-                <input type="submit" tabindex="20" value="<%text(_SKIN_UPDATE_BTN)%>" onclick="return checkSubmit();" />\r
-                <input type="reset" value="<%text(_SKIN_RESET_BTN)%>" />\r
-                (skin type: <%editskintype(skintype)%>)\r
-                <br /><br />\r
-                <%text(_SKIN_ALLOWEDVARS)%>\r
-                <%allowedskinactions%><br /><br />\r
-                <%text(_SKINEDIT_ALLOWEDBLOGS)%>\r
-                <%skineditallowedlist(blog)%>\r
-                <%text(_SKINEDIT_ALLOWEDTEMPLATESS)%>\r
-                <%skineditallowedlist(template)%><br />\r
-            </div>\r
-        </form><%pagefoot%>]]></part>\r
-    <part name="skiniedoimport"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
-        <h2><%text(_SKINIE_DONE)%></h2>\r
+<div>\r
+<input type='hidden' name='action' value='pluginadd' />\r
+<%ticket%>\r
+<select name="filename" tabindex="30">\r
+<%newpluginlist%>\r
+</select>\r
+<input type='submit' tabindex="40" value='<%text(_PLUGS_BTN_INSTALL)%>' />\r
+</div></form><%else%><p><%text(_PLUGS_NOCANDIDATES)%></p><%endif%><%pagefoot%>\r
+]]></part>\r
+<part name="pluginoptions"><![CDATA[\r
+<%pagehead%>\r
+<p><a href="<%adminurl%>index.php?action=pluginlist">(<%text(_PLUGS_BACK)%>)</a></p>\r
+<h2><%sprinttext(_PLUGIN_OPTIONS_TITLE,<|%geteditpluginfo(name)%|>)%></h2>\r
+<%headmessage%>\r
+<form action="<%adminurl%>index.php" method="post">\r
 \r
 \r
-        <ul>\r
-            <li><p><strong><%text(_SKINIE_INFO_GENERAL)%></strong> <%importskininfo(info)%></p></li>\r
-            <li><p><strong><%text(_SKINIE_INFO_IMPORTEDSKINS)%></strong> <%importskininfo(snames)%></p></li>\r
-            <li><p><strong><%text(_SKINIE_INFO_IMPORTEDTEMPLS)%></strong> <%importskininfo(tnames)%></p></li>\r
-        </ul><%pagefoot%>]]></part>\r
-    <part name="skinieimport"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=skinieoverview">(<%text(_BACK)%>)</a></p>\r
-        <h2><%text(_SKINIE_CONFIRM_TITLE)%></h2>\r
-        <ul>\r
-            <li><p><strong><%text(_SKINIE_INFO_GENERAL)%></strong> <%importskininfo(info)%></p></li>\r
-            <li><p><strong><%text(_SKINIE_INFO_SKINS)%></strong> <%importskininfo(snames)%></p></li>\r
-            <li><p><strong><%text(_SKINIE_INFO_TEMPLATES)%></strong> <%importskininfo(tnames)%></p></li>\r
-            <%if(nameclashes)%><li><p><strong style="color: red;"><%text(_SKINIE_INFO_SKINCLASH)%></strong> <%importskininfo(sclashes)%></p></li>\r
-            <li><p><strong style="color: red;"><%text(_SKINIE_INFO_TEMPLCLASH)%></strong> <%importskininfo(tclashes)%></p></li><%endif%>\r
-        </ul>\r
+<div>\r
+<input type="hidden" name="action" value="pluginoptionsupdate" />\r
+<input type="hidden" name="plugid" value="<%editpluginfo(id)%>" />\r
+<%ticket%>\r
+<%editplugoptionslist(admin/default)%>\r
+</div>\r
+</form><%pagefoot%>\r
+]]></part>\r
+<part name="settingsedit"><![CDATA[\r
+<%pagehead%>\r
+<p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
+<h2><%text(_SETTINGS_TITLE)%></h2>\r
+<form action="<%adminurl%>index.php" method="post">\r
+<div>\r
+<input type="hidden" name="action" value="settingsupdate" />\r
+<%ticket%>\r
+<table>\r
+<tr>\r
+<th colspan="2"><%text(_SETTINGS_SUB_GENERAL)%></th>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_DEFBLOG)%> <%helplink(defaultblog)%></td>\r
+<td><%defblogselect(admin/default)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_BASESKIN)%> <%helplink(baseskin)%></td>\r
+<td><%defskinselect(,admin/default)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_ADMINMAIL)%></td>\r
+<td><input name="AdminEmail" tabindex="10010" size="40" value="<%configsettingsedit(AdminEmail)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_SITENAME)%></td>\r
+<td><input name="SiteName" tabindex="10020" size="40" value="<%configsettingsedit(SiteName)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_SITEURL)%></td>\r
+<td><input name="IndexURL" tabindex="10030" size="40" value="<%configsettingsedit(IndexURL)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_ADMINURL)%></td>\r
+<td><input name="AdminURL" tabindex="10040" size="40" value="<%configsettingsedit(AdminURL)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_PLUGINURL)%> <%helplink(pluginurl)%></td>\r
+<td><input name="PluginURL" tabindex="10045" size="40" value="<%configsettingsedit(PluginURL)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_SKINSURL)%> <%helplink(skinsurl)%></td>\r
+<td><input name="SkinsURL" tabindex="10046" size="40" value="<%configsettingsedit(SkinsURL)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_ACTIONSURL)%> <%helplink(actionurl)%></td>\r
+<td><input name="ActionURL" tabindex="10047" size="40" value="<%configsettingsedit(ActionURL)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_LOCALE)%> <%helplink(locale)%></td>\r
+<td><select name="Locale" tabindex="10050"><%localeselectoptions%></select></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_DISABLESITE)%> <%helplink(disablesite)%></td>\r
+<td>\r
+<%configsettingsyesno(DisableSite, 10060)%><br />\r
+<%text(_SETTINGS_DISABLESITEURL)%> <input name="DisableSiteURL" tabindex="10070" size="40" value="<%configsettingsedit(DisableSiteURL)%>" />\r
+</td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_DIRS)%></td>\r
+<td><%outputspecialdirs(nucleusdir)%><i><%text(_SETTINGS_SEECONFIGPHP)%></i></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_DBLOGIN)%></td>\r
+<td><i><%text(_SETTINGS_SEECONFIGPHP)%></i></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_JSTOOLBAR)%></td>\r
+<td>\r
+<select name="DisableJsTools" tabindex="10075">\r
+<%jstoolbaroptions%>\r
+</select>\r
+</td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_URLMODE)%> <%helplink(urlmode)%></td>\r
+<td><%configsettingsedit(URLMode)%> <%text(_SETTINGS_URLMODE_HELP)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_DEBUGVARS)%> <%helplink(debugvars)%></td>\r
+<td><%configsettingsyesno(DebugVars, 10078)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_DEFAULTLISTSIZE)%> <%helplink(defaultlistsize)%></td>\r
+<td><input name="DefaultListSize" tabindex="10079" size="40" value="<%configsettingsedit(DefaultListSize)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_ADMINCSS)%></td>\r
+<td><select name="AdminCSS" tabindex="10080"><%adminstyleselectoptions%></select></td>\r
+</tr>\r
+<tr>\r
+<th colspan="2"><%text(_SETTINGS_MEDIA)%> <%helplink(media)%></th>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_MEDIADIR)%></td>\r
+<td>\r
+<%outputspecialdirs(mediadir)%>\r
+<i><%text(_SETTINGS_SEECONFIGPHP)%></i><%mediadirwarning%>\r
+</td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_MEDIAURL)%></td>\r
+<td><input name="MediaURL" tabindex="10080" size="40" value="<%configsettingsedit(MediaURL)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_ALLOWUPLOAD)%></td>\r
+<td><%configsettingsyesno(AllowUpload, 10090)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_ALLOWUPLOADTYPES)%></td>\r
+<td><input name="AllowedTypes" tabindex="10100" size="40" value="<%configsettingsedit(AllowedTypes)%>" />\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_MAXUPLOADSIZE)%></td>\r
+<td><input name="MaxUploadSize" tabindex="10105" size="40" value="<%configsettingsedit(MaxUploadSize)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_MEDIAPREFIX)%></td>\r
+<td><%configsettingsyesno(MediaPrefix, 10110)%></td>\r
+</tr>\r
+<tr>\r
+<th colspan="2"><%text(_SETTINGS_MEMBERS)%></th>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_CHANGELOGIN)%></td>\r
+<td><%configsettingsyesno(AllowLoginEdit, 10120)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_ALLOWCREATE)%> <%helplink(allowaccountcreation)%>\r
+</td>\r
+<td><%configsettingsyesno(AllowMemberCreate, 10130)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_NEWLOGIN)%> <%helplink(allownewmemberlogin)%><br /><%text(_SETTINGS_NEWLOGIN2)%></td>\r
+<td><%configsettingsyesno(NewMemberCanLogon, 10140)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_MEMBERMSGS)%> <%helplink(messageservice)%></td>\r
+<td><%configsettingsyesno(AllowMemberMail, 10150)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_NONMEMBERMSGS)%> <%helplink(messageservice)%></td>\r
+<td><%configsettingsyesno(NonmemberMail, 10155%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_PROTECTMEMNAMES)%> <%helplink(protectmemnames)%></td>\r
+<td><%configsettingsyesno(ProtectMemNames, 10156)%></td>\r
+</tr>\r
+<tr>\r
+<th colspan="2"><%text(_SETTINGS_COOKIES_TITLE)%> <%helplink(cookies)%></th>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_COOKIEPREFIX)%></td>\r
+<td><input name="CookiePrefix" tabindex="10159" size="40" value="<%configsettingsedit(CookiePrefix)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_COOKIEDOMAIN)%></td>\r
+<td><input name="CookieDomain" tabindex="10160" size="40" value="<%configsettingsedit(CookieDomain)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_COOKIEPATH)%></td>\r
+<td><input name="CookiePath" tabindex="10170" size="40" value="<%configsettingsedit(CookiePath)%>" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_COOKIESECURE)%></td>\r
+<td><%configsettingsyesno(CookieSecure, 10180)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_COOKIELIFE)%></td>\r
+<td><%configsettingsedit(SessionCookie)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_LASTVISIT)%></td>\r
+<td><%configsettingsyesno(LastVisit, 10200)%></td>\r
+</tr>\r
+<tr>\r
+<th colspan="2"><%text(_SETTINGS_UPDATE)%></th>\r
+</tr>\r
+<tr>\r
+<td><%text(_SETTINGS_UPDATE)%></td>\r
+<td><input type="submit" tabindex="10210" value="<%text(_SETTINGS_UPDATE_BTN)%>" onclick="return checkSubmit();" /></td>\r
+</tr>\r
+</table>\r
+</div>\r
+</form>\r
+<h2><%text(_PLUGINS_EXTRA)%></h2>\r
+<%pluginextras%><%pagefoot%>\r
+]]></part>\r
+<part name="showlogin"><![CDATA[\r
+<%pagehead%>\r
+<h2><%text(_LOGIN)%></h2>\r
+<%headmessage%>\r
+<form action="<%adminurl%>index.php" method="post"><p>\r
+<%text(_LOGIN_NAME)%> <br /><input name="login"  tabindex="10" />\r
+<br />\r
+<%text(_LOGIN_PASSWORD)%> <br /><input name="password"  tabindex="20" type="password" />\r
+<br />\r
+<input name="action" value="login" type="hidden" />\r
+<br />\r
+<input type="submit" value="<%text(_LOGIN)%>" tabindex="30" />\r
+<br />\r
+<small>\r
+<input type="checkbox" value="1" name="shared" tabindex="40" id="shared" /><label for="shared"><%text(_LOGIN_SHARED)%></label>\r
+<br /><a href="forgotpassword.php"><%text(_LOGIN_FORGOT)%></a>\r
+</small>\r
+<%passrequestvars%>\r
+</p></form><%pagefoot%>\r
+]]></part>\r
+<part name="skindelete"><![CDATA[\r
+<%pagehead%>\r
+<h2><%text(_DELETE_CONFIRM)%></h2>\r
+<p><%text(_CONFIRMTXT_SKIN)%><b><%editskintype(name)%></b> (<%editskintype(desc)%>)</p>\r
+<form method="post" action="<%adminurl%>index.php">\r
+<div>\r
+<input type="hidden" name="action" value="skindeleteconfirm" />\r
+<%ticket%>\r
+<input type="hidden" name="skinid" value="<%editskintype(id)%>" />\r
+<input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
+</div>\r
+</form><%pagefoot%>\r
+]]></part>\r
+<part name="skinedit"><![CDATA[\r
+       <%pagehead%>\r
+       <p><a href="<%adminurl%>index.php?action=skinoverview">(<%text(_SKIN_BACK)%>)</a></p>\r
+       \r
+       <h2><%text(_SKIN_EDITONE_TITLE)%> '<%editskin(name)%>'</h2>\r
+       \r
+       <h3><%text(_SKIN_PARTS_TITLE)%></h3>\r
+       <%text(_SKIN_PARTS_MSG)%>\r
+       <%normalskinlist(admin/default)%>\r
+       \r
+       <h3><%text(_SKIN_PARTS_SPECIAL)%></h3>\r
+       <form method="get" action="<%adminurl%>index.php">\r
+       <p>\r
+       <input type="hidden" name="action" value="skinedittype" />\r
+       <input type="hidden" name="skinid" value="<%editskin(id)%>" />\r
+       <input name="type" tabindex="89" size="20" maxlength="20" />\r
+       <input type="submit" tabindex="140" value="<%text(_SKIN_CREATE)%>" onclick="return checkSubmit();" />\r
+       </p>\r
+       </form>\r
+       <%specialskinlist(admin/default)%>\r
+       \r
+       <h3><%text(_SKIN_GENSETTINGS_TITLE)%></h3>\r
+       <form method="post" action="<%adminurl%>index.php">\r
+       <p>\r
+       <input type="hidden" name="action" value="skineditgeneral" />\r
+       <%ticket%>\r
+       <input type="hidden" name="skinid" value="<%editskin(id)%>" />\r
+       <table frame="box" rules="all" summary="<%text(_SKIN_GENSETTINGS_TITLE)%>">\r
+       <tr>\r
+       <td><%text(_SKIN_NAME)%> <%helplink(shortnames)%></td>\r
+       <td><input name="name" tabindex="90" value="<%editskin(name)%>" maxlength="20" size="20" /></td>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_SKIN_DESC)%></td>\r
+       <td><input name="desc" tabindex="100" value="<%editskin(desc)%>" maxlength="200" size="50" /></td>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_SKIN_TYPE)%></td>\r
+       <td><input name="type" tabindex="110" value="<%editskin(type)%>" maxlength="40" size="20" /></td>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_SKIN_INCLUDE_MODE)%> <%helplink(includemode)%></td>\r
+       <td><%editskin(mode)%></td>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_SKIN_INCLUDE_PREFIX)%> <%helplink(includeprefix)%></td>\r
+       <td><input name="inc_prefix" tabindex="130" value="<%editskin(prefix)%>" maxlength="40" size="20" /></td>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_SKIN_CHANGE)%></td>\r
+       <td><input type="submit" tabindex="140" value="<%text(_SKIN_CHANGE_BTN)%>" onclick="return checkSubmit();" /></td>\r
+       </tr>\r
+       </table>\r
+       </p>\r
+       </form>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="skinedittype"><![CDATA[\r
+       <%pagehead%>\r
+       <p>(<a href="<%adminurl%>index.php?action=skinoverview"><%text(_SKIN_GOBACK)%></a>)</p>\r
+       \r
+       <h2><%text(_SKIN_EDITPART_TITLE)%> '<%editskintype(name)%>': <%editskintype(skintype)%></h2>\r
+       <%headmessage%>\r
+       \r
+       <form method="post" action="<%adminurl%>index.php">\r
+       <p>\r
+       <input type="hidden" name="action" value="skinupdate" />\r
+       <%ticket%>\r
+       <input type="hidden" name="skinid" value="<%editskintype(id)%>" />\r
+       <input type="hidden" name="type" value="<%editskintype(skintyperaw)%>" />\r
+       <input type="submit" value="<%text(_SKIN_UPDATE_BTN)%>" onclick="return checkSubmit();" />\r
+       <input type="reset" value="<%text(_SKIN_RESET_BTN)%>" />\r
+       (skin type: <%editskintype(skintype)%>)<%skintypehelp%><br />\r
+       <textarea class="skinedit" tabindex="10" rows="20" cols="80" name="content"><%editskintype(content)%></textarea>\r
+       <br />\r
+       <input type="submit" tabindex="20" value="<%text(_SKIN_UPDATE_BTN)%>" onclick="return checkSubmit();" />\r
+       <input type="reset" value="<%text(_SKIN_RESET_BTN)%>" />\r
+       (skin type: <%editskintype(skintype)%>)\r
+       <br />\r
+       <br />\r
+       \r
+       <%text(_SKIN_ALLOWEDVARS)%>\r
+       <%allowedskinactions%><br /><br />\r
+       <%text(_SKINEDIT_ALLOWEDBLOGS)%>\r
+       <%skineditallowedlist(blog)%>\r
+       <%text(_SKINEDIT_ALLOWEDTEMPLATESS)%>\r
+       <%skineditallowedlist(template)%>\r
+       </p>\r
+       </form>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="skiniedoimport"><![CDATA[\r
+<%pagehead%>\r
+<p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
+<h2><%text(_SKINIE_DONE)%></h2>\r
 \r
 \r
-        <form method="post" action="<%adminurl%>index.php"><div>\r
-            <input type="hidden" name="action" value="skiniedoimport" />\r
-            <%ticket%>\r
-            <input type="hidden" name="skinfile" value="<%importskininfo(skinfile)%>" />\r
-            <input type="hidden" name="mode" value="<%importskininfo(mode)%>" />\r
-            <input type="submit" value="<%text(_SKINIE_CONFIRM_IMPORT)%>" />\r
-            <%if(nameclashes)%><br />\r
-            <input type="checkbox" name="overwrite" value="1" id="cb_overwrite" /><label for="cb_overwrite"><%text(_SKINIE_CONFIRM_OVERWRITE)%></label><%endif%>\r
-        </div></form><%pagefoot%>]]></part>\r
-    <part name="skinieoverview"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
-        <h2><%text(_SKINIE_TITLE_IMPORT)%></h2>\r
-        <p>\r
-            <label for="skinie_import_local"><%text(_SKINIE_LOCAL)%></label>\r
-            <%if(skincandidates)%><form method="post" action="<%adminurl%>index.php">\r
-                <div>\r
-                    <input type="hidden" name="action" value="skinieimport" />\r
-                    <%ticket%>\r
-                    <input type="hidden" name="mode" value="file" />\r
-                    <select name="skinfile" id="skinie_import_local">\r
-                        <%selectlocalskinfiles%>\r
-                    </select>\r
-                    <input type="submit" value="<%text(_SKINIE_BTN_IMPORT)%>" />\r
-                </div>\r
-            </form><%else%><%text(_SKINIE_NOCANDIDATES)%><%endif%>\r
-        </p>\r
-        <p><em><%text(_OR)%></em></p>\r
-        <form method="post" action="<%adminurl%>index.php">\r
-            <p>\r
-                <%ticket%>\r
-                <input type="hidden" name="action" value="skinieimport" />\r
-                <input type="hidden" name="mode" value="url" />\r
-                <label for="skinie_import_url"><%text(_SKINIE_FROMURL)%></label>\r
-                <input type="text" name="skinfile" id="skinie_import_url" size="60" value="http://" />\r
-                <input type="submit" value="<%text(_SKINIE_BTN_IMPORT)%>" />\r
-            </p>\r
-        </form>\r
-        <h2><%text(_SKINIE_TITLE_EXPORT)%></h2>\r
-        <form method="post" action="<%adminurl%>index.php">\r
-            <div>\r
-                <input type="hidden" name="action" value="skinieexport" />\r
-                <%ticket%>\r
-                <p><%text(_SKINIE_EXPORT_INTRO)%></p>\r
-                <table>\r
-                    <tr>\r
-                        <th colspan="2"><%text(_SKINIE_EXPORT_SKINS)%></th>\r
-                    </tr><tr>\r
-                        <%skinielist(skin,admin/default)%>\r
-                        <th colspan="2"><%text(_SKINIE_EXPORT_TEMPLATES)%></th>\r
-                    </tr><tr>\r
-                        <%skinielist(template,admin/default)%>\r
-                        <th colspan="2"><%text(_SKINIE_EXPORT_EXTRA)%></th>\r
-                    </tr><tr>\r
-                        <td colspan="2"><textarea cols="40" rows="5" name="info"></textarea></td>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_SKINIE_TITLE_EXPORT)%></th>\r
-                    </tr><tr>\r
-                        <td colspan="2"><input type="submit" value="<%text(_SKINIE_BTN_EXPORT)%>" /></td>\r
-                    </tr>\r
-                </table>\r
-            </div>\r
-        </form><%pagefoot%>]]></part>\r
-    <part name="skinoverview"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
-        <h2><%text(_SKIN_EDIT_TITLE)%></h2>\r
-        <h3><%text(_SKIN_AVAILABLE_TITLE)%></h3>\r
-        <%skinoverview(admin/default)%>\r
-        <h3><%text(_SKIN_NEW_TITLE)%></h3>\r
-        <form method="post" action="<%adminurl%>index.php">\r
-            <div>\r
-                <input name="action" value="skinnew" type="hidden" />\r
+<ul>\r
+<li><p><strong><%text(_SKINIE_INFO_GENERAL)%></strong> <%importskininfo(info)%></p></li>\r
+<li><p><strong><%text(_SKINIE_INFO_IMPORTEDSKINS)%></strong> <%importskininfo(snames)%></p></li>\r
+<li><p><strong><%text(_SKINIE_INFO_IMPORTEDTEMPLS)%></strong> <%importskininfo(tnames)%></p></li>\r
+</ul><%pagefoot%>\r
+]]></part>\r
+<part name="skinieimport"><![CDATA[\r
+<%pagehead%>\r
+<p><a href="<%adminurl%>index.php?action=skinieoverview">(<%text(_BACK)%>)</a></p>\r
+<h2><%text(_SKINIE_CONFIRM_TITLE)%></h2>\r
+<ul>\r
+<li><p><strong><%text(_SKINIE_INFO_GENERAL)%></strong> <%importskininfo(info)%></p></li>\r
+<li><p><strong><%text(_SKINIE_INFO_SKINS)%></strong> <%importskininfo(snames)%></p></li>\r
+<li><p><strong><%text(_SKINIE_INFO_TEMPLATES)%></strong> <%importskininfo(tnames)%></p></li>\r
+<%if(nameclashes)%><li><p><strong style="color: red;"><%text(_SKINIE_INFO_SKINCLASH)%></strong> <%importskininfo(sclashes)%></p></li>\r
+<li><p><strong style="color: red;"><%text(_SKINIE_INFO_TEMPLCLASH)%></strong> <%importskininfo(tclashes)%></p></li><%endif%>\r
+</ul>\r
 \r
 \r
-                <%ticket%>\r
-                <table>\r
-                    <tr>\r
-                        <td><%text(_SKIN_NAME)%> <%helplink(shortnames)%></td>\r
-                        <td><input name="name" tabindex="10010" maxlength="20" size="20" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SKIN_DESC)%></td>\r
-                        <td><input name="desc" tabindex="10020" maxlength="200" size="50" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_SKIN_CREATE)%></td>\r
-                        <td><input type="submit" tabindex="10030" value="<%text(_SKIN_CREATE_BTN)%>" onclick="return checkSubmit();" /></td>\r
-                    </tr>\r
-                </table>\r
-            </div>\r
-        </form><%pagefoot%>]]></part>\r
-    <part name="skinremovetype"><![CDATA[<%pagehead%><h2><%text(_DELETE_CONFIRM)%></h2>\r
-            <p><%text(_CONFIRMTXT_SKIN_PARTS_SPECIAL)%><br />\r
-            <b><%editskintype(skintype)%> (<%editskintype(name)%>)</b> (<%editskintype(desc)%>)</p>\r
-            <form method="post" action="<%adminurl%>index.php">\r
-                <div>\r
-                    <input type="hidden" name="action" value="skinremovetypeconfirm" />\r
-                    <%ticket%>\r
-                    <input type="hidden" name="skinid" value="<%editskintype(id)%>" />\r
-                    <input type="hidden" name="type" value="<%editskintype(skintype)%>" />\r
-                    <input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
-                </div>\r
-            </form><%pagefoot%>]]></part>\r
-    <part name="systemoverview"><![CDATA[<%pagehead%><h2><%text(_ADMIN_SYSTEMOVERVIEW_HEADING)%></h2>\r
+<form method="post" action="<%adminurl%>index.php"><div>\r
+<input type="hidden" name="action" value="skiniedoimport" />\r
+<%ticket%>\r
+<input type="hidden" name="skinfile" value="<%importskininfo(skinfile)%>" />\r
+<input type="hidden" name="mode" value="<%importskininfo(mode)%>" />\r
+<input type="submit" value="<%text(_SKINIE_CONFIRM_IMPORT)%>" />\r
+<%if(nameclashes)%><br />\r
+<input type="checkbox" name="overwrite" value="1" id="cb_overwrite" /><label for="cb_overwrite"><%text(_SKINIE_CONFIRM_OVERWRITE)%></label><%endif%>\r
+</div></form><%pagefoot%>\r
+]]></part>\r
+<part name="skinieoverview"><![CDATA[\r
+<%pagehead%>\r
+<p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
+<h2><%text(_SKINIE_TITLE_IMPORT)%></h2>\r
+<p>\r
+<label for="skinie_import_local"><%text(_SKINIE_LOCAL)%></label>\r
+<%if(skincandidates)%><form method="post" action="<%adminurl%>index.php">\r
+<p>\r
+<input type="hidden" name="action" value="skinieimport" />\r
+<%ticket%>\r
+<input type="hidden" name="mode" value="file" />\r
+<select name="skinfile" id="skinie_import_local">\r
+<%selectlocalskinfiles%>\r
+</select>\r
+<input type="submit" value="<%text(_SKINIE_BTN_IMPORT)%>" />\r
+</p>\r
+</form><%else%><%text(_SKINIE_NOCANDIDATES)%><%endif%>\r
+</p>\r
+<p><em><%text(_OR)%></em></p>\r
+<form method="post" action="<%adminurl%>index.php">\r
+<p>\r
+<%ticket%>\r
+<input type="hidden" name="action" value="skinieimport" />\r
+<input type="hidden" name="mode" value="url" />\r
+<label for="skinie_import_url"><%text(_SKINIE_FROMURL)%></label>\r
+<input type="text" name="skinfile" id="skinie_import_url" size="60" value="http://" />\r
+<input type="submit" value="<%text(_SKINIE_BTN_IMPORT)%>" />\r
+</p>\r
+</form>\r
+<h2><%text(_SKINIE_TITLE_EXPORT)%></h2>\r
+<form method="post" action="<%adminurl%>index.php">\r
+<div>\r
+<input type="hidden" name="action" value="skinieexport" />\r
+<%ticket%>\r
+<p><%text(_SKINIE_EXPORT_INTRO)%></p>\r
+<table>\r
+<tr>\r
+<th colspan="2"><%text(_SKINIE_EXPORT_SKINS)%></th>\r
+</tr>\r
+<tr>\r
+<%skinielist(skin,admin/default)%>\r
+<th colspan="2"><%text(_SKINIE_EXPORT_TEMPLATES)%></th>\r
+</tr>\r
+<tr>\r
+<%skinielist(template,admin/default)%>\r
+<th colspan="2"><%text(_SKINIE_EXPORT_EXTRA)%></th>\r
+</tr>\r
+<tr>\r
+<td colspan="2"><textarea cols="40" rows="5" name="info"></textarea></td>\r
+</tr>\r
+<tr>\r
+<th colspan="2"><%text(_SKINIE_TITLE_EXPORT)%></th>\r
+</tr>\r
+<tr>\r
+<td colspan="2"><input type="submit" value="<%text(_SKINIE_BTN_EXPORT)%>" /></td>\r
+</tr>\r
+</table>\r
+</div>\r
+</form><%pagefoot%>\r
+]]></part>\r
+<part name="skinoverview"><![CDATA[\r
+       <%pagehead%>\r
+       <p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
+       \r
+       <h2><%text(_SKIN_EDIT_TITLE)%></h2>\r
+       \r
+       <h3><%text(_SKIN_AVAILABLE_TITLE)%></h3>\r
+       <%skinoverview(admin/default)%>\r
+       \r
+       <h3><%text(_SKIN_NEW_TITLE)%></h3>\r
+       <form method="post" action="<%adminurl%>index.php">\r
+       <p>\r
+       <input name="action" value="skinnew" type="hidden" />\r
+       <%ticket%>\r
+       <table frame="box" rules="all" sumamry="<%text(_SKIN_NEW_TITLE)%>">\r
+       <tr>\r
+       <td><%text(_SKIN_NAME)%> <%helplink(shortnames)%></td>\r
+       <td><input name="name" tabindex="10010" maxlength="20" size="20" /></td>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_SKIN_DESC)%></td>\r
+       <td><input name="desc" tabindex="10020" maxlength="200" size="50" /></td>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_SKIN_CREATE)%></td>\r
+       <td><input type="submit" tabindex="10030" value="<%text(_SKIN_CREATE_BTN)%>" onclick="return checkSubmit();" /></td>\r
+       </tr>\r
+       </table>\r
+       </p>\r
+       </form>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="skinremovetype"><![CDATA[\r
+<%pagehead%>\r
+<h2><%text(_DELETE_CONFIRM)%></h2>\r
+<p><%text(_CONFIRMTXT_SKIN_PARTS_SPECIAL)%><br />\r
+<b><%editskintype(skintype)%> (<%editskintype(name)%>)</b> (<%editskintype(desc)%>)</p>\r
+<form method="post" action="<%adminurl%>index.php">\r
+<div>\r
+<input type="hidden" name="action" value="skinremovetypeconfirm" />\r
+<%ticket%>\r
+<input type="hidden" name="skinid" value="<%editskintype(id)%>" />\r
+<input type="hidden" name="type" value="<%editskintype(skintype)%>" />\r
+<input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
+</div>\r
+</form><%pagefoot%>\r
+]]></part>\r
+<part name="systemoverview"><![CDATA[\r
+<%pagehead%>\r
+<h2><%text(_ADMIN_SYSTEMOVERVIEW_HEADING)%></h2>\r
 <%if(superadmin)%>\r
 <%if(superadmin)%>\r
-        <h3><%text(_ADMIN_SYSTEMOVERVIEW_PHPANDMYSQL)%></h3>\r
-        <table summary="Version of PHP MySQL">\r
-            <tr>\r
-                <th colspan="2"><%text(_ADMIN_SYSTEMOVERVIEW_VERSIONS)%></th>\r
-            </tr><tr>\r
-                <td width="50%"><%text(_ADMIN_SYSTEMOVERVIEW_PHPVERSION)%></td>\r
-                <td><%systemsettings(phpversion)%></td>\r
-            </tr><tr>\r
-                <td><%text(_ADMIN_SYSTEMOVERVIEW_MYSQLVERSION)%></td>\r
-                <td><%systemsettings(sqlserverinfo)%> (<%systemsettings(sqlclientinfo)%>)</td>\r
-            </tr>\r
-        </table>\r
-        <table summary="Important PHP settings">\r
-            <tr>\r
-                <th colspan="2"><%text(_ADMIN_SYSTEMOVERVIEW_SETTINGS)%></th>\r
-            </tr><tr>\r
-                <td width="50%">magic_quotes_gpc</td>\r
-                <td><%systemsettings(magicquotesgpc)%></td>\r
-            </tr><tr>\r
-                <td width="50%">magic_quotes_runtime</td>\r
-                <td><%systemsettings(magicquotesruntime)%></td>\r
-            </tr><tr>\r
-                <td width="50%">register_globals</td>\r
-                <td><%systemsettings(registerglobals)%></td>\r
-            </tr>\r
-        </table>\r
-        <table summary="Information about GD library">\r
-            <tr>\r
-                <th colspan="2"><%text(_ADMIN_SYSTEMOVERVIEW_GDLIBRALY)%></th>\r
-            </tr>\r
-            <%systemsettings(gdinfo)%>\r
-        </table>\r
-        <table summary="special modules are loaded">\r
-            <tr>\r
-                <th colspan="2"><%text(_ADMIN_SYSTEMOVERVIEW_MODULES)%></th>\r
-            </tr><tr>\r
-                <td width="50%">mod_rewrite</td>\r
-                <td><%systemsettings(modrewrite)%></td>\r
-            </tr>\r
-        </table>\r
+<h3><%text(_ADMIN_SYSTEMOVERVIEW_PHPANDMYSQL)%></h3>\r
+<table summary="Version of PHP MySQL">\r
+<tr>\r
+<th colspan="2"><%text(_ADMIN_SYSTEMOVERVIEW_VERSIONS)%></th>\r
+</tr>\r
+<tr>\r
+<td width="50%"><%text(_ADMIN_SYSTEMOVERVIEW_PHPVERSION)%></td>\r
+<td><%systemsettings(phpversion)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_ADMIN_SYSTEMOVERVIEW_MYSQLVERSION)%></td>\r
+<td><%systemsettings(sqlserverinfo)%> (<%systemsettings(sqlclientinfo)%>)</td>\r
+</tr>\r
+</table>\r
+<table summary="Important PHP settings">\r
+<tr>\r
+<th colspan="2"><%text(_ADMIN_SYSTEMOVERVIEW_SETTINGS)%></th>\r
+</tr>\r
+<tr>\r
+<td width="50%">magic_quotes_gpc</td>\r
+<td><%systemsettings(magicquotesgpc)%></td>\r
+</tr>\r
+<tr>\r
+<td width="50%">magic_quotes_runtime</td>\r
+<td><%systemsettings(magicquotesruntime)%></td>\r
+</tr>\r
+<tr>\r
+<td width="50%">register_globals</td>\r
+<td><%systemsettings(registerglobals)%></td>\r
+</tr>\r
+</table>\r
+<table summary="Information about GD library">\r
+<tr>\r
+<th colspan="2"><%text(_ADMIN_SYSTEMOVERVIEW_GDLIBRALY)%></th>\r
+</tr>\r
+<%systemsettings(gdinfo)%>\r
+</table>\r
+<table summary="special modules are loaded">\r
+<tr>\r
+<th colspan="2"><%text(_ADMIN_SYSTEMOVERVIEW_MODULES)%></th>\r
+</tr>\r
+<tr>\r
+<td width="50%">mod_rewrite</td>\r
+<td><%systemsettings(modrewrite)%></td>\r
+</tr>\r
+</table>\r
 \r
 \r
-        <h3><%text(_ADMIN_SYSTEMOVERVIEW_NUCLEUSSYSTEM)%></h3>\r
-        <table summary="Information about the used Nucleus CMS">\r
-            <tr>\r
-                <th colspan="2">Nucleus CMS</th>\r
-            </tr><tr>\r
-                <td width="50%"><%text(_ADMIN_SYSTEMOVERVIEW_NUCLEUSVERSION)%></td>\r
-                <td><%systemsettings(nucleusversion)%></td>\r
-            </tr><tr>\r
-                <td width="50%"><%text(_ADMIN_SYSTEMOVERVIEW_NUCLEUSPATCHLEVEL)%></td>\r
-                <td><%systemsettings(nucleuspatchlevel)%></td>\r
-            </tr>\r
-        </table>\r
-        <table summary="Important settings of the installation">\r
-            <tr>\r
-                <th colspan="2"><%text(_ADMIN_SYSTEMOVERVIEW_NUCLEUSSETTINGS)%></th>\r
-            </tr><tr>\r
-                <td width="50%">$CONF['Self']</td>\r
-                <td><%systemsettings(confself)%></td>\r
-            </tr><tr>\r
-                <td width="50%">$CONF['ItemURL']</td>\r
-                <td><%systemsettings(confitemurl)%></td>\r
-            </tr><tr>\r
-                <td width="50%">$CONF['alertOnHeadersSent']</td>\r
-                <td><%systemsettings(alertonheaderssent)%></td>\r
-            </tr>\r
-        </table>\r
+<h3><%text(_ADMIN_SYSTEMOVERVIEW_NUCLEUSSYSTEM)%></h3>\r
+<table summary="Information about the used Nucleus CMS">\r
+<tr>\r
+<th colspan="2">Nucleus CMS</th>\r
+</tr>\r
+<tr>\r
+<td width="50%"><%text(_ADMIN_SYSTEMOVERVIEW_NUCLEUSVERSION)%></td>\r
+<td><%systemsettings(nucleusversion)%></td>\r
+</tr>\r
+<tr>\r
+<td width="50%"><%text(_ADMIN_SYSTEMOVERVIEW_NUCLEUSPATCHLEVEL)%></td>\r
+<td><%systemsettings(nucleuspatchlevel)%></td>\r
+</tr>\r
+</table>\r
+<table summary="Important settings of the installation">\r
+<tr>\r
+<th colspan="2"><%text(_ADMIN_SYSTEMOVERVIEW_NUCLEUSSETTINGS)%></th>\r
+</tr>\r
+<tr>\r
+<td width="50%">$CONF['Self']</td>\r
+<td><%systemsettings(confself)%></td>\r
+</tr>\r
+<tr>\r
+<td width="50%">$CONF['ItemURL']</td>\r
+<td><%systemsettings(confitemurl)%></td>\r
+</tr>\r
+<tr>\r
+<td width="50%">$CONF['alertOnHeadersSent']</td>\r
+<td><%systemsettings(alertonheaderssent)%></td>\r
+</tr>\r
+</table>\r
 \r
 \r
-        <h3><%text(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK)%></h3>\r
-        <!-- Link to the online version test at the Nucleus CMS website -->\r
-        <%text(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TXT)%>\r
-        <a href="<%systemsettings(versioncheckurl)%>" title="<%text(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE)%>">\r
-            Nucleus CMS <%systemsettings(nucleusversion)%> <%systemsettings(nucleuscodename)%>\r
-        </a><br />\r
+<h3><%text(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK)%></h3>\r
+<!-- Link to the online version test at the Nucleus CMS website -->\r
+<%text(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TXT)%>\r
+<a href="<%systemsettings(versioncheckurl)%>" title="<%text(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE)%>">\r
+Nucleus CMS <%systemsettings(nucleusversion)%> <%systemsettings(nucleuscodename)%>\r
+</a><br />\r
 <%else%>\r
 <%else%>\r
-        <%text(_ADMIN_SYSTEMOVERVIEW_NOT_ADMIN)%>\r
+<%text(_ADMIN_SYSTEMOVERVIEW_NOT_ADMIN)%>\r
 <%endif%>\r
 <%endif%>\r
-<%pagefoot%>]]></part>\r
-    <part name="teamdelete"><![CDATA[<%pagehead%><h2><%text(_DELETE_CONFIRM)%></h2>\r
-            <p>\r
-                <%text(_CONFIRMTXT_TEAM1)%>\r
-                <b>\r
-                    <%editmember(displayname)%>\r
-                </b>\r
-                <%text(_CONFIRMTXT_TEAM2)%>\r
-                <b>\r
-                    <%blogsetting(name)%>\r
-                </b>\r
-            </p>\r
-            <form method="post" action="<%adminurl%>index.php">\r
-                <div>\r
-                <input type="hidden" name="action" value="teamdeleteconfirm" />\r
-                <%ticket%>\r
-                <input type="hidden" name="memberid" value="<%editmember(id)%>" />\r
-            <input type="hidden" name="blogid" value="<%requestblogid%>" />\r
-            <input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
-            </div></form><%pagefoot%>]]></part>\r
-    <part name="templatedelete"><![CDATA[<%pagehead%><h2><%text(_DELETE_CONFIRM)%></h2>\r
-            <p><%text(_CONFIRMTXT_TEMPLATE)%><b><%edittemplateinfo(name)%></b> (<%edittemplateinfo(desc)%>)</p>\r
-            <form method="post" action="<%adminurl%>index.php">\r
-                <div>\r
-                    <input type="hidden" name="action" value="templatedeleteconfirm" />\r
-                    <%ticket%>\r
-                    <input type="hidden" name="templateid" value="<%edittemplateinfo(id)%>" />\r
-                    <input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
-                </div>\r
-            </form><%pagefoot%>]]></part>\r
-    <part name="templateedit"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=templateoverview">(<%text(_TEMPLATE_BACK)%>)</a></p>\r
-\r
-        <h2><%text(_TEMPLATE_EDIT_TITLE)%> '<%edittemplateinfo(name)%>'</h2>\r
-        <%headmessage%>\r
-        <p><%text(_TEMPLATE_EDIT_MSG)%></p>\r
-        <form method="post" action="<%adminurl%>index.php">\r
-            <div>\r
-                <input type="hidden" name="action" value="templateupdate" />\r
-                <%ticket%>\r
-                <input type="hidden" name="templateid" value="<%edittemplateinfo(id)%>" />\r
-                <table>\r
-                    <tr>\r
-                        <th colspan="2"><%text(_TEMPLATE_SETTINGS)%></th>\r
-                    </tr><tr>\r
-                        <td><%text(_TEMPLATE_NAME)%> <%helplink(shortnames)%></td>\r
-                        <td><input name="tname" tabindex="4" size="20" maxlength="20" value="<%edittemplateinfo(name)%>" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_TEMPLATE_DESC)%></td>\r
-                        <td><input name="tdesc" tabindex="5" size="50" maxlength="200" value="<%edittemplateinfo(desc)%>" /></td>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_TEMPLATE_UPDATE)%></th>\r
-                    </tr><tr>\r
-                        <td><%text(_TEMPLATE_UPDATE)%></td>\r
-                        <td>\r
-                            <input type="submit" tabindex="6" value="<%text(_TEMPLATE_UPDATE_BTN)%>" onclick="return checkSubmit();" />\r
-                            <input type="reset" tabindex="7" value="<%text(_TEMPLATE_RESET_BTN)%>" />\r
-                        </td>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_TEMPLATE_ITEMS)%> <%helplink(templateitems)%></th>\r
-                    <%edittemplateinfo(row,_TEMPLATE_ITEMHEADER,ITEM_HEADER,,8)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_ITEMBODY,ITEM,,9,1)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_ITEMFOOTER,ITEM_FOOTER,,10)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_MORELINK,MORELINK,morelink, 20)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_EDITLINK, EDITLINK, editlink, 25)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_NEW, NEW, new, 30)%>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_TEMPLATE_COMMENTS_ANY)%> <%helplink(templatecomments)%></th>\r
-                    <%edittemplateinfo(row,_TEMPLATE_CHEADER, COMMENTS_HEADER, commentheaders, 40)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_CBODY, COMMENTS_BODY, commentbody, 50, 1)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_CFOOTER, COMMENTS_FOOTER, commentheaders, 60)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_CONE, COMMENTS_ONE, commentwords, 70)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_CMANY, COMMENTS_MANY, commentwords, 80)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_CMORE, COMMENTS_CONTINUED, commentcontinued, 90)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_CMEXTRA, COMMENTS_AUTH, memberextra, 100)%>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_TEMPLATE_COMMENTS_NONE)%> <%helplink(templatecomments)%></th>\r
-                    <%edittemplateinfo(row,_TEMPLATE_CNONE, COMMENTS_NONE, , 110)%>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_TEMPLATE_COMMENTS_TOOMUCH)%> <%helplink(templatecomments)%></th>\r
-                    <%edittemplateinfo(row,_TEMPLATE_CTOOMUCH, COMMENTS_TOOMUCH, , 120)%>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_TEMPLATE_ARCHIVELIST)%> <%helplink(templatearchivelists)%></th>\r
-                    <%edittemplateinfo(row,_TEMPLATE_AHEADER, ARCHIVELIST_HEADER, , 130)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_AITEM, ARCHIVELIST_LISTITEM, , 140)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_AFOOTER, ARCHIVELIST_FOOTER, , 150)%>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_TEMPLATE_BLOGLIST)%> <%helplink(templatebloglists)%></th>\r
-                    <%edittemplateinfo(row,_TEMPLATE_BLOGHEADER, BLOGLIST_HEADER, , 160)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_BLOGITEM, BLOGLIST_LISTITEM, , 170)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_BLOGFOOTER, BLOGLIST_FOOTER, , 180)%>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_TEMPLATE_CATEGORYLIST)%> <%helplink(templatecategorylists)%></th>\r
-                    <%edittemplateinfo(row,_TEMPLATE_CATHEADER, CATLIST_HEADER, , 190)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_CATITEM, CATLIST_LISTITEM, , 200)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_CATFOOTER, CATLIST_FOOTER, , 210)%>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_TEMPLATE_DATETIME)%></th>\r
-                    <%edittemplateinfo(row,_TEMPLATE_DHEADER, DATE_HEADER, dateheads, 220)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_DFOOTER, DATE_FOOTER, dateheads, 230)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_DFORMAT, FORMAT_DATE, datetime, 240)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_TFORMAT, FORMAT_TIME, datetime, 250)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_LOCALE, LOCALE, locale, 260)%>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_TEMPLATE_IMAGE)%> <%helplink(templatepopups)%></th>\r
-                    <%edittemplateinfo(row,_TEMPLATE_PCODE, POPUP_CODE, , 270)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_ICODE, IMAGE_CODE, , 280)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_MCODE, MEDIA_CODE, , 290)%>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_TEMPLATE_SEARCH)%></th>\r
-                    <%edittemplateinfo(row,_TEMPLATE_SHIGHLIGHT, SEARCH_HIGHLIGHT, highlight,300)%>\r
-                    <%edittemplateinfo(row,_TEMPLATE_SNOTFOUND, SEARCH_NOTHINGFOUND, nothingfound,310)%>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_TEMPLATE_PLUGIN_FIELDS)%></th>\r
-                    <%edittemplateinfo(extratemplate,admin/default)%>\r
-                    </tr><tr>\r
-                        <th colspan="2"><%text(_TEMPLATE_UPDATE)%></th>\r
-                    </tr><tr>\r
-                        <td><%text(_TEMPLATE_UPDATE)%></td>\r
-                        <td>\r
-                            <input type="submit" tabindex="800" value="<%text(_TEMPLATE_UPDATE_BTN)%>" onclick="return checkSubmit();" />\r
-                            <input type="reset" tabindex="810" value="<%text(_TEMPLATE_RESET_BTN)%>" />\r
-                        </td>\r
-                    </tr>\r
-                </table>\r
-            </div>\r
-        </form><%pagefoot%>]]></part>\r
-    <part name="templateoverview"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
-        <h2><%text(_TEMPLATE_TITLE)%></h2>\r
-        <h3><%text(_TEMPLATE_AVAILABLE_TITLE)%></h3>\r
-        <%templateoverview(admin/default)%>\r
-        <h3><%text(_TEMPLATE_NEW_TITLE)%></h3>\r
-        <form method="post" action="<%adminurl%>index.php">\r
-            <div>\r
-                <input name="action" value="templatenew" type="hidden" />\r
-                <%ticket%>\r
-                <table>\r
-                    <tr>\r
-                        <td><%text(_TEMPLATE_NAME)%> <%helplink(shortnames)%></td>\r
-                        <td><input name="name" tabindex="10010" maxlength="20" size="20" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_TEMPLATE_DESC)%></td>\r
-                        <td><input name="desc" tabindex="10020" maxlength="200" size="50" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_TEMPLATE_CREATE)%></td>\r
-                        <td><input type="submit" tabindex="10030" value="<%text(_TEMPLATE_CREATE_BTN)%>" onclick="return checkSubmit();" /></td>\r
-                    </tr>\r
-                </table>\r
-            </div>\r
-        </form><%pagefoot%>]]></part>\r
-    <part name="usermanagement"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
-            <h2><%text(_MEMBERS_TITLE)%></h2>\r
-            <h3><%text(_MEMBERS_CURRENT)%></h3>\r
-            <%editmemberlist(admin/default)%>\r
-            <h3><%text(_MEMBERS_NEW)%></h3>\r
-            <form method="post" action="<%adminurl%>index.php" name="memberedit">\r
-                <div>\r
-                    <input type="hidden" name="action" value="memberadd" />\r
-                    <%ticket%>\r
-                    <table><tr>\r
-                        <th colspan="2"><%text(_MEMBERS_NEW)%></th>\r
-                    </tr><tr>\r
-                        <td>\r
-                            <%text(_MEMBERS_DISPLAY)%> <%helplink(shortnames)%>\r
-                            <br /><small><%text(_MEMBERS_DISPLAY_INFO)%></small>\r
-                        </td>\r
-                        <td><input tabindex="10010" name="name" size="32" maxlength="32" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_MEMBERS_REALNAME)%></td>\r
-                        <td><input name="realname" tabindex="10020" size="40" maxlength="60" /></td>\r
-                    </tr><tr>\r
-                       <td><%text(_MEMBERS_PWD)%></td>\r
-                        <td><input name="password" tabindex="10030" size="16" maxlength="40" type="password" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_MEMBERS_REPPWD)%></td>\r
-                        <td><input name="repeatpassword" tabindex="10035" size="16" maxlength="40" type="password" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_MEMBERS_EMAIL)%></td>\r
-                        <td><input name="email" tabindex="10040" size="40" maxlength="60" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_MEMBERS_URL)%></td>\r
-                        <td><input name="url" tabindex="10050" size="40" maxlength="100" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_MEMBERS_SUPERADMIN)%> <%helplink(superadmin)%></td>\r
-                        <td><%inputyesno(admin,1,10060)%> </td>\r
-                    </tr><tr>\r
-                        <td><%text(_MEMBERS_CANLOGIN)%> <%helplink(canlogin)%></td>\r
-                        <td><%inputyesno(canlogin,1,10070)%></td>\r
-                    </tr><tr>\r
-                        <td><%text(_MEMBERS_NOTES)%></td>\r
-                        <td><input name="notes" maxlength="100" size="40" tabindex="10080" /></td>\r
-                    </tr><tr>\r
-                        <td><%text(_MEMBERS_NEW)%></td>\r
-                        <td><input type="submit" value="<%text(_MEMBERS_NEW_BTN)%>" tabindex="10090" onclick="return checkSubmit();" /></td>\r
-                    </tr></table>\r
-                </div>\r
-            </form><%pagefoot%>]]></part>\r
+<%pagefoot%>\r
+]]></part>\r
+<part name="teamdelete"><![CDATA[\r
+<%pagehead%>\r
+<h2><%text(_DELETE_CONFIRM)%></h2>\r
+<p>\r
+<%text(_CONFIRMTXT_TEAM1)%>\r
+<b>\r
+<%editmember(displayname)%>\r
+</b>\r
+<%text(_CONFIRMTXT_TEAM2)%>\r
+<b>\r
+<%blogsetting(name)%>\r
+</b>\r
+</p>\r
+<form method="post" action="<%adminurl%>index.php">\r
+<div>\r
+<input type="hidden" name="action" value="teamdeleteconfirm" />\r
+<%ticket%>\r
+<input type="hidden" name="memberid" value="<%editmember(id)%>" />\r
+<input type="hidden" name="blogid" value="<%requestblogid%>" />\r
+<input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
+</div></form><%pagefoot%>\r
+]]></part>\r
+<part name="templatedelete"><![CDATA[\r
+<%pagehead%>\r
+<h2><%text(_DELETE_CONFIRM)%></h2>\r
+<p><%text(_CONFIRMTXT_TEMPLATE)%><b><%edittemplateinfo(name)%></b> (<%edittemplateinfo(desc)%>)</p>\r
+<form method="post" action="<%adminurl%>index.php">\r
+<div>\r
+<input type="hidden" name="action" value="templatedeleteconfirm" />\r
+<%ticket%>\r
+<input type="hidden" name="templateid" value="<%edittemplateinfo(id)%>" />\r
+<input type="submit" tabindex="10" value="<%text(_DELETE_CONFIRM_BTN)%>" />\r
+</div>\r
+</form><%pagefoot%>\r
+]]></part>\r
+<part name="templateedit"><![CDATA[\r
+       <%pagehead%>\r
+       <p><a href="<%adminurl%>index.php?action=templateoverview">(<%text(_TEMPLATE_BACK)%>)</a></p>\r
+       \r
+       <h2><%text(_TEMPLATE_EDIT_TITLE)%> '<%edittemplateinfo(name)%>'</h2>\r
+       <%headmessage%>\r
+       \r
+       <p><%text(_TEMPLATE_EDIT_MSG)%></p>\r
+       \r
+       <form method="post" action="<%adminurl%>index.php">\r
+       \r
+       <p>\r
+       <input type="hidden" name="action" value="templateupdate" />\r
+       <%ticket%>\r
+       <input type="hidden" name="templateid" value="<%edittemplateinfo(id)%>" />\r
+       </p>\r
+       \r
+       <table frame="box" rules="all" summary="<%text(_TEMPLATE_EDIT_TITLE)%>">\r
+       <tr>\r
+       <th colspan="2"><%text(_TEMPLATE_SETTINGS)%></th>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_TEMPLATE_NAME)%> <%helplink(shortnames)%></td>\r
+       <td><input name="tname" tabindex="4" size="20" maxlength="20" value="<%edittemplateinfo(name)%>" /></td>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_TEMPLATE_DESC)%></td>\r
+       <td><input name="tdesc" tabindex="5" size="50" maxlength="200" value="<%edittemplateinfo(desc)%>" /></td>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2"><%text(_TEMPLATE_UPDATE)%></th>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_TEMPLATE_UPDATE)%></td>\r
+       <td>\r
+       <input type="submit" tabindex="6" value="<%text(_TEMPLATE_UPDATE_BTN)%>" onclick="return checkSubmit();" />\r
+       <input type="reset" tabindex="7" value="<%text(_TEMPLATE_RESET_BTN)%>" />\r
+       </td>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2">\r
+       <%text(_TEMPLATE_ITEMS)%> <%helplink(templateitems)%></th>\r
+       <%edittemplateinfo(row,_TEMPLATE_ITEMHEADER,ITEM_HEADER,,8)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_ITEMBODY,ITEM,,9,1)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_ITEMFOOTER,ITEM_FOOTER,,10)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_MORELINK,MORELINK,morelink, 20)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_EDITLINK, EDITLINK, editlink, 25)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_NEW, NEW, new, 30)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2">\r
+       <%text(_TEMPLATE_COMMENTS_ANY)%> <%helplink(templatecomments)%></th>\r
+       <%edittemplateinfo(row,_TEMPLATE_CHEADER, COMMENTS_HEADER, commentheaders, 40)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_CBODY, COMMENTS_BODY, commentbody, 50, 1)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_CFOOTER, COMMENTS_FOOTER, commentheaders, 60)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_CONE, COMMENTS_ONE, commentwords, 70)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_CMANY, COMMENTS_MANY, commentwords, 80)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_CMORE, COMMENTS_CONTINUED, commentcontinued, 90)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_CMEXTRA, COMMENTS_AUTH, memberextra, 100)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2">\r
+       <%text(_TEMPLATE_COMMENTS_NONE)%> <%helplink(templatecomments)%></th>\r
+       <%edittemplateinfo(row,_TEMPLATE_CNONE, COMMENTS_NONE, , 110)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2">\r
+       <%text(_TEMPLATE_COMMENTS_TOOMUCH)%> <%helplink(templatecomments)%></th>\r
+       <%edittemplateinfo(row,_TEMPLATE_CTOOMUCH, COMMENTS_TOOMUCH, , 120)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2">\r
+       <%text(_TEMPLATE_ARCHIVELIST)%> <%helplink(templatearchivelists)%></th>\r
+       <%edittemplateinfo(row,_TEMPLATE_AHEADER, ARCHIVELIST_HEADER, , 130)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_AITEM, ARCHIVELIST_LISTITEM, , 140)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_AFOOTER, ARCHIVELIST_FOOTER, , 150)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2">\r
+       <%text(_TEMPLATE_BLOGLIST)%> <%helplink(templatebloglists)%></th>\r
+       <%edittemplateinfo(row,_TEMPLATE_BLOGHEADER, BLOGLIST_HEADER, , 160)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_BLOGITEM, BLOGLIST_LISTITEM, , 170)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_BLOGFOOTER, BLOGLIST_FOOTER, , 180)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2">\r
+       <%text(_TEMPLATE_CATEGORYLIST)%> <%helplink(templatecategorylists)%></th>\r
+       <%edittemplateinfo(row,_TEMPLATE_CATHEADER, CATLIST_HEADER, , 190)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_CATITEM, CATLIST_LISTITEM, , 200)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_CATFOOTER, CATLIST_FOOTER, , 210)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2">\r
+       <%text(_TEMPLATE_DATETIME)%></th>\r
+       <%edittemplateinfo(row,_TEMPLATE_DHEADER, DATE_HEADER, dateheads, 220)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_DFOOTER, DATE_FOOTER, dateheads, 230)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_DFORMAT, FORMAT_DATE, datetime, 240)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_TFORMAT, FORMAT_TIME, datetime, 250)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_LOCALE, LOCALE, locale, 260)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2">\r
+       <%text(_TEMPLATE_IMAGE)%> <%helplink(templatepopups)%></th>\r
+       <%edittemplateinfo(row,_TEMPLATE_PCODE, POPUP_CODE, , 270)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_ICODE, IMAGE_CODE, , 280)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_MCODE, MEDIA_CODE, , 290)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2">\r
+       <%text(_TEMPLATE_SEARCH)%></th>\r
+       <%edittemplateinfo(row,_TEMPLATE_SHIGHLIGHT, SEARCH_HIGHLIGHT, highlight,300)%>\r
+       <%edittemplateinfo(row,_TEMPLATE_SNOTFOUND, SEARCH_NOTHINGFOUND, nothingfound,310)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2">\r
+       <%text(_TEMPLATE_PLUGIN_FIELDS)%></th>\r
+       <%edittemplateinfo(extratemplate,admin/default)%>\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2">\r
+       <%text(_TEMPLATE_UPDATE)%></th>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_TEMPLATE_UPDATE)%></td>\r
+       <td>\r
+       <input type="submit" tabindex="800" value="<%text(_TEMPLATE_UPDATE_BTN)%>" onclick="return checkSubmit();" />\r
+       <input type="reset" tabindex="810" value="<%text(_TEMPLATE_RESET_BTN)%>" />\r
+       </td>\r
+       </tr>\r
+       </table>\r
+       </form>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="templateoverview"><![CDATA[\r
+       <%pagehead%>\r
+       <p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
+       <h2><%text(_TEMPLATE_TITLE)%></h2>\r
+       \r
+       <h3><%text(_TEMPLATE_AVAILABLE_TITLE)%></h3>\r
+       <%templateoverview(admin/default)%>\r
+       \r
+       <h3><%text(_TEMPLATE_NEW_TITLE)%></h3>\r
+       <form method="post" action="<%adminurl%>index.php">\r
+       <p>\r
+       <input name="action" value="templatenew" type="hidden" />\r
+       <%ticket%>\r
+       <table frame="box" rules="all" summary="<%text(_TEMPLATE_NEW_TITLE)%>">\r
+       <tr>\r
+       <td><%text(_TEMPLATE_NAME)%> <%helplink(shortnames)%></td>\r
+       <td><input name="name" tabindex="10010" maxlength="20" size="20" /></td>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_TEMPLATE_DESC)%></td>\r
+       <td><input name="desc" tabindex="10020" maxlength="200" size="50" /></td>\r
+       </tr>\r
+       <tr>\r
+       <td><%text(_TEMPLATE_CREATE)%></td>\r
+       <td><input type="submit" tabindex="10030" value="<%text(_TEMPLATE_CREATE_BTN)%>" onclick="return checkSubmit();" /></td>\r
+       </tr>\r
+       </table>\r
+       </p>\r
+       </form>\r
+       <%pagefoot%>\r
+]]></part>\r
+<part name="usermanagement"><![CDATA[\r
+<%pagehead%>\r
+<p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
+<h2><%text(_MEMBERS_TITLE)%></h2>\r
+<h3><%text(_MEMBERS_CURRENT)%></h3>\r
+<%editmemberlist(admin/default)%>\r
+<h3><%text(_MEMBERS_NEW)%></h3>\r
+<form method="post" action="<%adminurl%>index.php" name="memberedit">\r
+<div>\r
+<input type="hidden" name="action" value="memberadd" />\r
+<%ticket%>\r
+<table><tr>\r
+<th colspan="2"><%text(_MEMBERS_NEW)%></th>\r
+</tr>\r
+<tr>\r
+<td>\r
+<%text(_MEMBERS_DISPLAY)%> <%helplink(shortnames)%>\r
+<br /><small><%text(_MEMBERS_DISPLAY_INFO)%></small>\r
+</td>\r
+<td><input tabindex="10010" name="name" size="32" maxlength="32" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_MEMBERS_REALNAME)%></td>\r
+<td><input name="realname" tabindex="10020" size="40" maxlength="60" /></td>\r
+</tr>\r
+<tr>\r
+   <td><%text(_MEMBERS_PWD)%></td>\r
+<td><input name="password" tabindex="10030" size="16" maxlength="40" type="password" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_MEMBERS_REPPWD)%></td>\r
+<td><input name="repeatpassword" tabindex="10035" size="16" maxlength="40" type="password" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_MEMBERS_EMAIL)%></td>\r
+<td><input name="email" tabindex="10040" size="40" maxlength="60" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_MEMBERS_URL)%></td>\r
+<td><input name="url" tabindex="10050" size="40" maxlength="100" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_MEMBERS_SUPERADMIN)%> <%helplink(superadmin)%></td>\r
+<td><%inputyesno(admin,1,10060)%> </td>\r
+</tr>\r
+<tr>\r
+<td><%text(_MEMBERS_CANLOGIN)%> <%helplink(canlogin)%></td>\r
+<td><%inputyesno(canlogin,1,10070)%></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_MEMBERS_NOTES)%></td>\r
+<td><input name="notes" maxlength="100" size="40" tabindex="10080" /></td>\r
+</tr>\r
+<tr>\r
+<td><%text(_MEMBERS_NEW)%></td>\r
+<td><input type="submit" value="<%text(_MEMBERS_NEW_BTN)%>" tabindex="10090" onclick="return checkSubmit();" /></td>\r
+</tr></table>\r
+</div>\r
+</form><%pagefoot%>\r
+]]></part>\r
 <part name="createaccountinput"><![CDATA[\r
        <%pagehead%>\r
        <h2><%text(_CREATE_ACCOUNT0)%></h2>\r
 <part name="createaccountinput"><![CDATA[\r
        <%pagehead%>\r
        <h2><%text(_CREATE_ACCOUNT0)%></h2>\r
@@ -2559,22 +3042,43 @@ selector();
        <p><%text(_FORGOTPASSWORD_CONTACT)%></p>\r
        <%pagefoot%>\r
 ]]></part>\r
        <p><%text(_FORGOTPASSWORD_CONTACT)%></p>\r
        <%pagefoot%>\r
 ]]></part>\r
-  </skin>\r
-  <template name="admin/default">\r
-    <description><![CDATA[デフォルト管理画面用テンプレート]]></description>\r
-    <part name="PLUGIN_QUICKMENU_TITLE"><![CDATA[<h2><%text(_QMENU_PLUGINS)%></h2>\r
+</skin>\r
+<template name="admin/default">\r
+<description><![CDATA[\r
+       デフォルト管理画面用テンプレート\r
+]]></description>\r
+\r
+<part name="PLUGIN_QUICKMENU_HEAD"><![CDATA[\r
+       <h2><%text(_QMENU_PLUGINS)%></h2>\r
+       <ul>\r
+]]></part>\r
+<part name="PLUGIN_QUICKMENU_BODY"><![CDATA[\r
+       <li><a href="<%plugadminurl%>" title="<%plugadmintooltip%>"><%plugadmintitle%></a></li>\r
+]]></part>\r
+<part name="PLUGIN_QUICKMENU_FOOT"><![CDATA[\r
+       </ul>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="PLUGIN_QUICKMENU_HEAD"><![CDATA[<ul>\r
+\r
+<part name="SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD"><![CDATA[\r
+       <th><%coltime%></th>\r
+       <th><%colmesg%></th>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD"><![CDATA[<th><%coltime%></th><th><%colmesg%></th>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_ACTNLIST_BODY"><![CDATA[\r
+       <td><%timestamp%></td>\r
+       <td><%message%></td>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_ACTNLIST_BODY"><![CDATA[<td><%timestamp%></td><td><%message%></td>\r
+\r
+<part name="SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD"><![CDATA[\r
+       <th><%iprange%></th>\r
+       <th><%reason%></th>\r
+       <th><%colact%></th>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD"><![CDATA[<th><%iprange%></th><th><%reason%></th><th><%colact%></th>]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY"><![CDATA[<td><%iprange%></td>\r
-<td><%reason%></td>\r
-<td><a href="<%adminurl%>index.php?action=banlistdelete&amp;blogid=<%blogid%>&amp;iprange=<%iprange%>"><%delbtn%></a></td>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY"><![CDATA[\r
+       <td><%iprange%></td>\r
+       <td><%reason%></td>\r
+       <td><a href="<%adminurl%>index.php?action=banlistdelete&amp;blogid=<%blogid%>&amp;iprange=<%iprange%>"><%delbtn%></a></td>\r
 ]]></part>\r
 ]]></part>\r
+\r
 <part name="SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD"><![CDATA[\r
        <th><%colname%></th>\r
        <th><%coldesc%></th>\r
 <part name="SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD"><![CDATA[\r
        <th><%colname%></th>\r
        <th><%coldesc%></th>\r
@@ -2604,289 +3108,418 @@ selector();
        </a>\r
        </td>\r
 ]]></part>\r
        </a>\r
        </td>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM"><![CDATA[<td>\r
-<a href="<%adminurl%>index.php?action=blogsettings&amp;blogid=<%blogid%>" title="<%ttsettingtext%>"><%settingtext%></a>\r
-</td>\r
-<td>\r
-<a href="<%adminurl%>index.php?action=banlist&amp;blogid=<%blogid%>" title="<%ttbanstext%>"><%banstext%></a>\r
-</td>\r
+\r
+<part name="SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM"><![CDATA[\r
+       <td>\r
+       <a href="<%adminurl%>index.php?action=blogsettings&amp;blogid=<%blogid%>" title="<%ttsettingtext%>"><%settingtext%></a>\r
+       </td>\r
+       <td>\r
+       <a href="<%adminurl%>index.php?action=banlist&amp;blogid=<%blogid%>" title="<%ttbanstext%>"><%banstext%></a>\r
+       </td>\r
+]]></part>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM"><![CDATA[\r
+       <td>\r
+       <a href="<%adminurl%>index.php?action=deleteblog&amp;blogid=<%blogid%>" title="<%ttdeletetext%>"><%deletetext%></a>\r
+       </td>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM"><![CDATA[<td>\r
-<a href="<%adminurl%>index.php?action=deleteblog&amp;blogid=<%blogid%>" title="<%ttdeletetext%>"><%deletetext%></a>\r
-</td>]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_HEAD"><![CDATA[<th><%colshortname%></th><th><%colblogname%></th>\r
+\r
+<part name="SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_HEAD"><![CDATA[\r
+       <th><%colshortname%></th>\r
+       <th><%colblogname%></th>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_BODY"><![CDATA[<td><%bshortname%></td><td><%blogname%></td>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_BODY"><![CDATA[\r
+       <td><%bshortname%></td>\r
+       <td><%blogname%></td>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_SHORTNAM_HEAD"><![CDATA[<th><%colname%></th><th><%coldesc%></th>\r
+\r
+<part name="SHOWLIST_LISTPLUG_TABLE_SHORTNAM_HEAD"><![CDATA[\r
+       <th><%colname%></th>\r
+       <th><%coldesc%></th>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_SHORTNAM_BODY"><![CDATA[<td><%name%></td><td><%desc%></td>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_SHORTNAM_BODY"><![CDATA[\r
+       <td><%name%></td>\r
+       <td><%desc%></td>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_CATELIST_HEAD"><![CDATA[<th><%colname%></th><th><%coldesc%></th><th colspan="2"><%colact%></th>\r
+\r
+<part name="SHOWLIST_LISTPLUG_TABLE_CATELIST_HEAD"><![CDATA[\r
+       <th><%colname%></th>\r
+       <th><%coldesc%></th>\r
+       <th colspan="2"><%colact%></th>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_CATELIST_BODY"><![CDATA[<td><input type="checkbox" id="batch<%batchid%>" name="batch[<%batchid%>]" value="<%catid%>" />\r
-<label for="batch<%batchid%>"><%catname%></label>\r
-</td>\r
-<td><%catdesc%></td>\r
-<td><a href="<%adminurl%>index.php?action=categorydelete&amp;blogid=<%blogid%>&amp;catid=<%catid%>" tabindex="<%tabindex%>">\r
-<%delbtn%></a></td>\r
-<td><a href="<%adminurl%>index.php?action=categoryedit&amp;blogid=<%blogid%>&amp;catid=<%catid%>" tabindex="<%tabindex%>">\r
-<%editbtn%></a></td>\r
-]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD"><![CDATA[<th><%colname%></th><th><%coldesc%></th><th colspan="3"><%colact%></th>\r
-]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY"><![CDATA[<td><%templatename%></td>\r
-<td><%templatedesc%></td>\r
-<td style="white-space:nowrap">\r
-<a href="<%editurl%>" tabindex="<%tabindex%>"><%editbtn%>\r
-</a></td>\r
-<td style="white-space:nowrap">\r
-<a href="<%cloneurl%>" tabindex="<%tabindex%>"><%clonebtn%>\r
-</a></td>\r
-<td style="white-space:nowrap">\r
-<a href="<%deleteurl%>" tabindex="<%tabindex%>"><%delbtn%>\r
-</a></td>\r
-]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_DRFTLIST_HEAD"><![CDATA[<th><%colblog%></th><th><%coldesc%></th><th colspan="2"><%colact%></th>\r
-]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_DRFTLIST_BODY"><![CDATA[<td><%bshortname%></td>\r
-<td><%ititle%></td>\r
-<td><a href="<%adminurl%>index.php?action=itemedit&amp;itemid=<%itemid%>"><%editbtn%></a></td>\r
-<td><a href="<%adminurl%>index.php?action=itemdelete&amp;itemid=<%itemid%>"><%delbtn%></a></td>\r
-]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN"><![CDATA[<td style="white-space:nowrap"><a href="<%adminurl%>index.php?action=banlistnewfromitem&amp;itemid=<%itemid%>&amp;ip=<%banip%>" title="<%banhost%>"><%banbtn%></a></td>\r
-]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_BLOGLIST_HEAD"><![CDATA[<th><%blognames%></th><th colspan="8"><%actionshead%></th>\r
-]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY"><![CDATA[<td title="blogid:<%blogid%> shortname:<%shortname%>">\r
-<a href="<%blogurl%>"><img src="<%skinfile(/images/globe.gif)%>" width="13" height="13" alt="<%iconalt%>" /></a> <%blogname%>\r
-</td>\r
-<td>\r
-<a href="<%adminurl%>index.php?action=createitem&amp;blogid=<%blogid%>" title="<%ttaddtext%>"><%addtext%></a>\r
-</td>\r
-<td>\r
-<a href="<%adminurl%>index.php?action=itemlist&amp;blogid=<%blogid%>" title="<%ttedittext%>"><%edittext%></a>\r
-</td>\r
-<td>\r
-<a href="<%adminurl%>index.php?action=blogcommentlist&amp;blogid=<%blogid%>" title="<%ttcommenttext%>"><%commenttext%></a>\r
-</td>\r
-<td>\r
-<a href="<%adminurl%>index.php?action=bookmarklet&amp;blogid=<%blogid%>" title="<%ttbmlettext%>"><%bmlettext%></a>\r
-</td>]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_CMNTLIST_HEAD"><![CDATA[<th><%colinfo%></th><th><%colcontent%></th><th colspan="3"><%colaction%></th>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_CATELIST_BODY"><![CDATA[\r
+       <td><input type="checkbox" id="batch<%batchid%>" name="batch[<%batchid%>]" value="<%catid%>" />\r
+       <label for="batch<%batchid%>"><%catname%></label>\r
+       </td>\r
+       <td><%catdesc%></td>\r
+       <td><a href="<%adminurl%>index.php?action=categorydelete&amp;blogid=<%blogid%>&amp;catid=<%catid%>" tabindex="<%tabindex%>">\r
+       <%delbtn%></a></td>\r
+       <td><a href="<%adminurl%>index.php?action=categoryedit&amp;blogid=<%blogid%>&amp;catid=<%catid%>" tabindex="<%tabindex%>">\r
+       <%editbtn%></a></td>\r
+]]></part>\r
+\r
+<part name="SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD"><![CDATA[\r
+       <th><%colname%></th>\r
+       <th><%coldesc%></th>\r
+       <th colspan="3"><%colact%></th>\r
+]]></part>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY"><![CDATA[\r
+       <td><%templatename%></td>\r
+       <td><%templatedesc%></td>\r
+       <td style="white-space:nowrap">\r
+       <a href="<%editurl%>" tabindex="<%tabindex%>"><%editbtn%>\r
+       </a></td>\r
+       <td style="white-space:nowrap">\r
+       <a href="<%cloneurl%>" tabindex="<%tabindex%>"><%clonebtn%>\r
+       </a></td>\r
+       <td style="white-space:nowrap">\r
+       <a href="<%deleteurl%>" tabindex="<%tabindex%>"><%delbtn%>\r
+       </a></td>\r
+]]></part>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_DRFTLIST_HEAD"><![CDATA[\r
+       <th><%colblog%></th>\r
+       <th><%coldesc%></th>\r
+       <th colspan="2"><%colact%></th>\r
+]]></part>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_DRFTLIST_BODY"><![CDATA[\r
+       <td><%bshortname%></td>\r
+       <td><%ititle%></td>\r
+       <td><a href="<%adminurl%>index.php?action=itemedit&amp;itemid=<%itemid%>"><%editbtn%></a></td>\r
+       <td><a href="<%adminurl%>index.php?action=itemdelete&amp;itemid=<%itemid%>"><%delbtn%></a></td>\r
+]]></part>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN"><![CDATA[\r
+       <td style="white-space:nowrap"><a href="<%adminurl%>index.php?action=banlistnewfromitem&amp;itemid=<%itemid%>&amp;ip=<%banip%>" title="<%banhost%>"><%banbtn%></a></td>\r
+]]></part>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_BLOGLIST_HEAD"><![CDATA[\r
+       <th><%blognames%></th><th colspan="8"><%actionshead%></th>\r
+]]></part>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY"><![CDATA[\r
+       <td title="blogid:<%blogid%> shortname:<%shortname%>">\r
+       <a href="<%blogurl%>"><img src="<%skinfile(/images/globe.gif)%>" width="13" height="13" alt="<%iconalt%>" /></a> <%blogname%>\r
+       </td>\r
+       <td>\r
+       <a href="<%adminurl%>index.php?action=createitem&amp;blogid=<%blogid%>" title="<%ttaddtext%>"><%addtext%></a>\r
+       </td>\r
+       <td>\r
+       <a href="<%adminurl%>index.php?action=itemlist&amp;blogid=<%blogid%>" title="<%ttedittext%>"><%edittext%></a>\r
+       </td>\r
+       <td>\r
+       <a href="<%adminurl%>index.php?action=blogcommentlist&amp;blogid=<%blogid%>" title="<%ttcommenttext%>"><%commenttext%></a>\r
+       </td>\r
+       <td>\r
+       <a href="<%adminurl%>index.php?action=bookmarklet&amp;blogid=<%blogid%>" title="<%ttbmlettext%>"><%bmlettext%></a>\r
+       </td>\r
+]]></part>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_CMNTLIST_HEAD"><![CDATA[\r
+       <th><%colinfo%></th>\r
+       <th><%colcontent%></th>\r
+       <th colspan="3"><%colaction%></th>\r
+]]></part>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY"><![CDATA[\r
+       <td><%commentdate%><br /><%commentator%><br /><%commentsite%><br /><%commentmail%><br /></td>\r
+       <td><input type="checkbox" id="batch<%batchid%>" name="batch[<%batchid%>]" value="<%commentid%>" />\r
+       <label for="batch<%batchid%>"><%commentbody%></label></td>\r
+       <td style="white-space:nowrap">\r
+       <a href="<%adminurl%>index.php?action=commentedit&amp;commentid=<%commentid%>"><%editbtn%></a></td>\r
+       <td style="white-space:nowrap">\r
+       <a href="<%adminurl%>index.php?action=commentdelete&amp;commentid=<%commentid%>"><%delbtn%></a></td>\r
+       <%addbanlist%>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY"><![CDATA[<td><%commentdate%><br /><%commentator%><br /><%commentsite%><br /><%commentmail%><br /></td>\r
-<td><input type="checkbox" id="batch<%batchid%>" name="batch[<%batchid%>]" value="<%commentid%>" />\r
-<label for="batch<%batchid%>"><%commentbody%></label></td>\r
-<td style="white-space:nowrap">\r
-<a href="<%adminurl%>index.php?action=commentedit&amp;commentid=<%commentid%>"><%editbtn%></a></td>\r
-<td style="white-space:nowrap">\r
-<a href="<%adminurl%>index.php?action=commentdelete&amp;commentid=<%commentid%>"><%delbtn%></a></td>\r
-<%addbanlist%>]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD"><![CDATA[<input type="password" size="40" maxlength="128" name="<%varname%>" value="<%value%>" />\r
+<part name="SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD"><![CDATA[\r
+<input type="password" size="40" maxlength="128" name="<%varname%>" value="<%value%>" />\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEP"><![CDATA[<select name="<%varname%>">\r
+<part name="SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEP"><![CDATA[\r
+<select name="<%varname%>">\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEO"><![CDATA[<option value="<%value%>"<%selected%>><%optname%></option>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEO"><![CDATA[\r
+<option value="<%value%>"<%selected%>><%optname%></option>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEC"><![CDATA[</select>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEC"><![CDATA[\r
+</select>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_PLGOPT_OTAREA"><![CDATA[<textarea class="pluginoption" cols="30" rows="5" name="<%varname%>"<%readonly%>><%value%></textarea>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_PLGOPT_OTAREA"><![CDATA[\r
+<textarea class="pluginoption" cols="30" rows="5" name="<%varname%>"<%readonly%>><%value%></textarea>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_PLGOPT_OITEXT"><![CDATA[<input type="text" size="40" maxlength="128" name="<%varname%>" value="<%value%>"<%datatype%><%readonly%> />\r
+<part name="SHOWLIST_LISTPLUG_TABLE_PLGOPT_OITEXT"><![CDATA[\r
+<input type="text" size="40" maxlength="128" name="<%varname%>" value="<%value%>"<%datatype%><%readonly%> />\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_PLUGOPTN_FOOT"><![CDATA[<%extra%></td>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_PLUGOPTN_FOOT"><![CDATA[\r
+<%extra%></td>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_POPTLIST_FOOT"><![CDATA[<tr>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_POPTLIST_FOOT"><![CDATA[\r
+<tr>\r
 <th colspan="2"><%savetext%></th>\r
 <th colspan="2"><%savetext%></th>\r
-</tr><tr>\r
+</tr>\r
+<tr>\r
 <td><%savetext%></td>\r
 <td><input type="submit" value="<%savetext%>" /></td>\r
 </tr>\r
 ]]></part>\r
 <td><%savetext%></td>\r
 <td><input type="submit" value="<%savetext%>" /></td>\r
 </tr>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_ITEMLIST_HEAD"><![CDATA[<th><%colinfo%></th><th><%colcontent%></th><th style="white-space:nowrap"><%colaction%></th>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_ITEMLIST_HEAD"><![CDATA[\r
+       <th><%colinfo%></th>\r
+       <th><%colcontent%></th>\r
+       <th style="white-space:nowrap"><%colaction%></th>\r
+]]></part>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY"><![CDATA[\r
+       <td<%cssclass%>>\r
+       <%bshortlabel%> <%bshortnameval%><br />\r
+       <%categorylabel%> <%categorynameval%><br />\r
+       <%authorlabel%> <%authornameval%><br />\r
+       <%itemdatelabel%> <%itemdateval%><br />\r
+       <%itemtimelabel%> <%itemtimeval%>\r
+       </td>\r
+       <td<%cssclass%>>\r
+       <input type="checkbox" id="batch<%batchid%>" name="batch[<%batchid%>]" value="<%itemid%>" />\r
+       <label for="batch<%batchid%>"><b><%itemtitle%></b></label><br />\r
+       <%itembody%></td>\r
+       <td style="white-space:nowrap"<%cssclass%>>\r
+       <a href="<%adminurl%>index.php?action=itemedit&amp;itemid=<%itemid%>"><%editbtn%></a><br />\r
+       <a href="<%adminurl%>index.php?action=itemmove&amp;itemid=<%itemid%>"><%movebtn%></a><br />\r
+       <a href="<%adminurl%>index.php?action=itemdelete&amp;itemid=<%itemid%>"><%delbtn%></a><br />\r
+       <%camount%>\r
+       </td>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY"><![CDATA[<td<%cssclass%>>\r
-<%bshortlabel%> <%bshortnameval%><br />\r
-<%categorylabel%> <%categorynameval%><br />\r
-<%authorlabel%> <%authornameval%><br />\r
-<%itemdatelabel%> <%itemdateval%><br />\r
-<%itemtimelabel%> <%itemtimeval%>\r
-</td>\r
-<td<%cssclass%>>\r
-<input type="checkbox" id="batch<%batchid%>" name="batch[<%batchid%>]" value="<%itemid%>" />\r
-<label for="batch<%batchid%>"><b><%itemtitle%></b></label><br />\r
-<%itembody%></td>\r
-<td style="white-space:nowrap"<%cssclass%>>\r
-<a href="<%adminurl%>index.php?action=itemedit&amp;itemid=<%itemid%>"><%editbtn%></a><br />\r
-<a href="<%adminurl%>index.php?action=itemmove&amp;itemid=<%itemid%>"><%movebtn%></a><br />\r
-<a href="<%adminurl%>index.php?action=itemdelete&amp;itemid=<%itemid%>"><%delbtn%></a><br />\r
-<%camount%>\r
-</td>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_POPTLIST_HEAD"><![CDATA[\r
+       <th><%colinfo%></th>\r
+       <th><%colvalue%></th>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_POPTLIST_HEAD"><![CDATA[<th><%colinfo%></th><th><%colvalue%></th>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND"><![CDATA[\r
+       <br /><br /><%deplistlbl%><br /><%dependlist%>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND"><![CDATA[<br /><br /><%deplistlbl%><br /><%dependlist%>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ"><![CDATA[\r
+       <br /><br /><%deprlstlbl%><br /><%depreqlist%>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ"><![CDATA[<br /><br /><%deprlstlbl%><br /><%depreqlist%>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE"><![CDATA[\r
+       <td colspan="2"><%noplugalert%></td>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE"><![CDATA[<td colspan="2"><%noplugalert%></td>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN"><![CDATA[\r
+       <td>\r
+       <a href="<%actionupurl%>" tabindex="<%tabindex%>"><%actionuptxt%></a><br />\r
+       <a href="<%actiondownurl%>" tabindex="<%tabindex%>"><%actiondowntxt%></a><br />\r
+       <a href="<%actuninsturl%>" tabindex="<%tabindex%>"><%actuninsttxt%></a><br />\r
+       <%plugadminurl%>\r
+       <%plughelpurl%>\r
+       <%plugoptsetting%>\r
+       </td>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN"><![CDATA[<td>\r
-<a href="<%actionupurl%>" tabindex="<%tabindex%>"><%actionuptxt%></a><br />\r
-<a href="<%actiondownurl%>" tabindex="<%tabindex%>"><%actiondowntxt%></a><br />\r
-<a href="<%actuninsturl%>" tabindex="<%tabindex%>"><%actuninsttxt%></a><br />\r
-<%plugadminurl%>\r
-<%plughelpurl%>\r
-<%plugoptsetting%>\r
-</td>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_POPTLIST_BODY"><![CDATA[\r
+       <td><%description%></td>\r
+       <td>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_POPTLIST_BODY"><![CDATA[<td><%description%></td>\r
-<td>]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO"><![CDATA[<input type="radio" name="<%name%>" value="<%yesval%>"<%yescheckedval%> id="<%yesid%>" />\r
-<label for="<%yesid%>"><%yesvaltext%></label>\r
-<input type="radio" name="<%name%>" value="<%noval%>"<%nocheckedval%> id="<%noid%>"<%disabled%> />\r
-<label for="<%noid%>"><%novaltext%></label>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO"><![CDATA[\r
+       <input type="radio" name="<%name%>" value="<%yesval%>"<%yescheckedval%> id="<%yesid%>" />\r
+       <label for="<%yesid%>"><%yesvaltext%></label>\r
+       <input type="radio" name="<%name%>" value="<%noval%>"<%nocheckedval%> id="<%noid%>"<%disabled%> />\r
+       <label for="<%noid%>"><%novaltext%></label>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL"><![CDATA[<a href="<%actoptionurl%>" tabindex="<%tabindex%>"><%actoptiontxt%></a><br />\r
+<part name="SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL"><![CDATA[\r
+       <a href="<%actoptionurl%>" tabindex="<%tabindex%>"><%actoptiontxt%></a><br />\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN"><![CDATA[<a href="<%actadminurl%>" tabindex="<%tabindex%>"><%actadmintxt%></a><br />\r
+<part name="SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN"><![CDATA[\r
+       <a href="<%actadminurl%>" tabindex="<%tabindex%>"><%actadmintxt%></a><br />\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP"><![CDATA[<a href="<%acthelpurl%>" tabindex="<%tabindex%>"><%acthelptxt%></a><br />\r
+<part name="SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP"><![CDATA[\r
+       <a href="<%acthelpurl%>" tabindex="<%tabindex%>"><%acthelptxt%></a><br />\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL"><![CDATA[<a href="<%plugurl%>" tabindex="<%tabindex%>"><%plugsite%></a>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL"><![CDATA[\r
+       <a href="<%plugurl%>" tabindex="<%tabindex%>"><%plugsite%></a>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HEAD"><![CDATA[<th><%colinfo%></th>\r
-<th><%coldesc%></th>\r
-<th style=\"white-space:nowrap\"><%colactions%></th>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HEAD"><![CDATA[\r
+       <th><%colinfo%></th>\r
+       <th><%coldesc%></th>\r
+       <th style=\"white-space:nowrap\"><%colactions%></th>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST"><![CDATA[<br /><br /><%evntlstlbl%><br /><%eventlist%>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST"><![CDATA[\r
+       <br /><br /><%evntlstlbl%><br /><%eventlist%>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE"><![CDATA[<br /><br /><strong><%updatealert%></strong>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE"><![CDATA[\r
+       <br /><br /><strong><%updatealert%></strong>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY"><![CDATA[<td>\r
-<strong><%plugname%></strong><br />\r
-<%autherlabel%> <%plugauther%><br />\r
-<%versionlabel%> <%plugversion%><br />\r
-<%pluggeturl%><br />\r
-</td>\r
-<td>\r
-<%desclabel%><br /><%plugdesc%>\r
-<%eventlist%>\r
-<%needupdate%>\r
-<%dependlist%>\r
-<%depreqlist%>\r
-</td>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY"><![CDATA[\r
+       <td>\r
+       <strong><%plugname%></strong><br />\r
+       <%autherlabel%> <%plugauther%><br />\r
+       <%versionlabel%> <%plugversion%><br />\r
+       <%pluggeturl%><br />\r
+       </td>\r
+       <td>\r
+       <%desclabel%><br /><%plugdesc%>\r
+       <%eventlist%>\r
+       <%needupdate%>\r
+       <%dependlist%>\r
+       <%depreqlist%>\r
+       </td>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_TEAMLIST_HEAD"><![CDATA[<th><%colmembername%></th>\r
-<th><%colmemberrname%></th>\r
-<th><%colteamadmin%><%helplink(teamadmin)%></th>\r
-<th colspan="2"><%colactions%></th>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_TEAMLIST_HEAD"><![CDATA[\r
+       <th><%colmembername%></th>\r
+       <th><%colmemberrname%></th>\r
+       <th><%colteamadmin%><%helplink(teamadmin)%></th>\r
+       <th colspan="2"><%colactions%></th>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_TEAMLIST_BODY"><![CDATA[<td>\r
-<input type="checkbox" id="batch<%id%>" name="batch[<%id%>]" value="<%memberid%>" />\r
-<label for="batch<%id%>">\r
-<a href="mailto:<%mailaddress%>" tabindex="<%tabindex%>"><%name%></a>\r
-</label>\r
-</td>\r
-<td><%realname%></td>\r
-<td><%admin%></td>\r
-<td><a href="<%adminurl%>index.php?action=teamdelete&amp;memberid=<%memberid%>&amp;blogid=<%blogid%>" tabindex="<%tabindex%>"><%deletebtn%></a></td>\r
-<td><a href="<%chadminurl%>" tabindex="<%tabindex%>"><%chadminbtn%></a></td>\r
-]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_MEMBLIST_BODY"><![CDATA[<td>\r
-<input type="checkbox" id="batch<%id%>" name="batch[<%id%>]" value="<%memberid%>" />\r
-<label for="batch<%id%>">\r
-<a href="mailto:<%mailaddress%>" tabindex="<%tabindex%>"><%name%></a>\r
-</label>\r
-</td>\r
-<td><%realname%></td>\r
-<td><a href="<%url%>" tabindex="<%tabindex%>"><%url%></a></td>\r
-<td><%admin%></td>\r
-<td><%login%></td>\r
-<td><a href="<%adminurl%>index.php?action=memberedit&amp;memberid=<%memberid%>" tabindex="<%tabindex%>"><%editbtn%></a></td>\r
-<td><a href="<%adminurl%>index.php?action=memberdelete&amp;memberid=<%memberid%>" tabindex="<%tabindex%>"><%deletebtn%></a></td>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_TEAMLIST_BODY"><![CDATA[\r
+       <td>\r
+       <input type="checkbox" id="batch<%id%>" name="batch[<%id%>]" value="<%memberid%>" />\r
+       <label for="batch<%id%>">\r
+       <a href="mailto:<%mailaddress%>" tabindex="<%tabindex%>"><%name%></a>\r
+       </label>\r
+       </td>\r
+       <td><%realname%></td>\r
+       <td><%admin%></td>\r
+       <td><a href="<%adminurl%>index.php?action=teamdelete&amp;memberid=<%memberid%>&amp;blogid=<%blogid%>" tabindex="<%tabindex%>"><%deletebtn%></a></td>\r
+       <td><a href="<%chadminurl%>" tabindex="<%tabindex%>"><%chadminbtn%></a></td>\r
+]]></part>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_MEMBLIST_BODY"><![CDATA[\r
+       <td>\r
+       <input type="checkbox" id="batch<%id%>" name="batch[<%id%>]" value="<%memberid%>" />\r
+       <label for="batch<%id%>">\r
+       <a href="mailto:<%mailaddress%>" tabindex="<%tabindex%>"><%name%></a>\r
+       </label>\r
+       </td>\r
+       <td><%realname%></td>\r
+       <td><a href="<%url%>" tabindex="<%tabindex%>"><%url%></a></td>\r
+       <td><%admin%></td>\r
+       <td><%login%></td>\r
+       <td><a href="<%adminurl%>index.php?action=memberedit&amp;memberid=<%memberid%>" tabindex="<%tabindex%>"><%editbtn%></a></td>\r
+       <td><a href="<%adminurl%>index.php?action=memberdelete&amp;memberid=<%memberid%>" tabindex="<%tabindex%>"><%deletebtn%></a></td>\r
+]]></part>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_FOOT"><![CDATA[\r
+       <%typefoot%>\r
+       </tbody>\r
+       </table>\r
+]]></part>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_MEMBLIST_HEAD"><![CDATA[\r
+       <th><%colmembername%></th>\r
+       <th><%colmemberrname%></th>\r
+       <th><%colmemberurl%></th>\r
+       <th><%colmemberadmin%><%helplink(superadmin)%></th>\r
+       <th><%colmemberlogin%><%helplink(canlogin)%></th>\r
+       <th colspan="2"><%colactions%></th>\r
+]]></part>\r
+<part name="SHOWLIST_LISTPLUG_SELECT_FOOT"><![CDATA[\r
+       </select>\r
+]]></part>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_HEAD"><![CDATA[\r
+       <table>\r
+       <thead>\r
+       <tr>\r
+       <%typehead%>\r
+       </tr>\r
+       </thead>\r
+       <tbody>\r
+]]></part>\r
+<part name="SHOWLIST_LISTPLUG_TABLE_BODY"><![CDATA[\r
+       <tr onmouseover="focusRow(this);" onmouseout="blurRow(this);">\r
+       <%typebody%>\r
+       </tr>\r
+]]></part>\r
+<part name="SKINIE_EXPORT_LIST"><![CDATA[\r
+       <td><input type="checkbox" name="<%typeid%>"  id="<%expid%>" /><label for="<%expid%>"><%expname%></label></td>\r
+       <td><%expdesc%></td>\r
+       </tr>\r
+       <tr>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_FOOT"><![CDATA[<%typefoot%>\r
-</tbody></table>\r
+<part name="SHOWLIST_LISTPLUG_SELECT_HEAD"><![CDATA[\r
+       <select name="<%name%>" tabindex="<%tabindex%>" <%javascript%>>\r
+       <%extraoption%>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_MEMBLIST_HEAD"><![CDATA[<th><%colmembername%></th>\r
-<th><%colmemberrname%></th>\r
-<th><%colmemberurl%></th>\r
-<th><%colmemberadmin%><%helplink(superadmin)%></th>\r
-<th><%colmemberlogin%><%helplink(canlogin)%></th>\r
-<th colspan="2"><%colactions%></th>\r
+<part name="SHOWLIST_LISTPLUG_SELECT_BODY"><![CDATA[\r
+       <option value="<%value%>" <%selected%> title="<%title%>"><%option%></option>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_SELECT_FOOT"><![CDATA[</select>\r
+<part name="SHOWLIST_LISTPLUG_SELECT_FOOT"><![CDATA[\r
+       </select>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_HEAD"><![CDATA[<table>\r
-<thead><tr><%typehead%></tr></thead><tbody>\r
+<part name="INPUTYESNO_TEMPLATE_NORMAL"><![CDATA[\r
+       <input type="radio" name="<%name%>" value="<%yesval%>"<%yescheckedval%> id="<%yesid%>" />\r
+       <label for="<%yesid%>"><%yesvaltext%></label>\r
+       <input type="radio" name="<%name%>" value="<%noval%>"<%nocheckedval%> id="<%noid%>"<%disabled%> />\r
+       <label for="<%noid%>"><%novaltext%></label>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_BODY"><![CDATA[<tr onmouseover="focusRow(this);" onmouseout="blurRow(this);">\r
-<%typebody%>\r
-</tr>\r
+<part name="SYSTEMINFO_GDSETTINGS"><![CDATA[\r
+       <tr>\r
+       <td width="50%"><%key%></td>\r
+       <td><%value%></td>\r
+       </tr>\r
+]]></part>\r
+<part name="BANLIST_DELETED_LIST"><![CDATA[\r
+       <li><%blogname%></li>\r
+]]></part>\r
+<part name="INSERT_PLUGOPTION_TITLE"><![CDATA[\r
+       <tr>\r
+       <th colspan="2"><%sprinttext(_PLUGIN_OPTIONS_TITLE, <|%insertpluginfo(name)%|>)%></th>\r
+       </tr>\r
+]]></part>\r
+<part name="INSERT_PLUGOPTION_BODY"><![CDATA[\r
+       <tr><%listplugplugoptionrow(admin/default)%></tr>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SKINIE_EXPORT_LIST"><![CDATA[<td><input type="checkbox" name="<%typeid%>"  id="<%expid%>" /><label for="<%expid%>"><%expname%></label></td>\r
-<td><%expdesc%></td>\r
-</tr><tr>\r
+<part name="INPUTYESNO_TEMPLATE_ADMIN"><![CDATA[\r
+       <input onclick="selectCanLogin(true);" type="radio" name="<%name%>" value="<%yesval%>"<%yescheckedval%> id="<%yesid%>" />\r
+       <label for="<%yesid%>"><%yesvaltext%></label>\r
+       <input onclick="selectCanLogin(false);" type="radio" name="<%name%>" value="<%noval%>"<%nocheckedval%> id="<%noid%>"<%disabled%> />\r
+       <label for="<%noid%>"><%novaltext%></label>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_SELECT_HEAD"><![CDATA[<select<%name%><%tabindex%><%javascript%>>\n<%extraoption%>\r
+<part name="SPECIALSKINLIST_HEAD"><![CDATA[\r
+       <ul>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_SELECT_BODY"><![CDATA[<option value="<%value%>"<%selected%><%title%>><%option%></option>\r
+<part name="SPECIALSKINLIST_BODY"><![CDATA[\r
+       <li><a tabindex="<%tabindex%>" href="<%adminurl%>index.php?action=skinedittype&skinid=<%skinid%>&type=<%skintype%>"><%skintype%></a> (<a tabindex="<%tabindex%>" href="<%adminurl%>index.php?action=skinremovetype&skinid=<%skinid%>&type=<%skintype%>">remove</a>)</li>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="ADMIN_SPECIALSKINLIST_HEAD"><![CDATA[<ul>\r
+<part name="SPECIALSKINLIST_FOOT"><![CDATA[\r
+       </ul>\r
+]]></part>\r
+\r
+<part name="TEMPLATE_EDIT_ROW_HEAD"><![CDATA[\r
+       </tr>\r
+       <tr>\r
+       <td><%description%><%help%></td>\r
+       <td id="td<%count%>">\r
+       <textarea class="templateedit" name="<%name%>" tabindex="<%tabindex%>" cols="50" rows="<%rows%>" id="textarea<%count%>">\r
 ]]></part>\r
 ]]></part>\r
-    <part name="ADMIN_SPECIALSKINLIST_BODY"><![CDATA[<li><a tabindex="<%tabindex%>" href="<%adminurl%>index.php?action=adminskinedittype&skinid=<%skinid%>&type=<%skintype%>"><%skintype%></a> (<a tabindex="<%tabindex%>" href="<%adminurl%>index.php?action=adminskinremovetype&skinid=<%skinid%>&type=<%skintype%>">remove</a>)</li>\r
+<part name="TEMPLATE_EDIT_ROW_TAIL"><![CDATA[\r
+       </textarea>\r
+       </td>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="ADMIN_SPECIALSKINLIST_FOOT"><![CDATA[</ul>]]></part>\r
-    <part name="INPUTYESNO_TEMPLATE_NORMAL"><![CDATA[<input type="radio" name="<%name%>" value="<%yesval%>"<%yescheckedval%> id="<%yesid%>" />\r
-<label for="<%yesid%>"><%yesvaltext%></label>\r
-<input type="radio" name="<%name%>" value="<%noval%>"<%nocheckedval%> id="<%noid%>"<%disabled%> />\r
-<label for="<%noid%>"><%novaltext%></label>]]></part>\r
-    <part name="SYSTEMINFO_GDSETTINGS"><![CDATA[<tr>\r
-        <td width="50%"><%key%></td><td><%value%></td>\r
-</tr>]]></part>\r
-    <part name="BANLIST_DELETED_LIST"><![CDATA[<li><%blogname%></li>\r
+\r
+<part name="TEMPLATE_EDIT_EXPLUGNAME"><![CDATA[\r
+       </tr>\r
+       <tr>\r
+       <th colspan="2"><%explugtplname%></th>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="INSERT_PLUGOPTION_TITLE"><![CDATA[<tr><th colspan="2"><%sprinttext(_PLUGIN_OPTIONS_TITLE, <|%insertpluginfo(name)%|>)%></th></tr>\r
+\r
+<part name="ADMIN_BATCHLIST"><![CDATA[\r
+       <li><%text(_BATCH_EXECUTING)%&nbsp;<b><%adminbatchaction%></b>&nbsp;<%batchlisttype%>&nbsp;<b><%batchid%></b>...&nbsp;<b><%batchlistmsg%></b></li>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="INSERT_PLUGOPTION_BODY"><![CDATA[<tr><%listplugplugoptionrow(admin/default)%></tr>\r
+<part name="ADMIN_BLOGLINK"><![CDATA[\r
+       <a href="<%url%>" title="<%adminbloglinktitle%>"><%blogname%></a>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="INPUTYESNO_TEMPLATE_ADMIN"><![CDATA[<input onclick="selectCanLogin(true);" type="radio" name="<%name%>" value="<%yesval%>"<%yescheckedval%> id="<%yesid%>" />\r
-<label for="<%yesid%>"><%yesvaltext%></label>\r
-<input onclick="selectCanLogin(false);" type="radio" name="<%name%>" value="<%noval%>"<%nocheckedval%> id="<%noid%>"<%disabled%> />\r
-<label for="<%noid%>"><%novaltext%></label>]]></part>\r
-    <part name="SPECIALSKINLIST_FOOT"><![CDATA[</ul>]]></part>\r
-    <part name="SPECIALSKINLIST_BODY"><![CDATA[<li><a tabindex="<%tabindex%>" href="<%adminurl%>index.php?action=skinedittype&skinid=<%skinid%>&type=<%skintype%>"><%skintype%></a> (<a tabindex="<%tabindex%>" href="<%adminurl%>index.php?action=skinremovetype&skinid=<%skinid%>&type=<%skintype%>">remove</a>)</li>\r
+\r
+<part name="ADMIN_CUSTOMHELPLINK_ANCHOR"><![CDATA[\r
+       <a href="<%helpurl%>#<%helptarget%>" title="<%title%>" <%onclick%>>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="SPECIALSKINLIST_HEAD"><![CDATA[<ul>\r
+<part name="ADMIN_CUSTOMHELPLINK_ICON"><![CDATA[\r
+       <img src="<%iconurl%>" <%width%><%height%>alt="<%alt%>" title="<%title%>" /></a>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="TEMPLATE_EDIT_ROW_TAIL"><![CDATA[</textarea>\r
-    </td>\r
+<part name="NORMALSKINLIST_HEAD"><![CDATA[\r
+       <ul>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="TEMPLATE_EDIT_EXPLUGNAME"><![CDATA[</tr><tr>\r
-    <th colspan="2"><%explugtplname%></th>\r
+<part name="NORMALSKINLIST_BODY"><![CDATA[\r
+       <li><a href="<%editurl%>" tabindex="<%tabindex%>"><%skintypename%></a> <%help%></li>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="TEMPLATE_EDIT_ROW_HEAD"><![CDATA[</tr><tr>\r
-    <td>\r
-        <%description%><%help%>\r
-    </td>\r
-    <td id="td<%count%>">\r
-        <textarea class="templateedit" name="<%name%>" tabindex="<%tabindex%>" cols="50" rows="<%rows%>" id="textarea<%count%>">]]></part>\r
-    <part name="ADMIN_BATCHLIST"><![CDATA[<li><%text(_BATCH_EXECUTING)%&nbsp;<b><%adminbatchaction%></b>&nbsp;<%batchlisttype%>&nbsp;<b><%batchid%></b>...&nbsp;<b><%batchlistmsg%></b></li>\r
+<part name="NORMALSKINLIST_FOOT"><![CDATA[\r
+       </ul>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="ADMIN_BLOGLINK"><![CDATA[<a href="<%url%>" title="<%adminbloglinktitle%>"><%blogname%></a>]]></part>\r
-    <part name="ADMIN_CUSTOMHELPLINK_ANCHOR"><![CDATA[<a href="<%helpurl%>#<%helptarget%>" title="<%title%>" <%onclick%>>]]></part>\r
-    <part name="ADMINSKINTYPELIST_FOOT"><![CDATA[        </ul>\r
+<part name="SPECIALSKINLIST_HEAD"><![CDATA[\r
+       <ul>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="ADMIN_CUSTOMHELPLINK_ICON"><![CDATA[<img src="<%iconurl%>" <%width%><%height%>alt="<%alt%>" title="<%title%>" /></a>]]></part>\r
-    <part name="ADMINSKINTYPELIST_BODY"><![CDATA[<li><a tabindex="<%tabindex%>" href="<%adminurl%>index.php?action=adminskinedittype&skinid=<%skinid%>&type=<%skintype%>"><%name%></a> <%help%></li>\r
+<part name="SPECIALSKINLIST_BODY"><![CDATA[\r
+       <li><a href="<%editurl%>" tabindex="<%tabindex%>"><%skintype%></a> (<a href="<%removeurl%>" tabindex="<%tabindex%>">remove</a>)</li>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="ADMINSKINTYPELIST_HEAD"><![CDATA[        <ul>\r
+<part name="SPECIALSKINLIST_FOOT"><![CDATA[\r
+       </ul>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="PLUGIN_QUICKMENU_BODY"><![CDATA[<li><a href="<%plugadminurl%>" title="<%plugadmintooltip%>"><%plugadmintitle%></a></li>\r
+<part name="PLUGIN_QUICKMENU_BODY"><![CDATA[\r
+       <li><a href="<%plugadminurl%>" title="<%plugadmintooltip%>"><%plugadmintitle%></a></li>\r
 ]]></part>\r
 ]]></part>\r
-    <part name="PLUGIN_QUICKMENU_FOOT"><![CDATA[</ul>\r
+<part name="PLUGIN_QUICKMENU_FOOT"><![CDATA[\r
+       </ul>\r
 ]]></part>\r
 ]]></part>\r
-  </template>\r
+</template>\r
 </nucleusskin>\r
 </nucleusskin>\r
index 6fd9d00..6e57aa7 100644 (file)
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=<%charset%>" />
-        <title><%sitevar(name)%> - Admin</title>
-        <link rel="stylesheet" title="Nucleus Admin Default" type="text/css" href="<%skinfile(admin/default/styles/admin_contemporary.css)%>" />
-        <link rel="stylesheet" title="Nucleus Admin Default" type="text/css" href="<%skinfile(admin/default/styles/addedit.css)%>" />
-
-        <script type="text/javascript" src="<%skinfile(admin/default/javascript/edit.js)%>"></script>
-        <script type="text/javascript" src="<%skinfile(admin/default/javascript/admin.js)%>"></script>
-        <script type="text/javascript" src="<%skinfile(admin/default/javascript/compatibility.js)%>"></script>
-
-        <meta http-equiv='Pragma' content='no-cache' />
-        <meta http-equiv='Cache-Control' content='no-cache, must-revalidate' />
-        <meta http-equiv='Expires' content='-1' />
-        <%extrahead%>
-    </head>
-    <body>
-        <div id="adminwrapper">
-            <div class="header">
-                <h1><%sitevar(name)%></h1>
-            </div>
-            <div id="container">
-                <div id="content">
-                    <div class="loginname">
-                        <%if(loggedin)%><%text(_LOGGEDINAS)%> <%member(yourrealname)%> - <a href="<%adminurl%>index.php?action=logout"><%text(_LOGOUT)%></a><br /><a href="<%adminurl%>index.php?action=overview"><%text(_ADMINHOME)%></a> - <%else%><a href="<%adminurl%>index.php?action=showlogin" title="Log in"><%text(_NOTLOGGEDIN)%></a><br /><%endif%>
-                        <a href="<%sitevar(url)%>"><%text(_YOURSITE)%></a><br />
-                        (<%if(superadmin)%><a href="<%versioncheckurl%>" title="<%text(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE)%>"><%version%><%codename%></a><%newestcompare%><%else%><%version%><%codename%><%endif%>)
-                    </div><p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>
-        <h2><%text(_SKINIE_TITLE_IMPORT)%></h2>
-        <p>
-            <label for="skinie_import_local"><%text(_SKINIE_LOCAL)%></label>
-            <%if(superadmin)%><form method="post" action="<%adminurl%>index.php">
-                <div>
-                    <input type="hidden" name="action" value="adminskinieimport" />
-                    <input type="hidden" name="overwrite" value="1" />
-                    <%ticket%>
-                    <input type="hidden" name="mode" value="file" />
-                    <select name="skinfile" id="skinie_import_local">
-                        <%selectlocaladminskinfiles%>
-                    </select>
-                    <input type="submit" value="<%text(_SKINIE_BTN_IMPORT)%>" />
-                </div>
-            </form><%else%><%text(_SKINIE_NOCANDIDATES)%><%endif%>
-        </p>
-        <p><em><%text(_OR)%></em></p>
-        <form method="post" action="<%adminurl%>index.php">
-            <p>
-                <%ticket%>
-                <input type="hidden" name="action" value="adminskinieimport" />
-                <input type="hidden" name="mode" value="url" />
-                <label for="skinie_import_url"><%text(_SKINIE_FROMURL)%></label>
-                <input type="text" name="skinfile" id="skinie_import_url" size="60" value="http://" />
-                <input type="submit" value="<%text(_SKINIE_BTN_IMPORT)%>" />
-            </p>
-        </form>
-<%if(loggedin)%><%ifnot(adminaction,showlogin)%><h2><%text(_LOGOUT)%></h2>
-                    <ul>
-                        <li><a href="<%adminurl%>index.php?action=overview"><%text(_BACKHOME)%></a></li>
-                        <li><a href="<%adminurl%>index.php?action=logout"><%text(_LOGOUT)%></a></li>
-                    </ul><%endif%><%endif%>
-                    <div class="foot">
-                        <a href="<%text(_ADMINPAGEFOOT_OFFICIALURL)%>">Nucleus CMS</a> &copy; 2002- <%date(%Y)%> <%text(_ADMINPAGEFOOT_COPYRIGHT)%> - <a href="<%text(_ADMINPAGEFOOT_DONATEURL)%>"><%text(_ADMINPAGEFOOT_DONATE)%></a>
-                    </div>
-                </div><!-- content -->
-                <div id="quickmenu">
-                    <%if(loggedin)%><%ifnot(adminaction,showlogin)%><ul>
-                        <li><a href="<%adminurl%>index.php?action=overview"><%text(_QMENU_HOME)%></a></li>
-                    </ul>
-
-                    <h2><%text(_QMENU_ADD)%></h2>
-                    <form method="get" action="<%adminurl%>index.php">
-                        <div>
-                            <input type="hidden" name="action" value="createitem" />
-                            <%qmenuaddselect%>
-                        </div>
-                    </form>
-            
-                    <h2><%member(yourrealname)%></h2>
-                    <ul>
-                        <li><a href="<%adminurl%>index.php?action=editmembersettings"><%text(_QMENU_USER_SETTINGS)%></a></li>
-                        <li><a href="<%adminurl%>index.php?action=browseownitems"><%text(_QMENU_USER_ITEMS)%></a></li>
-                        <li><a href="<%adminurl%>index.php?action=browseowncomments"><%text(_QMENU_USER_COMMENTS)%></a></li>
-                    </ul>
-                    <%if(superadmin)%><h2><%text(_QMENU_MANAGE)%></h2>
-                    <ul>
-                        <li><a href="<%adminurl%>index.php?action=actionlog"><%text(_QMENU_MANAGE_LOG)%></a></li>
-                        <li><a href="<%adminurl%>index.php?action=settingsedit"><%text(_QMENU_MANAGE_SETTINGS)%></a></li>
-                        <li><a href="<%adminurl%>index.php?action=systemoverview"><%text(_QMENU_MANAGE_SYSTEM)%></a></li>
-                        <li><a href="<%adminurl%>index.php?action=usermanagement"><%text(_QMENU_MANAGE_MEMBERS)%></a></li>
-                        <li><a href="<%adminurl%>index.php?action=createnewlog"><%text(_QMENU_MANAGE_NEWBLOG)%></a></li>
-                        <li><a href="<%adminurl%>index.php?action=backupoverview"><%text(_QMENU_MANAGE_BACKUPS)%></a></li>
-                        <li><a href="<%adminurl%>index.php?action=pluginlist"><%text(_QMENU_MANAGE_PLUGINS)%></a></li>
-                    </ul>
-                    <h2><%text(_QMENU_LAYOUT)%></h2>
-                    <ul>
-                        <li><a href="<%adminurl%>index.php?action=skinoverview"><%text(_QMENU_LAYOUT_SKINS)%></a></li>
-                        <li><a href="<%adminurl%>index.php?action=templateoverview"><%text(_QMENU_LAYOUT_TEMPL)%></a></li>
-                        <li><a href="<%adminurl%>index.php?action=skinieoverview"><%text(_QMENU_LAYOUT_IEXPORT)%></a></li>
-                    </ul>
-                    <h2><%text(_SKINABLEADMIN_QMENU_LAYOUT)%></h2>
-                    <ul>
-                        <li><a href="<%adminurl%>index.php?action=adminskinoverview"><%text(_QMENU_LAYOUT_SKINS)%></a></li>
-                        <li><a href="<%adminurl%>index.php?action=admintemplateoverview"><%text(_QMENU_LAYOUT_TEMPL)%></a></li>
-                        <li><a href="<%adminurl%>index.php?action=adminskinieoverview"><%text(_QMENU_LAYOUT_IEXPORT)%></a></li>
-                    </ul><%endif%>
-                    <%quickmenu(default/admin)%>
-                    <%elseif(adminaction,activate)%><h2><%text(_QMENU_ACTIVATE)%></h2><%text(_QMENU_ACTIVATE_TEXT)%>
-                    <%elseif(adminaction,activatesetpwd)%><h2><%text(_QMENU_ACTIVATE)%></h2><%text(_QMENU_ACTIVATE_TEXT)%>
-                    <%else%><h2><%text(_QMENU_INTRO)%></h2><%text(_QMENU_INTRO_TEXT)%><%endif%>
-                </div>
-                <!-- content / quickmenu container -->
-                <div class="clear"></div>    <!-- new -->
-            </div>
-        <!-- adminwrapper -->    <!-- new -->
-        </div>     <!-- new -->
-    </body>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=<%charset%>" />
+<title><%sitevar(name)%> - Admin</title>
+<link rel="stylesheet" title="Nucleus Admin Default" type="text/css" href="<%skinfile(admin/default/styles/admin_contemporary.css)%>" />
+<link rel="stylesheet" title="Nucleus Admin Default" type="text/css" href="<%skinfile(admin/default/styles/addedit.css)%>" />
+
+<script type="text/javascript" src="<%skinfile(admin/default/javascript/edit.js)%>"></script>
+<script type="text/javascript" src="<%skinfile(admin/default/javascript/admin.js)%>"></script>
+<script type="text/javascript" src="<%skinfile(admin/default/javascript/compatibility.js)%>"></script>
+
+<meta http-equiv='Pragma' content='no-cache' />
+<meta http-equiv='Cache-Control' content='no-cache, must-revalidate' />
+<meta http-equiv='Expires' content='-1' />
+<%extrahead%>
+</head>
+<body>
+<div id="adminwrapper">
+<div class="header">
+<h1><%sitevar(name)%></h1>
+</div>
+<div id="container">
+<div id="content">
+<div class="loginname">
+
+<%if(loggedin)%>
+       <%text(_LOGGEDINAS)%> <%member(yourrealname)%> - <a href="<%adminurl%>index.php?action=logout"><%text(_LOGOUT)%></a><br />
+       <a href="<%adminurl%>index.php?action=overview"><%text(_ADMINHOME)%></a> - 
+<%else%>
+       <a href="<%adminurl%>index.php?action=showlogin" title="Log in"><%text(_NOTLOGGEDIN)%></a><br />
+<%endif%>
+
+<a href="<%sitevar(url)%>"><%text(_YOURSITE)%></a><br />
+(
+<%if(superadmin)%>
+       <a href="<%versioncheckurl%>" title="<%text(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE)%>"><%version%><%codename%></a><%newestcompare%>
+<%else%>
+       <%version%><%codename%>
+<%endif%>
+)
+</div>
+
+<p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>
+
+<h2><%text(_SKINIE_TITLE_IMPORT)%></h2>
+
+<p>
+<label for="skinie_import_local"><%text(_SKINIE_LOCAL)%></label>
+<%if(superadmin)%>
+       <form method="post" action="<%adminurl%>index.php">
+       <p>
+       <input type="hidden" name="action" value="adminskinieimport" />
+       <input type="hidden" name="overwrite" value="1" />
+       <%ticket%>
+       <input type="hidden" name="mode" value="file" />
+       <select name="skinfile" id="skinie_import_local">
+       <%selectlocalskinfiles%>
+       </select>
+       <input type="submit" value="<%text(_SKINIE_BTN_IMPORT)%>" />
+       </p>
+       </form>
+<%else%>
+       <p><%text(_SKINIE_NOCANDIDATES)%></p>
+<%endif%>
+
+<p><em><%text(_OR)%></em></p>
+
+<form method="post" action="<%adminurl%>index.php">
+<p>
+<%ticket%>
+<input type="hidden" name="action" value="adminskinieimport" />
+<input type="hidden" name="mode" value="url" />
+<label for="skinie_import_url"><%text(_SKINIE_FROMURL)%></label>
+<input type="text" name="skinfile" id="skinie_import_url" size="60" value="http://" />
+<input type="submit" value="<%text(_SKINIE_BTN_IMPORT)%>" />
+</p>
+</form>
+
+<%if(loggedin)%>
+       <%ifnot(adminaction,showlogin)%>
+               <h2><%text(_LOGOUT)%></h2>
+               <ul>
+               <li><a href="<%adminurl%>index.php?action=overview"><%text(_BACKHOME)%></a></li>
+               <li><a href="<%adminurl%>index.php?action=logout"><%text(_LOGOUT)%></a></li>
+               </ul>
+       <%endif%>
+<%endif%>
+
+<div class="foot">
+<a href="<%text(_ADMINPAGEFOOT_OFFICIALURL)%>">Nucleus CMS</a> &copy; 2002- <%date(%Y)%> <%text(_ADMINPAGEFOOT_COPYRIGHT)%> - <a href="<%text(_ADMINPAGEFOOT_DONATEURL)%>"><%text(_ADMINPAGEFOOT_DONATE)%></a>
+</div>
+</div>
+<!-- content -->
+
+<div id="quickmenu">
+<%if(loggedin)%>
+<%ifnot(adminaction,showlogin)%>
+<ul>
+<li><a href="<%adminurl%>index.php?action=overview"><%text(_QMENU_HOME)%></a></li>
+</ul>
+
+<h2><%text(_QMENU_ADD)%></h2>
+<form method="get" action="<%adminurl%>index.php">
+<div>
+<input type="hidden" name="action" value="createitem" />
+<%qmenuaddselect%>
+</div>
+</form>
+
+<h2><%member(yourrealname)%></h2>
+<ul>
+<li><a href="<%adminurl%>index.php?action=editmembersettings"><%text(_QMENU_USER_SETTINGS)%></a></li>
+<li><a href="<%adminurl%>index.php?action=browseownitems"><%text(_QMENU_USER_ITEMS)%></a></li>
+<li><a href="<%adminurl%>index.php?action=browseowncomments"><%text(_QMENU_USER_COMMENTS)%></a></li>
+</ul>
+
+<%if(superadmin)%>
+       <h2><%text(_QMENU_MANAGE)%></h2>
+       <ul>
+       <li><a href="<%adminurl%>index.php?action=actionlog"><%text(_QMENU_MANAGE_LOG)%></a></li>
+       <li><a href="<%adminurl%>index.php?action=settingsedit"><%text(_QMENU_MANAGE_SETTINGS)%></a></li>
+       <li><a href="<%adminurl%>index.php?action=systemoverview"><%text(_QMENU_MANAGE_SYSTEM)%></a></li>
+       <li><a href="<%adminurl%>index.php?action=usermanagement"><%text(_QMENU_MANAGE_MEMBERS)%></a></li>
+       <li><a href="<%adminurl%>index.php?action=createnewlog"><%text(_QMENU_MANAGE_NEWBLOG)%></a></li>
+       <li><a href="<%adminurl%>index.php?action=backupoverview"><%text(_QMENU_MANAGE_BACKUPS)%></a></li>
+       <li><a href="<%adminurl%>index.php?action=pluginlist"><%text(_QMENU_MANAGE_PLUGINS)%></a></li>
+       </ul>
+       <h2><%text(_QMENU_LAYOUT)%></h2>
+       <ul>
+       <li><a href="<%adminurl%>index.php?action=skinoverview"><%text(_QMENU_LAYOUT_SKINS)%></a></li>
+       <li><a href="<%adminurl%>index.php?action=templateoverview"><%text(_QMENU_LAYOUT_TEMPL)%></a></li>
+       <li><a href="<%adminurl%>index.php?action=skinieoverview"><%text(_QMENU_LAYOUT_IEXPORT)%></a></li>
+       </ul>
+       <h2><%text(_SKINABLEADMIN_QMENU_LAYOUT)%></h2>
+       <ul>
+       <li><a href="<%adminurl%>index.php?action=adminskinoverview"><%text(_QMENU_LAYOUT_SKINS)%></a></li>
+       <li><a href="<%adminurl%>index.php?action=admintemplateoverview"><%text(_QMENU_LAYOUT_TEMPL)%></a></li>
+       <li><a href="<%adminurl%>index.php?action=adminskinieoverview"><%text(_QMENU_LAYOUT_IEXPORT)%></a></li>
+       </ul><%endif%>
+       <%quickmenu(default/admin)%>
+<%elseif(adminaction,activate)%>
+       <h2><%text(_QMENU_ACTIVATE)%></h2><%text(_QMENU_ACTIVATE_TEXT)%>
+<%elseif(adminaction,activatesetpwd)%>
+       <h2><%text(_QMENU_ACTIVATE)%></h2><%text(_QMENU_ACTIVATE_TEXT)%>
+<%else%>
+       <h2><%text(_QMENU_INTRO)%></h2><%text(_QMENU_INTRO_TEXT)%>
+<%endif%>
+
+</div>
+<!-- content / quickmenu container -->
+<div class="clear"></div>
+<!-- new -->
+</div>
+<!-- adminwrapper -->
+<!-- new -->
+</div>
+ <!-- new -->
+</body>
 </html>
\ No newline at end of file
 </html>
\ No newline at end of file
index 3226359..807db30 100644 (file)
@@ -1,68 +1,67 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=<%charset%>" />
-        <title><%sitevar(name)%> - Admin</title>
-        <link rel="stylesheet" title="Nucleus Admin Default" type="text/css" href="<%skinfile(admin/default/styles/admin_contemporary.css)%>" />
-        <link rel="stylesheet" title="Nucleus Admin Default" type="text/css" href="<%skinfile(admin/default/styles/addedit.css)%>" />
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=<%charset%>" />
+<title><%sitevar(name)%> - Admin</title>
+<link rel="stylesheet" title="Nucleus Admin Default" type="text/css" href="<%skinfile(admin/default/styles/admin_contemporary.css)%>" />
+<link rel="stylesheet" title="Nucleus Admin Default" type="text/css" href="<%skinfile(admin/default/styles/addedit.css)%>" />
+<script type="text/javascript" src="<%skinfile(admin/default/javascript/edit.js)%>"></script>
+<script type="text/javascript" src="<%skinfile(admin/default/javascript/admin.js)%>"></script>
+<script type="text/javascript" src="<%skinfile(admin/default/javascript/compatibility.js)%>"></script>
+<meta http-equiv='Pragma' content='no-cache' />
+<meta http-equiv='Cache-Control' content='no-cache, must-revalidate' />
+<meta http-equiv='Expires' content='-1' />
+<%extrahead%>
+</head>
+<body>
+<div id="adminwrapper">
+<div class="header">
+<h1><%sitevar(name)%></h1>
+</div>
+<div id="container">
+<div id="content">
+<div class="loginname">
+<a href="<%adminurl%>index.php?action=showlogin" title="Log in"><%text(_NOTLOGGEDIN)%></a><br />
+<a href="<%sitevar(url)%>"><%text(_YOURSITE)%></a><br />
+(<%version%><%codename%>)
+</div>
 
 
-        <script type="text/javascript" src="<%skinfile(admin/default/javascript/edit.js)%>"></script>
+<h2><%text(_LOGIN)%></h2>
+<%headmessage%>
 
 
-        <script type="text/javascript" src="<%skinfile(admin/default/javascript/admin.js)%>"></script>
-        <script type="text/javascript" src="<%skinfile(admin/default/javascript/compatibility.js)%>"></script>
+<form action="index.php" method="post"><p>
+<%text(_LOGIN_NAME)%> <br />
+<input name="login"  tabindex="10" /><br />
+<%text(_LOGIN_PASSWORD)%> <br />
+<input name="password"  tabindex="20" type="password" /><br />
+<input name="action" value="login" type="hidden" /><input name="customaction" value="top" type="hidden" /><br />
+<input type="submit" value="<%text(_LOGIN)%>" tabindex="30" /><br />
+<small>
+<input type="checkbox" value="1" name="shared" tabindex="40" id="shared" /><label for="shared"><%text(_LOGIN_SHARED)%></label><br />
+<a href="forgotpassword.php"><%text(_LOGIN_FORGOT)%></a>
+</small>
+<%passrequestvars%>
+</p>
+</form>
 
 
-        <meta http-equiv='Pragma' content='no-cache' />
-        <meta http-equiv='Cache-Control' content='no-cache, must-revalidate' />
-        <meta http-equiv='Expires' content='-1' />
-        <%extrahead%>
-    </head>
-    <body>
+<div class="foot">
+<a href="<%text(_ADMINPAGEFOOT_OFFICIALURL)%>">Nucleus CMS</a> &copy; 2002- <%date(%Y)%> <%text(_ADMINPAGEFOOT_COPYRIGHT)%>
+ - <a href="<%text(_ADMINPAGEFOOT_DONATEURL)%>"><%text(_ADMINPAGEFOOT_DONATE)%></a>
+</div>
 
 
-        <div id="adminwrapper">
-            <div class="header">
-                <h1><%sitevar(name)%></h1>
-            </div>
-            <div id="container">
-                <div id="content">
-                    <div class="loginname">
-                        <a href="<%adminurl%>index.php?action=showlogin" title="Log in"><%text(_NOTLOGGEDIN)%></a><br /><%endif%>
+</div>
 
 
-                        <a href="<%sitevar(url)%>"><%text(_YOURSITE)%></a><br />
-                        (<%version%><%codename%>)
-                    </div><h2><%text(_LOGIN)%></h2>
-        <%headmessage%>
+<!-- content -->
+<div id="quickmenu">
+<h2><%text(_QMENU_INTRO)%></h2>
+<%text(_QMENU_INTRO_TEXT)%>
+</div>
+<!-- content / quickmenu container -->
+<div class="clear"></div>
+<!-- new -->
+</div>
 
 
-        <form action="index.php" method="post"><p>
-            <%text(_LOGIN_NAME)%> <br /><input name="login"  tabindex="10" />
-            <br />
-            <%text(_LOGIN_PASSWORD)%> <br /><input name="password"  tabindex="20" type="password" />
-
-            <br />
-            <input name="action" value="login" type="hidden" /><input name="customaction" value="top" type="hidden" />
-            <br />
-            <input type="submit" value="<%text(_LOGIN)%>" tabindex="30" />
-            <br />
-            <small>
-                <input type="checkbox" value="1" name="shared" tabindex="40" id="shared" /><label for="shared"><%text(_LOGIN_SHARED)%></label>
-                <br /><a href="forgotpassword.php"><%text(_LOGIN_FORGOT)%></a>
-
-            </small>
-            <%passrequestvars%>
-
-        </p></form>
-                    <div class="foot">
-                        <a href="<%text(_ADMINPAGEFOOT_OFFICIALURL)%>">Nucleus CMS</a> &copy; 2002- <%date(%Y)%> <%text(_ADMINPAGEFOOT_COPYRIGHT)%> - <a href="<%text(_ADMINPAGEFOOT_DONATEURL)%>"><%text(_ADMINPAGEFOOT_DONATE)%></a>
-                    </div>
-
-                </div><!-- content -->
-                <div id="quickmenu">
-                    <h2><%text(_QMENU_INTRO)%></h2><%text(_QMENU_INTRO_TEXT)%>
-                </div>
-                <!-- content / quickmenu container -->
-                <div class="clear"></div>    <!-- new -->
-            </div>
-
-        <!-- adminwrapper -->    <!-- new -->
-        </div>     <!-- new -->
-    </body>
+<!-- adminwrapper --><!-- new -->
+</div> <!-- new -->
+</body>
 </html>
\ No newline at end of file
 </html>
\ No newline at end of file