OSDN Git Service

merged 3.2 original code
[nucleus-jp/nucleus-jp-ancient.git] / utf8 / nucleus / libs / ADMIN.php
index dbeef1a..657362f 100755 (executable)
@@ -1,7 +1,7 @@
 <?php\r
 /**\r
-  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/) \r
-  * Copyright (C) 2002-2004 The Nucleus Group\r
+  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+  * Copyright (C) 2002-2005 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
@@ -9,9 +9,12 @@
   * of the License, or (at your option) any later version.\r
   * (see nucleus/documentation/index.html#license for more info)\r
   *\r
-  * The code for the Nucleus admin area   \r
+  * The code for the Nucleus admin area\r
+  *\r
+  * $Id: ADMIN.php,v 1.4 2005-03-12 06:19:04 kimitake Exp $\r
+  * $NucleusJP$\r
   */\r
\r
+\r
 class ADMIN {\r
 \r
        // action currently being executed ($action=xxxx -> action_xxxx method)\r
@@ -20,7 +23,7 @@ class ADMIN {
        function ADMIN() {\r
 \r
        }\r
-       \r
+\r
        /**\r
          * Executes an action\r
          *\r
@@ -28,6 +31,8 @@ class ADMIN {
          *             action to be performed\r
          */\r
        function action($action) {\r
+               global $CONF, $manager;\r
+\r
                // list of action aliases\r
                $alias = array(\r
                        'login' => 'overview',\r
@@ -38,14 +43,28 @@ class ADMIN {
                        $action = $alias[$action];\r
 \r
                $methodName = 'action_' . $action;\r
-               \r
-               $this->action = $action;\r
+\r
+               $this->action = strtolower($action);\r
+\r
+               // check ticket. All actions need a ticket, unless they are considered to be safe (a safe action\r
+               // is an action that requires user interaction before something is actually done)\r
+               // all safe actions are in this array:\r
+               $aActionsNotToCheck = array('showlogin', 'login', 'overview', 'itemlist', 'blogcommentlist', 'bookmarklet', 'blogsettings', 'banlist', 'deleteblog', 'editmembersettings', 'browseownitems', 'browseowncomments', 'createitem', 'itemedit', 'itemmove', 'categoryedit', 'categorydelete', 'manage', 'actionlog', 'settingsedit', 'backupoverview', 'pluginlist', 'createnewlog', 'usermanagement', 'skinoverview', 'templateoverview', 'skinieoverview', 'itemcommentlist', 'commentedit', 'commentdelete', 'banlistnewfromitem', 'banlistdelete', 'itemdelete', 'manageteam', 'teamdelete', 'banlistnew', 'memberedit', 'memberdelete', 'pluginhelp', 'pluginoptions', 'plugindelete', 'skinedittype', 'skindelete', 'skinedit', 'templateedit', 'templatedelete', 'activate');\r
+/*\r
+               // the rest of the actions needs to be checked\r
+               $aActionsToCheck = array('additem', 'itemupdate', 'itemmoveto', 'categoryupdate', 'categorydeleteconfirm', 'itemdeleteconfirm', 'commentdeleteconfirm', 'teamdeleteconfirm', 'memberdeleteconfirm', 'templatedeleteconfirm', 'skindeleteconfirm', 'banlistdeleteconfirm', 'plugindeleteconfirm', 'batchitem', 'batchcomment', 'batchmember', 'batchcategory', 'batchteam', 'regfile', 'commentupdate', 'banlistadd', 'changemembersettings', 'clearactionlog', 'settingsupdate', 'blogsettingsupdate', 'categorynew', 'teamchangeadmin', 'teamaddmember', 'memberadd', 'addnewlog', 'addnewlog2', 'backupcreate', 'backuprestore', 'pluginup', 'plugindown', 'pluginupdate', 'pluginadd', 'pluginoptionsupdate', 'skinupdate', 'skinclone', 'skineditgeneral', 'templateclone', 'templatenew', 'templateupdate', 'skinieimport', 'skinieexport', 'skiniedoimport', 'skinnew', 'deleteblogconfirm', 'sendping', 'rawping', 'activatesetpwd');\r
+*/\r
+               if (!in_array($this->action, $aActionsNotToCheck))\r
+               {\r
+                       if (!$manager->checkTicket())\r
+                               $this->error(_ERROR_BADTICKET);\r
+               }\r
 \r
                if (method_exists($this, $methodName))\r
                        call_user_func(array(&$this, $methodName));\r
                else\r
                        $this->error(_BADACTION . " ($action)");\r
-               \r
+\r
        }\r
 \r
 \r
@@ -56,19 +75,19 @@ class ADMIN {
 \r
        function action_login($msg = '', $passvars = 1) {\r
                global $member;\r
-               \r
+\r
                // skip to overview when allowed\r
                if ($member->isLoggedIn() && $member->canLogin()) {\r
                        $this->action_overview();\r
                        exit;\r
                }\r
-                       \r
+\r
                $this->pagehead();\r
-               \r
+\r
                echo '<h2>', _LOGIN ,'</h2>';\r
                if ($msg) echo _MESSAGE , ': ', htmlspecialchars($msg);\r
                ?>\r
-               \r
+\r
                <form action="index.php" method="post"><p>\r
                <?php echo _LOGIN_NAME?>: <br /><input name="login"  tabindex="10" />\r
                <br />\r
@@ -83,13 +102,13 @@ class ADMIN {
                        <br /><a href="forgotpassword.html"><?php echo _LOGIN_FORGOT?></a>\r
                </small>\r
                <?php                   // pass through vars\r
-                       \r
+\r
                        $oldaction = postVar('oldaction');\r
                        if (  ($oldaction != 'logout')  && ($oldaction != 'login')  && $passvars ) {\r
                                passRequestVars();\r
                        }\r
 \r
-                       \r
+\r
                ?>\r
                </p></form>\r
                <?php           $this->pagefoot();\r
@@ -101,52 +120,52 @@ class ADMIN {
          */\r
        function action_overview($msg = '') {\r
                global $member;\r
-               \r
+\r
                $this->pagehead();\r
-               \r
+\r
                if ($msg)\r
                        echo _MESSAGE , ': ', $msg;\r
-               \r
+\r
                /* ---- add items ---- */\r
                echo '<h2>' . _OVERVIEW_YRBLOGS . '</h2>';\r
-               \r
+\r
                $showAll = requestVar('showall');\r
-               \r
+\r
                if (($member->isAdmin()) && ($showAll == 'yes')) {\r
                        // Super-Admins have access to all blogs! (no add item support though)\r
                        $query =  'SELECT bnumber, bname, 1 as tadmin, burl, bshortname'\r
-                              . ' FROM ' . sql_table('blog')\r
-                              . ' ORDER BY bname';\r
+                                  . ' FROM ' . sql_table('blog')\r
+                                  . ' ORDER BY bname';\r
                } else {\r
                        $query =  'SELECT bnumber, bname, tadmin, burl, bshortname'\r
-                              . ' FROM ' . sql_table('blog') . ', ' . sql_table('team')\r
-                              . ' WHERE tblog=bnumber and tmember=' . $member->getID()\r
-                              . ' ORDER BY bname';             \r
+                                  . ' FROM ' . sql_table('blog') . ', ' . sql_table('team')\r
+                                  . ' WHERE tblog=bnumber and tmember=' . $member->getID()\r
+                                  . ' ORDER BY bname';\r
                }\r
                $template['content'] = 'bloglist';\r
                $template['superadmin'] = $member->isAdmin();\r
                $amount = showlist($query,'table',$template);\r
-               \r
+\r
                if (($showAll != 'yes') && ($member->isAdmin())) {\r
                        $total = quickQuery('SELECT COUNT(*) as result FROM ' . sql_table('blog'));\r
-                       if ($total > $amount) \r
+                       if ($total > $amount)\r
                                echo '<p><a href="index.php?action=overview&amp;showall=yes">Show all blogs</a></p>';\r
                }\r
 \r
                if ($amount == 0)\r
                        echo _OVERVIEW_NOBLOGS;\r
-                       \r
+\r
                if ($amount != 0) {\r
                        echo '<h2>' . _OVERVIEW_YRDRAFTS . '</h2>';\r
                        $query =  'SELECT ititle, inumber, bshortname'\r
                                   . ' FROM ' . sql_table('item'). ', ' . sql_table('blog')\r
-                              . ' WHERE iauthor='.$member->getID().' and iblog=bnumber and idraft=1';\r
+                                  . ' WHERE iauthor='.$member->getID().' and iblog=bnumber and idraft=1';\r
                        $template['content'] = 'draftlist';\r
                        $amountdrafts = showlist($query, 'table', $template);\r
-                       if ($amountdrafts == 0) \r
+                       if ($amountdrafts == 0)\r
                                echo _OVERVIEW_NODRAFTS;\r
                }\r
-               \r
+\r
                /* ---- user settings ---- */\r
                echo '<h2>' . _OVERVIEW_YRSETTINGS . '</h2>';\r
                echo '<ul>';\r
@@ -154,7 +173,7 @@ class ADMIN {
                echo '<li><a href="index.php?action=browseownitems">' . _OVERVIEW_BROWSEITEMS.'</a></li>';\r
                echo '<li><a href="index.php?action=browseowncomments">'._OVERVIEW_BROWSECOMM.'</a></li>';\r
                echo '</ul>';\r
-               \r
+\r
                /* ---- general settings ---- */\r
                if ($member->isAdmin()) {\r
                        echo '<h2>' . _OVERVIEW_MANAGEMENT. '</h2>';\r
@@ -162,144 +181,144 @@ class ADMIN {
                        echo '<li><a href="index.php?action=manage">',_OVERVIEW_MANAGE,'</a></li>';\r
                        echo '</ul>';\r
                }\r
-               \r
-               \r
+\r
+\r
                $this->pagefoot();\r
        }\r
-       \r
+\r
        // returns a link to a weblog (takes BLOG object as parameter)\r
        function bloglink(&$blog) {\r
                return '<a href="'.htmlspecialchars($blog->getURL()).'" title="'._BLOGLIST_TT_VISIT.'">'.$blog->getName() .'</a>';\r
        }\r
-       \r
+\r
        function action_manage($msg = '') {\r
                global $member;\r
-               \r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $this->pagehead();\r
-               \r
+\r
                echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';\r
-               \r
+\r
                if ($msg)\r
                        echo '<p>' , _MESSAGE , ': ', $msg , '</p>';\r
 \r
 \r
                echo '<h2>' . _MANAGE_GENERAL. '</h2>';\r
-               \r
+\r
                echo '<ul>';\r
                echo '<li><a href="index.php?action=createnewlog">'._OVERVIEW_NEWLOG.'</a></li>';\r
                echo '<li><a href="index.php?action=settingsedit">'._OVERVIEW_SETTINGS.'</a></li>';\r
-               echo '<li><a href="index.php?action=usermanagement">'._OVERVIEW_MEMBERS.'</a></li>';            \r
-               echo '<li><a href="index.php?action=actionlog">'._OVERVIEW_VIEWLOG.'</a></li>';         \r
+               echo '<li><a href="index.php?action=usermanagement">'._OVERVIEW_MEMBERS.'</a></li>';\r
+               echo '<li><a href="index.php?action=actionlog">'._OVERVIEW_VIEWLOG.'</a></li>';\r
                echo '</ul>';\r
-               \r
+\r
                echo '<h2>' . _MANAGE_SKINS . '</h2>';\r
                echo '<ul>';\r
                echo '<li><a href="index.php?action=skinoverview">'._OVERVIEW_SKINS.'</a></li>';\r
                echo '<li><a href="index.php?action=templateoverview">'._OVERVIEW_TEMPLATES.'</a></li>';\r
-               echo '<li><a href="index.php?action=skinieoverview">'._OVERVIEW_SKINIMPORT.'</a></li>';         \r
+               echo '<li><a href="index.php?action=skinieoverview">'._OVERVIEW_SKINIMPORT.'</a></li>';\r
                echo '</ul>';\r
-               \r
-               echo '<h2>' . _MANAGE_EXTRA . '</h2>';          \r
+\r
+               echo '<h2>' . _MANAGE_EXTRA . '</h2>';\r
                echo '<ul>';\r
-               echo '<li><a href="index.php?action=backupoverview">'._OVERVIEW_BACKUP.'</a></li>';                     \r
-               echo '<li><a href="index.php?action=pluginlist">'._OVERVIEW_PLUGINS.'</a></li>';                        \r
-               echo '</ul>';   \r
-               \r
-               $this->pagefoot();      \r
+               echo '<li><a href="index.php?action=backupoverview">'._OVERVIEW_BACKUP.'</a></li>';\r
+               echo '<li><a href="index.php?action=pluginlist">'._OVERVIEW_PLUGINS.'</a></li>';\r
+               echo '</ul>';\r
+\r
+               $this->pagefoot();\r
        }\r
-       \r
+\r
        function action_itemlist($blogid = '') {\r
                global $member, $manager;\r
-               \r
+\r
                if ($blogid == '')\r
                        $blogid = intRequestVar('blogid');\r
-               \r
-               $member->teamRights($blogid) or $member->isAdmin() or $this->disallow();                \r
-               \r
+\r
+               $member->teamRights($blogid) or $member->isAdmin() or $this->disallow();\r
+\r
                $this->pagehead();\r
                $blog =& $manager->getBlog($blogid);\r
-               \r
-               echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';          \r
+\r
+               echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';\r
                echo '<h2>' . _ITEMLIST_BLOG . ' ' . $this->bloglink($blog) . '</h2>';\r
-               \r
+\r
                // start index\r
                if (postVar('start'))\r
                        $start = intPostVar('start');\r
                else\r
-                       $start = 0;     \r
-                       \r
+                       $start = 0;\r
+\r
                if ($start == 0)\r
-                       echo '<p><a href="index.php?action=createitem&amp;blogid='.$blogid.'">',_ITEMLIST_ADDNEW,'</a></p>';            \r
-                       \r
+                       echo '<p><a href="index.php?action=createitem&amp;blogid='.$blogid.'">',_ITEMLIST_ADDNEW,'</a></p>';\r
+\r
                // amount of items to show\r
                if (postVar('amount'))\r
                        $amount = intPostVar('amount');\r
                else\r
-                       $amount = 10;   \r
-               \r
+                       $amount = 10;\r
+\r
                $search = postVar('search');    // search through items\r
-                       \r
+\r
                $query =  'SELECT bshortname, cname, mname, ititle, ibody, inumber, idraft, itime'\r
-                      . ' FROM ' . sql_table('item') . ', ' . sql_table('blog') . ', ' . sql_table('member') . ', ' . sql_table('category')\r
-                      . ' WHERE iblog=bnumber and iauthor=mnumber and icat=catid and iblog=' . $blogid;\r
-               \r
-               if ($search) \r
-                       $query .= ' and ((ititle LIKE "%' . addslashes($search) . '%") or (ibody LIKE "%' . addslashes($search) . '%") or (imore LIKE "%' . addslashes($search) . '%"))';                       \r
-                       \r
+                          . ' FROM ' . sql_table('item') . ', ' . sql_table('blog') . ', ' . sql_table('member') . ', ' . sql_table('category')\r
+                          . ' WHERE iblog=bnumber and iauthor=mnumber and icat=catid and iblog=' . $blogid;\r
+\r
+               if ($search)\r
+                       $query .= ' and ((ititle LIKE "%' . addslashes($search) . '%") or (ibody LIKE "%' . addslashes($search) . '%") or (imore LIKE "%' . addslashes($search) . '%"))';\r
+\r
                // non-blog-admins can only edit/delete their own items\r
-               if (!$member->blogAdminRights($blogid)) \r
+               if (!$member->blogAdminRights($blogid))\r
                        $query .= ' and iauthor=' . $member->getID();\r
 \r
-                               \r
+\r
                $query .= ' ORDER BY itime DESC'\r
-                       . " LIMIT $start,$amount";\r
-               \r
+                               . " LIMIT $start,$amount";\r
+\r
                $template['content'] = 'itemlist';\r
                $template['now'] = $blog->getCorrectTime(time());\r
 \r
 \r
-               $navList = new NAVLIST('itemlist', $start, $amount, 0, 1000, $blogid, $search, 0);\r
+               $navList =& new NAVLIST('itemlist', $start, $amount, 0, 1000, $blogid, $search, 0);\r
                $navList->showBatchList('item',$query,'table',$template);\r
 \r
-               \r
+\r
                $this->pagefoot();\r
        }\r
-       \r
-       \r
+\r
+\r
        function action_batchitem() {\r
                global $member, $manager;\r
-               \r
+\r
                // check if logged in\r
                $member->isLoggedIn() or $this->disallow();\r
-               \r
-               // more precise check will be done for each performed operation \r
-       \r
+\r
+               // more precise check will be done for each performed operation\r
+\r
                // get array of itemids from request\r
                $selected = requestIntArray('batch');\r
                $action = requestVar('batchaction');\r
-               \r
+\r
                // Show error when no items were selected\r
                if (!is_array($selected) || sizeof($selected) == 0)\r
                        $this->error(_BATCH_NOSELECTION);\r
-                       \r
+\r
                // On move: when no destination blog/category chosen, show choice now\r
                $destCatid = intRequestVar('destcatid');\r
-               if (($action == 'move') && (!$manager->existsCategory($destCatid))) \r
+               if (($action == 'move') && (!$manager->existsCategory($destCatid)))\r
                        $this->batchMoveSelectDestination('item',$selected);\r
-               \r
+\r
                // On delete: check if confirmation has been given\r
-               if (($action == 'delete') && (requestVar('confirmation') != 'yes')) \r
+               if (($action == 'delete') && (requestVar('confirmation') != 'yes'))\r
                        $this->batchAskDeleteConfirmation('item',$selected);\r
 \r
                $this->pagehead();\r
-               \r
-               echo '<a href="index.php?action=overview">(',_BACKHOME,')</a>';         \r
+\r
+               echo '<a href="index.php?action=overview">(',_BACKHOME,')</a>';\r
                echo '<h2>',_BATCH_ITEMS,'</h2>';\r
                echo '<p>',_BATCH_EXECUTING,' <b>',htmlspecialchars($action),'</b></p>';\r
                echo '<ul>';\r
-               \r
+\r
 \r
                // walk over all itemids and perform action\r
                foreach ($selected as $itemid) {\r
@@ -321,42 +340,42 @@ class ADMIN {
                        echo '<b>',($error ? $error : _BATCH_SUCCESS),'</b>';\r
                        echo '</li>';\r
                }\r
-               \r
+\r
                echo '</ul>';\r
                echo '<b>',_BATCH_DONE,'</b>';\r
-               \r
+\r
                $this->pagefoot();\r
 \r
-               \r
+\r
        }\r
-       \r
+\r
        function action_batchcomment() {\r
                global $member;\r
-               \r
+\r
                // check if logged in\r
                $member->isLoggedIn() or $this->disallow();\r
-               \r
-               // more precise check will be done for each performed operation \r
-       \r
+\r
+               // more precise check will be done for each performed operation\r
+\r
                // get array of itemids from request\r
                $selected = requestIntArray('batch');\r
                $action = requestVar('batchaction');\r
-               \r
+\r
                // Show error when no items were selected\r
                if (!is_array($selected) || sizeof($selected) == 0)\r
                        $this->error(_BATCH_NOSELECTION);\r
-                       \r
+\r
                // On delete: check if confirmation has been given\r
-               if (($action == 'delete') && (requestVar('confirmation') != 'yes')) \r
+               if (($action == 'delete') && (requestVar('confirmation') != 'yes'))\r
                        $this->batchAskDeleteConfirmation('comment',$selected);\r
 \r
                $this->pagehead();\r
-               \r
-               echo '<a href="index.php?action=overview">(',_BACKHOME,')</a>';         \r
+\r
+               echo '<a href="index.php?action=overview">(',_BACKHOME,')</a>';\r
                echo '<h2>',_BATCH_COMMENTS,'</h2>';\r
                echo '<p>',_BATCH_EXECUTING,' <b>',htmlspecialchars($action),'</b></p>';\r
                echo '<ul>';\r
-               \r
+\r
                // walk over all itemids and perform action\r
                foreach ($selected as $commentid) {\r
                        $commentid = intval($commentid);\r
@@ -374,40 +393,40 @@ class ADMIN {
                        echo '<b>',($error ? $error : _BATCH_SUCCESS),'</b>';\r
                        echo '</li>';\r
                }\r
-               \r
+\r
                echo '</ul>';\r
                echo '<b>',_BATCH_DONE,'</b>';\r
-               \r
+\r
                $this->pagefoot();\r
 \r
-               \r
+\r
        }\r
 \r
        function action_batchmember() {\r
                global $member;\r
-               \r
+\r
                // check if logged in and admin\r
                ($member->isLoggedIn() && $member->isAdmin()) or $this->disallow();\r
-               \r
+\r
                // get array of itemids from request\r
                $selected = requestIntArray('batch');\r
                $action = requestVar('batchaction');\r
-               \r
+\r
                // Show error when no members selected\r
                if (!is_array($selected) || sizeof($selected) == 0)\r
                        $this->error(_BATCH_NOSELECTION);\r
-                       \r
+\r
                // On delete: check if confirmation has been given\r
-               if (($action == 'delete') && (requestVar('confirmation') != 'yes')) \r
+               if (($action == 'delete') && (requestVar('confirmation') != 'yes'))\r
                        $this->batchAskDeleteConfirmation('member',$selected);\r
 \r
                $this->pagehead();\r
-               \r
-               echo '<a href="index.php?action=usermanagement">(',_MEMBERS_BACKTOOVERVIEW,')</a>';             \r
+\r
+               echo '<a href="index.php?action=usermanagement">(',_MEMBERS_BACKTOOVERVIEW,')</a>';\r
                echo '<h2>',_BATCH_MEMBERS,'</h2>';\r
                echo '<p>',_BATCH_EXECUTING,' <b>',htmlspecialchars($action),'</b></p>';\r
                echo '<ul>';\r
-               \r
+\r
                // walk over all itemids and perform action\r
                foreach ($selected as $memberid) {\r
                        $memberid = intval($memberid);\r
@@ -438,44 +457,44 @@ class ADMIN {
                        echo '<b>',($error ? $error : _BATCH_SUCCESS),'</b>';\r
                        echo '</li>';\r
                }\r
-               \r
+\r
                echo '</ul>';\r
                echo '<b>',_BATCH_DONE,'</b>';\r
-               \r
+\r
                $this->pagefoot();\r
 \r
-               \r
-       }       \r
-       \r
+\r
+       }\r
+\r
 \r
        function action_batchteam() {\r
                global $member;\r
-               \r
+\r
                $blogid = intRequestVar('blogid');\r
-               \r
+\r
                // check if logged in and admin\r
                ($member->isLoggedIn() && $member->blogAdminRights($blogid)) or $this->disallow();\r
-               \r
+\r
                // get array of itemids from request\r
                $selected = requestIntArray('batch');\r
                $action = requestVar('batchaction');\r
-               \r
+\r
                // Show error when no members selected\r
                if (!is_array($selected) || sizeof($selected) == 0)\r
                        $this->error(_BATCH_NOSELECTION);\r
-                       \r
+\r
                // On delete: check if confirmation has been given\r
-               if (($action == 'delete') && (requestVar('confirmation') != 'yes')) \r
+               if (($action == 'delete') && (requestVar('confirmation') != 'yes'))\r
                        $this->batchAskDeleteConfirmation('team',$selected);\r
 \r
                $this->pagehead();\r
-               \r
+\r
                echo '<p><a href="index.php?action=manageteam&amp;blogid=',$blogid,'">(',_BACK,')</a></p>';\r
 \r
                echo '<h2>',_BATCH_TEAM,'</h2>';\r
                echo '<p>',_BATCH_EXECUTING,' <b>',htmlspecialchars($action),'</b></p>';\r
                echo '<ul>';\r
-               \r
+\r
                // walk over all itemids and perform action\r
                foreach ($selected as $memberid) {\r
                        $memberid = intval($memberid);\r
@@ -506,49 +525,49 @@ class ADMIN {
                        echo '<b>',($error ? $error : _BATCH_SUCCESS),'</b>';\r
                        echo '</li>';\r
                }\r
-               \r
+\r
                echo '</ul>';\r
                echo '<b>',_BATCH_DONE,'</b>';\r
-               \r
+\r
                $this->pagefoot();\r
 \r
-               \r
-       }       \r
+\r
+       }\r
+\r
 \r
 \r
-       \r
        function action_batchcategory() {\r
                global $member, $manager;\r
-               \r
+\r
                // check if logged in\r
                $member->isLoggedIn() or $this->disallow();\r
-               \r
-               // more precise check will be done for each performed operation \r
-       \r
+\r
+               // more precise check will be done for each performed operation\r
+\r
                // get array of itemids from request\r
                $selected = requestIntArray('batch');\r
                $action = requestVar('batchaction');\r
-               \r
+\r
                // Show error when no items were selected\r
                if (!is_array($selected) || sizeof($selected) == 0)\r
                        $this->error(_BATCH_NOSELECTION);\r
-                       \r
+\r
                // On move: when no destination blog chosen, show choice now\r
                $destBlogId = intRequestVar('destblogid');\r
-               if (($action == 'move') && (!$manager->existsBlogID($destBlogId))) \r
+               if (($action == 'move') && (!$manager->existsBlogID($destBlogId)))\r
                        $this->batchMoveCategorySelectDestination('category',$selected);\r
-               \r
+\r
                // On delete: check if confirmation has been given\r
-               if (($action == 'delete') && (requestVar('confirmation') != 'yes')) \r
+               if (($action == 'delete') && (requestVar('confirmation') != 'yes'))\r
                        $this->batchAskDeleteConfirmation('category',$selected);\r
 \r
                $this->pagehead();\r
-               \r
-               echo '<a href="index.php?action=overview">(',_BACKHOME,')</a>';         \r
+\r
+               echo '<a href="index.php?action=overview">(',_BACKHOME,')</a>';\r
                echo '<h2>',BATCH_CATEGORIES,'</h2>';\r
                echo '<p>',_BATCH_EXECUTING,' <b>',htmlspecialchars($action),'</b></p>';\r
                echo '<ul>';\r
-               \r
+\r
                // walk over all itemids and perform action\r
                foreach ($selected as $catid) {\r
                        $catid = intval($catid);\r
@@ -569,15 +588,16 @@ class ADMIN {
                        echo '<b>',($error ? 'Error: '.$error : _BATCH_SUCCESS),'</b>';\r
                        echo '</li>';\r
                }\r
-               \r
+\r
                echo '</ul>';\r
                echo '<b>',_BATCH_DONE,'</b>';\r
-               \r
+\r
                $this->pagefoot();\r
-               \r
+\r
        }\r
-       \r
+\r
        function batchMoveSelectDestination($type, $ids) {\r
+               global $manager;\r
                $this->pagehead();\r
                ?>\r
                <h2><?php echo _MOVE_TITLE?></h2>\r
@@ -585,25 +605,29 @@ class ADMIN {
 \r
                        <input type="hidden" name="action" value="batch<?php echo $type?>" />\r
                        <input type="hidden" name="batchaction" value="move" />\r
-                       <?php                           // insert selected item numbers\r
+                       <?php\r
+                               $manager->addTicketHidden();\r
+\r
+                               // insert selected item numbers\r
                                $idx = 0;\r
                                foreach ($ids as $id)\r
                                        echo '<input type="hidden" name="batch[',($idx++),']" value="',intval($id),'" />';\r
-                       \r
+\r
                                // show blog/category selection list\r
                                $this->selectBlogCategory('destcatid');\r
-                       \r
+\r
                        ?>\r
-                       \r
-                       \r
+\r
+\r
                        <input type="submit" value="<?php echo _MOVE_BTN?>" onclick="return checkSubmit();" />\r
 \r
                </div></form>\r
                <?php           $this->pagefoot();\r
                exit;\r
        }\r
-       \r
+\r
        function batchMoveCategorySelectDestination($type, $ids) {\r
+               global $manager;\r
                $this->pagehead();\r
                ?>\r
                <h2><?php echo _MOVECAT_TITLE?></h2>\r
@@ -611,58 +635,64 @@ class ADMIN {
 \r
                        <input type="hidden" name="action" value="batch<?php echo $type?>" />\r
                        <input type="hidden" name="batchaction" value="move" />\r
-                       <?php                           // insert selected item numbers\r
+                       <?php\r
+                               $manager->addTicketHidden();\r
+\r
+                               // insert selected item numbers\r
                                $idx = 0;\r
                                foreach ($ids as $id)\r
                                        echo '<input type="hidden" name="batch[',($idx++),']" value="',intval($id),'" />';\r
-                       \r
+\r
                                // show blog/category selection list\r
                                $this->selectBlog('destblogid');\r
-                       \r
+\r
                        ?>\r
-                       \r
-                       \r
+\r
+\r
                        <input type="submit" value="<?php echo _MOVECAT_BTN?>" onclick="return checkSubmit();" />\r
 \r
                </div></form>\r
                <?php           $this->pagefoot();\r
                exit;\r
        }\r
-       \r
+\r
        function batchAskDeleteConfirmation($type, $ids) {\r
+               global $manager;\r
+\r
                $this->pagehead();\r
                ?>\r
                <h2><?php echo _BATCH_DELETE_CONFIRM?></h2>\r
                <form method="post" action="index.php"><div>\r
 \r
                        <input type="hidden" name="action" value="batch<?php echo $type?>" />\r
+                       <?php $manager->addTicketHidden() ?>\r
                        <input type="hidden" name="batchaction" value="delete" />\r
-                       <input type="hidden" name="confirmation" value="yes" />                 \r
+                       <input type="hidden" name="confirmation" value="yes" />\r
                        <?php                           // insert selected item numbers\r
                                $idx = 0;\r
                                foreach ($ids as $id)\r
                                        echo '<input type="hidden" name="batch[',($idx++),']" value="',intval($id),'" />';\r
-                                       \r
+\r
                                // add hidden vars for team & comment\r
-                               if ($type == 'team') \r
+                               if ($type == 'team')\r
                                {\r
                                        echo '<input type="hidden" name="blogid" value="',intRequestVar('blogid'),'" />';\r
                                }\r
-                               if ($type == 'comment') \r
+                               if ($type == 'comment')\r
                                {\r
                                        echo '<input type="hidden" name="itemid" value="',intRequestVar('itemid'),'" />';\r
                                }\r
-                                       \r
+\r
                        ?>\r
-                       \r
+\r
                        <input type="submit" value="<?php echo _BATCH_DELETE_CONFIRM_BTN?>" onclick="return checkSubmit();" />\r
 \r
                </div></form>\r
                <?php           $this->pagefoot();\r
                exit;\r
        }\r
-       \r
-       \r
+\r
+\r
        /**\r
          * Inserts a HTML select element with choices for all categories to which the current\r
          * member has access\r
@@ -670,7 +700,7 @@ class ADMIN {
        function selectBlogCategory($name, $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1) {\r
                ADMIN::selectBlog($name, 'category', $selected, $tabindex, $showNewCat, $iForcedBlogInclude);\r
        }\r
-       \r
+\r
        /**\r
          * Inserts a HTML select element with choices for all blogs to which the user has access\r
          *             mode = 'blog' => shows blognames and values are blogids\r
@@ -681,24 +711,24 @@ class ADMIN {
          */\r
        function selectBlog($name, $mode='blog', $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1) {\r
                global $member, $CONF;\r
-               \r
+\r
                // 0. get IDs of blogs to which member can post items (+ forced blog)\r
                $aBlogIds = array();\r
                if ($iForcedBlogInclude != -1)\r
                        $aBlogIds[] = intval($iForcedBlogInclude);\r
 \r
-               if (($member->isAdmin()) && ($CONF['ShowAllBlogs'])) \r
+               if (($member->isAdmin()) && ($CONF['ShowAllBlogs']))\r
                        $queryBlogs =  'SELECT bnumber FROM '.sql_table('blog').' ORDER BY bname';\r
                else\r
-                       $queryBlogs =  'SELECT bnumber FROM '.sql_table('blog').', '.sql_table('team').' WHERE tblog=bnumber and tmember=' . $member->getID();          \r
+                       $queryBlogs =  'SELECT bnumber FROM '.sql_table('blog').', '.sql_table('team').' WHERE tblog=bnumber and tmember=' . $member->getID();\r
                $rblogids = sql_query($queryBlogs);\r
                while ($o = mysql_fetch_object($rblogids))\r
                        if ($o->bnumber != $iForcedBlogInclude)\r
                                $aBlogIds[] = intval($o->bnumber);\r
-                               \r
+\r
                if (count($aBlogIds) == 0)\r
                        return;\r
-               \r
+\r
                echo '<select name="',$name,'" tabindex="',$tabindex,'">';\r
 \r
                // 1. select blogs (we'll create optiongroups)\r
@@ -739,200 +769,200 @@ class ADMIN {
                                echo '<option value="',$oBlog->bnumber,'"';\r
                                if ($oBlog->bnumber == $selected)\r
                                        echo ' selected="selected"';\r
-                               echo'>',htmlspecialchars($oBlog->bname),'</option>';                    \r
+                               echo'>',htmlspecialchars($oBlog->bname),'</option>';\r
                        }\r
                }\r
                echo '</select>';\r
-               \r
+\r
        }\r
-       \r
+\r
        function action_browseownitems() {\r
                global $member;\r
-               \r
+\r
                $this->pagehead();\r
-               \r
-               echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';          \r
+\r
+               echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';\r
                echo '<h2>' . _ITEMLIST_YOUR. '</h2>';\r
-               \r
+\r
                // start index\r
                if (postVar('start'))\r
                        $start = postVar('start');\r
                else\r
-                       $start = 0;     \r
-                       \r
+                       $start = 0;\r
+\r
                // amount of items to show\r
                if (postVar('amount'))\r
                        $amount = postVar('amount');\r
                else\r
-                       $amount = 10;   \r
-               \r
+                       $amount = 10;\r
+\r
                $search = postVar('search');    // search through items\r
-                       \r
+\r
                $query =  'SELECT bshortname, cname, mname, ititle, ibody, idraft, inumber, itime'\r
-                      . ' FROM '.sql_table('item').', '.sql_table('blog') . ', '.sql_table('member') . ', '.sql_table('category')\r
-                      . ' WHERE iauthor='. $member->getID() .' and iauthor=mnumber and iblog=bnumber and icat=catid';\r
-               \r
-               if ($search) \r
+                          . ' FROM '.sql_table('item').', '.sql_table('blog') . ', '.sql_table('member') . ', '.sql_table('category')\r
+                          . ' WHERE iauthor='. $member->getID() .' and iauthor=mnumber and iblog=bnumber and icat=catid';\r
+\r
+               if ($search)\r
                        $query .= ' and ((ititle LIKE "%' . addslashes($search) . '%") or (ibody LIKE "%' . addslashes($search) . '%") or (imore LIKE "%' . addslashes($search) . '%"))';\r
-                       \r
+\r
                $query .= ' ORDER BY itime DESC'\r
-                       . " LIMIT $start,$amount";\r
-               \r
+                               . " LIMIT $start,$amount";\r
+\r
                $template['content'] = 'itemlist';\r
                $template['now'] = time();\r
 \r
-               $navList = new NAVLIST('browseownitems', $start, $amount, 0, 1000, $blogid, $search, 0);\r
+               $navList =& new NAVLIST('browseownitems', $start, $amount, 0, 1000, $blogid, $search, 0);\r
                $navList->showBatchList('item',$query,'table',$template);\r
 \r
-               $this->pagefoot();              \r
-               \r
+               $this->pagefoot();\r
+\r
        }\r
-       \r
+\r
        /**\r
          * Show all the comments for a given item\r
          */\r
        function action_itemcommentlist($itemid = '') {\r
                global $member;\r
-               \r
+\r
                if ($itemid == '')\r
                        $itemid = intRequestVar('itemid');\r
-               \r
+\r
                // only allow if user is allowed to alter item\r
                $member->canAlterItem($itemid) or $this->disallow();\r
-               \r
+\r
                $blogid = getBlogIdFromItemId($itemid);\r
-       \r
+\r
                $this->pagehead();\r
-               \r
+\r
                // start index\r
                if (postVar('start'))\r
                        $start = postVar('start');\r
                else\r
-                       $start = 0;     \r
-                       \r
+                       $start = 0;\r
+\r
                // amount of items to show\r
                if (postVar('amount'))\r
                        $amount = postVar('amount');\r
                else\r
-                       $amount = 10;   \r
-               \r
-               $search = postVar('search');    \r
-               \r
+                       $amount = 10;\r
+\r
+               $search = postVar('search');\r
+\r
                echo '<p>(<a href="index.php?action=itemlist&amp;blogid=',$blogid,'">',_BACKTOOVERVIEW,'</a>)</p>';\r
                echo '<h2>',_COMMENTS,'</h2>';\r
-               \r
+\r
                $query =  'SELECT cbody, cuser, cmail, mname, ctime, chost, cnumber, cip, citem FROM '.sql_table('comment').' LEFT OUTER JOIN '.sql_table('member').' ON mnumber=cmember WHERE citem=' . $itemid;\r
 \r
-               if ($search) \r
+               if ($search)\r
                        $query .= ' and cbody LIKE "%' . addslashes($search) . '%"';\r
 \r
                $query .= ' ORDER BY ctime ASC'\r
-                       . " LIMIT $start,$amount";\r
+                               . " LIMIT $start,$amount";\r
 \r
                $template['content'] = 'commentlist';\r
                $template['canAddBan'] = $member->blogAdminRights(getBlogIDFromItemID($itemid));\r
 \r
-               $navList = new NAVLIST('itemcommentlist', $start, $amount, 0, 1000, 0, $search, $itemid);\r
+               $navList =& new NAVLIST('itemcommentlist', $start, $amount, 0, 1000, 0, $search, $itemid);\r
                $navList->showBatchList('comment',$query,'table',$template,_NOCOMMENTS);\r
-               \r
+\r
                $this->pagefoot();\r
        }\r
-       \r
+\r
        /**\r
          * Browse own comments\r
          */\r
        function action_browseowncomments() {\r
                global $member;\r
-               \r
+\r
                // start index\r
                if (postVar('start'))\r
                        $start = postVar('start');\r
                else\r
-                       $start = 0;     \r
-                       \r
+                       $start = 0;\r
+\r
                // amount of items to show\r
                if (postVar('amount'))\r
                        $amount = postVar('amount');\r
                else\r
-                       $amount = 10;   \r
-               \r
-               $search = postVar('search');                    \r
+                       $amount = 10;\r
+\r
+               $search = postVar('search');\r
 \r
 \r
                $query =  'SELECT cbody, cuser, cmail, mname, ctime, chost, cnumber, cip, citem FROM '.sql_table('comment').' LEFT OUTER JOIN '.sql_table('member').' ON mnumber=cmember WHERE cmember=' . $member->getID();\r
 \r
-               if ($search) \r
+               if ($search)\r
                        $query .= ' and cbody LIKE "%' . addslashes($search) . '%"';\r
 \r
                $query .= ' ORDER BY ctime DESC'\r
-                       . " LIMIT $start,$amount";\r
-               \r
+                               . " LIMIT $start,$amount";\r
+\r
                $this->pagehead();\r
-               \r
-               echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';          \r
+\r
+               echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';\r
                echo '<h2>', _COMMENTS_YOUR ,'</h2>';\r
-       \r
+\r
                $template['content'] = 'commentlist';\r
                $template['canAddBan'] = 0;     // doesn't make sense to allow banning yourself\r
-               \r
-               $navList = new NAVLIST('browseowncomments', $start, $amount, 0, 1000, 0, $search, 0);\r
+\r
+               $navList =& new NAVLIST('browseowncomments', $start, $amount, 0, 1000, 0, $search, 0);\r
                $navList->showBatchList('comment',$query,'table',$template,_NOCOMMENTS_YOUR);\r
-       \r
+\r
                $this->pagefoot();\r
        }\r
-       \r
+\r
        /**\r
          * Browse all comments for a weblog\r
          */\r
-       function action_blogcommentlist($blogid = '') \r
+       function action_blogcommentlist($blogid = '')\r
        {\r
                global $member, $manager;\r
-               \r
+\r
                if ($blogid == '')\r
                        $blogid = intRequestVar('blogid');\r
                else\r
                        $blogid = intval($blogid);\r
-                       \r
-               $member->teamRights($blogid) or $member->isAdmin() or $this->disallow();                \r
-               \r
+\r
+               $member->teamRights($blogid) or $member->isAdmin() or $this->disallow();\r
+\r
                // start index\r
                if (postVar('start'))\r
                        $start = postVar('start');\r
                else\r
-                       $start = 0;     \r
-                       \r
+                       $start = 0;\r
+\r
                // amount of items to show\r
                if (postVar('amount'))\r
                        $amount = postVar('amount');\r
                else\r
-                       $amount = 10;   \r
-               \r
+                       $amount = 10;\r
+\r
                $search = postVar('search');            // search through comments\r
 \r
 \r
                $query =  'SELECT cbody, cuser, cmail, mname, ctime, chost, cnumber, cip, citem FROM '.sql_table('comment').' LEFT OUTER JOIN '.sql_table('member').' ON mnumber=cmember WHERE cblog=' . intval($blogid);\r
 \r
-               if ($search != '') \r
+               if ($search != '')\r
                        $query .= ' and cbody LIKE "%' . addslashes($search) . '%"';\r
-                       \r
-                               \r
+\r
+\r
                $query .= ' ORDER BY ctime DESC'\r
-                       . " LIMIT $start,$amount";\r
+                               . " LIMIT $start,$amount";\r
 \r
 \r
                $blog =& $manager->getBlog($blogid);\r
 \r
                $this->pagehead();\r
-                               \r
-               echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';          \r
+\r
+               echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';\r
                echo '<h2>', _COMMENTS_BLOG , ' ' , $this->bloglink($blog), '</h2>';\r
-               \r
+\r
                $template['content'] = 'commentlist';\r
                $template['canAddBan'] = $member->blogAdminRights($blogid);\r
-               \r
+\r
                $navList =& new NAVLIST('blogcommentlist', $start, $amount, 0, 1000, $blogid, $search, 0);\r
-               $navList->showBatchList('comment',$query,'table',$template, 'No comments were made on items of this blog');\r
-       \r
+               $navList->showBatchList('comment',$query,'table',$template, _NOCOMMENTS_BLOG);\r
+\r
                $this->pagefoot();\r
        }\r
 \r
@@ -941,97 +971,97 @@ class ADMIN {
          */\r
        function action_createitem() {\r
                global $member, $manager;\r
-               \r
+\r
                $blogid = intRequestVar('blogid');\r
-               \r
+\r
                // check if allowed\r
-               $member->teamRights($blogid) or $this->disallow();              \r
-               \r
+               $member->teamRights($blogid) or $this->disallow();\r
+\r
                $memberid = $member->getID();\r
-               \r
+\r
                $blog =& $manager->getBlog($blogid);\r
-                               \r
+\r
                $this->pagehead();\r
-       \r
+\r
                // generate the add-item form\r
-               $formfactory = new PAGEFACTORY($blogid);\r
+               $formfactory =& new PAGEFACTORY($blogid);\r
                $formfactory->createAddForm('admin');\r
 \r
-               $this->pagefoot();      \r
+               $this->pagefoot();\r
        }\r
-       \r
+\r
        function action_itemedit() {\r
                global $member, $manager;\r
-               \r
+\r
                $itemid = intRequestVar('itemid');\r
-               \r
+\r
                // only allow if user is allowed to alter item\r
                $member->canAlterItem($itemid) or $this->disallow();\r
-               \r
+\r
                $item =& $manager->getItem($itemid,1,1);\r
                $blog =& $manager->getBlog(getBlogIDFromItemID($itemid));\r
-               \r
+\r
                $manager->notify('PrepareItemForEdit', array('item' => &$item));\r
-               \r
+\r
                if ($blog->convertBreaks()) {\r
                        $item['body'] = removeBreaks($item['body']);\r
                        $item['more'] = removeBreaks($item['more']);\r
                }\r
-       \r
+\r
                // form to edit blog items\r
                $this->pagehead();\r
-               $formfactory = new PAGEFACTORY($blog->getID());\r
-               $formfactory->createEditForm('admin',$item);            \r
-               $this->pagefoot();      \r
+               $formfactory =& new PAGEFACTORY($blog->getID());\r
+               $formfactory->createEditForm('admin',$item);\r
+               $this->pagefoot();\r
        }\r
-       \r
+\r
        function action_itemupdate() {\r
                global $member, $manager, $CONF;\r
-               \r
+\r
                $itemid = intRequestVar('itemid');\r
                $catid = postVar('catid');\r
-               \r
+\r
                // only allow if user is allowed to alter item\r
                $member->canUpdateItem($itemid, $catid) or $this->disallow();\r
 \r
                $actiontype = postVar('actiontype');\r
-               \r
+\r
                // delete actions are handled by itemdelete (which has confirmation)\r
                if ($actiontype == 'delete') {\r
                        $this->action_itemdelete();\r
-                       return; \r
+                       return;\r
                }\r
-                               \r
+\r
                $body   = postVar('body');\r
                $title  = postVar('title');\r
                $more   = postVar('more');\r
                $closed = intPostVar('closed');\r
 \r
                // default action = add now\r
-               if (!$actiontype) \r
+               if (!$actiontype)\r
                        $actiontype='addnow';\r
-                       \r
-               // create new category if needed \r
+\r
+               // create new category if needed\r
                if (strstr($catid,'newcat')) {\r
-                       // get blogid \r
+                       // get blogid\r
                        list($blogid) = sscanf($catid,"newcat-%d");\r
-                       \r
+\r
                        // create\r
                        $blog =& $manager->getBlog($blogid);\r
                        $catid = $blog->createNewCategory();\r
 \r
                        // show error when sth goes wrong\r
-                       if (!$catid) \r
+                       if (!$catid)\r
                                $this->doError(_ERROR_CATCREATEFAIL);\r
-               } \r
+               }\r
 \r
                /*\r
                        set some variables based on actiontype\r
-                       \r
+\r
                        actiontypes:\r
                                draft items -> addnow, addfuture, adddraft, delete\r
                                non-draft items -> edit, changedate, delete\r
-                       \r
+\r
                        variables set:\r
                                $timestamp: set to a nonzero value for future dates or date changes\r
                                $wasdraft: set to 1 when the item used to be a draft item\r
@@ -1046,7 +1076,7 @@ class ADMIN {
                        case 'addfuture':\r
                                $wasdraft = 1;\r
                                $publish = 1;\r
-                               $timestamp = mktime(postVar('hour'), postVar('minutes'), 0, postVar('month'), postVar('day'), postVar('year'));\r
+                               $timestamp = mktime(postVar('hour'), postVar('minutes'), 0, postVar('month'), postVar('day'), postVar('year'));\r
                                break;\r
                        case 'addnow':\r
                                $wasdraft = 1;\r
@@ -1064,15 +1094,22 @@ class ADMIN {
                                $wasdraft = 0;\r
                                $timestamp = 0;\r
                }\r
-               \r
+\r
                // edit the item for real\r
                ITEM::update($itemid, $catid, $title, $body, $more, $closed, $wasdraft, $publish, $timestamp);\r
-               \r
+\r
+               $blogid = getBlogIDFromItemID($itemid);\r
+               $blog =& $manager->getBlog($blogid);\r
+               if (!$closed && $publish && $wasdraft && $blog->pingUserland()) {\r
+                       $this->action_sendping($blogid);\r
+                       return;\r
+               }\r
+\r
                // show category edit window when we created a new category\r
                // ($catid will then be a new category ID, while postVar('catid') will be 'newcat-x')\r
                if ($catid != intPostVar('catid')) {\r
                        $this->action_categoryedit(\r
-                               $catid, \r
+                               $catid,\r
                                $blog->getID(),\r
                                $CONF['AdminURL'] . 'index.php?action=itemlist&blogid=' . getBlogIDFromItemID($itemid)\r
                        );\r
@@ -1081,136 +1118,141 @@ class ADMIN {
                        $this->action_itemlist(getBlogIDFromItemID($itemid));\r
                }\r
        }\r
-       \r
+\r
        function action_itemdelete() {\r
                global $member, $manager;\r
-               \r
+\r
                $itemid = intRequestVar('itemid');\r
-               \r
+\r
                // only allow if user is allowed to alter item\r
                $member->canAlterItem($itemid) or $this->disallow();\r
-               \r
+\r
                if (!$manager->existsItem($itemid,1,1))\r
                        $this->error(_ERROR_NOSUCHITEM);\r
-                       \r
+\r
                $item =& $manager->getItem($itemid,1,1);\r
                $title = htmlspecialchars(strip_tags($item['title']));\r
                $body = strip_tags($item['body']);\r
                $body = htmlspecialchars(shorten($body,300,'...'));\r
-               \r
+\r
                $this->pagehead();\r
                ?>\r
                        <h2><?php echo _DELETE_CONFIRM?></h2>\r
-                       \r
+\r
                        <p><?php echo _CONFIRMTXT_ITEM?></p>\r
-                       \r
+\r
                        <div class="note">\r
                                <b>"<?php echo  $title ?>"</b>\r
                                <br />\r
                                <?php echo $body?>\r
                        </div>\r
-                       \r
+\r
                        <form method="post" action="index.php"><div>\r
                                <input type="hidden" name="action" value="itemdeleteconfirm" />\r
+                               <?php $manager->addTicketHidden() ?>\r
                                <input type="hidden" name="itemid" value="<?php echo  $itemid; ?>" />\r
                                <input type="submit" value="<?php echo _DELETE_CONFIRM_BTN?>"  tabindex="10" />\r
                        </div></form>\r
-               <?php           \r
+               <?php\r
                $this->pagefoot();\r
        }\r
-       \r
+\r
        function action_itemdeleteconfirm() {\r
                global $member;\r
-               \r
+\r
                $itemid = intRequestVar('itemid');\r
-               \r
+\r
                // only allow if user is allowed to alter item\r
                $member->canAlterItem($itemid) or $this->disallow();\r
 \r
                // get blogid first\r
                $blogid = getBlogIdFromItemId($itemid);\r
-               \r
+\r
                // delete item (note: some checks will be performed twice)\r
                $this->deleteOneItem($itemid);\r
-               \r
+\r
                $this->action_itemlist($blogid);\r
        }\r
-       \r
+\r
        // deletes one item and returns error if something goes wrong\r
        function deleteOneItem($itemid) {\r
                global $member, $manager;\r
-               \r
+\r
                // only allow if user is allowed to alter item (also checks if itemid exists)\r
                if (!$member->canAlterItem($itemid))\r
                        return _ERROR_DISALLOWED;\r
-               \r
+\r
                $manager->loadClass('ITEM');\r
                ITEM::delete($itemid);\r
        }\r
 \r
        function action_itemmove() {\r
                global $member, $manager;\r
-               \r
-               $itemid = intRequestVar('itemid');              \r
-               \r
+\r
+               $itemid = intRequestVar('itemid');\r
+\r
                // only allow if user is allowed to alter item\r
                $member->canAlterItem($itemid) or $this->disallow();\r
 \r
                $item =& $manager->getItem($itemid,1,1);\r
-               \r
+\r
                $this->pagehead();\r
                ?>\r
                        <h2><?php echo _MOVE_TITLE?></h2>\r
                        <form method="post" action="index.php"><div>\r
                                <input type="hidden" name="action" value="itemmoveto" />\r
                                <input type="hidden" name="itemid" value="<?php echo  $itemid; ?>" />\r
-                               \r
-                               <?php $this->selectBlogCategory('catid',$item['catid'],10,1);?>\r
-                               \r
+\r
+                               <?php\r
+\r
+                                       $manager->addTicketHidden();\r
+                                       $this->selectBlogCategory('catid',$item['catid'],10,1);\r
+                               ?>\r
+\r
                                <input type="submit" value="<?php echo _MOVE_BTN?>" tabindex="10000" onclick="return checkSubmit();" />\r
                        </div></form>\r
-               <?php           \r
+               <?php\r
                $this->pagefoot();\r
        }\r
 \r
        function action_itemmoveto() {\r
                global $member, $manager;\r
-               \r
+\r
                $itemid = intRequestVar('itemid');\r
                $catid = requestVar('catid');\r
-               \r
-               // create new category if needed \r
+\r
+               // create new category if needed\r
                if (strstr($catid,'newcat')) {\r
-                       // get blogid \r
+                       // get blogid\r
                        list($blogid) = sscanf($catid,'newcat-%d');\r
-                       \r
+\r
                        // create\r
                        $blog =& $manager->getBlog($blogid);\r
                        $catid = $blog->createNewCategory();\r
 \r
                        // show error when sth goes wrong\r
-                       if (!$catid) \r
+                       if (!$catid)\r
                                $this->doError(_ERROR_CATCREATEFAIL);\r
-               } \r
-               \r
+               }\r
+\r
                // only allow if user is allowed to alter item\r
                $member->canUpdateItem($itemid, $catid) or $this->disallow();\r
 \r
-               ITEM::move($itemid, $catid);            \r
-               \r
+               ITEM::move($itemid, $catid);\r
+\r
                if ($catid != intRequestVar('catid'))\r
                        $this->action_categoryedit($catid, $blog->getID());\r
                else\r
-                       $this->action_itemlist(getBlogIDFromCatID($catid));             \r
+                       $this->action_itemlist(getBlogIDFromCatID($catid));\r
        }\r
-       \r
+\r
        /**\r
          * Moves one item to a given category (category existance should be checked by caller)\r
          * errors are returned\r
          */\r
        function moveOneItem($itemid, $destCatid) {\r
                global $member;\r
-               \r
+\r
                // only allow if user is allowed to move item\r
                if (!$member->canUpdateItem($itemid, $destCatid))\r
                        return _ERROR_DISALLOWED;\r
@@ -1223,46 +1265,50 @@ class ADMIN {
          */\r
        function action_additem() {\r
                global $member, $manager, $CONF;\r
-                \r
+\r
                $manager->loadClass('ITEM');\r
 \r
                $result = ITEM::createFromRequest();\r
-               \r
+\r
                if ($result['status'] == 'error')\r
                        $this->error($result['message']);\r
-               \r
+\r
                $blogid = getBlogIDFromItemID($result['itemid']);\r
                $blog =& $manager->getBlog($blogid);\r
 \r
+               $pingUrl = $manager->addTicketToUrl($CONF['AdminURL'] . 'index.php?action=sendping&blogid=' . intval($blogid));\r
+\r
                if ($result['status'] == 'newcategory')\r
                        $this->action_categoryedit(\r
                                $result['catid'],\r
-                               $blogid, \r
-                               $blog->pingUserland() ? $CONF['AdminURL'] . 'index.php?action=sendping&blogid=' . intval($blogid) : ''\r
+                               $blogid,\r
+                               $blog->pingUserland() ? $pingUrl : ''\r
                        );\r
                elseif ((postVar('actiontype') == 'addnow') && $blog->pingUserland())\r
                        $this->action_sendping($blogid);\r
                else\r
                        $this->action_itemlist($blogid);\r
        }\r
-       \r
+\r
        /**\r
          * Shows a window that says we're about to ping weblogs.com.\r
-         * immediately refresh to the real pinging page, which will \r
+         * immediately refresh to the real pinging page, which will\r
          * show an error, or redirect to the blog.\r
          *\r
          * @param $blogid ID of blog for which ping needs to be sent out\r
          */\r
        function action_sendping($blogid = -1) {\r
-               global $member;\r
-               \r
+               global $member, $manager;\r
+\r
                if ($blogid == -1)\r
                        $blogid = intRequestVar('blogid');\r
-               \r
+\r
                $member->isLoggedIn() or $this->disallow();\r
-               \r
-               $this->pagehead('<meta http-equiv="refresh" content="1; url=index.php?action=rawping&amp;blogid=' . $blogid . '" />');\r
-               ?>              \r
+\r
+               $rawPingUrl = $manager->addTicketToUrl('index.php?action=rawping&blogid=' . intval($blogid));\r
+\r
+               $this->pagehead('<meta http-equiv="refresh" content="1; url='.htmlspecialchars($rawPingUrl).'" />');\r
+               ?>\r
                <h2>Site Updated, Now pinging weblogs.com</h2>\r
 \r
                <p>\r
@@ -1270,78 +1316,79 @@ class ADMIN {
                        <br />\r
                        When the ping is complete (and successfull), your weblog will show up in the weblogs.com updates list.\r
                </p>\r
-               \r
+\r
                <p>\r
                        If you aren't automatically passed through, <a href="index.php?action=rawping&amp;blogid=<?php echo $blogid?>">try again</a>\r
                </p>\r
                <?php           $this->pagefoot();\r
        }\r
-       \r
+\r
        // ping to Weblogs.com\r
        // sends the real ping (can take up to 10 seconds!)\r
        function action_rawping() {\r
                global $manager;\r
                // TODO: checks?\r
-                               \r
+\r
                $blogid = intRequestVar('blogid');\r
                $blog =& $manager->getBlog($blogid);\r
-               \r
+\r
                $result = $blog->sendUserlandPing();\r
-               \r
+\r
                $this->pagehead();\r
-               \r
+\r
                ?>\r
-               \r
+\r
                <h2>Ping Results</h2>\r
-               \r
+\r
                <p>The following message was returned by weblogs.com:</p>\r
-               \r
+\r
                <div class='note'><?php echo  $result ?></div>\r
-               \r
+\r
                <ul>\r
                        <li><a href="index.php?action=itemlist&amp;blogid=<?php echo $blog->getID()?>">View list of recent items for <?php echo htmlspecialchars($blog->getName())?></a></li>\r
                        <li><a href="<?php echo $blog->getURL()?>">Visit your own site</a></li>\r
                </ul>\r
-               \r
+\r
                <?php           $this->pagefoot();\r
        }\r
-       \r
-       /** \r
+\r
+       /**\r
          * Allows to edit previously made comments\r
          */\r
        function action_commentedit() {\r
                global $member, $manager;\r
-               \r
+\r
                $commentid = intRequestVar('commentid');\r
-               \r
+\r
                $member->canAlterComment($commentid) or $this->disallow();\r
 \r
                $comment = COMMENT::getComment($commentid);\r
-               \r
+\r
                $manager->notify('PrepareCommentForEdit',array('comment' => &$comment));\r
 \r
                // change <br /> to \n\r
                $comment['body'] = str_replace('<br />','',$comment['body']);\r
-               \r
-               $comment['body'] = eregi_replace("<a href=['\"]([^'\"]+)['\"]>[^<]*</a>","\\1",$comment['body']);\r
-               \r
+\r
+               $comment['body'] = eregi_replace("<a href=['\"]([^'\"]+)['\"]( rel=\"nofollow\")?>[^<]*</a>","\\1",$comment['body']);\r
+\r
                $this->pagehead();\r
-               \r
+\r
                ?>\r
                <h2><?php echo _EDITC_TITLE?></h2>\r
-               \r
+\r
                <form action="index.php" method="post"><div>\r
-               \r
+\r
                <input type="hidden" name="action" value="commentupdate" />\r
+               <?php $manager->addTicketHidden(); ?>\r
                <input type="hidden" name="commentid" value="<?php echo  $commentid; ?>" />\r
                <table><tr>\r
                        <th colspan="2"><?php echo _EDITC_TITLE?></th>\r
                </tr><tr>\r
                        <td><?php echo _EDITC_WHO?></td>\r
                        <td>\r
-                       <?php                           if ($comment['member']) \r
+                       <?php                           if ($comment['member'])\r
                                        echo $comment['member'] . " (" . _EDITC_MEMBER . ")";\r
-                               else \r
+                               else\r
                                        echo $comment['user'] . " (" . _EDITC_NONMEMBER . ")";\r
                        ?>\r
                        </td>\r
@@ -1362,23 +1409,23 @@ class ADMIN {
                        <td><?php echo _EDITC_EDIT?></td>\r
                        <td><input type="submit"  tabindex="20" value="<?php echo _EDITC_EDIT?>" onclick="return checkSubmit();" /></td>\r
                </tr></table>\r
-               \r
+\r
                </div></form>\r
-               <?php           \r
+               <?php\r
                $this->pagefoot();\r
        }\r
-       \r
+\r
        function action_commentupdate() {\r
                global $member, $manager;\r
-               \r
+\r
                $commentid = intRequestVar('commentid');\r
-               \r
+\r
                $member->canAlterComment($commentid) or $this->disallow();\r
-               \r
+\r
                $body = postVar('body');\r
-               \r
+\r
                // intercept words that are too long\r
-               if (eregi("[a-zA-Z0-9|\.,;:!\?=\/\\]{90,90}",$body) != false) \r
+               if (eregi("[a-zA-Z0-9|\.,;:!\?=\/\\]{90,90}",$body) != false)\r
                        $this->error(_ERROR_COMMENT_LONGWORD);\r
 \r
                // check length\r
@@ -1386,75 +1433,76 @@ class ADMIN {
                        $this->error(_ERROR_COMMENT_NOCOMMENT);\r
                if (strlen($body)>5000)\r
                        $this->error(_ERROR_COMMENT_TOOLONG);\r
-               \r
-               \r
+\r
+\r
                // prepare body\r
                $body = COMMENT::prepareBody($body);\r
-               \r
+\r
                // call plugins\r
                $manager->notify('PreUpdateComment',array('body' => &$body));\r
-               \r
+\r
                $query =  'UPDATE '.sql_table('comment')\r
-                      . " SET cbody='" .addslashes($body). "'"\r
-                      . " WHERE cnumber=" . $commentid;\r
+                          . " SET cbody='" .addslashes($body). "'"\r
+                          . " WHERE cnumber=" . $commentid;\r
                sql_query($query);\r
-               \r
+\r
                // get itemid\r
                $res = sql_query('SELECT citem FROM '.sql_table('comment').' WHERE cnumber=' . $commentid);\r
                $o = mysql_fetch_object($res);\r
                $itemid = $o->citem;\r
-               \r
+\r
                if ($member->canAlterItem($itemid))\r
-                       $this->action_itemcommentlist($itemid); \r
+                       $this->action_itemcommentlist($itemid);\r
                else\r
                        $this->action_browseowncomments();\r
-       \r
+\r
        }\r
-       \r
+\r
        function action_commentdelete() {\r
-               global $member;\r
-               \r
+               global $member, $manager;\r
+\r
                $commentid = intRequestVar('commentid');\r
-               \r
+\r
                $member->canAlterComment($commentid) or $this->disallow();\r
 \r
                $comment = COMMENT::getComment($commentid);\r
 \r
                $body = strip_tags($comment['body']);\r
                $body = htmlspecialchars(shorten($body, 300, '...'));\r
-               \r
+\r
                if ($comment['member'])\r
                        $author = $comment['member'];\r
                else\r
                        $author = $comment['user'];\r
-               \r
+\r
                $this->pagehead();\r
                ?>\r
-               \r
+\r
                        <h2><?php echo _DELETE_CONFIRM?></h2>\r
-                       \r
+\r
                        <p><?php echo _CONFIRMTXT_COMMENT?></p>\r
-                       \r
+\r
                        <div class="note">\r
                        <b><?php echo _EDITC_WHO?>:</b> <?php echo  $author ?>\r
                        <br />\r
                        <b><?php echo _EDITC_TEXT?>:</b> <?php echo  $body ?>\r
                        </div>\r
-                       \r
+\r
                        <form method="post" action="index.php"><div>\r
                                <input type="hidden" name="action" value="commentdeleteconfirm" />\r
+                               <?php $manager->addTicketHidden() ?>\r
                                <input type="hidden" name="commentid" value="<?php echo  $commentid; ?>" />\r
                                <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />\r
                        </div></form>\r
-               <?php           \r
+               <?php\r
                $this->pagefoot();\r
        }\r
-       \r
+\r
        function action_commentdeleteconfirm() {\r
                global $member;\r
-               \r
+\r
                $commentid = intRequestVar('commentid');\r
-               \r
+\r
                // get item id first\r
                $res = sql_query('SELECT citem FROM '.sql_table('comment') .' WHERE cnumber=' . $commentid);\r
                $o = mysql_fetch_object($res);\r
@@ -1463,70 +1511,71 @@ class ADMIN {
                $error = $this->deleteOneComment($commentid);\r
                if ($error)\r
                        $this->doError($error);\r
-                       \r
+\r
                if ($member->canAlterItem($itemid))\r
-                       $this->action_itemcommentlist($itemid); \r
+                       $this->action_itemcommentlist($itemid);\r
                else\r
                        $this->action_browseowncomments();\r
        }\r
-       \r
+\r
        function deleteOneComment($commentid) {\r
                global $member, $manager;\r
-               \r
+\r
                $commentid = intval($commentid);\r
-               \r
+\r
                if (!$member->canAlterComment($commentid))\r
                        return _ERROR_DISALLOWED;\r
-                       \r
+\r
                $manager->notify('PreDeleteComment', array('commentid' => $commentid));\r
-                               \r
+\r
                // delete the comments associated with the item\r
                $query = 'DELETE FROM '.sql_table('comment').' WHERE cnumber=' . $commentid;\r
                sql_query($query);\r
-               \r
-               $manager->notify('PostDeleteComment', array('commentid' => $commentid));                \r
-               \r
+\r
+               $manager->notify('PostDeleteComment', array('commentid' => $commentid));\r
+\r
                return '';\r
        }\r
-       \r
+\r
        /**\r
          * Usermanagement main\r
          */\r
        function action_usermanagement() {\r
-               global $member;\r
-               \r
+               global $member, $manager;\r
+\r
                // check if allowed\r
                $member->isAdmin() or $this->disallow();\r
 \r
                $this->pagehead();\r
-       \r
+\r
                echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';\r
-               \r
+\r
                echo '<h2>' . _MEMBERS_TITLE .'</h2>';\r
-               \r
+\r
                echo '<h3>' . _MEMBERS_CURRENT .'</h3>';\r
-               \r
+\r
                // show list of members with actions\r
                $query =  'SELECT *'\r
-                      . ' FROM '.sql_table('member');\r
+                          . ' FROM '.sql_table('member');\r
                $template['content'] = 'memberlist';\r
                $template['tabindex'] = 10;\r
-               \r
-               $batch = new BATCH('member');\r
+\r
+               $batch =& new BATCH('member');\r
                $batch->showlist($query,'table',$template);\r
 \r
                echo '<h3>' . _MEMBERS_NEW .'</h3>';\r
                ?>\r
                        <form method="post" action="index.php"><div>\r
-                       \r
+\r
                        <input type="hidden" name="action" value="memberadd" />\r
-                       \r
+                       <?php $manager->addTicketHidden() ?>\r
+\r
                        <table>\r
                        <tr>\r
                                <th colspan="2"><?php echo _MEMBERS_NEW?></th>\r
                        </tr><tr>\r
                                <td><?php echo _MEMBERS_DISPLAY?> <?php help('shortnames');?>\r
-                                   <br /><small>(This is the name used to logon)</small>\r
+                                       <br /><small>(This is the name used to logon)</small>\r
                                </td>\r
                                <td><input tabindex="10010" name="name" size="16" maxlength="16" /></td>\r
                        </tr><tr>\r
@@ -1557,12 +1606,12 @@ class ADMIN {
                                <td><?php echo _MEMBERS_NEW?></td>\r
                                <td><input type="submit" value="<?php echo _MEMBERS_NEW_BTN?>" tabindex="10090" onclick="return checkSubmit();" /></td>\r
                        </tr></table>\r
-                       \r
-                       </div></form>           \r
-               <?php           \r
+\r
+                       </div></form>\r
+               <?php\r
                $this->pagefoot();\r
        }\r
-       \r
+\r
        /**\r
          * Edit member settings\r
          */\r
@@ -1571,14 +1620,15 @@ class ADMIN {
        }\r
        function action_editmembersettings($memberid = '') {\r
                global $member, $manager, $CONF;\r
-               \r
+\r
                if ($memberid == '')\r
                        $memberid = $member->getID();\r
-               \r
+\r
                // check if allowed\r
                ($member->getID() == $memberid) or $member->isAdmin() or $this->disallow();\r
-       \r
-               $this->pagehead();\r
+\r
+               $extrahead = '<script type="text/javascript" src="javascript/numbercheck.js"></script>';\r
+               $this->pagehead($extrahead);\r
 \r
                // show message to go back to member overview (only for admins)\r
                if ($member->isAdmin())\r
@@ -1587,19 +1637,21 @@ class ADMIN {
                        echo '<a href="index.php?action=overview">(' ._BACKHOME. ')</a>';\r
 \r
                echo '<h2>' . _MEMBERS_EDIT . '</h2>';\r
-               \r
+\r
                $mem = MEMBER::createFromID($memberid);\r
-               \r
+\r
                ?>\r
                <form method="post" action="index.php"><div>\r
-               \r
+\r
                <input type="hidden" name="action" value="changemembersettings" />\r
                <input type="hidden" name="memberid" value="<?php echo  $memberid; ?>" />\r
+               <?php $manager->addTicketHidden() ?>\r
+\r
                <table><tr>\r
                        <th colspan="2"><?php echo _MEMBERS_EDIT?></th>\r
                </tr><tr>\r
                        <td><?php echo _MEMBERS_DISPLAY?> <?php help('shortnames');?>\r
-                           <br /><small><?php echo _MEMBERS_DISPLAY_INFO?></small>\r
+                               <br /><small><?php echo _MEMBERS_DISPLAY_INFO?></small>\r
                        </td>\r
                        <td>\r
                        <?php if ($CONF['AllowLoginEdit'] || $member->isAdmin()) { ?>\r
@@ -1612,7 +1664,7 @@ class ADMIN {
                </tr><tr>\r
                        <td><?php echo _MEMBERS_REALNAME?></td>\r
                        <td><input name="realname" tabindex="20" maxlength="60" size="40" value="<?php echo  htmlspecialchars($mem->getRealName()); ?>" /></td>\r
-               </tr><tr>               \r
+               </tr><tr>\r
                <?php if ($CONF['AllowLoginEdit'] || $member->isAdmin()) { ?>\r
                        <td><?php echo _MEMBERS_PWD?></td>\r
                        <td><input type="password" tabindex="30" maxlength="40" size="16" name="password" /></td>\r
@@ -1622,31 +1674,31 @@ class ADMIN {
                <?php } ?>\r
                </tr><tr>\r
                        <td><?php echo _MEMBERS_EMAIL?>\r
-                           <br /><small><?php echo _MEMBERS_EMAIL_EDIT?></small>\r
+                               <br /><small><?php echo _MEMBERS_EMAIL_EDIT?></small>\r
                        </td>\r
                        <td><input name="email" tabindex="40" size="40" maxlength="60" value="<?php echo  htmlspecialchars($mem->getEmail()); ?>" /></td>\r
                </tr><tr>\r
                        <td><?php echo _MEMBERS_URL?></td>\r
-                       <td><input name="url" tabindex="50" size="40" maxlength="100" value="<?php echo  htmlspecialchars($mem->getURL()); ?>" /></td>                  \r
+                       <td><input name="url" tabindex="50" size="40" maxlength="100" value="<?php echo  htmlspecialchars($mem->getURL()); ?>" /></td>\r
                <?php // only allow to change this by super-admins\r
                   // we don't want normal users to 'upgrade' themselves to super-admins, do we? ;-)\r
                   if ($member->isAdmin()) {\r
                ?>\r
                        </tr><tr>\r
                                <td><?php echo _MEMBERS_SUPERADMIN?> <?php help('superadmin'); ?></td>\r
-                               <td><?php $this->input_yesno('admin',$mem->isAdmin(),60); ?></td>       \r
+                               <td><?php $this->input_yesno('admin',$mem->isAdmin(),60); ?></td>\r
                        </tr><tr>\r
                                <td><?php echo _MEMBERS_CANLOGIN?> <?php help('canlogin'); ?></td>\r
                                <td><?php $this->input_yesno('canlogin',$mem->canLogin(),70); ?></td>\r
                <?php } ?>\r
                </tr><tr>\r
                        <td><?php echo _MEMBERS_NOTES?></td>\r
-                       <td><input name="notes" tabindex="80" size="40" maxlength="100" value="<?php echo  htmlspecialchars($mem->getNotes()); ?>" /></td>                      \r
-               </tr><tr>               \r
+                       <td><input name="notes" tabindex="80" size="40" maxlength="100" value="<?php echo  htmlspecialchars($mem->getNotes()); ?>" /></td>\r
+               </tr><tr>\r
                        <td><?php echo _MEMBERS_DEFLANG?> <?php help('language'); ?>\r
                        </td>\r
                        <td>\r
-                       \r
+\r
                                <select name="deflang" tabindex="85">\r
                                        <option value=""><?php echo _MEMBERS_USESITELANG?></option>\r
                                <?php                           // show a dropdown list of all available languages\r
@@ -1664,13 +1716,13 @@ class ADMIN {
                                closedir($dirhandle);\r
 \r
                                ?>\r
-                               </select>                       \r
-                       \r
+                               </select>\r
+\r
                        </td>\r
                </tr>\r
                <?php\r
                        // plugin options\r
-                       $this->_insertPluginOptions('member',$memberid);                        \r
+                       $this->_insertPluginOptions('member',$memberid);\r
                ?>\r
                <tr>\r
                        <th colspan="2"><?php echo _MEMBERS_EDIT ?></th>\r
@@ -1678,35 +1730,35 @@ class ADMIN {
                        <td><?php echo _MEMBERS_EDIT?></td>\r
                        <td><input type="submit" tabindex="90" value="<?php echo _MEMBERS_EDIT_BTN?>" onclick="return checkSubmit();" /></td>\r
                </tr></table>\r
-               \r
+\r
                </div></form>\r
-               \r
-               \r
-               <?php           \r
-                       echo '<h3>', _PLUGINS_EXTRA , '</h3>';\r
+\r
+               <?php\r
+                       echo '<h3>',_PLUGINS_EXTRA,'</h3>';\r
+\r
                        $manager->notify(\r
-                               'MemberSettingsFormExtras',     \r
+                               'MemberSettingsFormExtras',\r
                                array(\r
                                        'member' => &$mem\r
                                )\r
                        );\r
-                       \r
+\r
                $this->pagefoot();\r
        }\r
-       \r
-       \r
+\r
+\r
        function action_changemembersettings() {\r
                global $member, $CONF, $manager;\r
-               \r
+\r
                $memberid = intRequestVar('memberid');\r
-               \r
+\r
                // check if allowed\r
                ($member->getID() == $memberid) or $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $name                   = trim(postVar('name'));\r
                $realname               = trim(postVar('realname'));\r
                $password               = postVar('password');\r
-               $repeatpassword = postVar('repeatpassword');            \r
+               $repeatpassword = postVar('repeatpassword');\r
                $email                  = postVar('email');\r
                $url                    = postVar('url');\r
 \r
@@ -1718,7 +1770,7 @@ class ADMIN {
                $canlogin               = postVar('canlogin');\r
                $notes                  = postVar('notes');\r
                $deflang                = postVar('deflang');\r
-               \r
+\r
                $mem = MEMBER::createFromID($memberid);\r
 \r
                if ($CONF['AllowLoginEdit'] || $member->isAdmin()) {\r
@@ -1728,238 +1780,399 @@ class ADMIN {
 \r
                        if (($name != $mem->getDisplayName()) && MEMBER::exists($name))\r
                                $this->error(_ERROR_NICKNAMEINUSE);\r
-                               \r
+\r
                        if ($password != $repeatpassword)\r
                                $this->error(_ERROR_PASSWORDMISMATCH);\r
-                               \r
+\r
                        if ($password && (strlen($password) < 6))\r
                                $this->error(_ERROR_PASSWORDTOOSHORT);\r
                }\r
-               \r
+\r
                if (!isValidMailAddress($email))\r
                        $this->error(_ERROR_BADMAILADDRESS);\r
 \r
-       \r
+\r
                if (!$realname)\r
                        $this->error(_ERROR_REALNAMEMISSING);\r
-                       \r
-               if (($deflang != '') && (!checkLanguage($deflang))) \r
+\r
+               if (($deflang != '') && (!checkLanguage($deflang)))\r
                        $this->error(_ERROR_NOSUCHLANGUAGE);\r
-               \r
+\r
                // check if there will remain at least one site member with both the logon and admin rights\r
                // (check occurs when taking away one of these rights from such a member)\r
                if (    (!$admin && $mem->isAdmin() && $mem->canLogin())\r
-                    || (!$canlogin && $mem->isAdmin() && $mem->canLogin())\r
+                        || (!$canlogin && $mem->isAdmin() && $mem->canLogin())\r
                   )\r
                {\r
                        $r = sql_query('SELECT * FROM '.sql_table('member').' WHERE madmin=1 and mcanlogin=1');\r
                        if (mysql_num_rows($r) < 2)\r
                                $this->error(_ERROR_ATLEASTONEADMIN);\r
                }\r
-               \r
-               \r
-               // if email changed, generate new password\r
-               if ($email != $mem->getEmail())\r
-               {\r
-                       $password = genPassword(10);\r
-                       $newpass = 1;\r
-               } else {\r
-                       $newpass = 0;\r
-               }\r
 \r
                if ($CONF['AllowLoginEdit'] || $member->isAdmin()) {\r
                        $mem->setDisplayName($name);\r
-                       if ($password) \r
+                       if ($password)\r
                                $mem->setPassword($password);\r
                }\r
 \r
                if ($newpass)\r
                        $mem->setPassword($password);\r
-               \r
+\r
+               $oldEmail = $mem->getEmail();\r
+\r
                $mem->setRealName($realname);\r
                $mem->setEmail($email);\r
                $mem->setURL($url);\r
                $mem->setNotes($notes);\r
                $mem->setLanguage($deflang);\r
 \r
-               \r
+\r
                // only allow super-admins to make changes to the admin status\r
                if ($member->isAdmin()) {\r
                        $mem->setAdmin($admin);\r
                        $mem->setCanLogin($canlogin);\r
                }\r
 \r
-       \r
+\r
                $mem->write();\r
-               \r
+\r
+               // if email changed, generate new password\r
+               if ($oldEmail != $mem->getEmail())\r
+               {\r
+                       $mem->sendActivationLink('addresschange', $oldEmail);\r
+                       // logout member\r
+                       $mem->newCookieKey();\r
+                       $member->logout();\r
+                       $this->action_login(_MSG_ACTIVATION_SENT, 0);\r
+                       return;\r
+               }\r
+\r
+\r
                // store plugin options\r
                $aOptions = requestArray('plugoption');\r
                NucleusPlugin::_applyPluginOptions($aOptions);\r
-               $manager->notify('PostPluginOptionsUpdate',array('context' => 'member', 'memberid' => $memberid, 'member' => &$mem));           \r
-               \r
-               // if new password was generated, send out mail message and logout\r
-               if ($newpass) \r
-                       $mem->sendPassword($password);\r
+               $manager->notify('PostPluginOptionsUpdate',array('context' => 'member', 'memberid' => $memberid, 'member' => &$mem));\r
 \r
-               if (  ( $mem->getID() == $member->getID() ) \r
+               if (  ( $mem->getID() == $member->getID() )\r
                   && ( $newpass || ( $mem->getDisplayName() != $member->getDisplayName() ) )\r
                   ) {\r
+                       $mem->newCookieKey();\r
                        $member->logout();\r
                        $this->action_login(_MSG_LOGINAGAIN, 0);\r
                } else {\r
                        $this->action_overview(_MSG_SETTINGSCHANGED);\r
                }\r
        }\r
-       \r
+\r
        function action_memberadd() {\r
                global $member;\r
-               \r
+\r
                // check if allowed\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                if (postVar('password') != postVar('repeatpassword'))\r
                        $this->error(_ERROR_PASSWORDMISMATCH);\r
-               if (strlen(postVar('password')) < 6)  \r
+               if (strlen(postVar('password')) < 6)\r
                        $this->error(_ERROR_PASSWORDTOOSHORT);\r
-               \r
-               $res = MEMBER::create(postVar('name'), postVar('realname'), postVar('password'), postVar('email'), postVar('url'), postVar('admin'), postVar('canlogin'), postVar('notes'));    \r
+\r
+               $res = MEMBER::create(postVar('name'), postVar('realname'), postVar('password'), postVar('email'), postVar('url'), postVar('admin'), postVar('canlogin'), postVar('notes'));\r
                if ($res != 1)\r
                        $this->error($res);\r
-               \r
-               $this->action_usermanagement();         \r
+\r
+               $this->action_usermanagement();\r
+       }\r
+\r
+       /**\r
+        * Account activation\r
+        *\r
+        * @author dekarma\r
+        */\r
+       function action_activate() {\r
+\r
+               $key = getVar('key');\r
+               $this->_showActivationPage($key);\r
+       }\r
+\r
+       function _showActivationPage($key, $message = '')\r
+       {\r
+               global $manager;\r
+\r
+               // clean up old activation keys\r
+               MEMBER::cleanupActivationTable();\r
+\r
+               // get activation info\r
+               $info = MEMBER::getActivationInfo($key);\r
+\r
+               if (!$info)\r
+                       $this->error(_ERROR_ACTIVATE);\r
+\r
+               $mem = MEMBER::createFromId($info->vmember);\r
+\r
+               if (!$mem)\r
+                       $this->error(_ERROR_ACTIVATE);\r
+\r
+               $text = '';\r
+               $title = '';\r
+               $bNeedsPasswordChange = true;\r
+\r
+               switch ($info->vtype)\r
+               {\r
+                       case 'forgot':\r
+                               $title = _ACTIVATE_FORGOT_TITLE;\r
+                               $text = _ACTIVATE_FORGOT_TEXT;\r
+                               break;\r
+                       case 'register':\r
+                               $title = _ACTIVATE_REGISTER_TITLE;\r
+                               $text = _ACTIVATE_REGISTER_TEXT;\r
+                               break;\r
+                       case 'addresschange':\r
+                               $title = _ACTIVATE_CHANGE_TITLE;\r
+                               $text = _ACTIVATE_CHANGE_TEXT;\r
+                               $bNeedsPasswordChange = false;\r
+                               MEMBER::activate($key);\r
+                               break;\r
+               }\r
+\r
+               $aVars = array(\r
+                       'memberName' => htmlspecialchars($mem->getDisplayName())\r
+               );\r
+               $title = TEMPLATE::fill($title, $aVars);\r
+               $text = TEMPLATE::fill($text, $aVars);\r
+\r
+               $this->pagehead();\r
+\r
+                       echo '<h2>' , $title, '</h2>';\r
+                       echo '<p>' , $text, '</p>';\r
+\r
+                       if ($message != '')\r
+                       {\r
+                               echo '<p class="error">',$message,'</p>';\r
+                       }\r
+\r
+                       if ($bNeedsPasswordChange)\r
+                       {\r
+                               ?>\r
+                                       <div><form action="index.php" method="post">\r
+\r
+                                               <input type="hidden" name="action" value="activatesetpwd" />\r
+                                               <?php $manager->addTicketHidden() ?>\r
+                                               <input type="hidden" name="key" value="<?php echo htmlspecialchars($key) ?>" />\r
+\r
+                                               <table><tr>\r
+                                                       <td><?php echo _MEMBERS_PWD?></td>\r
+                                                       <td><input type="password" maxlength="40" size="16" name="password" /></td>\r
+                                               </tr><tr>\r
+                                                       <td><?php echo _MEMBERS_REPPWD?></td>\r
+                                                       <td><input type="password" maxlength="40" size="16" name="repeatpassword" /></td>\r
+                                               <?php\r
+\r
+                                                       global $manager;\r
+                                                       $manager->notify('FormExtra', array('type' => 'activation', 'member' => $mem));\r
+\r
+                                               ?>\r
+                                               </tr><tr>\r
+                                                       <td><?php echo _MEMBERS_SETPWD ?></td>\r
+                                                       <td><input type='submit' value='<?php echo _MEMBERS_SETPWD_BTN ?>' /></td>\r
+                                               </tr></table>\r
+\r
+\r
+                                       </form></div>\r
+\r
+                               <?php\r
+\r
+                       }\r
+\r
+               $this->pagefoot();\r
+\r
+       }\r
+\r
+       /**\r
+        * Account activation - set password part\r
+        *\r
+        * @author dekarma\r
+        */\r
+       function action_activatesetpwd() {\r
+\r
+               $key = postVar('key');\r
+\r
+               // clean up old activation keys\r
+               MEMBER::cleanupActivationTable();\r
+\r
+               // get activation info\r
+               $info = MEMBER::getActivationInfo($key);\r
+\r
+               if (!$info || ($info->type == 'addresschange'))\r
+                       return $this->_showActivationPage($key, _ERROR_ACTIVATE);\r
+\r
+               $mem = MEMBER::createFromId($info->vmember);\r
+\r
+               if (!$mem)\r
+                       return $this->_showActivationPage($key, _ERROR_ACTIVATE);\r
+\r
+               $password               = postVar('password');\r
+               $repeatpassword = postVar('repeatpassword');\r
+\r
+               if ($password != $repeatpassword)\r
+                       return $this->_showActivationPage($key, _ERROR_PASSWORDMISMATCH);\r
+\r
+               if ($password && (strlen($password) < 6))\r
+                       return $this->_showActivationPage($key, _ERROR_PASSWORDTOOSHORT);\r
+\r
+               $error = '';\r
+               global $manager;\r
+               $manager->notify('ValidateForm', array('type' => 'activation', 'member' => $mem, 'error' => &$error));\r
+               if ($error != '')\r
+                       return $this->_showActivationPage($key, $error);\r
+\r
+\r
+               // set password\r
+               $mem->setPassword($password);\r
+               $mem->write();\r
+\r
+               // do the activation\r
+               MEMBER::activate($key);\r
+\r
+               $this->pagehead();\r
+                       echo '<h2>',_ACTIVATE_SUCCESS_TITLE,'</h2>';\r
+                       echo '<p>',_ACTIVATE_SUCCESS_TEXT,'</p>';\r
+               $this->pagefoot();\r
        }\r
-       \r
+\r
        /**\r
          * Manage team\r
          */\r
        function action_manageteam() {\r
-               global $member;\r
-               \r
+               global $member, $manager;\r
+\r
                $blogid = intRequestVar('blogid');\r
-               \r
+\r
                // check if allowed\r
                $member->blogAdminRights($blogid) or $this->disallow();\r
-       \r
+\r
                $this->pagehead();\r
-               \r
+\r
                echo "<p><a href='index.php?action=blogsettings&amp;blogid=$blogid'>(",_BACK_TO_BLOGSETTINGS,")</a></p>";\r
-               \r
+\r
                echo '<h2>' . _TEAM_TITLE . getBlogNameFromID($blogid) . '</h2>';\r
-               \r
+\r
                echo '<h3>' . _TEAM_CURRENT . '</h3>';\r
 \r
 \r
 \r
                $query =  'SELECT tblog, tmember, mname, mrealname, memail, tadmin'\r
-                      . ' FROM '.sql_table('member').', '.sql_table('team')\r
-                      . ' WHERE tmember=mnumber and tblog=' . $blogid;\r
+                          . ' FROM '.sql_table('member').', '.sql_table('team')\r
+                          . ' WHERE tmember=mnumber and tblog=' . $blogid;\r
 \r
                $template['content'] = 'teamlist';\r
                $template['tabindex'] = 10;\r
-               \r
-               $batch = new BATCH('team');\r
+\r
+               $batch =& new BATCH('team');\r
                $batch->showlist($query, 'table', $template);\r
 \r
                ?>\r
                        <h3><?php echo _TEAM_ADDNEW?></h3>\r
 \r
                        <form method='post' action='index.php'><div>\r
-                       \r
+\r
                        <input type='hidden' name='action' value='teamaddmember' />\r
                        <input type='hidden' name='blogid' value='<?php echo  $blogid; ?>' />\r
+                       <?php $manager->addTicketHidden() ?>\r
 \r
                        <table><tr>\r
                                <td><?php echo _TEAM_CHOOSEMEMBER?></td>\r
                                <td><?php                                       // TODO: try to make it so only non-team-members are listed\r
                                        $query =  'SELECT mname as text, mnumber as value'\r
-                                              . ' FROM '.sql_table('member');\r
+                                                  . ' FROM '.sql_table('member');\r
 \r
                                        $template['name'] = 'memberid';\r
                                        $template['tabindex'] = 10000;\r
-                                       showlist($query,'select',$template);                    \r
+                                       showlist($query,'select',$template);\r
                                ?></td>\r
                        </tr><tr>\r
                                <td><?php echo _TEAM_ADMIN?><?php help('teamadmin'); ?></td>\r
                                <td><?php $this->input_yesno('admin',0,10020); ?></td>\r
                        </tr><tr>\r
                                <td><?php echo _TEAM_ADD?></td>\r
-                               <td><input type='submit' value='<?php echo _TEAM_ADD_BTN?>' tabindex="10030" /></td>            \r
+                               <td><input type='submit' value='<?php echo _TEAM_ADD_BTN?>' tabindex="10030" /></td>\r
                        </tr></table>\r
-                       \r
+\r
                        </div></form>\r
-               <?php           \r
+               <?php\r
                $this->pagefoot();\r
        }\r
-       \r
+\r
        /**\r
          * Add member tot tram\r
          */\r
        function action_teamaddmember() {\r
                global $member, $manager;\r
-               \r
+\r
                $memberid = intPostVar('memberid');\r
                $blogid = intPostVar('blogid');\r
                $admin = intPostVar('admin');\r
-               \r
+\r
                // check if allowed\r
                $member->blogAdminRights($blogid) or $this->disallow();\r
-               \r
+\r
                $blog =& $manager->getBlog($blogid);\r
                if (!$blog->addTeamMember($memberid, $admin))\r
                        $this->error(_ERROR_ALREADYONTEAM);\r
-               \r
+\r
                $this->action_manageteam();\r
-               \r
+\r
        }\r
-       \r
+\r
        function action_teamdelete() {\r
                global $member, $manager;\r
-               \r
+\r
                $memberid = intRequestVar('memberid');\r
                $blogid = intRequestVar('blogid');\r
-               \r
+\r
                // check if allowed\r
                $member->blogAdminRights($blogid) or $this->disallow();\r
-               \r
+\r
                $teammem = MEMBER::createFromID($memberid);\r
                $blog =& $manager->getBlog($blogid);\r
-               \r
+\r
                $this->pagehead();\r
                ?>\r
                        <h2><?php echo _DELETE_CONFIRM?></h2>\r
-                       \r
+\r
                        <p><?php echo _CONFIRMTXT_TEAM1?><b><?php echo  $teammem->getDisplayName() ?></b><?php echo _CONFIRMTXT_TEAM2?><b><?php echo  htmlspecialchars(strip_tags($blog->getName())) ?></b>\r
                        </p>\r
-                       \r
-                       \r
+\r
+\r
                        <form method="post" action="index.php"><div>\r
                        <input type="hidden" name="action" value="teamdeleteconfirm" />\r
+                       <?php $manager->addTicketHidden() ?>\r
                        <input type="hidden" name="memberid" value="<?php echo  $memberid; ?>" />\r
                        <input type="hidden" name="blogid" value="<?php echo  $blogid; ?>" />\r
                        <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />\r
                        </div></form>\r
-               <?php           \r
+               <?php\r
                $this->pagefoot();\r
        }\r
-       \r
+\r
        function action_teamdeleteconfirm() {\r
                global $member;\r
-               \r
+\r
                $memberid = intRequestVar('memberid');\r
                $blogid = intRequestVar('blogid');\r
 \r
                $error = $this->deleteOneTeamMember($blogid, $memberid);\r
-               \r
-               \r
+               if ($error)\r
+                       $this->error($error);\r
+\r
+\r
                $this->action_manageteam();\r
        }\r
-       \r
+\r
        function deleteOneTeamMember($blogid, $memberid) {\r
                global $member, $manager;\r
-               \r
+\r
                $blogid = intval($blogid);\r
                $memberid = intval($memberid);\r
-               \r
+\r
                // check if allowed\r
                if (!$member->blogAdminRights($blogid))\r
                        return _ERROR_DISALLOWED;\r
@@ -1967,9 +2180,9 @@ class ADMIN {
                // check if: - there remains at least one blog admin\r
                //           - (there remains at least one team member)\r
                $tmem = MEMBER::createFromID($memberid);\r
-               \r
-               $manager->notify('PreDeleteTeamMember', array('member' => &$mem, 'blogid' => $blogid));                         \r
-               \r
+\r
+               $manager->notify('PreDeleteTeamMember', array('member' => &$mem, 'blogid' => $blogid));\r
+\r
                if ($tmem->isBlogAdmin($blogid)) {\r
                        // check if there are more blog members left and at least one admin\r
                        // (check for at least two admins before deletion)\r
@@ -1978,67 +2191,68 @@ class ADMIN {
                        if (mysql_num_rows($r) < 2)\r
                                return _ERROR_ATLEASTONEBLOGADMIN;\r
                }\r
-               \r
+\r
                $query = 'DELETE FROM '.sql_table('team')." WHERE tblog=$blogid and tmember=$memberid";\r
                sql_query($query);\r
-               \r
-               $manager->notify('PostDeleteTeamMember', array('member' => &$mem, 'blogid' => $blogid));                                                \r
-               \r
+\r
+               $manager->notify('PostDeleteTeamMember', array('member' => &$mem, 'blogid' => $blogid));\r
+\r
                return '';\r
        }\r
-       \r
+\r
        function action_teamchangeadmin() {\r
                global $member;\r
-               \r
+\r
                $blogid = intRequestVar('blogid');\r
                $memberid = intRequestVar('memberid');\r
-               \r
+\r
                // check if allowed\r
                $member->blogAdminRights($blogid) or $this->disallow();\r
 \r
                $mem = MEMBER::createFromID($memberid);\r
-               \r
+\r
                // don't allow when there is only one admin at this moment\r
                if ($mem->isBlogAdmin($blogid)) {\r
                        $r = sql_query('SELECT * FROM '.sql_table('team') . " WHERE tblog=$blogid and tadmin=1");\r
                        if (mysql_num_rows($r) == 1)\r
                                $this->error(_ERROR_ATLEASTONEBLOGADMIN);\r
                }\r
-               \r
+\r
                if ($mem->isBlogAdmin($blogid))\r
                        $newval = 0;\r
-               else    \r
+               else\r
                        $newval = 1;\r
-                       \r
+\r
                $query = 'UPDATE '.sql_table('team') ." SET tadmin=$newval WHERE tblog=$blogid and tmember=$memberid";\r
                sql_query($query);\r
-               \r
+\r
                // only show manageteam if member did not change its own admin privileges\r
                if ($member->isBlogAdmin($blogid))\r
                        $this->action_manageteam();\r
                else\r
                        $this->action_overview(_MSG_ADMINCHANGED);\r
        }\r
-         \r
+\r
        function action_blogsettings() {\r
                global $member, $manager;\r
-               \r
+\r
                $blogid = intRequestVar('blogid');\r
-               \r
+\r
                // check if allowed\r
                $member->blogAdminRights($blogid) or $this->disallow();\r
-               \r
+\r
                $blog =& $manager->getBlog($blogid);\r
-               \r
-               $this->pagehead();\r
-               \r
-               echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';          \r
+\r
+               $extrahead = '<script type="text/javascript" src="javascript/numbercheck.js"></script>';\r
+               $this->pagehead($extrahead);\r
+\r
+               echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';\r
                ?>\r
                <h2><?php echo _EBLOG_TITLE?>: '<?php echo $this->bloglink($blog)?>'</h2>\r
 \r
                <h3><?php echo _EBLOG_TEAM_TITLE?></h3>\r
-               \r
-               <p>Members currently on your team: \r
+\r
+               <p>Members currently on your team:\r
                <?php\r
                        $res = sql_query('SELECT mname, mrealname FROM ' . sql_table('member') . ',' . sql_table('team') . ' WHERE mnumber=tmember AND tblog=' . intval($blogid));\r
                        $aMemberNames = array();\r
@@ -2047,18 +2261,19 @@ class ADMIN {
                        echo implode(',', $aMemberNames);\r
                ?>\r
                </p>\r
-               \r
-               \r
+\r
+\r
 \r
                <p>\r
                <a href="index.php?action=manageteam&amp;blogid=<?php echo $blogid?>"><?php echo _EBLOG_TEAM_TEXT?></a>\r
                </p>\r
 \r
                <h3><?php echo _EBLOG_SETTINGS_TITLE?></h3>\r
-               \r
+\r
                <form method="post" action="index.php"><div>\r
-               \r
+\r
                <input type="hidden" name="action" value="blogsettingsupdate" />\r
+               <?php $manager->addTicketHidden() ?>\r
                <input type="hidden" name="blogid" value="<?php echo  $blogid; ?>" />\r
                <table><tr>\r
                        <td><?php echo _EBLOG_NAME?></td>\r
@@ -2076,36 +2291,36 @@ class ADMIN {
                        <td><input name="url" tabindex="40" size="40" maxlength="100" value="<?php echo  htmlspecialchars($blog->getURL()) ?>" /></td>\r
                </tr><tr>\r
                        <td><?php echo _EBLOG_DEFSKIN?>\r
-                           <?php help('blogdefaultskin'); ?>\r
+                               <?php help('blogdefaultskin'); ?>\r
                        </td>\r
                        <td>\r
-                               <?php \r
+                               <?php\r
                                        $query =  'SELECT sdname as text, sdnumber as value'\r
-                                              . ' FROM '.sql_table('skin_desc');\r
+                                                  . ' FROM '.sql_table('skin_desc');\r
                                        $template['name'] = 'defskin';\r
                                        $template['selected'] = $blog->getDefaultSkin();\r
                                        $template['tabindex'] = 50;\r
-                                       showlist($query,'select',$template);            \r
+                                       showlist($query,'select',$template);\r
                                ?>\r
-                               \r
+\r
                        </td>\r
                </tr><tr>\r
                        <td><?php echo _EBLOG_LINEBREAKS?> <?php help('convertbreaks'); ?>\r
                        </td>\r
-                       <td><?php $this->input_yesno('convertbreaks',$blog->convertBreaks(),55); ?></td>        \r
+                       <td><?php $this->input_yesno('convertbreaks',$blog->convertBreaks(),55); ?></td>\r
                </tr><tr>\r
                        <td><?php echo _EBLOG_ALLOWPASTPOSTING?> <?php help('allowpastposting'); ?>\r
                        </td>\r
-                       <td><?php $this->input_yesno('allowpastposting',$blog->allowPastPosting(),57); ?></td>  \r
-               </tr><tr>                                       \r
+                       <td><?php $this->input_yesno('allowpastposting',$blog->allowPastPosting(),57); ?></td>\r
+               </tr><tr>\r
                        <td><?php echo _EBLOG_DISABLECOMMENTS?>\r
                        </td>\r
-                       <td><?php $this->input_yesno('comments',$blog->commentsEnabled(),60); ?></td>   \r
+                       <td><?php $this->input_yesno('comments',$blog->commentsEnabled(),60); ?></td>\r
                </tr><tr>\r
                        <td><?php echo _EBLOG_ANONYMOUS?>\r
                        </td>\r
-                       <td><?php $this->input_yesno('public',$blog->isPublic(),70); ?></td>    \r
-               </tr><tr>               \r
+                       <td><?php $this->input_yesno('public',$blog->isPublic(),70); ?></td>\r
+               </tr><tr>\r
                        <td><?php echo _EBLOG_NOTIFY?> <?php help('blognotify'); ?></td>\r
                        <td><input name="notify" tabindex="80" maxlength="60" size="40" value="<?php echo  htmlspecialchars($blog->getNotifyAddress()); ?>" /></td>\r
                </tr><tr>\r
@@ -2116,17 +2331,17 @@ class ADMIN {
                                /><label for="notifyComment"><?php echo _EBLOG_NOTIFY_COMMENT?></label>\r
                                <br />\r
                                <input name="notifyVote" value="5" type="checkbox" tabindex="82" id="notifyVote"\r
-                                       <?php if  ($blog->notifyOnVote()) echo "checked='checked'" ?>                           \r
+                                       <?php if  ($blog->notifyOnVote()) echo "checked='checked'" ?>\r
                                /><label for="notifyVote"><?php echo _EBLOG_NOTIFY_KARMA?></label>\r
                                <br />\r
                                <input name="notifyNewItem" value="7" type="checkbox" tabindex="83" id="notifyNewItem"\r
-                                       <?php if  ($blog->notifyOnNewItem()) echo "checked='checked'" ?>                                \r
+                                       <?php if  ($blog->notifyOnNewItem()) echo "checked='checked'" ?>\r
                                /><label for="notifyNewItem"><?php echo _EBLOG_NOTIFY_ITEM?></label>\r
                        </td>\r
                </tr><tr>\r
                        <td><?php echo _EBLOG_PING?> <?php help('pinguserland'); ?></td>\r
-                       <td><?php $this->input_yesno('pinguserland',$blog->pingUserland(),85); ?></td>                          \r
-               </tr><tr>               \r
+                       <td><?php $this->input_yesno('pinguserland',$blog->pingUserland(),85); ?></td>\r
+               </tr><tr>\r
                        <td><?php echo _EBLOG_MAXCOMMENTS?> <?php help('blogmaxcomments'); ?></td>\r
                        <td><input name="maxcomments" tabindex="90" size="3" value="<?php echo  htmlspecialchars($blog->getMaxComments()); ?>" /></td>\r
                </tr><tr>\r
@@ -2135,25 +2350,25 @@ class ADMIN {
                </tr><tr>\r
                        <td><?php echo _EBLOG_DEFCAT?></td>\r
                        <td>\r
-                               <?php \r
+                               <?php\r
                                        $query =  'SELECT cname as text, catid as value'\r
-                                              . ' FROM '.sql_table('category')\r
-                                              . ' WHERE cblog=' . $blog->getID();\r
+                                                  . ' FROM '.sql_table('category')\r
+                                                  . ' WHERE cblog=' . $blog->getID();\r
                                        $template['name'] = 'defcat';\r
                                        $template['selected'] = $blog->getDefaultCategory();\r
                                        $template['tabindex'] = 110;\r
-                                       showlist($query,'select',$template);            \r
+                                       showlist($query,'select',$template);\r
                                ?>\r
-                       </td>                   \r
+                       </td>\r
                </tr><tr>\r
                        <td><?php echo _EBLOG_OFFSET?> <?php help('blogtimeoffset'); ?>\r
-                           <br /><?php echo _EBLOG_STIME?> <b><?php echo  strftime("%H:%M",time()); ?></b>\r
-                           <br /><?php echo _EBLOG_BTIME?> <b><?php echo  strftime("%H:%M",$blog->getCorrectTime()); ?></b>\r
-                           </td>\r
-                       <td><input name="timeoffset" tabindex="120" size="3" value="<?php echo  htmlspecialchars($blog->getTimeOffset()); ?>" /></td>                   \r
+                               <br /><?php echo _EBLOG_STIME?> <b><?php echo  strftime("%H:%M",time()); ?></b>\r
+                               <br /><?php echo _EBLOG_BTIME?> <b><?php echo  strftime("%H:%M",$blog->getCorrectTime()); ?></b>\r
+                               </td>\r
+                       <td><input name="timeoffset" tabindex="120" size="3" value="<?php echo  htmlspecialchars($blog->getTimeOffset()); ?>" /></td>\r
                </tr><tr>\r
                        <td><?php echo _EBLOG_SEARCH?> <?php help('blogsearchable'); ?></td>\r
-                       <td><?php $this->input_yesno('searchable',$blog->getSearchable(),122); ?></td>  \r
+                       <td><?php $this->input_yesno('searchable',$blog->getSearchable(),122); ?></td>\r
                </tr>\r
                <?php\r
                        // plugin options\r
@@ -2161,31 +2376,32 @@ class ADMIN {
                ?>\r
                <tr>\r
                        <th colspan="2"><?php echo _EBLOG_CHANGE?></th>\r
-               </tr><tr>               \r
+               </tr><tr>\r
                        <td><?php echo _EBLOG_CHANGE?></td>\r
                        <td><input type="submit" tabindex="130" value="<?php echo _EBLOG_CHANGE_BTN?>" onclick="return checkSubmit();" /></td>\r
                </tr></table>\r
-               \r
+\r
                </div></form>\r
-               \r
+\r
                <h3><?php echo _EBLOG_CAT_TITLE?></h3>\r
-               \r
 \r
-               <?php           \r
+\r
+               <?php\r
                $query = 'SELECT * FROM '.sql_table('category').' WHERE cblog='.$blog->getID().' ORDER BY cname';\r
                $template['content'] = 'categorylist';\r
                $template['tabindex'] = 200;\r
-               \r
-               $batch = new BATCH('category');\r
+\r
+               $batch =& new BATCH('category');\r
                $batch->showlist($query,'table',$template);\r
-               \r
+\r
                ?>\r
 \r
-               \r
+\r
                <form action="index.php" method="post"><div>\r
                <input name="action" value="categorynew" type="hidden" />\r
+               <?php $manager->addTicketHidden() ?>\r
                <input name="blogid" value="<?php echo $blog->getID()?>" type="hidden" />\r
-               \r
+\r
                <table><tr>\r
                        <th colspan="2"><?php echo _EBLOG_CAT_CREATE?></th>\r
                </tr><tr>\r
@@ -2198,53 +2414,54 @@ class ADMIN {
                        <td><?php echo _EBLOG_CAT_CREATE?></td>\r
                        <td><input type="submit" value="<?php echo _EBLOG_CAT_CREATE?>" tabindex="320" /></td>\r
                </tr></table>\r
-               \r
+\r
                </div></form>\r
-               \r
-               <?php           \r
-                       echo '<h3>', _PLUGINS_EXTRA , '</h3>';\r
-               \r
+\r
+               <?php\r
+\r
+                       echo '<h3>',_PLUGINS_EXTRA,'</h3>';\r
+\r
                        $manager->notify(\r
-                               'BlogSettingsFormExtras',       \r
+                               'BlogSettingsFormExtras',\r
                                array(\r
                                        'blog' => &$blog\r
                                )\r
                        );\r
-               \r
+\r
                $this->pagefoot();\r
        }\r
-       \r
+\r
        function action_categorynew() {\r
                global $member, $manager;\r
-               \r
+\r
                $blogid = intRequestVar('blogid');\r
-               \r
+\r
                $member->blogAdminRights($blogid) or $this->disallow();\r
-               \r
+\r
                $cname = postVar('cname');\r
                $cdesc = postVar('cdesc');\r
-               \r
+\r
                if (!isValidCategoryName($cname))\r
                        $this->error(_ERROR_BADCATEGORYNAME);\r
-                       \r
+\r
                $query = 'SELECT * FROM '.sql_table('category') . ' WHERE cname=\'' . addslashes($cname).'\' and cblog=' . intval($blogid);\r
                $res = sql_query($query);\r
                if (mysql_num_rows($res) > 0)\r
                        $this->error(_ERROR_DUPCATEGORYNAME);\r
-                       \r
+\r
                $blog           =& $manager->getBlog($blogid);\r
                $newCatID       =  $blog->createNewCategory($cname, $cdesc);\r
-               \r
+\r
                $this->action_blogsettings();\r
        }\r
-       \r
-       \r
+\r
+\r
        function action_categoryedit($catid = '', $blogid = '', $desturl = '') {\r
-               global $member;\r
-               \r
+               global $member, $manager;\r
+\r
                if ($blogid == '')\r
                        $blogid = intGetVar('blogid');\r
-               else \r
+               else\r
                        $blogid = intval($blogid);\r
                if ($catid == '')\r
                        $catid = intGetVar('catid');\r
@@ -2259,16 +2476,18 @@ class ADMIN {
                $cname = $obj->cname;\r
                $cdesc = $obj->cdesc;\r
 \r
-               $this->pagehead();\r
+               $extrahead = '<script type="text/javascript" src="javascript/numbercheck.js"></script>';\r
+               $this->pagehead($extrahead);\r
 \r
                ?>\r
                <h2><?php echo _EBLOG_CAT_UPDATE?> '<?php echo htmlspecialchars($cname)?>'</h2>\r
                <form method='post' action='index.php'><div>\r
                <input name="blogid" type="hidden" value="<?php echo $blogid?>" />\r
-               <input name="catid" type="hidden" value="<?php echo $catid?>" />                        \r
-               <input name="desturl" type="hidden" value="<?php echo htmlspecialchars($desturl) ?>" />                                 \r
-               <input name="action" type="hidden" value="categoryupdate" />            \r
-               \r
+               <input name="catid" type="hidden" value="<?php echo $catid?>" />\r
+               <input name="desturl" type="hidden" value="<?php echo htmlspecialchars($desturl) ?>" />\r
+               <input name="action" type="hidden" value="categoryupdate" />\r
+               <?php $manager->addTicketHidden(); ?>\r
+\r
                <table><tr>\r
                        <th colspan="2"><?php echo _EBLOG_CAT_UPDATE ?></th>\r
                </tr><tr>\r
@@ -2278,7 +2497,7 @@ class ADMIN {
                        <td><?php echo _EBLOG_CAT_DESC?></td>\r
                        <td><input type="text" name="cdesc" value="<?php echo htmlspecialchars($cdesc)?>" size="40" maxlength="200" /></td>\r
                </tr>\r
-               <?php \r
+               <?php\r
                        // insert plugin options\r
                        $this->_insertPluginOptions('category',$catid);\r
                ?>\r
@@ -2288,16 +2507,16 @@ class ADMIN {
                        <td><?php echo _EBLOG_CAT_UPDATE?></td>\r
                        <td><input type="submit" value="<?php echo _EBLOG_CAT_UPDATE_BTN?>" /></td>\r
                </tr></table>\r
-                       \r
+\r
                </div></form>\r
-               <?php           \r
+               <?php\r
                $this->pagefoot();\r
        }\r
-       \r
-       \r
+\r
+\r
        function action_categoryupdate() {\r
                global $member, $manager;\r
-               \r
+\r
                $blogid = intPostVar('blogid');\r
                $catid = intPostVar('catid');\r
                $cname = postVar('cname');\r
@@ -2305,28 +2524,28 @@ class ADMIN {
                $desturl = postVar('desturl');\r
 \r
                $member->blogAdminRights($blogid) or $this->disallow();\r
-               \r
+\r
                if (!isValidCategoryName($cname))\r
                        $this->error(_ERROR_BADCATEGORYNAME);\r
-                       \r
+\r
                $query = 'SELECT * FROM '.sql_table('category').' WHERE cname=\'' . addslashes($cname).'\' and cblog=' . intval($blogid) . " and not(catid=$catid)";\r
                $res = sql_query($query);\r
                if (mysql_num_rows($res) > 0)\r
                        $this->error(_ERROR_DUPCATEGORYNAME);\r
-                       \r
+\r
                $query =  'UPDATE '.sql_table('category').' SET'\r
                           . " cname='" . addslashes($cname) . "',"\r
-                          . " cdesc='" . addslashes($cdesc) . "'"                         \r
+                          . " cdesc='" . addslashes($cdesc) . "'"\r
                           . " WHERE catid=" . $catid;\r
-                          \r
+\r
                sql_query($query);\r
-               \r
+\r
                // store plugin options\r
                $aOptions = requestArray('plugoption');\r
                NucleusPlugin::_applyPluginOptions($aOptions);\r
-               $manager->notify('PostPluginOptionsUpdate',array('context' => 'category', 'catid' => $catid));          \r
+               $manager->notify('PostPluginOptionsUpdate',array('context' => 'category', 'catid' => $catid));\r
+\r
 \r
-               \r
                if ($desturl) {\r
                        redirect($desturl);\r
                        exit;\r
@@ -2336,54 +2555,55 @@ class ADMIN {
        }\r
 \r
        function action_categorydelete() {\r
-               global $member, $manager; \r
-               \r
+               global $member, $manager;\r
+\r
                $blogid = intRequestVar('blogid');\r
                $catid = intRequestVar('catid');\r
-               \r
+\r
                $member->blogAdminRights($blogid) or $this->disallow();\r
-               \r
+\r
                $blog =& $manager->getBlog($blogid);\r
-       \r
+\r
                // check if the category is valid\r
-               if (!$blog->isValidCategory($catid)) \r
+               if (!$blog->isValidCategory($catid))\r
                        $this->error(_ERROR_NOSUCHCATEGORY);\r
-       \r
+\r
                // don't allow deletion of default category\r
                if ($blog->getDefaultCategory() == $catid)\r
                        $this->error(_ERROR_DELETEDEFCATEGORY);\r
-               \r
+\r
                // check if catid is the only category left for blogid\r
                $query = 'SELECT catid FROM '.sql_table('category').' WHERE cblog=' . $blogid;\r
                $res = sql_query($query);\r
                if (mysql_num_rows($res) == 1)\r
                        $this->error(_ERROR_DELETELASTCATEGORY);\r
-               \r
-               \r
+\r
+\r
                $this->pagehead();\r
                ?>\r
                        <h2><?php echo _DELETE_CONFIRM?></h2>\r
-                       \r
+\r
                        <div>\r
                        <?php echo _CONFIRMTXT_CATEGORY?><b><?php echo  $blog->getCategoryName($catid)?></b>\r
                        </div>\r
-                       \r
+\r
                        <form method="post" action="index.php"><div>\r
                        <input type="hidden" name="action" value="categorydeleteconfirm" />\r
+                       <?php $manager->addTicketHidden() ?>\r
                        <input type="hidden" name="blogid" value="<?php echo $blogid?>" />\r
-                       <input type="hidden" name="catid" value="<?php echo $catid?>" />                                                \r
+                       <input type="hidden" name="catid" value="<?php echo $catid?>" />\r
                        <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />\r
                        </div></form>\r
-               <?php           \r
+               <?php\r
                $this->pagefoot();\r
        }\r
-       \r
+\r
        function action_categorydeleteconfirm() {\r
-               global $member, $manager; \r
-               \r
+               global $member, $manager;\r
+\r
                $blogid = intRequestVar('blogid');\r
                $catid = intRequestVar('catid');\r
-               \r
+\r
                $member->blogAdminRights($blogid) or $this->disallow();\r
 \r
                $error = $this->deleteOneCategory($catid);\r
@@ -2391,84 +2611,84 @@ class ADMIN {
                        $this->error($error);\r
 \r
                $this->action_blogsettings();\r
-       }       \r
+       }\r
 \r
        function deleteOneCategory($catid) {\r
                global $manager, $member;\r
-               \r
+\r
                $catid = intval($catid);\r
-               \r
-               $manager->notify('PreDeleteCategory', array('catid' => $catid));                \r
+\r
+               $manager->notify('PreDeleteCategory', array('catid' => $catid));\r
 \r
                $blogid = getBlogIDFromCatID($catid);\r
-               \r
+\r
                if (!$member->blogAdminRights($blogid))\r
                        return ERROR_DISALLOWED;\r
-               \r
+\r
                // get blog\r
                $blog =& $manager->getBlog($blogid);\r
 \r
                // check if the category is valid\r
-               if (!$blog || !$blog->isValidCategory($catid)) \r
+               if (!$blog || !$blog->isValidCategory($catid))\r
                        return _ERROR_NOSUCHCATEGORY;\r
-       \r
+\r
                $destcatid = $blog->getDefaultCategory();\r
-               \r
+\r
                // don't allow deletion of default category\r
                if ($blog->getDefaultCategory() == $catid)\r
                        return _ERROR_DELETEDEFCATEGORY;\r
-               \r
+\r
                // check if catid is the only category left for blogid\r
                $query = 'SELECT catid FROM '.sql_table('category').' WHERE cblog=' . $blogid;\r
                $res = sql_query($query);\r
                if (mysql_num_rows($res) == 1)\r
                        return _ERROR_DELETELASTCATEGORY;\r
-                       \r
+\r
                // change category for all items to the default category\r
                $query = 'UPDATE '.sql_table('item')." SET icat=$destcatid WHERE icat=$catid";\r
                sql_query($query);\r
-               \r
+\r
                // delete all associated plugin options\r
                NucleusPlugin::_deleteOptionValues('category', $catid);\r
-               \r
+\r
                // delete category\r
                $query = 'DELETE FROM '.sql_table('category').' WHERE catid=' .$catid;\r
                sql_query($query);\r
-               \r
-               $manager->notify('PostDeleteCategory', array('catid' => $catid));                               \r
+\r
+               $manager->notify('PostDeleteCategory', array('catid' => $catid));\r
 \r
        }\r
-       \r
+\r
        function moveOneCategory($catid, $destblogid) {\r
                global $manager, $member;\r
 \r
                $catid = intval($catid);\r
                $destblogid = intval($destblogid);\r
-               \r
+\r
                $blogid = getBlogIDFromCatID($catid);\r
-               \r
+\r
                // mover should have admin rights on both blogs\r
                if (!$member->blogAdminRights($blogid))\r
                        return _ERROR_DISALLOWED;\r
                if (!$member->blogAdminRights($destblogid))\r
                        return _ERROR_DISALLOWED;\r
-                       \r
+\r
                // cannot move to self\r
                if ($blogid == $destblogid)\r
                        return _ERROR_MOVETOSELF;\r
-               \r
+\r
                // get blogs\r
                $blog =& $manager->getBlog($blogid);\r
-               $destblog =& $manager->getBlog($destblogid);            \r
-               \r
+               $destblog =& $manager->getBlog($destblogid);\r
+\r
                // check if the category is valid\r
-               if (!$blog || !$blog->isValidCategory($catid)) \r
+               if (!$blog || !$blog->isValidCategory($catid))\r
                        return _ERROR_NOSUCHCATEGORY;\r
-                       \r
+\r
                // don't allow default category to be moved\r
                if ($blog->getDefaultCategory() == $catid)\r
                        return _ERROR_MOVEDEFCATEGORY;\r
-                       \r
+\r
                $manager->notify(\r
                        'PreMoveCategory',\r
                        array(\r
@@ -2477,7 +2697,7 @@ class ADMIN {
                                'destblog' => &$destblog\r
                        )\r
                );\r
-               \r
+\r
                // update comments table (cblog)\r
                $query = 'SELECT inumber FROM '.sql_table('item').' WHERE icat='.$catid;\r
                $items = sql_query($query);\r
@@ -2489,7 +2709,7 @@ class ADMIN {
                $query = 'UPDATE '.sql_table('item').' SET iblog='.$destblogid.' WHERE icat='.$catid;\r
                sql_query($query);\r
 \r
-               // move category \r
+               // move category\r
                $query = 'UPDATE '.sql_table('category').' SET cblog='.$destblogid.' WHERE catid='.$catid;\r
                sql_query($query);\r
 \r
@@ -2500,47 +2720,47 @@ class ADMIN {
                                'sourceblog' => &$blog,\r
                                'destblog' => $destblog\r
                        )\r
-               );              \r
-               \r
+               );\r
+\r
        }\r
 \r
        function action_blogsettingsupdate() {\r
                global $member, $manager;\r
-               \r
+\r
                $blogid = intRequestVar('blogid');\r
-               \r
+\r
                $member->blogAdminRights($blogid) or $this->disallow();\r
-               \r
+\r
                $blog =& $manager->getBlog($blogid);\r
-               \r
+\r
                $notify                 = trim(postVar('notify'));\r
                $shortname              = trim(postVar('shortname'));\r
                $updatefile             = trim(postVar('update'));\r
-               \r
+\r
                $notifyComment  = intPostVar('notifyComment');\r
                $notifyVote             = intPostVar('notifyVote');\r
-               $notifyNewItem  = intPostVar('notifyNewItem');          \r
-               \r
+               $notifyNewItem  = intPostVar('notifyNewItem');\r
+\r
                if ($notifyComment == 0)        $notifyComment = 1;\r
-               if ($notifyVote == 0)           $notifyVote = 1;                \r
-               if ($notifyNewItem == 0)        $notifyNewItem = 1;             \r
-               \r
+               if ($notifyVote == 0)           $notifyVote = 1;\r
+               if ($notifyNewItem == 0)        $notifyNewItem = 1;\r
+\r
                $notifyType = $notifyComment * $notifyVote * $notifyNewItem;\r
-               \r
-               \r
+\r
+\r
                if ($notify) {\r
-                       $not = new NOTIFICATION($notify);\r
+                       $not =& new NOTIFICATION($notify);\r
                        if (!$not->validAddresses())\r
                                $this->error(_ERROR_BADNOTIFY);\r
-                       \r
+\r
                }\r
-                       \r
+\r
                if (!isValidShortName($shortname))\r
                        $this->error(_ERROR_BADSHORTBLOGNAME);\r
-                       \r
+\r
                if (($blog->getShortName() != $shortname) && $manager->existsBlog($shortname))\r
                        $this->error(_ERROR_DUPSHORTBLOGNAME);\r
-                       \r
+\r
                // check if update file is writable\r
                if ($updatefile && !is_writeable($updatefile))\r
                        $this->error(_ERROR_UPDATEFILE);\r
@@ -2548,7 +2768,7 @@ class ADMIN {
                $blog->setName(trim(postVar('name')));\r
                $blog->setShortName($shortname);\r
                $blog->setNotifyAddress($notify);\r
-               $blog->setNotifyType($notifyType);              \r
+               $blog->setNotifyType($notifyType);\r
                $blog->setMaxComments(postVar('maxcomments'));\r
                $blog->setCommentsEnabled(postVar('comments'));\r
                $blog->setTimeOffset(postVar('timeoffset'));\r
@@ -2559,63 +2779,64 @@ class ADMIN {
                $blog->setPublic(postVar('public'));\r
                $blog->setPingUserland(postVar('pinguserland'));\r
                $blog->setConvertBreaks(intPostVar('convertbreaks'));\r
-               $blog->setAllowPastPosting(intPostVar('allowpastposting'));             \r
+               $blog->setAllowPastPosting(intPostVar('allowpastposting'));\r
                $blog->setDefaultCategory(intPostVar('defcat'));\r
                $blog->setSearchable(intPostVar('searchable'));\r
 \r
                $blog->writeSettings();\r
-               \r
+\r
                // store plugin options\r
                $aOptions = requestArray('plugoption');\r
                NucleusPlugin::_applyPluginOptions($aOptions);\r
-               $manager->notify('PostPluginOptionsUpdate',array('context' => 'blog', 'blogid' => $blogid, 'blog' => &$blog));          \r
-               \r
-               \r
+               $manager->notify('PostPluginOptionsUpdate',array('context' => 'blog', 'blogid' => $blogid, 'blog' => &$blog));\r
+\r
+\r
                $this->action_overview(_MSG_SETTINGSCHANGED);\r
        }\r
-       \r
+\r
        function action_deleteblog() {\r
                global $member, $CONF, $manager;\r
-               \r
-               $blogid = intRequestVar('blogid');              \r
-               \r
+\r
+               $blogid = intRequestVar('blogid');\r
+\r
                $member->blogAdminRights($blogid) or $this->disallow();\r
 \r
                // check if blog is default blog\r
                if ($CONF['DefaultBlog'] == $blogid)\r
                        $this->error(_ERROR_DELDEFBLOG);\r
-                       \r
+\r
                $blog =& $manager->getBlog($blogid);\r
-               \r
+\r
                $this->pagehead();\r
                ?>\r
                        <h2><?php echo _DELETE_CONFIRM?></h2>\r
-                       \r
+\r
                        <p><?php echo _WARNINGTXT_BLOGDEL?>\r
                        </p>\r
-                       \r
+\r
                        <div>\r
                        <?php echo _CONFIRMTXT_BLOG?><b><?php echo  htmlspecialchars($blog->getName())?></b>\r
                        </div>\r
-                       \r
+\r
                        <form method="post" action="index.php"><div>\r
                        <input type="hidden" name="action" value="deleteblogconfirm" />\r
+                       <?php $manager->addTicketHidden() ?>\r
                        <input type="hidden" name="blogid" value="<?php echo  $blogid; ?>" />\r
                        <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />\r
                        </div></form>\r
-               <?php           \r
+               <?php\r
                $this->pagefoot();\r
        }\r
-       \r
+\r
        function action_deleteblogconfirm() {\r
                global $member, $CONF, $manager;\r
-               \r
-               $blogid = intRequestVar('blogid');              \r
-               \r
-               $manager->notify('PreDeleteBlog', array('blogid' => $blogid));                          \r
-               \r
+\r
+               $blogid = intRequestVar('blogid');\r
+\r
+               $manager->notify('PreDeleteBlog', array('blogid' => $blogid));\r
+\r
                $member->blogAdminRights($blogid) or $this->disallow();\r
-               \r
+\r
                // check if blog is default blog\r
                if ($CONF['DefaultBlog'] == $blogid)\r
                        $this->error(_ERROR_DELDEFBLOG);\r
@@ -2624,143 +2845,151 @@ class ADMIN {
                $query = 'DELETE FROM '.sql_table('comment').' WHERE cblog='.$blogid;\r
                sql_query($query);\r
 \r
-               // delete all items             \r
+               // delete all items\r
                $query = 'DELETE FROM '.sql_table('item').' WHERE iblog='.$blogid;\r
                sql_query($query);\r
-               \r
+\r
                // delete all team members\r
                $query = 'DELETE FROM '.sql_table('team').' WHERE tblog='.$blogid;\r
                sql_query($query);\r
-               \r
+\r
                // delete all bans\r
                $query = 'DELETE FROM '.sql_table('ban').' WHERE blogid='.$blogid;\r
                sql_query($query);\r
-               \r
+\r
                // delete all categories\r
                $query = 'DELETE FROM '.sql_table('category').' WHERE cblog='.$blogid;\r
                sql_query($query);\r
-               \r
+\r
                // delete all associated plugin options\r
                NucleusPlugin::_deleteOptionValues('blog', $blogid);\r
-               \r
+\r
                // delete the blog itself\r
                $query = 'DELETE FROM '.sql_table('blog').' WHERE bnumber='.$blogid;\r
                sql_query($query);\r
-               \r
-               $manager->notify('PostDeleteBlog', array('blogid' => $blogid));                                         \r
-               \r
+\r
+               $manager->notify('PostDeleteBlog', array('blogid' => $blogid));\r
+\r
                $this->action_overview(_DELETED_BLOG);\r
        }\r
-       \r
+\r
        function action_memberdelete() {\r
-               global $member;\r
-               \r
+               global $member, $manager;\r
+\r
                $memberid = intRequestVar('memberid');\r
-       \r
+\r
                ($member->getID() == $memberid) or $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $mem = MEMBER::createFromID($memberid);\r
-               \r
+\r
                $this->pagehead();\r
                ?>\r
                        <h2><?php echo _DELETE_CONFIRM?></h2>\r
-                       \r
+\r
                        <p><?php echo _CONFIRMTXT_MEMBER?><b><?php echo  $mem->getDisplayName() ?></b>\r
                        </p>\r
-                       \r
+\r
                        <p>\r
                        Please note that media files will <b>NOT</b> be deleted. (At least not in this Nucleus version)\r
                        </p>\r
-                       \r
+\r
                        <form method="post" action="index.php"><div>\r
                        <input type="hidden" name="action" value="memberdeleteconfirm" />\r
+                       <?php $manager->addTicketHidden() ?>\r
                        <input type="hidden" name="memberid" value="<?php echo  $memberid; ?>" />\r
                        <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />\r
                        </div></form>\r
-               <?php           \r
+               <?php\r
                $this->pagefoot();\r
        }\r
-       \r
+\r
        function action_memberdeleteconfirm() {\r
                global $member;\r
-               \r
-               $memberid = intRequestVar('memberid');          \r
-               \r
+\r
+               $memberid = intRequestVar('memberid');\r
+\r
                ($member->getID() == $memberid) or $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $error = $this->deleteOneMember($memberid);\r
                if ($error)\r
                        $this->error($error);\r
-               \r
+\r
                if ($member->isAdmin())\r
                        $this->action_usermanagement();\r
                else\r
                        $this->action_overview(_DELETED_MEMBER);\r
-       }       \r
-       \r
+       }\r
+\r
+       // (static)\r
        function deleteOneMember($memberid) {\r
                global $manager;\r
-               \r
+\r
                $memberid = intval($memberid);\r
                $mem = MEMBER::createFromID($memberid);\r
-               \r
-               if (!$mem->canBeDeleted()) \r
-                       return _ERROR_DELETEMEMBER;     \r
 \r
-               $manager->notify('PreDeleteMember', array('member' => &$mem));                          \r
-               \r
+               if (!$mem->canBeDeleted())\r
+                       return _ERROR_DELETEMEMBER;\r
+\r
+               $manager->notify('PreDeleteMember', array('member' => &$mem));\r
+\r
                $query = 'DELETE FROM '.sql_table('member').' WHERE mnumber='.$memberid;\r
                sql_query($query);\r
 \r
                $query = 'DELETE FROM '.sql_table('team').' WHERE tmember='.$memberid;\r
-               sql_query($query);      \r
-               \r
+               sql_query($query);\r
+\r
+               $query = 'DELETE FROM '.sql_table('activation').' WHERE vmember='.$memberid;\r
+               sql_query($query);\r
+\r
                // delete all associated plugin options\r
                NucleusPlugin::_deleteOptionValues('member', $memberid);\r
-               \r
-               $manager->notify('PostDeleteMember', array('member' => &$mem));                                         \r
-               \r
+\r
+               $manager->notify('PostDeleteMember', array('member' => &$mem));\r
+\r
                return '';\r
        }\r
-       \r
+\r
        function action_createnewlog() {\r
-               global $member, $CONF;\r
-               \r
+               global $member, $CONF, $manager;\r
+\r
                // Only Super-Admins can do this\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $this->pagehead();\r
 \r
                echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';\r
                ?>\r
                <h2><?php echo _EBLOG_CREATE_TITLE?></h2>\r
-               \r
+\r
                <h3>注意事項</h3>\r
-               \r
+\r
                <p>作成にあたって、下記の<strong>注意事項</strong> をまずお読み下さい</p>\r
-               \r
+\r
                <p>新しいweblogを作成した後に、このblogにアクセスするための方法を紹介しておきます。方法は2つあります:</p>\r
-               \r
+\r
                <ol>\r
-                       <li><strong>簡単な方法:</strong> <code>index.php</code>の複製を作り、新しいblogを表示するように変更を加えます。 この変更の詳細は、作成後に表示されます。Further instructions on how to do this will be provided after you've submitted this first form.</li>\r
+                       <li><strong>簡単な方法:</strong> <code>index.php</code>の複製を作り、新しいblogを表示するように変更を加えます。 この変更の詳細は、作成後に表示されます。</li>\r
                        <li><strong>高度な方法:</strong> 現在のblogで使用しているスキンに<code>otherblog</code>というコードを使った記述を加えます。この方法では、同じページ内で複数のblogを展開することが可能となります。</li>\r
                </ol>\r
-               \r
+\r
                <h3>Weblogの作成</h3>\r
-               \r
+\r
                <p>\r
                <?php echo _EBLOG_CREATE_TEXT?>\r
                </p>\r
-               \r
+\r
                <form method="post" action="index.php"><div>\r
-               \r
+\r
                <input type="hidden" name="action" value="addnewlog" />\r
+               <?php $manager->addTicketHidden() ?>\r
+\r
+\r
                <table><tr>\r
                        <td><?php echo _EBLOG_NAME?></td>\r
                        <td><input name="name" tabindex="10" size="40" maxlength="60" /></td>\r
                </tr><tr>\r
                        <td><?php echo _EBLOG_SHORTNAME?>\r
-                           <?php help('shortblogname'); ?>\r
+                               <?php help('shortblogname'); ?>\r
                        </td>\r
                        <td><input name="shortname" tabindex="20" maxlength="15" size="15" /></td>\r
                </tr><tr>\r
@@ -2768,57 +2997,57 @@ class ADMIN {
                        <td><input name="desc" tabindex="30" maxlength="200" size="40" /></td>\r
                </tr><tr>\r
                        <td><?php echo _EBLOG_DEFSKIN?>\r
-                           <?php help('blogdefaultskin'); ?>\r
+                               <?php help('blogdefaultskin'); ?>\r
                        </td>\r
                        <td>\r
-                               <?php \r
+                               <?php\r
                                        $query =  'SELECT sdname as text, sdnumber as value'\r
-                                              . ' FROM '.sql_table('skin_desc');\r
+                                                  . ' FROM '.sql_table('skin_desc');\r
                                        $template['name'] = 'defskin';\r
                                        $template['tabindex'] = 50;\r
                                        $template['selected'] = $CONF['BaseSkin'];      // set default selected skin to be globally defined base skin\r
-                                       showlist($query,'select',$template);            \r
+                                       showlist($query,'select',$template);\r
                                ?>\r
                        </td>\r
                </tr><tr>\r
                        <td><?php echo _EBLOG_OFFSET?>\r
-                           <?php help('blogtimeoffset'); ?>\r
-                           <br /><?php echo _EBLOG_STIME?> <b><?php echo  strftime("%H:%M",time()); ?></b>\r
+                               <?php help('blogtimeoffset'); ?>\r
+                               <br /><?php echo _EBLOG_STIME?> <b><?php echo  strftime("%H:%M",time()); ?></b>\r
                        </td>\r
-                       <td><input name="timeoffset" tabindex="110" size="3" value="0" /></td>                  \r
+                       <td><input name="timeoffset" tabindex="110" size="3" value="0" /></td>\r
                </tr><tr>\r
                        <td><?php echo _EBLOG_ADMIN?>\r
-                           <?php help('blogadmin'); ?>\r
+                               <?php help('blogadmin'); ?>\r
                        </td>\r
                        <td><?php echo _EBLOG_ADMIN_MSG?></td>\r
                </tr><tr>\r
                        <td><?php echo _EBLOG_CREATE?></td>\r
                        <td><input type="submit" tabindex="120" value="<?php echo _EBLOG_CREATE_BTN?>" onclick="return checkSubmit();" /></td>\r
                </tr></table>\r
-               \r
+\r
                </div></form>\r
-               <?php           \r
-               $this->pagefoot();      \r
+               <?php\r
+               $this->pagefoot();\r
        }\r
-       \r
+\r
        function action_addnewlog() {\r
                global $member, $manager, $CONF;\r
-               \r
+\r
                // Only Super-Admins can do this\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $bname                  = trim(postVar('name'));\r
                $bshortname             = trim(postVar('shortname'));\r
                $btimeoffset    = postVar('timeoffset');\r
                $bdesc                  = trim(postVar('desc'));\r
                $bdefskin               = postVar('defskin');\r
-               \r
+\r
                if (!isValidShortName($bshortname))\r
                        $this->error(_ERROR_BADSHORTBLOGNAME);\r
-                       \r
+\r
                if ($manager->existsBlog($bshortname))\r
                        $this->error(_ERROR_DUPSHORTBLOGNAME);\r
-                       \r
+\r
                $manager->notify(\r
                        'PreAddBlog',\r
                        array(\r
@@ -2837,13 +3066,13 @@ class ADMIN {
                $btimeoffset =  addslashes($btimeoffset);\r
                $bdesc =                addslashes($bdesc);\r
                $bdefskin =     addslashes($bdefskin);\r
-               \r
+\r
                // create blog\r
                $query = 'INSERT INTO '.sql_table('blog')." (bname, bshortname, bdesc, btimeoffset, bdefskin) VALUES ('$bname', '$bshortname', '$bdesc', '$btimeoffset', '$bdefskin')";\r
                sql_query($query);\r
                $blogid = mysql_insert_id();\r
                $blog   =& $manager->getBlog($blogid);\r
-               \r
+\r
                // create new category\r
                sql_query('INSERT INTO '.sql_table('category')." (cblog, cname, cdesc) VALUES ($blogid, 'General','Items that do not fit in other categories')");\r
                $catid = mysql_insert_id();\r
@@ -2851,42 +3080,42 @@ class ADMIN {
                // set as default category\r
                $blog->setDefaultCategory($catid);\r
                $blog->writeSettings();\r
-       \r
-               // create team member   \r
+\r
+               // create team member\r
                $memberid = $member->getID();\r
                $query = 'INSERT INTO '.sql_table('team')." (tmember, tblog, tadmin) VALUES ($memberid, $blogid, 1)";\r
                sql_query($query);\r
-       \r
+\r
 \r
                $blog->additem($blog->getDefaultCategory(),'First Item','これはあなたのweblogにおける最初のアイテムです。自由に削除していただいてかまいません。','',$blogid, $memberid,$blog->getCorrectTime(),0,0,0);\r
-               \r
+\r
                $manager->notify(\r
                        'PostAddBlog',\r
                        array(\r
                                'blog' => &$blog\r
                        )\r
                );\r
-               \r
+\r
                $manager->notify(\r
                        'PostAddCategory',\r
                        array(\r
                                'catid' => $catid\r
                        )\r
                );\r
-               \r
+\r
                $this->pagehead();\r
                ?>\r
                <h2>新しいweblogが作成されました</h2>\r
-               \r
+\r
                <p>新しいweblog 「<?php echo htmlspecialchars($bname)?>」が作成されました。続けて、これにアクセスするために以下のどちらかの手順に進んでください。</p>\r
-               \r
+\r
                <ol>\r
                        <li><a href="#index_php">簡単な方法: 下のコードを貼付けた <code><?php echo htmlspecialchars($bshortname)?>.php</code> というファイルを作成する</a></li>\r
-                       <li><a href="#skins">高度な方法: 現在使用しているスキンに新しいweblogを展開させるための記述を加える</a></li>                 \r
+                       <li><a href="#skins">高度な方法: 現在使用しているスキンに新しいweblogを展開させるための記述を加える</a></li>\r
                </ol>\r
-               \r
+\r
                <h3><a id="index_php">方法 1: <code><?php echo htmlspecialchars($bshortname)?>.php</code> というファイルを作成</a></h3>\r
-               \r
+\r
                <p><code><?php echo htmlspecialchars($bshortname)?>.php</code> というファイルを作成して、中身に以下のコードを貼り付ける:</p>\r
 <pre><code>&lt;?php\r
 \r
@@ -2900,12 +3129,14 @@ selector();
 ?&gt;</code></pre>\r
 \r
                <p>すでにある<code>index.php</code>と同じディレクトリにアップロードします。</p>\r
-               \r
+\r
                <p>新しいweblogの作成を完了するためには、下にこのファイルのURLを入力してください。 (すでに用意した値で合っているとは思いますが保証はしません):</p>\r
-               \r
+\r
+\r
                <form action="index.php" method="post"><div>\r
-                       <input type="hidden" name="action" value="addnewlog2" />                \r
-                       <input type="hidden" name="blogid" value="<?php echo intval($blogid)?>" />                                              \r
+                       <input type="hidden" name="action" value="addnewlog2" />\r
+                       <?php $manager->addTicketHidden() ?>\r
+                       <input type="hidden" name="blogid" value="<?php echo intval($blogid)?>" />\r
                        <table><tr>\r
                                <td><?php echo _EBLOG_URL?></td>\r
                                <td><input name="url" maxlength="100" size="40" value="<?php echo htmlspecialchars($CONF['IndexURL'].$bshortname.'.php')?>" /></td>\r
@@ -2914,14 +3145,16 @@ selector();
                                <td><input type="submit" value="<?php echo _EBLOG_CREATE_BTN?>" onclick="return checkSubmit();" /></td>\r
                        </tr></table>\r
                </div></form>\r
-               \r
+\r
                <h3><a id="skins">方法 2: 現在使用しているスキンに新しいweblogを展開する記述を加える</a></h3>\r
 \r
                <p>新しいweblogの作成を完了するためには、下にURLを入力してください。 (大抵は既存blogと同じURL)</p>\r
-               \r
+\r
+\r
                <form action="index.php" method="post"><div>\r
                        <input type="hidden" name="action" value="addnewlog2" />\r
-                       <input type="hidden" name="blogid" value="<?php echo intval($blogid)?>" />                      \r
+                       <?php $manager->addTicketHidden() ?>\r
+                       <input type="hidden" name="blogid" value="<?php echo intval($blogid)?>" />\r
                        <table><tr>\r
                                <td><?php echo _EBLOG_URL?></td>\r
                                <td><input name="url" maxlength="100" size="40" /></td>\r
@@ -2930,41 +3163,41 @@ selector();
                                <td><input type="submit" value="<?php echo _EBLOG_CREATE_BTN?>" onclick="return checkSubmit();" /></td>\r
                        </tr></table>\r
                </div></form>\r
-               \r
-               <?php           $this->pagefoot();              \r
-               \r
+\r
+               <?php           $this->pagefoot();\r
+\r
        }\r
-       \r
+\r
        function action_addnewlog2() {\r
                global $member, $manager;\r
-               \r
+\r
                $member->blogAdminRights($blogid) or $this->disallow();\r
-               \r
+\r
                $burl   = requestVar('url');\r
                $blogid = intRequestVar('blogid');\r
-               \r
-               $blog =& $manager->getBlog($blogid);            \r
+\r
+               $blog =& $manager->getBlog($blogid);\r
                $blog->setURL(trim($burl));\r
-               $blog->writeSettings();         \r
-               \r
+               $blog->writeSettings();\r
+\r
                $this->action_overview(_MSG_NEWBLOG);\r
        }\r
 \r
        function action_skinieoverview() {\r
-               global $member, $DIR_LIBS;\r
-               \r
+               global $member, $DIR_LIBS, $manager;\r
+\r
                $member->isAdmin() or $this->disallow();\r
 \r
                // load skinie class\r
                include_once($DIR_LIBS . 'skinie.php');\r
-               \r
+\r
                $this->pagehead();\r
-               \r
-               echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';                \r
-               \r
+\r
+               echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';\r
+\r
        ?>\r
-               <h2><?php echo _SKINIE_TITLE_IMPORT?></h2>      \r
-                       \r
+               <h2><?php echo _SKINIE_TITLE_IMPORT?></h2>\r
+\r
                                <p><label for="skinie_import_local"><?php echo _SKINIE_LOCAL?></label>\r
                                <?php                                   global $DIR_SKINS;\r
 \r
@@ -2974,6 +3207,7 @@ selector();
                                                ?>\r
                                                        <form method="post" action="index.php"><div>\r
                                                                <input type="hidden" name="action" value="skinieimport" />\r
+                                                               <?php $manager->addTicketHidden() ?>\r
                                                                <input type="hidden" name="mode" value="file" />\r
                                                                <select name="skinfile" id="skinie_import_local">\r
                                                                <?php                                                                   foreach ($candidates as $skinname => $skinfile) {\r
@@ -2989,24 +3223,26 @@ selector();
                                        }\r
                                ?>\r
                                </p>\r
-                               \r
+\r
                                <p><em><?php echo _OR?></em></p>\r
-                               \r
+\r
                                <form method="post" action="index.php"><p>\r
+                                       <?php $manager->addTicketHidden() ?>\r
                                        <input type="hidden" name="action" value="skinieimport" />\r
-                                       <input type="hidden" name="mode" value="url" />                                 \r
+                                       <input type="hidden" name="mode" value="url" />\r
                                        <label for="skinie_import_url"><?php echo _SKINIE_FROMURL?></label>\r
                                        <input type="text" name="skinfile" id="skinie_import_url" size="60" value="http://" />\r
                                        <input type="submit" value="<?php echo _SKINIE_BTN_IMPORT?>" />\r
                                </p></form>\r
 \r
-       \r
+\r
                <h2><?php echo _SKINIE_TITLE_EXPORT?></h2>\r
                <form method="post" action="index.php"><div>\r
                        <input type="hidden" name="action" value="skinieexport" />\r
-                       \r
+                       <?php $manager->addTicketHidden() ?>\r
+\r
                        <p><?php echo _SKINIE_EXPORT_INTRO?></p>\r
-                       \r
+\r
                        <table><tr>\r
                                <th colspan="2"><?php echo _SKINIE_EXPORT_SKINS?></th>\r
                        </tr><tr>\r
@@ -3016,72 +3252,72 @@ selector();
                        $id = 'skinexp' . $skinObj->sdnumber;\r
                        echo '<td><input type="checkbox" name="skin[',$skinObj->sdnumber,']"  id="',$id,'" />';\r
                        echo '<label for="',$id,'">',htmlspecialchars($skinObj->sdname),'</label></td>';\r
-                       echo '<td>',htmlspecialchars($skinObj->sddesc),'</td>';                 \r
+                       echo '<td>',htmlspecialchars($skinObj->sddesc),'</td>';\r
                        echo '</tr><tr>';\r
                }\r
-               \r
+\r
                echo '<th colspan="2">',_SKINIE_EXPORT_TEMPLATES,'</th></tr><tr>';\r
-               \r
+\r
                // show list of templates\r
                $res = sql_query('SELECT * FROM '.sql_table('template_desc'));\r
                while ($templateObj = mysql_fetch_object($res)) {\r
-                       $id = 'templateexp' . $templateObj->tdnumber;           \r
+                       $id = 'templateexp' . $templateObj->tdnumber;\r
                        echo '<td><input type="checkbox" name="template[',$templateObj->tdnumber,']" id="',$id,'" />';\r
                        echo '<label for="',$id,'">',htmlspecialchars($templateObj->tdname),'</label></td>';\r
-                       echo '<td>',htmlspecialchars($templateObj->tddesc),'</td>';                     \r
+                       echo '<td>',htmlspecialchars($templateObj->tddesc),'</td>';\r
                        echo '</tr><tr>';\r
                }\r
-               \r
+\r
        ?>\r
                                <th colspan="2"><?php echo _SKINIE_EXPORT_EXTRA?></th>\r
                        </tr><tr>\r
                                <td colspan="2"><textarea cols="40" rows="5" name="info"></textarea></td>\r
-                       </tr><tr>                               \r
+                       </tr><tr>\r
                                <th colspan="2"><?php echo _SKINIE_TITLE_EXPORT?></th>\r
                        </tr><tr>\r
                                <td colspan="2"><input type="submit" value="<?php echo _SKINIE_BTN_EXPORT?>" /></td>\r
                        </tr></table>\r
                </div></form>\r
-       \r
-       <?php   \r
+\r
+       <?php\r
                $this->pagefoot();\r
-               \r
+\r
        }\r
-       \r
+\r
        function action_skinieimport() {\r
-               global $member, $DIR_LIBS, $DIR_SKINS;\r
-               \r
+               global $member, $DIR_LIBS, $DIR_SKINS, $manager;\r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                // load skinie class\r
                include_once($DIR_LIBS . 'skinie.php');\r
-               \r
+\r
                $skinFileRaw= postVar('skinfile');\r
                $mode           = postVar('mode');\r
 \r
-               $importer = new SKINIMPORT();\r
-               \r
+               $importer =& new SKINIMPORT();\r
+\r
                // get full filename\r
                if ($mode == 'file')\r
                {\r
                        $skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml';\r
-                       \r
+\r
                        // backwards compatibilty (in v2.0, exports were saved as skindata.xml)\r
                        if (!file_exists($skinFile))\r
                                $skinFile = $DIR_SKINS . $skinFileRaw . '/skindata.xml';\r
                } else {\r
                        $skinFile = $skinFileRaw;\r
                }\r
-               \r
+\r
                // read only metadata\r
-               $error = $importer->readFile($skinFile, 1);     \r
-               \r
+               $error = $importer->readFile($skinFile, 1);\r
+\r
 \r
                if ($error) $this->error($error);\r
 \r
                $this->pagehead();\r
 \r
-               echo '<p><a href="index.php?action=skinieoverview">(',_BACK,')</a></p>';                \r
+               echo '<p><a href="index.php?action=skinieoverview">(',_BACK,')</a></p>';\r
                ?>\r
                <h2><?php echo _SKINIE_CONFIRM_TITLE?></h2>\r
 \r
@@ -3089,29 +3325,30 @@ selector();
                        <li><p><strong><?php echo _SKINIE_INFO_GENERAL?></strong> <?php echo htmlspecialchars($importer->getInfo())?></p></li>\r
                        <li><p><strong><?php echo _SKINIE_INFO_SKINS?></strong> <?php echo implode(' <em>'._AND.'</em> ',$importer->getSkinNames())?></p></li>\r
                        <li><p><strong><?php echo _SKINIE_INFO_TEMPLATES?></strong> <?php echo implode(' <em>'._AND.'</em> ',$importer->getTemplateNames())?></p></li>\r
-                       <li><p><strong style="color: red;"><?php echo _SKINIE_INFO_SKINCLASH?></strong> <?php echo implode(' <em>'._AND.'</em> ',$importer->checkSkinNameClashes())?></p></li>          \r
+                       <li><p><strong style="color: red;"><?php echo _SKINIE_INFO_SKINCLASH?></strong> <?php echo implode(' <em>'._AND.'</em> ',$importer->checkSkinNameClashes())?></p></li>\r
                        <li><p><strong style="color: red;"><?php echo _SKINIE_INFO_TEMPLCLASH?></strong> <?php echo implode(' <em>'._AND.'</em> ',$importer->checkTemplateNameClashes())?></p></li>\r
                </ul>\r
 \r
                <form method="post" action="index.php"><div>\r
                        <input type="hidden" name="action" value="skiniedoimport" />\r
+                       <?php $manager->addTicketHidden() ?>\r
                        <input type="hidden" name="skinfile" value="<?php echo htmlspecialchars(postVar('skinfile'))?>" />\r
-                       <input type="hidden" name="mode" value="<?php echo htmlspecialchars($mode)?>" />                        \r
+                       <input type="hidden" name="mode" value="<?php echo htmlspecialchars($mode)?>" />\r
                        <input type="submit" value="<?php echo _SKINIE_CONFIRM_IMPORT?>" />\r
                        <br />\r
                        <input type="checkbox" name="overwrite" value="1" id="cb_overwrite" /><label for="cb_overwrite"><?php echo _SKINIE_CONFIRM_OVERWRITE?></label>\r
                </div></form>\r
 \r
 \r
-               <?php           \r
+               <?php\r
                $this->pagefoot();\r
        }\r
-       \r
+\r
        function action_skiniedoimport() {\r
                global $member, $DIR_LIBS, $DIR_SKINS;\r
-               \r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                // load skinie class\r
                include_once($DIR_LIBS . 'skinie.php');\r
 \r
@@ -3119,23 +3356,23 @@ selector();
                $mode           = postVar('mode');\r
 \r
                $allowOverwrite = intPostVar('overwrite');\r
-               \r
+\r
                // get full filename\r
                if ($mode == 'file')\r
                {\r
-                       $skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml';              \r
-                       \r
+                       $skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml';\r
+\r
                        // backwards compatibilty (in v2.0, exports were saved as skindata.xml)\r
                        if (!file_exists($skinFile))\r
                                $skinFile = $DIR_SKINS . $skinFileRaw . '/skindata.xml';\r
-                       \r
+\r
                } else {\r
                        $skinFile = $skinFileRaw;\r
                }\r
 \r
-               $importer = new SKINIMPORT();\r
+               $importer =& new SKINIMPORT();\r
 \r
-               $error = $importer->readFile($skinFile);        \r
+               $error = $importer->readFile($skinFile);\r
 \r
                if ($error)\r
                        $this->error($error);\r
@@ -3147,7 +3384,7 @@ selector();
 \r
                $this->pagehead();\r
 \r
-               echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';                                \r
+               echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';\r
        ?>\r
                <h2><?php echo _SKINIE_DONE?></h2>\r
 \r
@@ -3160,15 +3397,15 @@ selector();
        <?php           $this->pagefoot();\r
 \r
        }\r
-       \r
+\r
        function action_skinieexport() {\r
                global $member, $DIR_LIBS;\r
-               \r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                // load skinie class\r
                include_once($DIR_LIBS . 'skinie.php');\r
-               \r
+\r
                $aSkins = requestIntArray('skin');\r
                $aTemplates = requestIntArray('template');\r
 \r
@@ -3176,11 +3413,11 @@ selector();
                if (!is_array($aSkins)) $aSkins = array();\r
 \r
                $skinList = array_keys($aSkins);\r
-               $templateList = array_keys($aTemplates);        \r
+               $templateList = array_keys($aTemplates);\r
 \r
                $info = postVar('info');\r
 \r
-               $exporter = new SKINEXPORT();\r
+               $exporter =& new SKINEXPORT();\r
                foreach ($skinList as $skinId) {\r
                        $exporter->addSkin($skinId);\r
                }\r
@@ -3189,32 +3426,33 @@ selector();
                }\r
                $exporter->setInfo($info);\r
 \r
-               $exporter->export();    \r
+               $exporter->export();\r
        }\r
-       \r
+\r
        function action_templateoverview() {\r
-               global $member;\r
-               \r
+               global $member, $manager;\r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $this->pagehead();\r
-               \r
-               echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';                \r
-               \r
+\r
+               echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';\r
+\r
                echo '<h2>' . _TEMPLATE_TITLE . '</h2>';\r
                echo '<h3>' . _TEMPLATE_AVAILABLE_TITLE . '</h3>';\r
-               \r
+\r
                $query = 'SELECT * FROM '.sql_table('template_desc').' ORDER BY tdname';\r
                $template['content'] = 'templatelist';\r
                $template['tabindex'] = 10;\r
                showlist($query,'table',$template);\r
-               \r
+\r
                echo '<h3>' . _TEMPLATE_NEW_TITLE . '</h3>';\r
-               \r
+\r
                ?>\r
                <form method="post" action="index.php"><div>\r
-               \r
+\r
                <input name="action" value="templatenew" type="hidden" />\r
+               <?php $manager->addTicketHidden() ?>\r
                <table><tr>\r
                        <td><?php echo _TEMPLATE_NAME?> <?php help('shortnames');?></td>\r
                        <td><input name="name" tabindex="10010" maxlength="20" size="20" /></td>\r
@@ -3225,47 +3463,48 @@ selector();
                        <td><?php echo _TEMPLATE_CREATE?></td>\r
                        <td><input type="submit" tabindex="10030" value="<?php echo _TEMPLATE_CREATE_BTN?>" onclick="return checkSubmit();" /></td>\r
                </tr></table>\r
-               \r
+\r
                </div></form>\r
-               \r
-               <?php           \r
+\r
+               <?php\r
                $this->pagefoot();\r
        }\r
-       \r
+\r
        function action_templateedit($msg = '') {\r
-               global $member;\r
-               \r
+               global $member, $manager;\r
+\r
                $templateid = intRequestVar('templateid');\r
-               \r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $extrahead = '<script type="text/javascript" src="javascript/templateEdit.js"></script>';\r
                $extrahead .= '<script type="text/javascript">setTemplateEditText("'.addslashes(_EDITTEMPLATE_EMPTY).'");</script>';\r
 \r
                $this->pagehead($extrahead);\r
-               \r
+\r
                $templatename = TEMPLATE::getNameFromId($templateid);\r
                $templatedescription = TEMPLATE::getDesc($templateid);\r
-               $template = TEMPLATE::read($templatename);\r
-               \r
+               $template =& $manager->getTemplate($templatename);\r
+\r
                ?>\r
                <p>\r
                <a href="index.php?action=templateoverview">(<?php echo _TEMPLATE_BACK?>)</a>\r
                </p>\r
 \r
                <h2><?php echo _TEMPLATE_EDIT_TITLE?> '<?php echo  $templatename; ?>'</h2>\r
-               \r
+\r
                <?php                                   if ($msg) echo "<p>"._MESSAGE.": $msg</p>";\r
                ?>\r
-               \r
+\r
                <p><?php echo _TEMPLATE_EDIT_MSG?></p>\r
-               \r
+\r
                <form method="post" action="index.php">\r
                <div>\r
-               \r
+\r
                <input type="hidden" name="action" value="templateupdate" />\r
+               <?php $manager->addTicketHidden() ?>\r
                <input type="hidden" name="templateid" value="<?php echo  $templateid; ?>" />\r
-               \r
+\r
                <table><tr>\r
                        <th colspan="2"><?php echo _TEMPLATE_SETTINGS?></th>\r
                </tr><tr>\r
@@ -3284,63 +3523,63 @@ selector();
                        </td>\r
                </tr><tr>\r
                        <th colspan="2"><?php echo _TEMPLATE_ITEMS?> <?php help('templateitems'); ?></th>\r
-<?php  $this->_templateEditRow($template, _TEMPLATE_ITEMHEADER, 'ITEM_HEADER', '', 8);         \r
-       $this->_templateEditRow($template, _TEMPLATE_ITEMBODY, 'ITEM', '', 9, 1);               \r
-       $this->_templateEditRow($template, _TEMPLATE_ITEMFOOTER, 'ITEM_FOOTER', '', 10);                \r
-       $this->_templateEditRow($template, _TEMPLATE_MORELINK, 'MORELINK', 'morelink', 20);             \r
-       $this->_templateEditRow($template, _TEMPLATE_EDITLINK, 'EDITLINK', 'editlink', 25);                     \r
-       $this->_templateEditRow($template, _TEMPLATE_NEW, 'NEW', 'new', 30);            \r
+<?php  $this->_templateEditRow($template, _TEMPLATE_ITEMHEADER, 'ITEM_HEADER', '', 8);\r
+       $this->_templateEditRow($template, _TEMPLATE_ITEMBODY, 'ITEM', '', 9, 1);\r
+       $this->_templateEditRow($template, _TEMPLATE_ITEMFOOTER, 'ITEM_FOOTER', '', 10);\r
+       $this->_templateEditRow($template, _TEMPLATE_MORELINK, 'MORELINK', 'morelink', 20);\r
+       $this->_templateEditRow($template, _TEMPLATE_EDITLINK, 'EDITLINK', 'editlink', 25);\r
+       $this->_templateEditRow($template, _TEMPLATE_NEW, 'NEW', 'new', 30);\r
 ?>\r
-               </tr><tr>       \r
+               </tr><tr>\r
                        <th colspan="2"><?php echo _TEMPLATE_COMMENTS_ANY?> <?php help('templatecomments'); ?></th>\r
-<?php  $this->_templateEditRow($template, _TEMPLATE_CHEADER, 'COMMENTS_HEADER', 'commentheaders', 40);         \r
-       $this->_templateEditRow($template, _TEMPLATE_CBODY, 'COMMENTS_BODY', 'commentbody', 50, 1);             \r
-       $this->_templateEditRow($template, _TEMPLATE_CFOOTER, 'COMMENTS_FOOTER', 'commentheaders', 60);         \r
-       $this->_templateEditRow($template, _TEMPLATE_CONE, 'COMMENTS_ONE', 'commentwords', 70);         \r
-       $this->_templateEditRow($template, _TEMPLATE_CMANY, 'COMMENTS_MANY', 'commentwords', 80);               \r
-       $this->_templateEditRow($template, _TEMPLATE_CMORE, 'COMMENTS_CONTINUED', 'commentcontinued', 90);              \r
-       $this->_templateEditRow($template, _TEMPLATE_CMEXTRA, 'COMMENTS_AUTH', 'memberextra', 100);             \r
+<?php  $this->_templateEditRow($template, _TEMPLATE_CHEADER, 'COMMENTS_HEADER', 'commentheaders', 40);\r
+       $this->_templateEditRow($template, _TEMPLATE_CBODY, 'COMMENTS_BODY', 'commentbody', 50, 1);\r
+       $this->_templateEditRow($template, _TEMPLATE_CFOOTER, 'COMMENTS_FOOTER', 'commentheaders', 60);\r
+       $this->_templateEditRow($template, _TEMPLATE_CONE, 'COMMENTS_ONE', 'commentwords', 70);\r
+       $this->_templateEditRow($template, _TEMPLATE_CMANY, 'COMMENTS_MANY', 'commentwords', 80);\r
+       $this->_templateEditRow($template, _TEMPLATE_CMORE, 'COMMENTS_CONTINUED', 'commentcontinued', 90);\r
+       $this->_templateEditRow($template, _TEMPLATE_CMEXTRA, 'COMMENTS_AUTH', 'memberextra', 100);\r
 ?>\r
-               </tr><tr>       \r
+               </tr><tr>\r
                        <th colspan="2"><?php echo _TEMPLATE_COMMENTS_NONE?> <?php help('templatecomments'); ?></th>\r
 <?php\r
-       $this->_templateEditRow($template, _TEMPLATE_CNONE, 'COMMENTS_NONE', '', 110);          \r
+       $this->_templateEditRow($template, _TEMPLATE_CNONE, 'COMMENTS_NONE', '', 110);\r
 ?>\r
-               </tr><tr>       \r
+               </tr><tr>\r
                        <th colspan="2"><?php echo _TEMPLATE_COMMENTS_TOOMUCH?> <?php help('templatecomments'); ?></th>\r
-<?php  $this->_templateEditRow($template, _TEMPLATE_CTOOMUCH, 'COMMENTS_TOOMUCH', '', 120);            \r
+<?php  $this->_templateEditRow($template, _TEMPLATE_CTOOMUCH, 'COMMENTS_TOOMUCH', '', 120);\r
 ?>\r
-               </tr><tr>       \r
+               </tr><tr>\r
                        <th colspan="2"><?php echo _TEMPLATE_ARCHIVELIST?> <?php help('templatearchivelists'); ?></th>\r
-<?php  $this->_templateEditRow($template, _TEMPLATE_AHEADER, 'ARCHIVELIST_HEADER', '', 130);           \r
-       $this->_templateEditRow($template, _TEMPLATE_AITEM, 'ARCHIVELIST_LISTITEM', '', 140);                   \r
-       $this->_templateEditRow($template, _TEMPLATE_AFOOTER, 'ARCHIVELIST_FOOTER', '', 150);           \r
+<?php  $this->_templateEditRow($template, _TEMPLATE_AHEADER, 'ARCHIVELIST_HEADER', '', 130);\r
+       $this->_templateEditRow($template, _TEMPLATE_AITEM, 'ARCHIVELIST_LISTITEM', '', 140);\r
+       $this->_templateEditRow($template, _TEMPLATE_AFOOTER, 'ARCHIVELIST_FOOTER', '', 150);\r
 ?>\r
-               </tr><tr>       \r
+               </tr><tr>\r
                        <th colspan="2"><?php echo _TEMPLATE_CATEGORYLIST?> <?php help('templatecategorylists'); ?></th>\r
-<?php  $this->_templateEditRow($template, _TEMPLATE_CATHEADER, 'CATLIST_HEADER', '', 160);             \r
-       $this->_templateEditRow($template, _TEMPLATE_CATITEM, 'CATLIST_LISTITEM', '', 170);                     \r
-       $this->_templateEditRow($template, _TEMPLATE_CATFOOTER, 'CATLIST_FOOTER', '', 180);             \r
+<?php  $this->_templateEditRow($template, _TEMPLATE_CATHEADER, 'CATLIST_HEADER', '', 160);\r
+       $this->_templateEditRow($template, _TEMPLATE_CATITEM, 'CATLIST_LISTITEM', '', 170);\r
+       $this->_templateEditRow($template, _TEMPLATE_CATFOOTER, 'CATLIST_FOOTER', '', 180);\r
 ?>\r
                </tr><tr>\r
                        <th colspan="2"><?php echo _TEMPLATE_DATETIME?></th>\r
-<?php  $this->_templateEditRow($template, _TEMPLATE_DHEADER, 'DATE_HEADER', 'dateheads', 190);         \r
-       $this->_templateEditRow($template, _TEMPLATE_DFOOTER, 'DATE_FOOTER', 'dateheads', 200);                 \r
-       $this->_templateEditRow($template, _TEMPLATE_DFORMAT, 'FORMAT_DATE', 'datetime', 210);          \r
-       $this->_templateEditRow($template, _TEMPLATE_TFORMAT, 'FORMAT_TIME', 'datetime', 220);                  \r
-       $this->_templateEditRow($template, _TEMPLATE_LOCALE, 'LOCALE', 'locale', 230);          \r
+<?php  $this->_templateEditRow($template, _TEMPLATE_DHEADER, 'DATE_HEADER', 'dateheads', 190);\r
+       $this->_templateEditRow($template, _TEMPLATE_DFOOTER, 'DATE_FOOTER', 'dateheads', 200);\r
+       $this->_templateEditRow($template, _TEMPLATE_DFORMAT, 'FORMAT_DATE', 'datetime', 210);\r
+       $this->_templateEditRow($template, _TEMPLATE_TFORMAT, 'FORMAT_TIME', 'datetime', 220);\r
+       $this->_templateEditRow($template, _TEMPLATE_LOCALE, 'LOCALE', 'locale', 230);\r
 ?>\r
-               </tr><tr>       \r
+               </tr><tr>\r
                        <th colspan="2"><?php echo _TEMPLATE_IMAGE?> <?php help('templatepopups'); ?></th>\r
-<?php  $this->_templateEditRow($template, _TEMPLATE_PCODE, 'POPUP_CODE', '', 240);             \r
-       $this->_templateEditRow($template, _TEMPLATE_ICODE, 'IMAGE_CODE', '', 250);                     \r
-       $this->_templateEditRow($template, _TEMPLATE_MCODE, 'MEDIA_CODE', '', 260);             \r
+<?php  $this->_templateEditRow($template, _TEMPLATE_PCODE, 'POPUP_CODE', '', 240);\r
+       $this->_templateEditRow($template, _TEMPLATE_ICODE, 'IMAGE_CODE', '', 250);\r
+       $this->_templateEditRow($template, _TEMPLATE_MCODE, 'MEDIA_CODE', '', 260);\r
 ?>\r
                </tr><tr>\r
                        <th colspan="2"><?php echo _TEMPLATE_SEARCH?></th>\r
-<?php  $this->_templateEditRow($template, _TEMPLATE_SHIGHLIGHT, 'SEARCH_HIGHLIGHT', 'highlight',270);          \r
-       $this->_templateEditRow($template, _TEMPLATE_SNOTFOUND, 'SEARCH_NOTHINGFOUND', 'nothingfound',280);             \r
-?>                     \r
+<?php  $this->_templateEditRow($template, _TEMPLATE_SHIGHLIGHT, 'SEARCH_HIGHLIGHT', 'highlight',270);\r
+       $this->_templateEditRow($template, _TEMPLATE_SNOTFOUND, 'SEARCH_NOTHINGFOUND', 'nothingfound',280);\r
+?>\r
                </tr><tr>\r
                        <th colspan="2"><?php echo _TEMPLATE_UPDATE?></th>\r
                </tr><tr>\r
@@ -3350,59 +3589,59 @@ selector();
                                <input type="reset" tabindex="300" value="<?php echo _TEMPLATE_RESET_BTN?>" />\r
                        </td>\r
                </tr></table>\r
-               \r
+\r
                </div>\r
                </form>\r
-               <?php   \r
+               <?php\r
                $this->pagefoot();\r
        }\r
-       \r
+\r
        function _templateEditRow(&$template, $description, $name, $help = '', $tabindex = 0, $big = 0) {\r
                static $count = 1;\r
        ?>\r
-               </tr><tr>       \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  htmlspecialchars($template[$name]); ?></textarea></td>\r
        <?php           $count++;\r
        }\r
-       \r
+\r
        function action_templateupdate() {\r
                global $member;\r
-               \r
-               $templateid = intRequestVar('templateid');              \r
+\r
+               $templateid = intRequestVar('templateid');\r
 \r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $name = postVar('tname');\r
                $desc = postVar('tdesc');\r
-               \r
+\r
                if (!isValidTemplateName($name))\r
                        $this->error(_ERROR_BADTEMPLATENAME);\r
-               \r
+\r
                if ((TEMPLATE::getNameFromId($templateid) != $name) && TEMPLATE::exists($name))\r
                        $this->error(_ERROR_DUPTEMPLATENAME);\r
-                               \r
+\r
 \r
                $name = addslashes($name);\r
                $desc = addslashes($desc);\r
-               \r
+\r
                // 1. Remove all template parts\r
                $query = 'DELETE FROM '.sql_table('template').' WHERE tdesc=' . $templateid;\r
                sql_query($query);\r
-               \r
+\r
                // 2. Update description\r
                $query =  'UPDATE '.sql_table('template_desc').' SET'\r
-                      . " tdname='" . $name . "',"\r
-                      . " tddesc='" . $desc . "'"\r
-                      . " WHERE tdnumber=" . $templateid;\r
+                          . " tdname='" . $name . "',"\r
+                          . " tddesc='" . $desc . "'"\r
+                          . " WHERE tdnumber=" . $templateid;\r
                sql_query($query);\r
-               \r
+\r
                // 3. Add non-empty template parts\r
                $this->addToTemplate($templateid, 'ITEM_HEADER', postVar('ITEM_HEADER'));\r
                $this->addToTemplate($templateid, 'ITEM', postVar('ITEM'));\r
                $this->addToTemplate($templateid, 'ITEM_FOOTER', postVar('ITEM_FOOTER'));\r
                $this->addToTemplate($templateid, 'MORELINK', postVar('MORELINK'));\r
-               $this->addToTemplate($templateid, 'EDITLINK', postVar('EDITLINK'));             \r
+               $this->addToTemplate($templateid, 'EDITLINK', postVar('EDITLINK'));\r
                $this->addToTemplate($templateid, 'NEW', postVar('NEW'));\r
                $this->addToTemplate($templateid, 'COMMENTS_HEADER', postVar('COMMENTS_HEADER'));\r
                $this->addToTemplate($templateid, 'COMMENTS_BODY', postVar('COMMENTS_BODY'));\r
@@ -3429,118 +3668,119 @@ selector();
                $this->addToTemplate($templateid, 'POPUP_CODE', postVar('POPUP_CODE'));\r
                $this->addToTemplate($templateid, 'MEDIA_CODE', postVar('MEDIA_CODE'));\r
                $this->addToTemplate($templateid, 'IMAGE_CODE', postVar('IMAGE_CODE'));\r
-               \r
-               \r
+\r
+\r
                // jump back to template edit\r
                $this->action_templateedit(_TEMPLATE_UPDATED);\r
-       \r
-       }       \r
+\r
+       }\r
 \r
        function addToTemplate($id, $partname, $content) {\r
                $partname = addslashes($partname);\r
-               $content = addslashes($content);        \r
-               \r
+               $content = addslashes($content);\r
+\r
                $id = intval($id);\r
-               \r
+\r
                // don't add empty parts:\r
                if (!trim($content)) return -1;\r
-               \r
+\r
                $query = 'INSERT INTO '.sql_table('template')." (tdesc, tpartname, tcontent) "\r
-                      . "VALUES ($id, '$partname', '$content')";\r
+                          . "VALUES ($id, '$partname', '$content')";\r
                mysql_query($query) or die("Query error: " . mysql_error());\r
                return mysql_insert_id();\r
-       }       \r
-       \r
+       }\r
+\r
        function action_templatedelete() {\r
-               global $member;\r
-               \r
+               global $member, $manager;\r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $templateid = intRequestVar('templateid');\r
                // TODO: check if template can be deleted\r
-               \r
+\r
                $this->pagehead();\r
-               \r
+\r
                $name = TEMPLATE::getNameFromId($templateid);\r
                $desc = TEMPLATE::getDesc($templateid);\r
-               \r
+\r
                ?>\r
                        <h2><?php echo _DELETE_CONFIRM?></h2>\r
-                       \r
+\r
                        <p>\r
                        <?php echo _CONFIRMTXT_TEMPLATE?><b><?php echo $name?></b> (<?php echo  htmlspecialchars($desc) ?>)\r
                        </p>\r
-                       \r
+\r
                        <form method="post" action="index.php"><div>\r
                                <input type="hidden" name="action" value="templatedeleteconfirm" />\r
+                               <?php $manager->addTicketHidden() ?>\r
                                <input type="hidden" name="templateid" value="<?php echo  $templateid ?>" />\r
                                <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />\r
                        </div></form>\r
-               <?php           \r
+               <?php\r
                $this->pagefoot();\r
-       }       \r
-       \r
+       }\r
+\r
        function action_templatedeleteconfirm() {\r
                global $member, $manager;\r
-               \r
+\r
                $templateid = intRequestVar('templateid');\r
-               \r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $manager->notify('PreDeleteTemplate', array('templateid' => $templateid));\r
-               \r
+\r
                // 1. delete description\r
                sql_query('DELETE FROM '.sql_table('template_desc').' WHERE tdnumber=' . $templateid);\r
-               \r
+\r
                // 2. delete parts\r
                sql_query('DELETE FROM '.sql_table('template').' WHERE tdesc=' . $templateid);\r
-               \r
-               $manager->notify('PostDeleteTemplate', array('templateid' => $templateid));             \r
-               \r
-               $this->action_templateoverview();\r
-       }       \r
-       \r
+\r
+               $manager->notify('PostDeleteTemplate', array('templateid' => $templateid));\r
+\r
+               $this->action_templateoverview();\r
+       }\r
+\r
        function action_templatenew() {\r
                global $member;\r
-               \r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $name = postVar('name');\r
                $desc = postVar('desc');\r
-               \r
+\r
                if (!isValidTemplateName($name))\r
                        $this->error(_ERROR_BADTEMPLATENAME);\r
-               \r
+\r
                if (TEMPLATE::exists($name))\r
-                       $this->error(_ERROR_DUPTEMPLATENAME);           \r
+                       $this->error(_ERROR_DUPTEMPLATENAME);\r
 \r
                $newTemplateId = TEMPLATE::createNew($name, $desc);\r
 \r
                $this->action_templateoverview();\r
        }\r
-       \r
+\r
        function action_templateclone() {\r
                global $member;\r
-               \r
+\r
                $templateid = intRequestVar('templateid');\r
-               \r
+\r
                $member->isAdmin() or $this->disallow();\r
-                               \r
+\r
                // 1. read old template\r
                $name = TEMPLATE::getNameFromId($templateid);\r
                $desc = TEMPLATE::getDesc($templateid);\r
 \r
                // 2. create desc thing\r
                $name = "cloned" . $name;\r
-               \r
+\r
                // if a template with that name already exists:\r
                if (TEMPLATE::exists($name)) {\r
                        $i = 1;\r
                        while (TEMPLATE::exists($name . $i))\r
                                $i++;\r
                        $name .= $i;\r
-               }               \r
-               \r
+               }\r
+\r
                $newid = TEMPLATE::createNew($name, $desc);\r
 \r
                // 3. create clone\r
@@ -3552,32 +3792,33 @@ selector();
 \r
                $this->action_templateoverview();\r
        }\r
-       \r
+\r
        function action_skinoverview() {\r
-               global $member;\r
-               \r
+               global $member, $manager;\r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $this->pagehead();\r
-               \r
-               echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';                \r
-               \r
+\r
+               echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';\r
+\r
                echo '<h2>' . _SKIN_EDIT_TITLE . '</h2>';\r
-               \r
+\r
                echo '<h3>' . _SKIN_AVAILABLE_TITLE . '</h3>';\r
-               \r
+\r
                $query = 'SELECT * FROM '.sql_table('skin_desc').' ORDER BY sdname';\r
                $template['content'] = 'skinlist';\r
                $template['tabindex'] = 10;\r
                showlist($query,'table',$template);\r
-               \r
+\r
                echo '<h3>' . _SKIN_NEW_TITLE . '</h3>';\r
-               \r
+\r
                ?>\r
                <form method="post" action="index.php">\r
                <div>\r
-               \r
+\r
                <input name="action" value="skinnew" type="hidden" />\r
+               <?php $manager->addTicketHidden() ?>\r
                <table><tr>\r
                        <td><?php echo _SKIN_NAME?> <?php help('shortnames');?></td>\r
                        <td><input name="name" tabindex="10010" maxlength="20" size="20" /></td>\r
@@ -3588,49 +3829,49 @@ selector();
                        <td><?php echo _SKIN_CREATE?></td>\r
                        <td><input type="submit" tabindex="10030" value="<?php echo _SKIN_CREATE_BTN?>" onclick="return checkSubmit();" /></td>\r
                </tr></table>\r
-               \r
+\r
                </div>\r
                </form>\r
-               \r
-               <?php           \r
+\r
+               <?php\r
                $this->pagefoot();\r
        }\r
-       \r
+\r
        function action_skinnew() {\r
                global $member;\r
-               \r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $name = trim(postVar('name'));\r
                $desc = trim(postVar('desc'));\r
-               \r
+\r
                if (!isValidSkinName($name))\r
                        $this->error(_ERROR_BADSKINNAME);\r
-               \r
+\r
                if (SKIN::exists($name))\r
-                       $this->error(_ERROR_DUPSKINNAME);               \r
-                       \r
+                       $this->error(_ERROR_DUPSKINNAME);\r
+\r
                $newId = SKIN::createNew($name, $desc);\r
-               \r
+\r
                $this->action_skinoverview();\r
-       }       \r
+       }\r
 \r
        function action_skinedit() {\r
-               global $member;\r
-               \r
+               global $member, $manager;\r
+\r
                $skinid = intRequestVar('skinid');\r
-               \r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
-               $skin = new SKIN($skinid);\r
-               \r
+\r
+               $skin =& new SKIN($skinid);\r
+\r
                $this->pagehead();\r
                ?>\r
                <p>\r
-                       <a href="index.php?action=skinoverview">(<?php echo _SKIN_BACK?>)</a>           \r
+                       <a href="index.php?action=skinoverview">(<?php echo _SKIN_BACK?>)</a>\r
                </p>\r
                <h2><?php echo _SKIN_EDITONE_TITLE?> '<?php echo  $skin->getName() ?>'</h2>\r
-               \r
+\r
                <h3><?php echo _SKIN_PARTS_TITLE?></h3>\r
                <?php echo _SKIN_PARTS_MSG?>\r
                <ul>\r
@@ -3643,12 +3884,13 @@ selector();
                        <li><a tabindex="70" href="index.php?action=skinedittype&amp;skinid=<?php echo  $skinid ?>&amp;type=member"><?php echo _SKIN_PART_MEMBER?></a> <?php help('skinpartmember')?></li>\r
                        <li><a tabindex="75" href="index.php?action=skinedittype&amp;skinid=<?php echo  $skinid ?>&amp;type=imagepopup"><?php echo _SKIN_PART_POPUP?></a> <?php help('skinpartimagepopup')?></li>\r
                </ul>\r
-               \r
+\r
                <h3><?php echo _SKIN_GENSETTINGS_TITLE?></h3>\r
                <form method="post" action="index.php">\r
                <div>\r
-               \r
+\r
                <input type="hidden" name="action" value="skineditgeneral" />\r
+               <?php $manager->addTicketHidden() ?>\r
                <input type="hidden" name="skinid" value="<?php echo  $skinid ?>" />\r
                <table><tr>\r
                        <td><?php echo _SKIN_NAME?> <?php help('shortnames');?></td>\r
@@ -3662,40 +3904,40 @@ selector();
                </tr><tr>\r
                        <td><?php echo _SKIN_INCLUDE_MODE?> <?php help('includemode')?></td>\r
                        <td><?php $this->input_yesno('inc_mode',$skin->getIncludeMode(),120,'skindir','normal',_PARSER_INCMODE_SKINDIR,_PARSER_INCMODE_NORMAL);?></td>\r
-               </tr><tr>               \r
+               </tr><tr>\r
                        <td><?php echo _SKIN_INCLUDE_PREFIX?> <?php help('includeprefix')?></td>\r
                        <td><input name="inc_prefix" tabindex="130" value="<?php echo  htmlspecialchars($skin->getIncludePrefix()) ?>" maxlength="40" size="20" /></td>\r
-               </tr><tr>               \r
+               </tr><tr>\r
                        <td><?php echo _SKIN_CHANGE?></td>\r
                        <td><input type="submit" tabindex="140" value="<?php echo _SKIN_CHANGE_BTN?>" onclick="return checkSubmit();" /></td>\r
                </tr></table>\r
-               \r
+\r
                </div>\r
                </form>\r
-               \r
-               \r
+\r
+\r
                <?php           $this->pagefoot();\r
        }\r
-       \r
+\r
        function action_skineditgeneral() {\r
                global $member;\r
-               \r
-               $skinid = intRequestVar('skinid');              \r
-               \r
+\r
+               $skinid = intRequestVar('skinid');\r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $name = postVar('name');\r
                $desc = postVar('desc');\r
                $type = postVar('type');\r
                $inc_mode = postVar('inc_mode');\r
                $inc_prefix = postVar('inc_prefix');\r
-               \r
-               $skin = new SKIN($skinid);\r
-               \r
+\r
+               $skin =& new SKIN($skinid);\r
+\r
                // 1. Some checks\r
                if (!isValidSkinName($name))\r
                        $this->error(_ERROR_BADSKINNAME);\r
-               \r
+\r
                if (($skin->getName() != $name) && SKIN::exists($name))\r
                        $this->error(_ERROR_DUPSKINNAME);\r
 \r
@@ -3704,65 +3946,66 @@ selector();
 \r
                // 2. Update description\r
                $skin->updateGeneralInfo($name, $desc, $type, $inc_mode, $inc_prefix);\r
-               \r
+\r
                $this->action_skinedit();\r
-               \r
+\r
        }\r
-       \r
+\r
        function action_skinedittype($msg = '') {\r
-               global $member;\r
-               \r
+               global $member, $manager;\r
+\r
                $skinid = intRequestVar('skinid');\r
                $type = requestVar('type');\r
-               \r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
-               $skin = new SKIN($skinid);\r
-               \r
+\r
+               $skin =& new SKIN($skinid);\r
+\r
                $friendlyNames = SKIN::getFriendlyNames();\r
-               \r
+\r
                $this->pagehead();\r
                ?>\r
                <p>(<a href="index.php?action=skinoverview"><?php echo _SKIN_GOBACK?></a>)</p>\r
-               \r
+\r
                <h2><?php echo _SKIN_EDITPART_TITLE?> '<?php echo  $skin->getName() ?>': <?php echo  $friendlyNames[$type] ?></h2>\r
-               \r
+\r
                <?php                   if ($msg) echo "<p>"._MESSAGE.": $msg</p>";\r
                ?>\r
-               \r
-               \r
+\r
+\r
                <form method="post" action="index.php">\r
                <div>\r
-               \r
+\r
                <input type="hidden" name="action" value="skinupdate" />\r
+               <?php $manager->addTicketHidden() ?>\r
                <input type="hidden" name="skinid" value="<?php echo  $skinid ?>" />\r
                <input type="hidden" name="type" value="<?php echo  $type ?>" />\r
-               \r
+\r
                <input type="submit" value="<?php echo _SKIN_UPDATE_BTN?>" onclick="return checkSubmit();" />\r
                <input type="reset" value="<?php echo _SKIN_RESET_BTN?>" />\r
                (skin type: <?php echo  $friendlyNames[$type] ?>)\r
                <?php help('skinpart' . $type);?>\r
                <br />\r
-               \r
+\r
                <textarea class="skinedit" tabindex="10" rows="20" cols="80" name="content"><?php echo  htmlspecialchars($skin->getContent($type)) ?></textarea>\r
-               \r
+\r
                <br />\r
                <input type="submit" tabindex="20" value="<?php echo _SKIN_UPDATE_BTN?>" onclick="return checkSubmit();" />\r
                <input type="reset" value="<?php echo _SKIN_RESET_BTN?>" />\r
                (skin type: <?php echo  $friendlyNames[$type] ?>)\r
-               \r
+\r
                <br /><br />\r
-               <?php echo _SKIN_ALLOWEDVARS?> \r
+               <?php echo _SKIN_ALLOWEDVARS?>\r
                <?php                   $actions = SKIN::getAllowedActionsForType($type);\r
 \r
                        sort($actions);\r
-                       \r
+\r
                        while ($current = array_shift($actions)) {\r
                                // skip deprecated vars\r
                                if ($current == 'ifcat') continue;\r
                                if ($current == 'imagetext') continue;\r
                                if ($current == 'vars') continue;\r
-                               \r
+\r
                                echo helplink('skinvar-' . $current) . "$current</a>";\r
                                if (count($actions) != 0) echo ", ";\r
                        }\r
@@ -3779,110 +4022,111 @@ selector();
                        showlist($query,'table',array('content'=>'shortnames'));\r
                ?>\r
 \r
-               \r
+\r
                </div>\r
                </form>\r
-               \r
-               \r
-               <?php           $this->pagefoot();      \r
+\r
+\r
+               <?php           $this->pagefoot();\r
        }\r
-       \r
+\r
        function action_skinupdate() {\r
                global $member;\r
-               \r
-               $skinid = intRequestVar('skinid');              \r
+\r
+               $skinid = intRequestVar('skinid');\r
                $content = trim(postVar('content'));\r
-               $type = postVar('type');                \r
+               $type = postVar('type');\r
 \r
                $member->isAdmin() or $this->disallow();\r
-               \r
-               $skin = new SKIN($skinid);\r
+\r
+               $skin =& new SKIN($skinid);\r
                $skin->update($type, $content);\r
-               \r
+\r
                $this->action_skinedittype(_SKIN_UPDATED);\r
        }\r
-       \r
+\r
        function action_skindelete() {\r
-               global $member, $CONF;\r
-               \r
+               global $member, $manager, $CONF;\r
+\r
                $skinid = intRequestVar('skinid');\r
-               \r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                // don't allow default skin to be deleted\r
                if ($skinid == $CONF['BaseSkin'])\r
                        $this->error(_ERROR_DEFAULTSKIN);\r
-                       \r
+\r
                // don't allow deletion of default skins for blogs\r
                $query = 'SELECT bname FROM '.sql_table('blog').' WHERE bdefskin=' . $skinid;\r
                $r = sql_query($query);\r
                if ($o = mysql_fetch_object($r))\r
                        $this->error(_ERROR_SKINDEFDELETE . $o->bname);\r
-               \r
+\r
                $this->pagehead();\r
-               \r
-               $skin = new SKIN($skinid);\r
+\r
+               $skin =& new SKIN($skinid);\r
                $name = $skin->getName();\r
                $desc = $skin->getDescription();\r
-               \r
+\r
                ?>\r
                        <h2><?php echo _DELETE_CONFIRM?></h2>\r
-                       \r
+\r
                        <p>\r
                                <?php echo _CONFIRMTXT_SKIN?><b><?php echo  $name ?></b> (<?php echo  htmlspecialchars($desc)?>)\r
                        </p>\r
-                       \r
+\r
                        <form method="post" action="index.php"><div>\r
                                <input type="hidden" name="action" value="skindeleteconfirm" />\r
+                               <?php $manager->addTicketHidden() ?>\r
                                <input type="hidden" name="skinid" value="<?php echo  $skinid ?>" />\r
                                <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />\r
                        </div></form>\r
-               <?php           \r
+               <?php\r
                $this->pagefoot();\r
-       }       \r
-       \r
+       }\r
+\r
        function action_skindeleteconfirm() {\r
                global $member, $CONF, $manager;\r
-               \r
-               $skinid = intRequestVar('skinid');              \r
-               \r
+\r
+               $skinid = intRequestVar('skinid');\r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                // don't allow default skin to be deleted\r
                if ($skinid == $CONF['BaseSkin'])\r
                        $this->error(_ERROR_DEFAULTSKIN);\r
-                       \r
+\r
                // don't allow deletion of default skins for blogs\r
                $query = 'SELECT bname FROM '.sql_table('blog').' WHERE bdefskin=' . $skinid;\r
                $r = sql_query($query);\r
                if ($o = mysql_fetch_object($r))\r
-                       $this->error(_ERROR_SKINDEFDELETE .$o->bname);          \r
-               \r
-               $manager->notify('PreDeleteSkin', array('skinid' => $skinid));  \r
-               \r
+                       $this->error(_ERROR_SKINDEFDELETE .$o->bname);\r
+\r
+               $manager->notify('PreDeleteSkin', array('skinid' => $skinid));\r
+\r
                // 1. delete description\r
                sql_query('DELETE FROM '.sql_table('skin_desc').' WHERE sdnumber=' . $skinid);\r
-               \r
+\r
                // 2. delete parts\r
                sql_query('DELETE FROM '.sql_table('skin').' WHERE sdesc=' . $skinid);\r
-               \r
-               $manager->notify('PostDeleteSkin', array('skinid' => $skinid));                 \r
-               \r
+\r
+               $manager->notify('PostDeleteSkin', array('skinid' => $skinid));\r
+\r
                $this->action_skinoverview();\r
        }\r
-       \r
+\r
        function action_skinclone() {\r
                global $member;\r
-               \r
-               $skinid = intRequestVar('skinid');              \r
-               \r
+\r
+               $skinid = intRequestVar('skinid');\r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                // 1. read skin to clone\r
-               $skin = new SKIN($skinid);\r
-               \r
+               $skin =& new SKIN($skinid);\r
+\r
                $name = "clone_" . $skin->getName();\r
-               \r
+\r
                // if a skin with that name already exists:\r
                if (SKIN::exists($name)) {\r
                        $i = 1;\r
@@ -3890,7 +4134,7 @@ selector();
                                $i++;\r
                        $name .= $i;\r
                }\r
-               \r
+\r
                // 2. create skin desc\r
                $newid = SKIN::createNew(\r
                        $name,\r
@@ -3899,8 +4143,8 @@ selector();
                        $skin->getIncludeMode(),\r
                        $skin->getIncludePrefix()\r
                );\r
-               \r
-               \r
+\r
+\r
                // 3. clone\r
                $this->skinclonetype($skin, $newid, 'index');\r
                $this->skinclonetype($skin, $newid, 'item');\r
@@ -3910,11 +4154,11 @@ selector();
                $this->skinclonetype($skin, $newid, 'error');\r
                $this->skinclonetype($skin, $newid, 'member');\r
                $this->skinclonetype($skin, $newid, 'imagepopup');\r
-               \r
+\r
                $this->action_skinoverview();\r
-               \r
+\r
        }\r
-       \r
+\r
        function skinclonetype($skin, $newid, $type) {\r
                $newid = intval($newid);\r
                $content = $skin->getContent($type);\r
@@ -3923,48 +4167,49 @@ selector();
                        sql_query($query);\r
                }\r
        }\r
-       \r
+\r
        function action_settingsedit() {\r
                global $member, $manager, $CONF, $DIR_NUCLEUS, $DIR_MEDIA;\r
-               \r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $this->pagehead();\r
-               \r
-               echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';                \r
+\r
+               echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';\r
                ?>\r
 \r
                <h2><?php echo _SETTINGS_TITLE?></h2>\r
-               \r
+\r
                <form action="index.php" method="post">\r
                <div>\r
-               \r
+\r
                <input type="hidden" name="action" value="settingsupdate" />\r
-               \r
+               <?php $manager->addTicketHidden() ?>\r
+\r
                <table><tr>\r
                        <th colspan="2"><?php echo _SETTINGS_SUB_GENERAL?></th>\r
                </tr><tr>\r
                        <td><?php echo _SETTINGS_DEFBLOG?> <?php help('defaultblog'); ?></td>\r
                        <td>\r
-                               <?php \r
+                               <?php\r
                                        $query =  'SELECT bname as text, bnumber as value'\r
-                                              . ' FROM '.sql_table('blog');\r
+                                                  . ' FROM '.sql_table('blog');\r
                                        $template['name'] = 'DefaultBlog';\r
                                        $template['selected'] = $CONF['DefaultBlog'];\r
                                        $template['tabindex'] = 10;\r
-                                       showlist($query,'select',$template);            \r
+                                       showlist($query,'select',$template);\r
                                ?>\r
                        </td>\r
                </tr><tr>\r
                        <td><?php echo _SETTINGS_BASESKIN?> <?php help('baseskin'); ?></td>\r
                        <td>\r
-                               <?php \r
+                               <?php\r
                                        $query =  'SELECT sdname as text, sdnumber as value'\r
-                                              . ' FROM '.sql_table('skin_desc');\r
+                                                  . ' FROM '.sql_table('skin_desc');\r
                                        $template['name'] = 'BaseSkin';\r
                                        $template['selected'] = $CONF['BaseSkin'];\r
                                        $template['tabindex'] = 1;\r
-                                       showlist($query,'select',$template);            \r
+                                       showlist($query,'select',$template);\r
                                ?>\r
                        </td>\r
                </tr><tr>\r
@@ -3988,11 +4233,11 @@ selector();
                </tr><tr>\r
                        <td><?php echo _SETTINGS_ACTIONSURL?> <?php help('actionurl');?></td>\r
                        <td><input name="ActionURL" tabindex="10047" size="40" value="<?php echo  htmlspecialchars($CONF['ActionURL']) ?>" /></td>\r
-               </tr><tr>               \r
+               </tr><tr>\r
                        <td><?php echo _SETTINGS_LANGUAGE?> <?php help('language'); ?>\r
                        </td>\r
                        <td>\r
-                       \r
+\r
                                <select name="Language" tabindex="10050">\r
                                <?php                           // show a dropdown list of all available languages\r
                                global $DIR_LANG;\r
@@ -4009,78 +4254,80 @@ selector();
                                closedir($dirhandle);\r
 \r
                                ?>\r
-                               </select>                       \r
-                       \r
+                               </select>\r
+\r
                        </td>\r
                </tr><tr>\r
                        <td><?php echo _SETTINGS_DISABLESITE?> <?php help('disablesite'); ?>\r
                        </td>\r
                        <td><?php $this->input_yesno('DisableSite',$CONF['DisableSite'],10060); ?>\r
-                           <br />\r
-                           URL: <input name="DisableSiteURL" tabindex="10070" size="40" value="<?php echo  htmlspecialchars($CONF['DisableSiteURL'])?>" />\r
+                                       <br />\r
+                               URL: <input name="DisableSiteURL" tabindex="10070" size="40" value="<?php echo  htmlspecialchars($CONF['DisableSiteURL'])?>" />\r
                        </td>\r
                </tr><tr>\r
                        <td><?php echo _SETTINGS_DIRS?></td>\r
                        <td><?php echo  htmlspecialchars($DIR_NUCLEUS) ?>\r
-                           <i><?php echo _SETTINGS_SEECONFIGPHP?></i></td>                             \r
-               </tr><tr>               \r
+                               <i><?php echo _SETTINGS_SEECONFIGPHP?></i></td>\r
+               </tr><tr>\r
                        <td><?php echo _SETTINGS_DBLOGIN?></td>\r
                        <td><i><?php echo _SETTINGS_SEECONFIGPHP?></i></td>\r
                </tr><tr>\r
                        <td>\r
-                       <?php echo _SETTINGS_JSTOOLBAR;\r
-                                /* =_SETTINGS_DISABLEJS \r
+                       <?php\r
+                               echo _SETTINGS_JSTOOLBAR\r
+                               /* =_SETTINGS_DISABLEJS\r
 \r
-\r
-                       \r
                                        I temporary changed the meaning of DisableJsTools, until I can find a good\r
-                                       way to select the javascript version to use \r
-                                       \r
-                                       now, its: \r
+                                       way to select the javascript version to use\r
+\r
+                                       now, its:\r
                                                0 : IE\r
                                                1 : all javascript disabled\r
                                                2 : 'simpler' javascript (for mozilla/opera/mac)\r
-                           */\r
+                               */\r
                           ?>\r
                        </td>\r
                        <td><?php /* $this->input_yesno('DisableJsTools',$CONF['DisableJsTools'],10075); */?>\r
                                <select name="DisableJsTools" tabindex="10075">\r
-                       <?php                                   $extra = ($CONF['DisableJsTools'] == 1) ? 'selected="selected"' : ''; \r
+                       <?php                                   $extra = ($CONF['DisableJsTools'] == 1) ? 'selected="selected"' : '';\r
                                        echo "<option $extra value='1'>",_SETTINGS_JSTOOLBAR_NONE,"</option>";\r
-                                       $extra = ($CONF['DisableJsTools'] == 2) ? 'selected="selected"' : '';                                   \r
+                                       $extra = ($CONF['DisableJsTools'] == 2) ? 'selected="selected"' : '';\r
                                        echo "<option $extra value='2'>",_SETTINGS_JSTOOLBAR_SIMPLE,"</option>";\r
-                                       $extra = ($CONF['DisableJsTools'] == 0) ? 'selected="selected"' : '';                                                                           \r
-                                       echo "<option $extra value='0'>",_SETTINGS_JSTOOLBAR_FULL,"</option>";                                  \r
+                                       $extra = ($CONF['DisableJsTools'] == 0) ? 'selected="selected"' : '';\r
+                                       echo "<option $extra value='0'>",_SETTINGS_JSTOOLBAR_FULL,"</option>";\r
                        ?>\r
                                </select>\r
-                       </td>                   \r
+                       </td>\r
                </tr><tr>\r
                        <td><?php echo _SETTINGS_URLMODE?> <?php help('urlmode');?></td>\r
-                       <td><?php $this->input_yesno('URLMode',$CONF['URLMode'],10077,\r
-                                                 'normal','pathinfo',_SETTINGS_URLMODE_NORMAL,_SETTINGS_URLMODE_PATHINFO);\r
-                                                 \r
-                                                 echo ' ', _SETTINGS_URLMODE_HELP;\r
-                                                 \r
-                                                  ?>\r
-                       </td>\r
+                                          <td><?php\r
+\r
+                                          $this->input_yesno('URLMode',$CONF['URLMode'],10077,\r
+                                                         'normal','pathinfo',_SETTINGS_URLMODE_NORMAL,_SETTINGS_URLMODE_PATHINFO);\r
+\r
+                                          echo ' ', _SETTINGS_URLMODE_HELP;\r
+\r
+                                                        ?>\r
+\r
+                                          </td>\r
                </tr><tr>\r
                        <th colspan="2"><?php echo _SETTINGS_MEDIA?> <?php help('media'); ?></th>\r
                </tr><tr>\r
                        <td><?php echo _SETTINGS_MEDIADIR?></td>\r
                        <td><?php echo  htmlspecialchars($DIR_MEDIA) ?>\r
-                           <i><?php echo _SETTINGS_SEECONFIGPHP?></i>\r
-                           <?php                               if (!is_dir($DIR_MEDIA))\r
-                                       echo "<br /><b>" . _WARNING_NOTADIR . "</b>";\r
-                               if (!is_readable($DIR_MEDIA))\r
-                                       echo "<br /><b>" . _WARNING_NOTREADABLE . "</b>";                                       \r
-                               if (!is_writeable($DIR_MEDIA))\r
-                                       echo "<br /><b>" . _WARNING_NOTWRITABLE . "</b>";                        \r
-                           ?>\r
+                               <i><?php echo _SETTINGS_SEECONFIGPHP?></i>\r
+                               <?php                           if (!is_dir($DIR_MEDIA))\r
+                                               echo "<br /><b>" . _WARNING_NOTADIR . "</b>";\r
+                                       if (!is_readable($DIR_MEDIA))\r
+                                               echo "<br /><b>" . _WARNING_NOTREADABLE . "</b>";\r
+                                       if (!is_writeable($DIR_MEDIA))\r
+                                               echo "<br /><b>" . _WARNING_NOTWRITABLE . "</b>";\r
+                               ?>\r
                        </td>\r
                </tr><tr>\r
                        <td><?php echo _SETTINGS_MEDIAURL?></td>\r
                        <td>\r
-                           <input name="MediaURL" tabindex="10080" size="40" value="<?php echo  htmlspecialchars($CONF['MediaURL']) ?>" />\r
+                               <input name="MediaURL" tabindex="10080" size="40" value="<?php echo  htmlspecialchars($CONF['MediaURL']) ?>" />\r
                        </td>\r
                </tr><tr>\r
                        <td><?php echo _SETTINGS_ALLOWUPLOAD?></td>\r
@@ -4088,13 +4335,13 @@ selector();
                </tr><tr>\r
                        <td><?php echo _SETTINGS_ALLOWUPLOADTYPES?></td>\r
                        <td>\r
-                           <input name="AllowedTypes" tabindex="10100" size="40" value="<?php echo  htmlspecialchars($CONF['AllowedTypes']) ?>" />\r
+                               <input name="AllowedTypes" tabindex="10100" size="40" value="<?php echo  htmlspecialchars($CONF['AllowedTypes']) ?>" />\r
                        </td>\r
                </tr><tr>\r
                        <td><?php echo _SETTINGS_MAXUPLOADSIZE?></td>\r
                        <td>\r
-                           <input name="MaxUploadSize" tabindex="10105" size="40" value="<?php echo  htmlspecialchars($CONF['MaxUploadSize']) ?>" />\r
-                       </td>                   \r
+                               <input name="MaxUploadSize" tabindex="10105" size="40" value="<?php echo  htmlspecialchars($CONF['MaxUploadSize']) ?>" />\r
+                       </td>\r
                </tr><tr>\r
                        <td><?php echo _SETTINGS_MEDIAPREFIX?></td>\r
                        <td><?php $this->input_yesno('MediaPrefix',$CONF['MediaPrefix'],10110); ?></td>\r
@@ -4104,33 +4351,33 @@ selector();
                </tr><tr>\r
                        <td><?php echo _SETTINGS_CHANGELOGIN?></td>\r
                        <td><?php $this->input_yesno('AllowLoginEdit',$CONF['AllowLoginEdit'],10120); ?></td>\r
-               </tr><tr>               \r
+               </tr><tr>\r
                        <td><?php echo _SETTINGS_ALLOWCREATE?>\r
-                           <?php help('allowaccountcreation'); ?>\r
+                               <?php help('allowaccountcreation'); ?>\r
                        </td>\r
                        <td><?php $this->input_yesno('AllowMemberCreate',$CONF['AllowMemberCreate'],10130); ?>\r
                        </td>\r
                </tr><tr>\r
                        <td><?php echo _SETTINGS_NEWLOGIN?> <?php help('allownewmemberlogin'); ?>\r
-                           <br /><?php echo _SETTINGS_NEWLOGIN2?>\r
+                               <br /><?php echo _SETTINGS_NEWLOGIN2?>\r
                        </td>\r
                        <td><?php $this->input_yesno('NewMemberCanLogon',$CONF['NewMemberCanLogon'],10140); ?>\r
                        </td>\r
-               </tr><tr>               \r
+               </tr><tr>\r
                        <td><?php echo _SETTINGS_MEMBERMSGS?>\r
-                           <?php help('messageservice'); ?>\r
+                               <?php help('messageservice'); ?>\r
                        </td>\r
                        <td><?php $this->input_yesno('AllowMemberMail',$CONF['AllowMemberMail'],10150); ?>\r
                        </td>\r
-               </tr><tr>               \r
+               </tr><tr>\r
                        <td><?php echo _SETTINGS_NONMEMBERMSGS?>\r
-                           <?php help('messageservice'); ?>\r
+                               <?php help('messageservice'); ?>\r
                        </td>\r
                        <td><?php $this->input_yesno('NonmemberMail',$CONF['NonmemberMail'],10155); ?>\r
                        </td>\r
-               </tr><tr>               \r
+               </tr><tr>\r
                        <td><?php echo _SETTINGS_PROTECTMEMNAMES?>\r
-                           <?php help('protectmemnames'); ?>\r
+                               <?php help('protectmemnames'); ?>\r
                        </td>\r
                        <td><?php $this->input_yesno('ProtectMemNames',$CONF['ProtectMemNames'],10156); ?>\r
                        </td>\r
@@ -4140,6 +4387,9 @@ selector();
                </tr><tr>\r
                        <th colspan="2"><?php echo _SETTINGS_COOKIES_TITLE?> <?php help('cookies'); ?></th>\r
                </tr><tr>\r
+                       <td><?php echo _SETTINGS_COOKIEPREFIX?></td>\r
+                       <td><input name="CookiePrefix" tabindex="10159" size="40" value="<?php echo  htmlspecialchars($CONF['CookiePrefix'])?>" /></td>\r
+               </tr><tr>\r
                        <td><?php echo _SETTINGS_COOKIEDOMAIN?></td>\r
                        <td><input name="CookieDomain" tabindex="10160" size="40" value="<?php echo  htmlspecialchars($CONF['CookieDomain'])?>" /></td>\r
                </tr><tr>\r
@@ -4151,7 +4401,7 @@ selector();
                </tr><tr>\r
                        <td><?php echo _SETTINGS_COOKIELIFE?></td>\r
                        <td><?php $this->input_yesno('SessionCookie',$CONF['SessionCookie'],10190,\r
-                                                 1,0,_SETTINGS_COOKIESESSION,_SETTINGS_COOKIEMONTH); ?>\r
+                                                         1,0,_SETTINGS_COOKIESESSION,_SETTINGS_COOKIEMONTH); ?>\r
                        </td>\r
                </tr><tr>\r
                        <td><?php echo _SETTINGS_LASTVISIT?></td>\r
@@ -4165,47 +4415,47 @@ selector();
                        <td><?php echo _SETTINGS_UPDATE?></td>\r
                        <td><input type="submit" tabindex="10210" value="<?php echo _SETTINGS_UPDATE_BTN?>" onclick="return checkSubmit();" /></td>\r
                </tr></table>\r
-               \r
+\r
                </div>\r
                </form>\r
 \r
-               <?php           \r
-                       echo '<h2>',_PLUGINS_EXTRA,'</h2>';             \r
+               <?php\r
+                       echo '<h2>',_PLUGINS_EXTRA,'</h2>';\r
 \r
                        $manager->notify(\r
-                               'GeneralSettingsFormExtras',    \r
+                               'GeneralSettingsFormExtras',\r
                                array()\r
                        );\r
-               \r
+\r
                $this->pagefoot();\r
        }\r
-       \r
+\r
        function action_settingsupdate() {\r
                global $member, $CONF;\r
-               \r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                // check if email address for admin is valid\r
                if (!isValidMailAddress(postVar('AdminEmail')))\r
                        $this->error(_ERROR_BADMAILADDRESS);\r
 \r
-               \r
-               // save settings        \r
-               $this->updateConfig('DefaultBlog',              postVar('DefaultBlog'));        \r
-               $this->updateConfig('BaseSkin',                 postVar('BaseSkin'));                   \r
-               $this->updateConfig('IndexURL',                 postVar('IndexURL'));   \r
+\r
+               // save settings\r
+               $this->updateConfig('DefaultBlog',              postVar('DefaultBlog'));\r
+               $this->updateConfig('BaseSkin',                 postVar('BaseSkin'));\r
+               $this->updateConfig('IndexURL',                 postVar('IndexURL'));\r
                $this->updateConfig('AdminURL',                 postVar('AdminURL'));\r
-               $this->updateConfig('PluginURL',                postVar('PluginURL'));          \r
-               $this->updateConfig('SkinsURL',                 postVar('SkinsURL'));                           \r
-               $this->updateConfig('ActionURL',                postVar('ActionURL'));                                          \r
-               $this->updateConfig('Language',                 postVar('Language'));   \r
-               $this->updateConfig('AdminEmail',               postVar('AdminEmail')); \r
-               $this->updateConfig('SessionCookie',    postVar('SessionCookie'));      \r
-               $this->updateConfig('AllowMemberCreate',postVar('AllowMemberCreate'));  \r
-               $this->updateConfig('AllowMemberMail',  postVar('AllowMemberMail'));    \r
-               $this->updateConfig('NonmemberMail',    postVar('NonmemberMail'));                      \r
-               $this->updateConfig('ProtectMemNames',  postVar('ProtectMemNames'));                                    \r
-               $this->updateConfig('SiteName',                 postVar('SiteName'));   \r
+               $this->updateConfig('PluginURL',                postVar('PluginURL'));\r
+               $this->updateConfig('SkinsURL',                 postVar('SkinsURL'));\r
+               $this->updateConfig('ActionURL',                postVar('ActionURL'));\r
+               $this->updateConfig('Language',                 postVar('Language'));\r
+               $this->updateConfig('AdminEmail',               postVar('AdminEmail'));\r
+               $this->updateConfig('SessionCookie',    postVar('SessionCookie'));\r
+               $this->updateConfig('AllowMemberCreate',postVar('AllowMemberCreate'));\r
+               $this->updateConfig('AllowMemberMail',  postVar('AllowMemberMail'));\r
+               $this->updateConfig('NonmemberMail',    postVar('NonmemberMail'));\r
+               $this->updateConfig('ProtectMemNames',  postVar('ProtectMemNames'));\r
+               $this->updateConfig('SiteName',                 postVar('SiteName'));\r
                $this->updateConfig('NewMemberCanLogon',postVar('NewMemberCanLogon'));\r
                $this->updateConfig('DisableSite',              postVar('DisableSite'));\r
                $this->updateConfig('DisableSiteURL',   postVar('DisableSiteURL'));\r
@@ -4214,36 +4464,37 @@ selector();
                $this->updateConfig('AllowedTypes',             postVar('AllowedTypes'));\r
                $this->updateConfig('AllowUpload',              postVar('AllowUpload'));\r
                $this->updateConfig('MaxUploadSize',    postVar('MaxUploadSize'));\r
-               $this->updateConfig('MediaPrefix',              postVar('MediaPrefix'));                \r
+               $this->updateConfig('MediaPrefix',              postVar('MediaPrefix'));\r
                $this->updateConfig('AllowLoginEdit',   postVar('AllowLoginEdit'));\r
-               $this->updateConfig('DisableJsTools',   postVar('DisableJsTools'));             \r
+               $this->updateConfig('DisableJsTools',   postVar('DisableJsTools'));\r
                $this->updateConfig('CookieDomain',             postVar('CookieDomain'));\r
                $this->updateConfig('CookiePath',               postVar('CookiePath'));\r
                $this->updateConfig('CookieSecure',             postVar('CookieSecure'));\r
-               $this->updateConfig('URLMode',                  postVar('URLMode'));            \r
-               \r
+               $this->updateConfig('URLMode',                  postVar('URLMode'));\r
+               $this->updateConfig('CookiePrefix',             postVar('CookiePrefix'));\r
+\r
                // load new config and redirect (this way, the new language will be used is necessary)\r
                // note that when changing cookie settings, this redirect might cause the user\r
                // to have to log in again.\r
                getConfig();\r
                redirect($CONF['AdminURL'] . '?action=manage');\r
                exit;\r
-       \r
+\r
        }\r
-       \r
-       \r
+\r
+\r
        function updateConfig($name, $val) {\r
                $name = addslashes($name);\r
                $val = trim(addslashes($val));\r
-               \r
+\r
                $query = 'UPDATE '.sql_table('config')\r
-                      . " SET value='$val'"\r
-                      . " WHERE name='$name'";\r
+                          . " SET value='$val'"\r
+                          . " WHERE name='$name'";\r
 \r
                mysql_query($query) or die("Query error: " . mysql_error());\r
                return mysql_insert_id();\r
        }\r
-       \r
+\r
        /**\r
          * Error message\r
          */\r
@@ -4257,17 +4508,17 @@ selector();
                $this->pagefoot();\r
                exit;\r
        }\r
-       \r
+\r
        function disallow() {\r
                ACTIONLOG::add(WARNING, _ACTIONLOG_DISALLOWED . serverVar('REQUEST_URI'));\r
-               \r
+\r
                $this->error(_ERROR_DISALLOWED);\r
        }\r
-       \r
-       \r
+\r
+\r
        function pagehead($extrahead = '') {\r
                global $member, $nucleus, $CONF, $manager;\r
-               \r
+\r
                $manager->notify(\r
                        'AdminPrePageHead',\r
                        array(\r
@@ -4275,26 +4526,25 @@ selector();
                                'action' => $this->action\r
                        )\r
                );\r
-               \r
+\r
                $baseUrl = htmlspecialchars($CONF['AdminURL']);\r
 \r
                ?>\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">\r
                <head>\r
-                       <meta http-equiv="Content-Type" content="text/html; charset=<?php echo _CHARSET ?>" />\r
-                       <title><?php echo htmlspecialchars($CONF['SiteName'])?> - Admin</title>         \r
+                       <title><?php echo htmlspecialchars($CONF['SiteName'])?> - Admin</title>\r
                        <link rel="stylesheet" title="Nucleus Admin Default" type="text/css" href="<?php echo $baseUrl?>styles/admin.css" />\r
-                       <link rel="stylesheet" title="Nucleus Admin Default" type="text/css" \r
+                       <link rel="stylesheet" title="Nucleus Admin Default" type="text/css"\r
                        href="<?php echo $baseUrl?>styles/addedit.css" />\r
-                       \r
+\r
                        <script type="text/javascript" src="<?php echo $baseUrl?>javascript/edit.js"></script>\r
                        <script type="text/javascript" src="<?php echo $baseUrl?>javascript/admin.js"></script>\r
                        <script type="text/javascript" src="<?php echo $baseUrl?>javascript/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
+         <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
 \r
                        <?php echo $extrahead?>\r
                </head>\r
@@ -4305,36 +4555,36 @@ selector();
                <div id="container">\r
                <div id="content">\r
                <div class="loginname">\r
-               <?php                   if ($member->isLoggedIn()) \r
+               <?php                   if ($member->isLoggedIn())\r
                                echo _LOGGEDINAS . ' ' . $member->getDisplayName()\r
-                                   ." - <a href='index.php?action=logout'>" . _LOGOUT. "</a>"\r
-                                   . "<br /><a href='index.php?action=overview'>" . _ADMINHOME . "</a> - ";\r
-                       else \r
-                               echo _NOTLOGGEDIN . ' <br />';\r
+                                       ." - <a href='index.php?action=logout'>" . _LOGOUT. "</a>"\r
+                                       . "<br /><a href='index.php?action=overview'>" . _ADMINHOME . "</a> - ";\r
+                       else\r
+                               echo '<a href="index.php?action=showlogin" title="Log in">' , _NOTLOGGEDIN , '</a> <br />';\r
 \r
                        echo "<a href='".$CONF['IndexURL']."'>"._YOURSITE."</a>";\r
-                       \r
+\r
                        echo '<br />(';\r
-                       \r
+\r
                        if ($member->isLoggedIn() && $member->isAdmin())\r
-                               echo '<a href="http://nucleuscms.org/version.php?v=',getNucleusVersion(),'&amp;pl=',getNucleusPatchLevel(),'" title="Check for upgrade">Nucleus ', $nucleus['version'], '</a>';\r
+                               echo '<a href="http://nucleuscms.org/version.php?v=',getNucleusVersion(),'&amp;pl=',getNucleusPatchLevel(),'" title="Check for upgrade">Nucleus CMS ', $nucleus['version'], '</a>';\r
                        else\r
-                               echo 'Nucleus ' , $nucleus['version'];\r
+                               echo 'Nucleus CMS ' , $nucleus['version'];\r
                        echo ')';\r
                echo '</div>';\r
        }\r
-       \r
+\r
        function pagefoot() {\r
                global $action, $member, $manager;\r
-               \r
+\r
                $manager->notify(\r
                        'AdminPrePageFoot',\r
                        array(\r
                                'action' => $this->action\r
                        )\r
-               );              \r
-               \r
-               if ($action != 'showlogin') {\r
+               );\r
+\r
+               if ($member->isLoggedIn() && ($action != 'showlogin')) {\r
                        ?>\r
                        <h2><?php echo  _LOGOUT ?></h2>\r
                        <ul>\r
@@ -4344,21 +4594,21 @@ selector();
                        <?php           }\r
                ?>\r
                        <div class="foot">\r
-                               <a href="http://nucleuscms.org/">Nucleus</a> &copy; 2002-2004 The Nucleus Group\r
+                               <a href="http://nucleuscms.org/">Nucleus CMS</a> &copy; 2002-2005 The Nucleus Group\r
                                -\r
                                <a href="http://nucleuscms.org/donate.php">Donate!</a>\r
-                       </div>          \r
-                       \r
+                       </div>\r
+\r
                        </div><!-- content -->\r
-                       \r
+\r
                        <div id="quickmenu">\r
-       \r
-                               <?php                           // ---- user settings ---- \r
+\r
+                               <?php                           // ---- user settings ----\r
                                if (($action != 'showlogin') && ($member->isLoggedIn())) {\r
                                        echo '<ul>';\r
                                        echo '<li><a href="index.php?action=overview">',_QMENU_HOME,'</a></li>';\r
-                                       echo '</ul>';                           \r
-                               \r
+                                       echo '</ul>';\r
+\r
                                        echo '<h2>',_QMENU_ADD,'</h2>';\r
                                        echo '<form method="get" action="index.php"><div>';\r
                                        echo '<input type="hidden" name="action" value="createitem" />';\r
@@ -4373,7 +4623,7 @@ selector();
                                                        $query =  'SELECT bnumber as value, bname as text'\r
                                                                   . ' FROM ' . sql_table('blog') . ', ' . sql_table('team')\r
                                                                   . ' WHERE tblog=bnumber and tmember=' . $member->getID()\r
-                                                                  . ' ORDER BY bname';         \r
+                                                                  . ' ORDER BY bname';\r
                                                }\r
                                                $template['name'] = 'blogid';\r
                                                $template['tabindex'] = 15000;\r
@@ -4381,7 +4631,7 @@ selector();
                                                $template['selected'] = -1;\r
                                                $template['shorten'] = 10;\r
                                                $template['shortenel'] = '';\r
-                                               $template['javascript'] = 'onchange="return form.submit()"';                                    \r
+                                               $template['javascript'] = 'onchange="return form.submit()"';\r
                                                showlist($query,'select',$template);\r
 \r
                                        echo '</div></form>';\r
@@ -4396,29 +4646,29 @@ selector();
 \r
 \r
 \r
-                                       // ---- general settings ---- \r
+                                       // ---- general settings ----\r
                                        if ($member->isAdmin()) {\r
 \r
                                                echo '<h2>',_QMENU_MANAGE,'</h2>';\r
 \r
                                                echo '<ul>';\r
-                                               echo '<li><a href="index.php?action=actionlog">',_QMENU_MANAGE_LOG,'</a></li>';         \r
+                                               echo '<li><a href="index.php?action=actionlog">',_QMENU_MANAGE_LOG,'</a></li>';\r
                                                echo '<li><a href="index.php?action=settingsedit">',_QMENU_MANAGE_SETTINGS,'</a></li>';\r
-                                               echo '<li><a href="index.php?action=usermanagement">',_QMENU_MANAGE_MEMBERS,'</a></li>';                \r
-                                               echo '<li><a href="index.php?action=createnewlog">',_QMENU_MANAGE_NEWBLOG,'</a></li>';                                                                                  \r
-                                               echo '<li><a href="index.php?action=backupoverview">',_QMENU_MANAGE_BACKUPS,'</a></li>';                        \r
-                                               echo '<li><a href="index.php?action=pluginlist">',_QMENU_MANAGE_PLUGINS,'</a></li>';                    \r
+                                               echo '<li><a href="index.php?action=usermanagement">',_QMENU_MANAGE_MEMBERS,'</a></li>';\r
+                                               echo '<li><a href="index.php?action=createnewlog">',_QMENU_MANAGE_NEWBLOG,'</a></li>';\r
+                                               echo '<li><a href="index.php?action=backupoverview">',_QMENU_MANAGE_BACKUPS,'</a></li>';\r
+                                               echo '<li><a href="index.php?action=pluginlist">',_QMENU_MANAGE_PLUGINS,'</a></li>';\r
                                                echo '</ul>';\r
 \r
                                                echo '<h2>',_QMENU_LAYOUT,'</h2>';\r
                                                echo '<ul>';\r
                                                echo '<li><a href="index.php?action=skinoverview">',_QMENU_LAYOUT_SKINS,'</a></li>';\r
                                                echo '<li><a href="index.php?action=templateoverview">',_QMENU_LAYOUT_TEMPL,'</a></li>';\r
-                                               echo '<li><a href="index.php?action=skinieoverview">',_QMENU_LAYOUT_IEXPORT,'</a></li>';                \r
+                                               echo '<li><a href="index.php?action=skinieoverview">',_QMENU_LAYOUT_IEXPORT,'</a></li>';\r
                                                echo '</ul>';\r
 \r
                                        }\r
-                                       \r
+\r
                                        $aPluginExtras = array();\r
                                        $manager->notify(\r
                                                'QuickMenu',\r
@@ -4436,31 +4686,33 @@ selector();
                                                }\r
                                                echo '</ul>';\r
                                        }\r
-                                       \r
-                               } else {\r
 \r
-                                               echo '<h2>', _QMENU_INTRO, '</h2>', _QMENU_INTRO_TEXT;\r
-                                               \r
+                               } else if (($action == 'activate') || ($action == 'activatesetpwd')) {\r
+\r
+                                       echo '<h2>', _QMENU_ACTIVATE, '</h2>', _QMENU_ACTIVATE_TEXT;\r
+                               } else {\r
+                                       // introduction text on login screen\r
+                                       echo '<h2>', _QMENU_INTRO, '</h2>', _QMENU_INTRO_TEXT;\r
                                }\r
                                ?>\r
                        </div>\r
-                       \r
+\r
                        <!-- content / quickmenu container -->\r
-                       </div>\r
-                       \r
-               \r
+                       </div>\r
+\r
+\r
                        </body>\r
                        </html>\r
                <?php   }\r
-       \r
-       \r
+\r
+\r
        function action_regfile() {\r
                global $member, $CONF;\r
-               \r
+\r
                $blogid = intRequestVar('blogid');\r
-               \r
+\r
                $member->teamRights($blogid) or $this->disallow();\r
-               \r
+\r
                // header-code stolen from phpMyAdmin\r
                // REGEDIT and bookmarklet code stolen from GreyMatter\r
 \r
@@ -4470,36 +4722,36 @@ selector();
                header('Content-Type: application/octetstream');\r
                header('Content-Disposition: filename="nucleus.reg"');\r
                header('Pragma: no-cache');\r
-               header('Expires: 0');           \r
-               \r
+               header('Expires: 0');\r
+\r
                echo "REGEDIT4\n";\r
                echo "[HKEY_CURRENT_USER\\Software\\Microsoft\\Internet Explorer\\MenuExt\\Post To &Nucleus (".$sjisBlogName.")]\n";\r
                echo '@="' . $CONF['AdminURL'] . "bookmarklet.php?action=contextmenucode&blogid=".intval($blogid)."\"\n";\r
-               echo '"contexts"=hex:31';               \r
+               echo '"contexts"=hex:31';\r
        }\r
-       \r
+\r
        function action_bookmarklet() {\r
                global $member, $manager;\r
-               \r
+\r
                $blogid = intRequestVar('blogid');\r
-               \r
+\r
                $member->teamRights($blogid) or $this->disallow();\r
-               \r
+\r
                $blog =& $manager->getBlog($blogid);\r
                $bm = getBookmarklet($blogid);\r
-               \r
+\r
                $this->pagehead();\r
 \r
                echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';\r
-               \r
+\r
                ?>\r
-               \r
+\r
                <h2>Bookmarklet<!-- and Right Click Menu --></h2>\r
-               \r
+\r
                <p>\r
                Bookmarklet とは、クリック1回で記事の投稿ができるシステムです。 この Bookmarklet をインストールすると、ブラウザのツールバーの'add to weblog'ボタンが利用可能となり、Nucleusの新規アイテムの追加ウィンドウがポップアップします。任意のWebページを開いた状態でこのボタンを押せば、そのWebページのタイトルと、そのページへのリンクタグがすでに埋め込まれた状態でアイテム追加ウィンドウが開き、さらに、そのページ内に引用したい文を選択した状態であればその引用文も自動的に引用します。\r
                </p>\r
-               \r
+\r
                <h3>Bookmarklet</h3>\r
                <p>\r
                        下のリンク部分を「お気に入り」もしくはツールバーにドラッグできます。<small>(その前にテストしてみたい場合は単純に下のリンクをクリックしてみてください)</small>\r
@@ -4507,16 +4759,20 @@ selector();
                        <br />\r
                        <a href="<?php echo htmlspecialchars($bm)?>">Add to <?php echo $blog->getShortName()?></a> (ほとんどのブラウザで動作します)\r
                </p>\r
-               \r
+\r
                <h3>右クリックメニューにインストール (WindowsでIE使用時)</h3>\r
                <p>\r
-                       あるいは<a href="index.php?action=regfile&amp;blogid=<?php echo $blogid?>">右クリックメニュー</a>にインストールすることもできます (「開く」を選択すれば直接レジストリに登録します)\r
+                       <?php\r
+                               $url = 'index.php?action=regfile&blogid=' . intval($blogid);\r
+                               $url = $manager->addTicketToUrl($url);\r
+                       ?>\r
+                       あるいは<a href="<?php echo htmlspecialchars($url) ?>">右クリックメニュー</a>にインストールすることもできます (「開く」を選択すれば直接レジストリに登録します)\r
                </p>\r
-               \r
+\r
                <p>\r
-                       このインストールした右クリックメニューを表示するためにはIEの再起動が必要です\r
+                       このインストールした右クリックメニューを表示するためにはIEの再起動が必要です\r
                </p>\r
-               \r
+\r
                <h3>アンインストール</h3>\r
                <p>\r
                        「お気に入り」もしくはツールバーから消すには、単に削除するだけです。\r
@@ -4525,7 +4781,7 @@ selector();
                <p>\r
                        右クリックメニューから消したい時は、以下の手順を踏んでください:\r
                </p>\r
-               \r
+\r
                <ol>\r
                        <li>スタートメニューから「ファイルを指定して実行...」を選択</li>\r
                        <li>"regedit" と入力</li>\r
@@ -4536,29 +4792,31 @@ selector();
 \r
                <?php\r
                $this->pagefoot();\r
-               \r
+\r
        }\r
 \r
 \r
        function action_actionlog() {\r
-               global $member;\r
-               \r
+               global $member, $manager;\r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $this->pagehead();\r
-               \r
-               echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';                \r
-               \r
+\r
+               echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';\r
+\r
+               $url = $manager->addTicketToUrl('index.php?action=clearactionlog');\r
+\r
                ?>\r
                        <h2><?php echo _ACTIONLOG_CLEAR_TITLE?></h2>\r
-                       <p><a href="index.php?action=clearactionlog"><?php echo _ACTIONLOG_CLEAR_TEXT?></a></p>\r
+                       <p><a href="<?php echo htmlspecialchars($url)?>"><?php echo _ACTIONLOG_CLEAR_TEXT?></a></p>\r
                <?php\r
                echo '<h2>' . _ACTIONLOG_TITLE . '</h2>';\r
-               \r
+\r
                $query =  'SELECT * FROM '.sql_table('actionlog').' ORDER BY timestamp DESC';\r
                $template['content'] = 'actionlist';\r
                $amount = showlist($query,'table',$template);\r
-               \r
+\r
                $this->pagefoot();\r
 \r
        }\r
@@ -4566,30 +4824,30 @@ selector();
 \r
        function action_banlist() {\r
                global $member, $manager;\r
-               \r
+\r
                $blogid = intRequestVar('blogid');\r
-               \r
+\r
                $member->blogAdminRights($blogid) or $this->disallow();\r
-               \r
+\r
                $blog =& $manager->getBlog($blogid);\r
-               \r
+\r
                $this->pagehead();\r
 \r
-               echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';          \r
-               \r
+               echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';\r
+\r
                echo '<h2>' . _BAN_TITLE . " '". $this->bloglink($blog) ."'</h2>";\r
-               \r
+\r
                $query =  'SELECT * FROM '.sql_table('ban').' WHERE blogid='.$blogid.' ORDER BY iprange';\r
                $template['content'] = 'banlist';\r
                $amount = showlist($query,'table',$template);\r
-               \r
+\r
                if ($amount == 0)\r
                        echo _BAN_NONE;\r
-                       \r
+\r
                echo '<h2>'._BAN_NEW_TITLE.'</h2>';\r
                echo "<p><a href='index.php?action=banlistnew&amp;blogid=$blogid'>"._BAN_NEW_TEXT."</a></p>";\r
-               \r
-               \r
+\r
+\r
                $this->pagefoot();\r
 \r
        }\r
@@ -4597,57 +4855,58 @@ selector();
 \r
        function action_banlistdelete() {\r
                global $member, $manager;\r
-               \r
-               $blogid = intRequestVar('blogid');              \r
-               $iprange = requestVar('iprange');               \r
-               \r
+\r
+               $blogid = intRequestVar('blogid');\r
+               $iprange = requestVar('iprange');\r
+\r
                $member->blogAdminRights($blogid) or $this->disallow();\r
-               \r
+\r
                $blog =& $manager->getBlog($blogid);\r
-               \r
+\r
                $this->pagehead();\r
                ?>\r
                        <h2><?php echo _BAN_REMOVE_TITLE?></h2>\r
-                       \r
+\r
                        <form method="post" action="index.php">\r
-                       \r
+\r
                        <h3><?php echo _BAN_IPRANGE?></h3>\r
-                       \r
+\r
                        <p>\r
                                <?php echo _CONFIRMTXT_BAN?> <?php echo htmlspecialchars($iprange) ?>\r
                                <input name="iprange" type="hidden" value="<?php echo htmlspecialchars($iprange)?>" />\r
                        </p>\r
-                       \r
+\r
                        <h3><?php echo _BAN_BLOGS?></h3>\r
-                       \r
+\r
                        <div>\r
                                <input type="hidden" name="blogid" value="<?php echo $blogid?>" />\r
                                <input name="allblogs" type="radio" value="0" id="allblogs_one" /><label for="allblogs_one">Only blog '<?php echo htmlspecialchars($blog->getName())?>'</label>\r
                                <br />\r
                                <input name="allblogs" type="radio" value="1" checked="checked" id="allblogs_all" /><label for="allblogs_all"><?php echo _BAN_ALLBLOGS?></label>\r
                        </div>\r
-                       \r
+\r
                        <h3><?php echo _BAN_DELETE_TITLE?></h3>\r
-                       \r
+\r
                        <div>\r
+                               <?php $manager->addTicketHidden() ?>\r
                                <input type="hidden" name="action" value="banlistdeleteconfirm" />\r
                                <input type="submit" value="<?php echo _DELETE_CONFIRM_BTN?>" />\r
                        </div>\r
-                       \r
+\r
                        </form>\r
-               <?php           \r
+               <?php\r
                $this->pagefoot();\r
        }\r
 \r
        function action_banlistdeleteconfirm() {\r
                global $member, $manager;\r
-               \r
+\r
                $blogid = intPostVar('blogid');\r
                $allblogs = postVar('allblogs');\r
                $iprange = postVar('iprange');\r
-               \r
+\r
                $member->blogAdminRights($blogid) or $this->disallow();\r
-               \r
+\r
                $deleted = array();\r
 \r
                if (!$allblogs) {\r
@@ -4662,59 +4921,59 @@ selector();
                        }\r
                }\r
 \r
-               if (sizeof($deleted) == 0) \r
-                       $this->error(_ERROR_DELETEBAN);         \r
+               if (sizeof($deleted) == 0)\r
+                       $this->error(_ERROR_DELETEBAN);\r
 \r
                $this->pagehead();\r
-               \r
+\r
                echo '<a href="index.php?action=banlist&amp;blogid=',$blogid,'">(',_BACK,')</a>';\r
                echo '<h2>'._BAN_REMOVED_TITLE.'</h2>';\r
                echo "<p>"._BAN_REMOVED_TEXT."</p>";\r
-               \r
+\r
                echo "<ul>";\r
                foreach ($deleted as $delblog) {\r
                        $b =& $manager->getBlog($delblog);\r
                        echo "<li>" . htmlspecialchars($b->getName()). "</li>";\r
                }\r
                echo "</ul>";\r
-               \r
+\r
                $this->pagefoot();\r
 \r
        }\r
-       \r
+\r
        function action_banlistnewfromitem() {\r
                $this->action_banlistnew(getBlogIDFromItemID(intRequestVar('itemid')));\r
        }\r
-       \r
+\r
        function action_banlistnew($blogid = '') {\r
                global $member, $manager;\r
-               \r
+\r
                if ($blogid == '')\r
                        $blogid = intRequestVar('blogid');\r
-               \r
+\r
                $ip = requestVar('ip');\r
-               \r
+\r
                $member->blogAdminRights($blogid) or $this->disallow();\r
-               \r
+\r
                $blog =& $manager->getBlog($blogid);\r
-               \r
+\r
                $this->pagehead();\r
                ?>\r
                <h2><?php echo _BAN_ADD_TITLE?></h2>\r
-               \r
-               \r
+\r
+\r
                <form method="post" action="index.php">\r
-               \r
+\r
                <h3><?php echo _BAN_IPRANGE?></h3>\r
-               \r
+\r
                <p><?php echo _BAN_IPRANGE_TEXT?></p>\r
-               \r
+\r
                <div class="note">\r
                <b>An example</b>: "134.58.253.193" will only block one computer, while "134.58.253" will block 256 IP addresses, including the one from the first example.\r
                </div>\r
-               \r
+\r
                <div>\r
-               <?php                   if ($ip) { \r
+               <?php                   if ($ip) {\r
                ?>\r
                        <input name="iprange" type="radio" value="<?php echo htmlspecialchars($ip)?>" checked="checked" id="ip_fixed" /><label for="ip_fixed"><?php echo htmlspecialchars($ip)?></label>\r
                        <br />\r
@@ -4725,50 +4984,51 @@ selector();
                        }\r
                ?>\r
                </div>\r
-               \r
+\r
                <h3><?php echo _BAN_BLOGS?></h3>\r
 \r
                <p><?php echo _BAN_BLOGS_TEXT?></p>\r
 \r
-               <div>           \r
+               <div>\r
                        <input type="hidden" name="blogid" value="<?php echo $blogid?>" />\r
                        <input name="allblogs" type="radio" value="0" id="allblogs_one" /><label for="allblogs_one">'<?php echo htmlspecialchars($blog->getName())?>'</label>\r
                        <br />\r
                        <input name="allblogs" type="radio" value="1" checked="checked" id="allblogs_all" /><label for="allblogs_all"><?php echo _BAN_ALLBLOGS?></label>\r
                </div>\r
-               \r
+\r
                <h3><?php echo _BAN_REASON_TITLE?></h3>\r
 \r
                <p><?php echo _BAN_REASON_TEXT?></p>\r
-               \r
+\r
                <div><textarea name="reason" cols="40" rows="5"></textarea></div>\r
 \r
                <h3><?php echo _BAN_ADD_TITLE?></h3>\r
-               \r
+\r
                <div>\r
                        <input name="action" type="hidden" value="banlistadd" />\r
+                       <?php $manager->addTicketHidden() ?>\r
                        <input type="submit" value="<?php echo _BAN_ADD_BTN?>" />\r
                </div>\r
-               \r
+\r
                </form>\r
-               \r
+\r
                <?php           $this->pagefoot();\r
        }\r
-       \r
+\r
        function action_banlistadd() {\r
                global $member;\r
-               \r
+\r
                $blogid =               intPostVar('blogid');\r
                $allblogs =     postVar('allblogs');\r
                $iprange =              postVar('iprange');\r
                if ($iprange == "custom")\r
                        $iprange = postVar('customiprange');\r
                $reason =               postVar('reason');\r
-               \r
+\r
                $member->blogAdminRights($blogid) or $this->disallow();\r
-               \r
+\r
                // TODO: check IP range validity\r
-               \r
+\r
                if (!$allblogs) {\r
                        if (!BAN::addBan($blogid, $iprange, $reason))\r
                                $this->error(_ERROR_ADDBAN);\r
@@ -4783,61 +5043,63 @@ selector();
                        if ($failed)\r
                                $this->error(_ERROR_ADDBAN);\r
                }\r
-               \r
+\r
                $this->action_banlist();\r
-               \r
+\r
        }\r
-       \r
+\r
        function action_clearactionlog() {\r
                global $member;\r
-               \r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                ACTIONLOG::clear();\r
-               \r
+\r
                $this->action_manage(_MSG_ACTIONLOGCLEARED);\r
        }\r
-       \r
+\r
        function action_backupoverview() {\r
-               global $member;\r
-               \r
+               global $member, $manager;\r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $this->pagehead();\r
 \r
-               echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';                                \r
+               echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';\r
                ?>\r
                <h2><?php echo _BACKUPS_TITLE?></h2>\r
-               \r
+\r
                <h3><?php echo _BACKUP_TITLE?></h3>\r
-               \r
+\r
                <p><?php echo _BACKUP_INTRO?></p>\r
-               \r
+\r
                <form method="post" action="index.php"><p>\r
                <input type="hidden" name="action" value="backupcreate" />\r
+               <?php $manager->addTicketHidden() ?>\r
 \r
                <input type="radio" name="gzip" value="1" checked="checked" id="gzip_yes" tabindex="10" /><label for="gzip_yes"><?php echo _BACKUP_ZIP_YES?></label>\r
                <br />\r
                <input type="radio" name="gzip" value="0" id="gzip_no" tabindex="10" /><label for="gzip_no" ><?php echo _BACKUP_ZIP_NO?></label>\r
                <br /><br />\r
                <input type="submit" value="<?php echo _BACKUP_BTN?>" tabindex="20" />\r
-               \r
+\r
                </p></form>\r
-               \r
+\r
                <div class="note"><?php echo _BACKUP_NOTE?></div>\r
 \r
-       \r
+\r
                <h3><?php echo _RESTORE_TITLE?></h3>\r
-               \r
+\r
                <div class="note"><?php echo _RESTORE_NOTE?></div>\r
-               \r
+\r
                <p><?php echo _RESTORE_INTRO?></p>\r
-               \r
+\r
                <form method="post" action="index.php" enctype="multipart/form-data"><p>\r
                        <input type="hidden" name="action" value="backuprestore" />\r
+                       <?php $manager->addTicketHidden() ?>\r
                        <input name="backup_file" type="file" tabindex="30" />\r
                        <br /><br />\r
-                       <input type="submit" value="<?php echo _RESTORE_BTN?>" tabindex="40" />         \r
+                       <input type="submit" value="<?php echo _RESTORE_BTN?>" tabindex="40" />\r
                        <br /><input type="checkbox" name="letsgo" value="1" id="letsgo" tabindex="50" /><label for="letsgo"><?php echo _RESTORE_IMSURE?></label>\r
                        <br /><?php echo _RESTORE_WARNING?>\r
                </p></form>\r
@@ -4847,18 +5109,18 @@ selector();
 \r
        function action_backupcreate() {\r
                global $member, $DIR_LIBS;\r
-               \r
+\r
                $member->isAdmin() or $this->disallow();\r
 \r
                // use compression ?\r
                $useGzip = intval(postVar('gzip'));\r
-               \r
+\r
                include($DIR_LIBS . 'backup.php');\r
-               \r
-               // try to extend time limit \r
+\r
+               // try to extend time limit\r
                // (creating/restoring dumps might take a while)\r
                @set_time_limit(1200);\r
-               \r
+\r
                do_backup($useGzip);\r
                exit;\r
        }\r
@@ -4866,61 +5128,62 @@ selector();
 \r
        function action_backuprestore() {\r
                global $member, $DIR_LIBS;\r
-               \r
+\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                if (intPostVar('letsgo') != 1)\r
                        $this->error(_ERROR_BACKUP_NOTSURE);\r
 \r
                include($DIR_LIBS . 'backup.php');\r
-               \r
-               // try to extend time limit \r
+\r
+               // try to extend time limit\r
                // (creating/restoring dumps might take a while)\r
                @set_time_limit(1200);\r
-               \r
+\r
                $message = do_restore();\r
                if ($message != '')\r
                        $this->error($message);\r
-                       \r
+\r
                $this->pagehead();\r
                ?>\r
                <h2><?php echo _RESTORE_COMPLETE?></h2>\r
                <?php           $this->pagefoot();\r
 \r
        }\r
-       \r
+\r
 \r
        function action_pluginlist() {\r
-               global $member;\r
-               \r
+               global $member, $manager;\r
+\r
                // check if allowed\r
                $member->isAdmin() or $this->disallow();\r
-       \r
+\r
                $this->pagehead();\r
-               \r
-               echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';                \r
-               \r
+\r
+               echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';\r
+\r
                echo '<h2>' , _PLUGS_TITLE_MANAGE , ' ', help('plugins'), '</h2>';\r
-               \r
+\r
                echo '<h3>' , _PLUGS_TITLE_INSTALLED , '</h3>';\r
-               \r
-               \r
+\r
+\r
                $query =  'SELECT * FROM '.sql_table('plugin').' ORDER BY porder ASC';\r
 \r
                $template['content'] = 'pluginlist';\r
                $template['tabindex'] = 10;\r
                showlist($query, 'table', $template);\r
-       \r
+\r
                ?>\r
                        <h3><?php echo _PLUGS_TITLE_UPDATE?></h3>\r
-                       \r
+\r
                        <p><?php echo _PLUGS_TEXT_UPDATE?></p>\r
-                       \r
+\r
                        <form method="post" action="index.php"><div>\r
                                <input type="hidden" name="action" value="pluginupdate" />\r
+                               <?php $manager->addTicketHidden() ?>\r
                                <input type="submit" value="<?php echo _PLUGS_BTN_UPDATE ?>" tabindex="20" />\r
                        </div></form>\r
-                       \r
+\r
                        <h3><?php echo _PLUGS_TITLE_NEW?></h3>\r
 \r
                        <?php                           // find a list of possibly non-installed plugins\r
@@ -4936,15 +5199,16 @@ selector();
                                        }\r
                                }\r
                                closedir($dirhandle);\r
-                               \r
+\r
                                if (sizeof($candidates) > 0) {\r
                        ?>\r
 \r
                        <p><?php echo _PLUGS_ADD_TEXT?></p>\r
-                       \r
+\r
 \r
                        <form method='post' action='index.php'><div>\r
                                <input type='hidden' name='action' value='pluginadd' />\r
+                               <?php $manager->addTicketHidden() ?>\r
                                <select name="filename" tabindex="30">\r
                                <?php                                   foreach($candidates as $name)\r
                                                echo '<option value="NP_',$name,'">',htmlspecialchars($name),'</option>';\r
@@ -4956,96 +5220,146 @@ selector();
                <?php                   } else {        // sizeof(candidates) == 0\r
                                echo '<p>',_PLUGS_NOCANDIDATES,'</p>';\r
                        }\r
-               \r
+\r
+               $this->pagefoot();\r
+       }\r
+\r
+       function action_pluginhelp() {\r
+               global $member, $manager, $DIR_PLUGINS, $CONF;\r
+\r
+               // check if allowed\r
+               $member->isAdmin() or $this->disallow();\r
+\r
+               $plugid = intGetVar('plugid');\r
+\r
+               if (!$manager->pidInstalled($plugid))\r
+                       $this->error(_ERROR_NOSUCHPLUGIN);\r
+\r
+               $plugName = getPluginNameFromPid($plugid);\r
+\r
+               $this->pagehead();\r
+\r
+               echo '<p><a href="index.php?action=pluginlist">(',_PLUGS_BACK,')</a></p>';\r
+\r
+               echo '<h2>',_PLUGS_HELP_TITLE,': ',htmlspecialchars($plugName),'</h2>';\r
+\r
+               $plug =& $manager->getPlugin($plugName);\r
+               $helpFile = $DIR_PLUGINS.$plug->getShortName().'/help.html';\r
+\r
+               if (($plug->supportsFeature('HelpPage') > 0) && (@file_exists($helpFile))) {\r
+                       @readfile($helpFile);\r
+               } else {\r
+                       echo '<p>Error: ', _ERROR_PLUGNOHELPFILE,'</p>';\r
+                       echo '<p><a href="index.php?action=pluginlist">(',_BACK,')</a></p>';\r
+               }\r
+\r
+\r
                $this->pagefoot();\r
        }\r
-       \r
-       \r
+\r
+\r
        function action_pluginadd() {\r
                global $member, $manager, $DIR_PLUGINS;\r
-               \r
+\r
                // check if allowed\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $name = postVar('filename');\r
-               \r
+\r
                if ($manager->pluginInstalled($name))\r
                        $this->error(_ERROR_DUPPLUGIN);\r
                if (!checkPlugin($name))\r
                        $this->error(_ERROR_PLUGFILEERROR . ' (' . $name . ')');\r
-               \r
+\r
+               // check if the plugin dependency is met\r
+               $plugin =& $manager->getPlugin($name);\r
+               $pluginList = $plugin->getPluginDep();\r
+               foreach ($pluginList as $pluginName)\r
+               {\r
+\r
+                       $res = sql_query('SELECT * FROM '.sql_table('plugin') . ' WHERE pfile="' . $pluginName . '"');\r
+                       if (mysql_num_rows($res) == 0)\r
+                       {\r
+                               // uninstall plugin again...\r
+                               $this->deleteOnePlugin($plugin->getID());\r
+\r
+                               $this->error(_ERROR_INSREQPLUGIN . $pluginName);\r
+                       }\r
+               }\r
+\r
                // get number of currently installed plugins\r
                $numCurrent = mysql_num_rows(sql_query('SELECT * FROM '.sql_table('plugin')));\r
 \r
                // plugin will be added as last one in the list\r
                $newOrder = $numCurrent + 1;\r
-               \r
+\r
                $manager->notify(\r
                        'PreAddPlugin',\r
                        array(\r
                                'file' => &$name\r
                        )\r
                );\r
-               \r
+\r
                // do this before calling getPlugin (in case the plugin id is used there)\r
                $query = 'INSERT INTO '.sql_table('plugin').' (porder, pfile) VALUES ('.$newOrder.',"'.addslashes($name).'")';\r
                sql_query($query);\r
                $iPid = mysql_insert_id();\r
 \r
+               // need to update the plugin object's pid since we didn't have it above when it's first create....\r
+               $plugin->plugid = $iPid;\r
+\r
                $manager->clearCachedInfo('installedPlugins');\r
 \r
                // call the install method of the plugin\r
-               $plugin =& $manager->getPlugin($name);\r
-               \r
                if (!$plugin)\r
                {\r
                        sql_query('DELETE FROM ' . sql_table('plugin') . ' WHERE pid='. intval($iPid));\r
                        $manager->clearCachedInfo('installedPlugins');\r
                        $this->error('Plugin could not be loaded, or does not support certain features that are required for it to run on your Nucleus installation (you might want to check the <a href="?action=actionlog">actionlog</a> for more info)');\r
                }\r
-               \r
+\r
                // check if plugin needs a newer Nucleus version\r
                if (getNucleusVersion() < $plugin->getMinNucleusVersion())\r
                {\r
                        // uninstall plugin again...\r
                        $this->deleteOnePlugin($plugin->getID());\r
-                       \r
+\r
                        // ...and show error\r
                        $this->error(_ERROR_NUCLEUSVERSIONREQ . $plugin->getMinNucleusVersion());\r
                }\r
-               \r
+\r
                // check if plugin needs a newer Nucleus version\r
                if ((getNucleusVersion() == $plugin->getMinNucleusVersion()) && (getNucleusPatchLevel() < $plugin->getMinNucleusPatchLevel()))\r
                {\r
                        // uninstall plugin again...\r
                        $this->deleteOnePlugin($plugin->getID());\r
-                       \r
+\r
                        // ...and show error\r
                        $this->error(_ERROR_NUCLEUSVERSIONREQ . $plugin->getMinNucleusVersion() . ' patch ' . $plugin->getMinNucleusPatchLevel());\r
                }\r
-               \r
+\r
                $plugin->install();\r
-               \r
+\r
                $manager->notify(\r
                        'PostAddPlugin',\r
                        array(\r
                                'plugin' => &$plugin\r
                        )\r
-               );              \r
-               \r
+               );\r
+\r
                // update all events\r
                $this->action_pluginupdate();\r
        }\r
-       \r
+\r
        function action_pluginupdate() {\r
                global $member, $manager;\r
-               \r
+\r
                // check if allowed\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                // delete everything from plugin_events\r
                sql_query('DELETE FROM '.sql_table('plugin_event'));\r
-               \r
+\r
                // loop over all installed plugins\r
                $res = sql_query('SELECT pid, pfile FROM '.sql_table('plugin'));\r
                while($o = mysql_fetch_object($res)) {\r
@@ -5054,47 +5368,48 @@ selector();
                        if ($plug)\r
                        {\r
                                $eventList = $plug->getEventList();\r
-                               foreach ($eventList as $eventName) \r
+                               foreach ($eventList as $eventName)\r
                                        sql_query('INSERT INTO '.sql_table('plugin_event').' (pid, event) VALUES ('.$pid.', \''.addslashes($eventName).'\')');\r
                        }\r
                }\r
-               \r
+\r
                $this->action_pluginlist();\r
        }\r
-       \r
+\r
        function action_plugindelete() {\r
                global $member, $manager;\r
-               \r
+\r
                // check if allowed\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $pid = intGetVar('plugid');\r
-               \r
+\r
                if (!$manager->pidInstalled($pid))\r
                        $this->error(_ERROR_NOSUCHPLUGIN);\r
-                       \r
+\r
                $this->pagehead();\r
                ?>\r
                        <h2><?php echo _DELETE_CONFIRM?></h2>\r
-                       \r
+\r
                        <p><?php echo _CONFIRMTXT_PLUGIN?> <strong><?php echo getPluginNameFromPid($pid)?></strong>?</p>\r
-                       \r
+\r
                        <form method="post" action="index.php"><div>\r
+                       <?php $manager->addTicketHidden() ?>\r
                        <input type="hidden" name="action" value="plugindeleteconfirm" />\r
                        <input type="hidden" name="plugid" value="<?php echo $pid; ?>" />\r
                        <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />\r
                        </div></form>\r
                <?php           $this->pagefoot();\r
        }\r
-       \r
+\r
        function action_plugindeleteconfirm() {\r
                global $member, $manager;\r
-               \r
+\r
                // check if allowed\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $pid = intPostVar('plugid');\r
-               \r
+\r
                $error = $this->deleteOnePlugin($pid, 1);\r
                if ($error) {\r
                        $this->error($error);\r
@@ -5102,27 +5417,45 @@ selector();
 \r
                $this->action_pluginlist();\r
        }\r
-       \r
+\r
        function deleteOnePlugin($pid, $callUninstall = 0) {\r
                global $manager;\r
-               \r
+\r
                $pid = intval($pid);\r
-               \r
+\r
                if (!$manager->pidInstalled($pid))\r
                        return _ERROR_NOSUCHPLUGIN;\r
-                       \r
+\r
+               $name = quickQuery('SELECT pfile as result FROM '.sql_table('plugin').' WHERE pid='.$pid);\r
+\r
                // call the unInstall method of the plugin\r
                if ($callUninstall) {\r
-                       $name = quickQuery('SELECT pfile as result FROM '.sql_table('plugin').' WHERE pid='.$pid);\r
                        $plugin =& $manager->getPlugin($name);\r
                        if ($plugin) $plugin->unInstall();\r
                }\r
 \r
-               $manager->notify('PreDeletePlugin', array('plugid' => $pid));   \r
-               \r
+               // check dependency before delete\r
+               $res = sql_query('SELECT pfile FROM '.sql_table('plugin'));\r
+               while($o = mysql_fetch_object($res)) {\r
+                       $plug =& $manager->getPlugin($o->pfile);\r
+                       if ($plug)\r
+                       {\r
+                               $depList = $plug->getPluginDep();\r
+                               foreach ($depList as $depName)\r
+                               {\r
+                                       if ($name == $depName)\r
+                                       {\r
+                                               return _ERROR_DELREQPLUGIN . $o->pfile;\r
+                                       }\r
+                               }\r
+                       }\r
+               }\r
+\r
+               $manager->notify('PreDeletePlugin', array('plugid' => $pid));\r
+\r
                // delete all subscriptions\r
                sql_query('DELETE FROM '.sql_table('plugin_event').' WHERE pid=' . $pid);\r
-               \r
+\r
                // delete all options\r
                // get OIDs from plugin_option_desc\r
                $res = sql_query('SELECT oid FROM ' . sql_table('plugin_option_desc') . ' WHERE opid=' . $pid);\r
@@ -5130,91 +5463,92 @@ selector();
                while ($o = mysql_fetch_object($res)) {\r
                        array_push($aOIDs, $o->oid);\r
                }\r
-               \r
+\r
                // delete from plugin_option and plugin_option_desc\r
                sql_query('DELETE FROM '.sql_table('plugin_option_desc').' WHERE opid=' . $pid);\r
                if (count($aOIDs) > 0)\r
-                       sql_query('DELETE FROM '.sql_table('plugin_option').' WHERE oid in ('.implode(',',$aOIDs).')');         \r
-               \r
+                       sql_query('DELETE FROM '.sql_table('plugin_option').' WHERE oid in ('.implode(',',$aOIDs).')');\r
+\r
                // update order numbers\r
                $o = mysql_fetch_object(sql_query('SELECT porder FROM '.sql_table('plugin').' WHERE pid=' . $pid));\r
                sql_query('UPDATE '.sql_table('plugin').' SET porder=(porder - 1) WHERE porder>'.$o->porder);\r
-               \r
+\r
                // delete row\r
                sql_query('DELETE FROM '.sql_table('plugin').' WHERE pid='.$pid);\r
-               \r
+\r
                $manager->clearCachedInfo('installedPlugins');\r
-               $manager->notify('PostDeletePlugin', array('plugid' => $pid));                  \r
-               \r
+               $manager->notify('PostDeletePlugin', array('plugid' => $pid));\r
+\r
                return '';\r
        }\r
-       \r
+\r
        function action_pluginup() {\r
                global $member, $manager;\r
-               \r
+\r
                // check if allowed\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $plugid = intGetVar('plugid');\r
 \r
                if (!$manager->pidInstalled($plugid))\r
                        $this->error(_ERROR_NOSUCHPLUGIN);\r
-                       \r
+\r
                // 1. get old order number\r
                $o = mysql_fetch_object(sql_query('SELECT porder FROM '.sql_table('plugin').' WHERE pid='.$plugid));\r
                $oldOrder = $o->porder;\r
-                               \r
+\r
                // 2. calculate new order number\r
                $newOrder = ($oldOrder > 1) ? ($oldOrder - 1) : 1;\r
-               \r
+\r
                // 3. update plug numbers\r
-               sql_query('UPDATE '.sql_table('plugin').' SET porder='.$oldOrder.' WHERE porder='.$newOrder);           \r
-               sql_query('UPDATE '.sql_table('plugin').' SET porder='.$newOrder.' WHERE pid='.$plugid);                \r
-               \r
+               sql_query('UPDATE '.sql_table('plugin').' SET porder='.$oldOrder.' WHERE porder='.$newOrder);\r
+               sql_query('UPDATE '.sql_table('plugin').' SET porder='.$newOrder.' WHERE pid='.$plugid);\r
+\r
                $this->action_pluginlist();\r
        }\r
 \r
        function action_plugindown() {\r
                global $member, $manager;\r
-               \r
+\r
                // check if allowed\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $plugid = intGetVar('plugid');\r
                if (!$manager->pidInstalled($plugid))\r
                        $this->error(_ERROR_NOSUCHPLUGIN);\r
-                       \r
+\r
                // 1. get old order number\r
                $o = mysql_fetch_object(sql_query('SELECT porder FROM '.sql_table('plugin').' WHERE pid='.$plugid));\r
                $oldOrder = $o->porder;\r
-               \r
+\r
                $maxOrder = mysql_num_rows(sql_query('SELECT * FROM '.sql_table('plugin')));\r
-                               \r
+\r
                // 2. calculate new order number\r
                $newOrder = ($oldOrder < $maxOrder) ? ($oldOrder + 1) : $maxOrder;\r
-               \r
+\r
                // 3. update plug numbers\r
-               sql_query('UPDATE '.sql_table('plugin').' SET porder='.$oldOrder.' WHERE porder='.$newOrder);           \r
-               sql_query('UPDATE '.sql_table('plugin').' SET porder='.$newOrder.' WHERE pid='.$plugid);                \r
-               \r
+               sql_query('UPDATE '.sql_table('plugin').' SET porder='.$oldOrder.' WHERE porder='.$newOrder);\r
+               sql_query('UPDATE '.sql_table('plugin').' SET porder='.$newOrder.' WHERE pid='.$plugid);\r
+\r
                $this->action_pluginlist();\r
        }\r
-       \r
+\r
        function action_pluginoptions($message = '') {\r
                global $member, $manager;\r
 \r
                // check if allowed\r
                $member->isAdmin() or $this->disallow();\r
-               \r
+\r
                $pid = intRequestVar('plugid');\r
                if (!$manager->pidInstalled($pid))\r
                        $this->error(_ERROR_NOSUCHPLUGIN);\r
 \r
-               $this->pagehead();\r
+               $extrahead = '<script type="text/javascript" src="javascript/numbercheck.js"></script>';\r
+               $this->pagehead($extrahead);\r
 \r
                ?>\r
                        <p><a href="index.php?action=pluginlist">(<?php echo _PLUGS_BACK?>)</a></p>\r
-                       \r
+\r
                        <h2>Options for <?php echo htmlspecialchars(getPluginNameFromPid($pid))?></h2>\r
 \r
                        <?php if  ($message) echo $message?>\r
@@ -5222,10 +5556,13 @@ selector();
                        <form action="index.php" method="post">\r
                        <div>\r
                                <input type="hidden" name="action" value="pluginoptionsupdate" />\r
-                               <input type="hidden" name="plugid" value="<?php echo $pid?>" />                         \r
-               <?php           \r
+                               <input type="hidden" name="plugid" value="<?php echo $pid?>" />\r
+\r
+               <?php\r
+\r
+               $manager->addTicketHidden();\r
 \r
-               $aOptions = array(); \r
+               $aOptions = array();\r
                $aOIDs = array();\r
                $query = 'SELECT * FROM ' . sql_table('plugin_option_desc') . ' WHERE ocontext=\'global\' and opid=' . $pid . ' ORDER BY oid ASC';\r
                $r = sql_query($query);\r
@@ -5244,27 +5581,27 @@ selector();
                // fill out actual values\r
                if (count($aOIDs) > 0) {\r
                        $r = sql_query('SELECT oid, ovalue FROM ' . sql_table('plugin_option') . ' WHERE oid in ('.implode(',',$aOIDs).')');\r
-                       while ($o = mysql_fetch_object($r)) \r
+                       while ($o = mysql_fetch_object($r))\r
                                $aOptions[$o->oid]['value'] = $o->ovalue;\r
                }\r
-               \r
+\r
                // call plugins\r
                $manager->notify('PrePluginOptionsEdit',array('context' => 'global', 'plugid' => $pid, 'options'=>&$aOptions));\r
-               \r
+\r
                $template['content'] = 'plugoptionlist';\r
                $amount = showlist($aOptions,'table',$template);\r
                if ($amount == 0)\r
                        echo '<p>',_ERROR_NOPLUGOPTIONS,'</p>';\r
-               \r
+\r
                ?>\r
                        </div>\r
                        </form>\r
                <?php           $this->pagefoot();\r
-               \r
-               \r
-               \r
+\r
+\r
+\r
        }\r
-       \r
+\r
        function action_pluginoptionsupdate() {\r
                global $member, $manager;\r
 \r
@@ -5274,25 +5611,27 @@ selector();
                $pid = intRequestVar('plugid');\r
                if (!$manager->pidInstalled($pid))\r
                        $this->error(_ERROR_NOSUCHPLUGIN);\r
-                       \r
+\r
                $aOptions = requestArray('plugoption');\r
                NucleusPlugin::_applyPluginOptions($aOptions);\r
 \r
-               $manager->notify('PostPluginOptionsUpdate',array('context' => 'global', 'plugid' => $pid));             \r
-               \r
+               $manager->notify('PostPluginOptionsUpdate',array('context' => 'global', 'plugid' => $pid));\r
+\r
                $this->action_pluginoptions(_PLUGS_OPTIONS_UPDATED);\r
        }\r
-       \r
 \r
+       /**\r
+         * @static\r
+         */\r
        function _insertPluginOptions($context, $contextid = 0) {\r
-               // get all current values for this contextid \r
+               // get all current values for this contextid\r
                // (note: this might contain doubles for overlapping contextids)\r
                $aIdToValue = array();\r
                $res = sql_query('SELECT oid, ovalue FROM ' . sql_table('plugin_option') . ' WHERE ocontextid=' . intval($contextid));\r
                while ($o = mysql_fetch_object($res)) {\r
                        $aIdToValue[$o->oid] = $o->ovalue;\r
                }\r
-               \r
+\r
                // get list of oids per pid\r
                $query = 'SELECT * FROM ' . sql_table('plugin_option_desc') . ',' . sql_table('plugin')\r
                           . ' WHERE opid=pid and ocontext=\''.addslashes($context).'\' ORDER BY porder, oid ASC';\r
@@ -5313,14 +5652,15 @@ selector();
                                'description' => $o->odesc,\r
                                'type' => $o->otype,\r
                                'typeinfo' => $o->oextra,\r
-                               'contextid' => $contextid\r
+                               'contextid' => $contextid,\r
+                               'extra' => ''\r
                        ));\r
                }\r
-               \r
+\r
                global $manager;\r
                $manager->notify('PrePluginOptionsEdit',array('context' => $context, 'contextid' => $contextid, 'options'=>&$aOptions));\r
-       \r
-               \r
+\r
+\r
                $iPrevPid = -1;\r
                foreach ($aOptions as $aOption) {\r
 \r
@@ -5330,24 +5670,24 @@ selector();
 \r
                                echo '<tr><th colspan="2">Options for ', htmlspecialchars($aOption['pfile']),'</th></tr>';\r
                        }\r
-                               \r
+\r
                        echo '<tr>';\r
                        listplug_plugOptionRow($aOption);\r
                        echo '</tr>';\r
-       \r
+\r
                }\r
 \r
-       \r
+\r
        }\r
-       \r
+\r
        /* helper functions to create option forms etc. */\r
        function input_yesno($name, $checkedval,$tabindex = 0, $value1 = 1, $value2 = 0, $yesval = _YES, $noval = _NO) {\r
                $id = htmlspecialchars($name);\r
                $id = str_replace('[','-',$id);\r
-               $id = str_replace(']','-',$id);         \r
+               $id = str_replace(']','-',$id);\r
                $id1 = $id . htmlspecialchars($value1);\r
                $id2 = $id . htmlspecialchars($value2);\r
-               \r
+\r
                echo '<input type="radio" name="', htmlspecialchars($name),'" value="', htmlspecialchars($value1),'" ';\r
                        if ($checkedval == $value1)\r
                                echo "tabindex='$tabindex' checked='checked'";\r
@@ -5355,16 +5695,16 @@ selector();
                echo ' ';\r
                echo '<input type="radio" name="', htmlspecialchars($name),'" value="', htmlspecialchars($value2),'" ';\r
                        if ($checkedval != $value1)\r
-                               echo "tabindex='$tabindex' checked='checked'";                          \r
+                               echo "tabindex='$tabindex' checked='checked'";\r
                        echo ' id="'.$id2.'" /><label for="'.$id2.'">' . $noval . '</label>';\r
        }\r
 \r
 \r
-       \r
+\r
 } // class ADMIN\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
@@ -5381,7 +5721,7 @@ class ENCAPSULATE {
                // get list contents and stop buffering\r
                $list = ob_get_contents();\r
                ob_end_clean();\r
-               \r
+\r
                if ($nbOfRows > 0) {\r
                        $this->showHead();\r
                        echo $list;\r
@@ -5410,26 +5750,26 @@ class NAVLIST extends ENCAPSULATE {
                $this->search = $search;\r
                $this->itemid = $itemid;\r
        }\r
-       \r
+\r
        function showBatchList($batchtype, $query, $type, $template, $errorMessage = _LISTS_NOMORE) {\r
-               $batch = new BATCH($batchtype);\r
+               $batch =& new BATCH($batchtype);\r
 \r
                $this->doEncapsulate(\r
                                array(&$batch, 'showlist'),\r
                                array(&$query, $type, $template),\r
                                $errorMessage\r
                );\r
-       \r
+\r
        }\r
 \r
-       \r
+\r
        function showHead() {\r
                $this->showNavigation();\r
        }\r
        function showFoot() {\r
                $this->showNavigation();\r
        }\r
-       \r
+\r
        /**\r
          * Displays a next/prev bar for long tables\r
          */\r
@@ -5442,7 +5782,7 @@ class NAVLIST extends ENCAPSULATE {
                $blogid = $this->blogid;\r
                $search = $this->search;\r
                $itemid = $this->itemid;\r
-               \r
+\r
                $prev = $start - $amount;\r
                if ($prev < $minamount) $prev=$minamount;\r
 \r
@@ -5456,9 +5796,9 @@ class NAVLIST extends ENCAPSULATE {
        <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="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="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
@@ -5467,33 +5807,33 @@ class NAVLIST extends ENCAPSULATE {
        </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="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 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
+               <input type="submit" value="&gt; <?php echo _LISTS_CHANGE?>" />\r
                </div></form>\r
-       </td><td>       \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="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
+               <input type="submit" value="&gt; <?php echo  _LISTS_SEARCH?>" />\r
                </div></form>\r
-       </td><td>       \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="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="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
+               </div></form>\r
        </td></tr>\r
        </table>\r
        <?php   }\r
@@ -5502,20 +5842,20 @@ class NAVLIST extends ENCAPSULATE {
 }\r
 \r
 /**\r
- * A class used to encapsulate a list of some sort in a batch selection \r
+ * A class used to encapsulate a list of some sort in a batch selection\r
  */\r
 class BATCH extends ENCAPSULATE {\r
        function BATCH($type) {\r
                $this->type = $type;\r
        }\r
-       \r
+\r
        function showHead() {\r
                ?>\r
                        <form method="post" action="index.php">\r
                <?php\r
-// TODO: get a list op operations above the list too \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
+//             $this->showOperationList();\r
        }\r
 \r
        function showFoot() {\r
@@ -5525,6 +5865,7 @@ class BATCH extends ENCAPSULATE {
                <?php   }\r
 \r
        function showOperationList() {\r
+               global $manager;\r
                ?>\r
                <div class="batchoperations">\r
                        <?php echo _BATCH_WITH_SEL ?>\r
@@ -5537,7 +5878,7 @@ class BATCH extends ENCAPSULATE {
                                                        'move'          => _BATCH_ITEM_MOVE\r
                                                );\r
                                                break;\r
-                                       case 'member': \r
+                                       case 'member':\r
                                                $options = array(\r
                                                        'delete'        => _BATCH_MEMBER_DELETE,\r
                                                        'setadmin'      => _BATCH_MEMBER_SET_ADM,\r
@@ -5569,26 +5910,27 @@ class BATCH extends ENCAPSULATE {
                        ?>\r
                        </select>\r
                        <input type="hidden" name="action" value="batch<?php echo $this->type?>" />\r
-                       <?php                           // add hidden fields for 'team' and 'comment' batchlists\r
-                               if ($this->type == 'team') \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
+                               if ($this->type == 'comment')\r
                                {\r
                                        echo '<input type="hidden" name="itemid" value="',intRequestVar('itemid'),'" />';\r
                                }\r
-                               \r
-                       ?>\r
-                       \r
-                       <input type="submit" value="Execute" />\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
+\r
        // shortcut :)\r
        function showList($query, $type, $template, $errorMessage = _LISTS_NOMORE) {\r
                return $this->doEncapsulate(    'showlist',\r
@@ -5610,20 +5952,15 @@ function showlist($query, $type, $template) {
 \r
                call_user_func('listplug_' . $type, $template, 'HEAD');\r
 \r
-               // add extra row if needed\r
-               if ($template['extra']) {\r
-                       echo '<option value="',$template['extraval'],'">',$template['extra'],'</option>';\r
-               }\r
-\r
                foreach ($query as $currentObj) {\r
                        $template['current'] = $currentObj;\r
                        call_user_func('listplug_' . $type, $template, 'BODY');\r
                }\r
-               \r
+\r
                call_user_func('listplug_' . $type, $template, 'FOOT');\r
-               \r
+\r
                return sizeof($query);\r
-                       \r
+\r
        } else {\r
                $res = sql_query($query);\r
 \r
@@ -5634,12 +5971,7 @@ function showlist($query, $type, $template) {
 \r
                call_user_func('listplug_' . $type, $template, 'HEAD');\r
 \r
-               // add extra row if needed\r
-               if ($template['extra']) {\r
-                       echo '<option value="',$template['extraval'],'">',$template['extra'],'</option>';\r
-               }\r
-\r
-               while($template['current'] = mysql_fetch_object($res)) \r
+               while($template['current'] = mysql_fetch_object($res))\r
                        call_user_func('listplug_' . $type, $template, 'BODY');\r
 \r
                call_user_func('listplug_' . $type, $template, 'FOOT');\r
@@ -5655,6 +5987,12 @@ function listplug_select($template, $type) {
        switch($type) {\r
                case 'HEAD':\r
                        echo '<select name="'.$template['name'].'" tabindex="'.$template['tabindex'].'" '.$template['javascript'].'>';\r
+\r
+                       // add extra row if needed\r
+                       if ($template['extra']) {\r
+                               echo '<option value="',$template['extraval'],'">',$template['extra'],'</option>';\r
+                       }\r
+\r
                        break;\r
                case 'BODY':\r
                        $current = $template['current'];\r
@@ -5690,7 +6028,7 @@ function listplug_table($template, $type) {
                        echo "</tr>";\r
                        break;\r
                case 'FOOT':\r
-                       call_user_func("listplug_table_" . $template['content'] , $template,  'FOOT');          \r
+                       call_user_func("listplug_table_" . $template['content'] , $template,  'FOOT');\r
                        echo "</tbody></table>";\r
                        break;\r
        }\r
@@ -5700,16 +6038,16 @@ function listplug_table_memberlist($template, $type) {
        switch($type) {\r
                case 'HEAD':\r
                        echo '<th>' . _LIST_MEMBER_NAME . '</th><th>' . _LIST_MEMBER_RNAME . '</th><th>' . _LIST_MEMBER_URL . '</th><th>' . _LIST_MEMBER_ADMIN;\r
-                       help('superadmin'); \r
+                       help('superadmin');\r
                        echo "</th><th>" . _LIST_MEMBER_LOGIN;\r
                        help('canlogin');\r
-                       echo "</th><th colspan='2'>" . _LISTS_ACTIONS. "</th>";         \r
+                       echo "</th><th colspan='2'>" . _LISTS_ACTIONS. "</th>";\r
                        break;\r
                case 'BODY':\r
                        $current = $template['current'];\r
-                       \r
+\r
                        echo '<td>';\r
-                       $id = listplug_nextBatchId();                   \r
+                       $id = listplug_nextBatchId();\r
                        echo '<input type="checkbox" id="batch',$id,'" name="batch[',$id,']" value="',$current->mnumber,'" />';\r
                        echo '<label for="batch',$id,'">';\r
                        echo "<a href='mailto:", htmlspecialchars($current->memail), "' tabindex='".$template['tabindex']."'>", htmlspecialchars($current->mname), "</a>";\r
@@ -5720,23 +6058,24 @@ function listplug_table_memberlist($template, $type) {
                        echo '<td>', ($current->madmin ? _YES : _NO),'</td>';\r
                        echo '<td>', ($current->mcanlogin ? _YES : _NO), '</td>';\r
                        echo "<td><a href='index.php?action=memberedit&amp;memberid=$current->mnumber' tabindex='".$template['tabindex']."'>"._LISTS_EDIT."</a></td>";\r
-                       echo "<td><a href='index.php?action=memberdelete&amp;memberid=$current->mnumber' tabindex='".$template['tabindex']."'>"._LISTS_DELETE."</a></td>";                      \r
+                       echo "<td><a href='index.php?action=memberdelete&amp;memberid=$current->mnumber' tabindex='".$template['tabindex']."'>"._LISTS_DELETE."</a></td>";\r
                        break;\r
        }\r
 }\r
 \r
 function listplug_table_teamlist($template, $type) {\r
+       global $manager;\r
        switch($type) {\r
                case 'HEAD':\r
                        echo "<th>"._LIST_MEMBER_NAME."</th><th>"._LIST_MEMBER_RNAME."</th><th>"._LIST_TEAM_ADMIN;\r
                        help('teamadmin');\r
-                       echo "</th><th colspan='2'>"._LISTS_ACTIONS."</th>";            \r
+                       echo "</th><th colspan='2'>"._LISTS_ACTIONS."</th>";\r
                        break;\r
                case 'BODY':\r
                        $current = $template['current'];\r
-               \r
+\r
                        echo '<td>';\r
-                       $id = listplug_nextBatchId();                   \r
+                       $id = listplug_nextBatchId();\r
                        echo '<input type="checkbox" id="batch',$id,'" name="batch[',$id,']" value="',$current->tmember,'" />';\r
                        echo '<label for="batch',$id,'">';\r
                        echo "<a href='mailto:", htmlspecialchars($current->memail), "' tabindex='".$template['tabindex']."'>", htmlspecialchars($current->mname), "</a>";\r
@@ -5745,10 +6084,14 @@ function listplug_table_teamlist($template, $type) {
                        echo '<td>', htmlspecialchars($current->mrealname), '</td>';\r
                        echo '<td>', ($current->tadmin ? _YES : _NO) , '</td>';\r
                        echo "<td><a href='index.php?action=teamdelete&amp;memberid=$current->tmember&amp;blogid=$current->tblog' tabindex='".$template['tabindex']."'>"._LISTS_DELETE."</a></td>";\r
-                       echo "<td><a href='index.php?action=teamchangeadmin&amp;memberid=$current->tmember&amp;blogid=$current->tblog' tabindex='".$template['tabindex']."'>"._LIST_TEAM_CHADMIN."</a></td>";                   \r
+\r
+                       $url = 'index.php?action=teamchangeadmin&memberid=' . intval($current->tmember) . '&blogid=' . intval($current->tblog);\r
+                       $url = $manager->addTicketToUrl($url);\r
+                       echo "<td><a href='",htmlspecialchars($url),"' tabindex='".$template['tabindex']."'>"._LIST_TEAM_CHADMIN."</a></td>";\r
                        break;\r
        }\r
 }\r
+\r
 function encode_desc(&$data)\r
     {   //_$to_entities = get_html_translation_table(HTML_ENTITIES);\r
         $to_entities = get_html_translation_table(HTML_SPECIALCHARS);\r
@@ -5759,6 +6102,7 @@ function encode_desc(&$data)
         $data = str_replace('\n','<br />',$data); //hack\r
         return $data;\r
     }\r
+\r
 function listplug_table_pluginlist($template, $type) {\r
        global $manager;\r
        switch($type) {\r
@@ -5768,7 +6112,7 @@ function listplug_table_pluginlist($template, $type) {
                        break;\r
                case 'BODY':\r
                        $current = $template['current'];\r
-                       \r
+\r
                        $plug =& $manager->getPlugin($current->pfile);\r
                        if ($plug) {\r
                                echo '<td>';\r
@@ -5780,19 +6124,31 @@ function listplug_table_pluginlist($template, $type) {
                                echo '</td>';\r
                                echo '<td>';\r
                                        echo _LIST_PLUGS_DESC .'<br/>'. encode_desc($plug->getDescription());\r
-                                       if (sizeof($plug->getEventList()) > 0)\r
+                                       if (sizeof($plug->getEventList()) > 0) {\r
                                                echo '<br /><br />',_LIST_PLUGS_SUBS,'<br />',htmlspecialchars(implode($plug->getEventList(),', '));\r
-\r
+                                               // check the database to see if it is up-to-date and notice the user if not\r
+                                       }\r
+                                       if (!$plug->subscribtionListIsUptodate()) {\r
+                                               echo '<br /><br /><strong>',_LIST_PLUG_SUBS_NEEDUPDATE,'</strong>';\r
+                                       }\r
+                                       if (sizeof($plug->getPluginDep()) > 0)\r
+                                               echo '<br /><br />',_LIST_PLUGS_DEP,'<br />',htmlspecialchars(implode($plug->getPluginDep(),', '));\r
                                echo '</td>';\r
                        } else {\r
                                echo '<td colspan="2">Error: plugin file <b>',htmlspecialchars($current->pfile),'.php</b> could not be loaded, or it has been set inactive because it does not support some features (check the <a href="?action=actionlog">actionlog</a> for more info)</td>';\r
                        }\r
                        echo '<td>';\r
-                               echo "<a href='index.php?action=pluginup&amp;plugid=$current->pid' tabindex='".$template['tabindex']."'>",_LIST_PLUGS_UP,"</a>";\r
-                               echo "<br /><a href='index.php?action=plugindown&amp;plugid=$current->pid' tabindex='".$template['tabindex']."'>",_LIST_PLUGS_DOWN,"</a>";\r
+\r
+                               $baseUrl = 'index.php?plugid=' . intval($current->pid) . '&action=';\r
+                               $url = $manager->addTicketToUrl($baseUrl . 'pluginup');\r
+                               echo "<a href='",htmlspecialchars($url),"' tabindex='".$template['tabindex']."'>",_LIST_PLUGS_UP,"</a>";\r
+                               $url = $manager->addTicketToUrl($baseUrl . 'plugindown');\r
+                               echo "<br /><a href='",htmlspecialchars($url),"' tabindex='".$template['tabindex']."'>",_LIST_PLUGS_DOWN,"</a>";\r
                                echo "<br /><a href='index.php?action=plugindelete&amp;plugid=$current->pid' tabindex='".$template['tabindex']."'>",_LIST_PLUGS_UNINSTALL,"</a>";\r
                                if ($plug && ($plug->hasAdminArea() > 0))\r
                                        echo "<br /><a href='".htmlspecialchars($plug->getAdminURL())."'  tabindex='".$template['tabindex']."'>",_LIST_PLUGS_ADMIN,"</a>";\r
+                               if ($plug && ($plug->supportsFeature('HelpPage') > 0))\r
+                                       echo "<br /><a href='index.php?action=pluginhelp&amp;plugid=$current->pid'  tabindex='".$template['tabindex']."'>",_LIST_PLUGS_HELP,"</a>";\r
                                if (quickQuery('SELECT COUNT(*) AS result FROM '.sql_table('plugin_option_desc').' WHERE ocontext=\'global\' and opid='.$current->pid) > 0)\r
                                        echo "<br /><a href='index.php?action=pluginoptions&amp;plugid=$current->pid'  tabindex='".$template['tabindex']."'>",_LIST_PLUGS_OPTIONS,"</a>";\r
                        echo '</td>';\r
@@ -5824,79 +6180,100 @@ function listplug_table_plugoptionlist($template, $type) {
 \r
 function listplug_plugOptionRow($current) {\r
        $varname = 'plugoption['.$current['oid'].']['.$current['contextid'].']';\r
+       // retreive the optionmeta\r
+       $meta = NucleusPlugin::getOptionMeta($current['typeinfo']);\r
+\r
+       // only if it is not a hidden option write the controls to the page\r
+       if ($meta['access'] != 'hidden') {\r
+               echo '<td>',htmlspecialchars($current['description']?$current['description']:$current['name']),'</td>';\r
+               echo '<td>';\r
+               switch($current['type']) {\r
+                       case 'yesno':\r
+                               ADMIN::input_yesno($varname, $current['value'], 0, 'yes', 'no');\r
+                               break;\r
+                       case 'password':\r
+                               echo '<input type="password" size="40" maxlength="128" name="',htmlspecialchars($varname),'" value="',htmlspecialchars($current['value']),'" />';\r
+                               break;\r
+                       case 'select':\r
+                               echo '<select name="'.htmlspecialchars($varname).'">';\r
+                               $aOptions = NucleusPlugin::getOptionSelectValues($current['typeinfo']);\r
+                               $aOptions = explode('|', $aOptions);\r
+                               for ($i=0; $i<(count($aOptions)-1); $i+=2) {\r
+                                       echo '<option value="'.htmlspecialchars($aOptions[$i+1]).'"';\r
+                                       if ($aOptions[$i+1] == $current['value'])\r
+                                               echo ' selected="selected"';\r
+                                       echo '>'.htmlspecialchars($aOptions[$i]).'</option>';\r
+                               }\r
+                               echo '</select>';\r
+                               break;\r
+                       case 'textarea':\r
+                               //$meta = NucleusPlugin::getOptionMeta($current['typeinfo']);\r
+                               echo '<textarea class="pluginoption" cols="30" rows="5" name="',htmlspecialchars($varname),'"';\r
+                               if ($meta['access'] == 'readonly') {\r
+                                       echo ' readonly="readonly"';\r
+                               }\r
+                               echo '>',htmlspecialchars($current['value']),'</textarea>';\r
+                               break;\r
+                       case 'text':\r
+                       default:\r
+                               //$meta = NucleusPlugin::getOptionMeta($current['typeinfo']);\r
 \r
-       echo '<td>',htmlspecialchars($current['description']?$current['description']:$current['name']),'</td>';\r
-       echo '<td>';\r
-       switch($current['type']) {\r
-               case 'yesno':\r
-                       ADMIN::input_yesno($varname, $current['value'], 0, 'yes', 'no');\r
-                       break;\r
-               case 'password':\r
-                       echo '<input type="password" size="40" maxlength="128" name="',htmlspecialchars($varname),'" value="',htmlspecialchars($current['value']),'" />';\r
-                       break;\r
-               case 'select':\r
-                       echo '<select name="'.htmlspecialchars($varname).'">';\r
-                       $aOptions = explode('|', $current['typeinfo']);\r
-                       for ($i=0; $i<(count($aOptions)-1); $i+=2) {\r
-                               echo '<option value="'.htmlspecialchars($aOptions[$i+1]).'"';\r
-                               if ($aOptions[$i+1] == $current['value'])\r
-                                       echo ' selected="selected"';\r
-                               echo '>'.htmlspecialchars($aOptions[$i]).'</option>';\r
-                       }\r
-                       echo '</select>';\r
-                       break;\r
-               case 'textarea':\r
-                       echo '<textarea class="pluginoption" cols="30" rows="5" name="',htmlspecialchars($varname),'">',htmlspecialchars($current['value']),'</textarea>';                              \r
-                       break;\r
-               case 'text':\r
-               default:\r
-                       echo '<input type="text" size="40" maxlength="128" name="',htmlspecialchars($varname),'" value="',htmlspecialchars($current['value']),'" />';\r
+                               echo '<input type="text" size="40" maxlength="128" name="',htmlspecialchars($varname),'" value="',htmlspecialchars($current['value']),'"';\r
+                               if ($meta['datatype'] == 'numerical') {\r
+                                       echo ' onkeyup="checkNumeric(this)" onblur="checkNumeric(this)"';\r
+                               }\r
+                               if ($meta['access'] == 'readonly') {\r
+                                       echo ' readonly="readonly"';\r
+                               }\r
+                               echo ' />';\r
+               }\r
+               echo $current['extra'];\r
+               echo '</td>';\r
        }\r
-       echo '</td>';\r
 }\r
 \r
 function listplug_table_itemlist($template, $type) {\r
        switch($type) {\r
                case 'HEAD':\r
-                       echo "<th>"._LIST_ITEM_INFO."</th><th>"._LIST_ITEM_CONTENT."</th><th style=\"white-space:nowrap\" colspan='1'>"._LISTS_ACTIONS."</th>";\r
+                       echo "<th>"._LIST_ITEM_INFO."</th><th>"._LIST_ITEM_CONTENT."</th><th colspan='1'>"._LISTS_ACTIONS."</th>";\r
                        break;\r
                case 'BODY':\r
                        $current = $template['current'];\r
                        $current->itime = strtotime($current->itime);   // string -> unix timestamp\r
-                       \r
-                       if ($current->idraft == 1) \r
+\r
+                       if ($current->idraft == 1)\r
                                $cssclass = "class='draft'";\r
 \r
                        // (can't use offset time since offsets might vary between blogs)\r
                        if ($current->itime > $template['now'])\r
                                $cssclass = "class='future'";\r
-                       \r
-                       echo "<td $cssclass>",_LIST_ITEM_BLOG," ", htmlspecialchars($current->bshortname);\r
-                       echo "    <br />",_LIST_ITEM_CAT," ", htmlspecialchars($current->cname);                        \r
-                       echo "    <br />",_LIST_ITEM_AUTHOR, " ", htmlspecialchars($current->mname);\r
+\r
+                       echo "<td $cssclass>",_LIST_ITEM_BLOG,' ', htmlspecialchars($current->bshortname);\r
+                       echo "    <br />",_LIST_ITEM_CAT,' ', htmlspecialchars($current->cname);\r
+                       echo "    <br />",_LIST_ITEM_AUTHOR, ' ', htmlspecialchars($current->mname);\r
                        echo "    <br />",_LIST_ITEM_DATE," " . date("Y-m-d",$current->itime);\r
                        echo "<br />",_LIST_ITEM_TIME," " . date("H:i",$current->itime);\r
-                       echo "</td>";                   \r
+                       echo "</td>";\r
                        echo "<td $cssclass>";\r
-                       \r
-                       $id = listplug_nextBatchId(); \r
-                       \r
+\r
+                       $id = listplug_nextBatchId();\r
+\r
                        echo '<input type="checkbox" id="batch',$id,'" name="batch[',$id,']" value="',$current->inumber,'" />';\r
                        echo '<label for="batch',$id,'">';\r
                        echo "<b>" . htmlspecialchars(strip_tags($current->ititle)) . "</b>";\r
                        echo '</label>';\r
                        echo "<br />";\r
-                       \r
-                       \r
+\r
+\r
                        $current->ibody = strip_tags($current->ibody);\r
                        $current->ibody = htmlspecialchars(shorten($current->ibody,300,'...'));\r
-                       \r
+\r
                        echo "$current->ibody</td>";\r
-                       echo "<td style=\"white-space:nowrap\" $cssclass>";\r
+                       echo "<td $cssclass>";\r
                        echo    "<a href='index.php?action=itemedit&amp;itemid=$current->inumber'>"._LISTS_EDIT."</a>";\r
                        echo    "<br /><a href='index.php?action=itemcommentlist&amp;itemid=$current->inumber'>"._LISTS_COMMENTS."</a>";\r
-                       echo    "<br /><a href='index.php?action=itemmove&amp;itemid=$current->inumber'>"._LISTS_MOVE."</a>";                   \r
-                       echo    "<br /><a href='index.php?action=itemdelete&amp;itemid=$current->inumber'>"._LISTS_DELETE."</a>";                       \r
+                       echo    "<br /><a href='index.php?action=itemmove&amp;itemid=$current->inumber'>"._LISTS_MOVE."</a>";\r
+                       echo    "<br /><a href='index.php?action=itemdelete&amp;itemid=$current->inumber'>"._LISTS_DELETE."</a>";\r
                        echo "</td>";\r
                        break;\r
        }\r
@@ -5916,32 +6293,32 @@ function listplug_table_commentlist($template, $type) {
                case 'BODY':\r
                        $current = $template['current'];\r
                        $current->ctime = strtotime($current->ctime);   // string -> unix timestamp\r
-                       \r
+\r
                        echo '<td>';\r
                        echo date("Y-m-d@H:i",$current->ctime);\r
                        echo '<br />';\r
                        if ($current->mname)\r
-                               echo htmlspecialchars($current->mname)' ', _LIST_COMMENTS_MEMBER;\r
+                               echo htmlspecialchars($current->mname) ,' ', _LIST_COMMENTS_MEMBER;\r
                        else\r
                                echo htmlspecialchars($current->cuser);\r
                        echo '</td>';\r
-                       \r
-                       \r
+\r
+\r
                        $current->cbody = strip_tags($current->cbody);\r
                        $current->cbody = htmlspecialchars(shorten($current->cbody, 300, '...'));\r
 \r
                        echo '<td>';\r
-                       $id = listplug_nextBatchId();                   \r
+                       $id = listplug_nextBatchId();\r
                        echo '<input type="checkbox" id="batch',$id,'" name="batch[',$id,']" value="',$current->cnumber,'" />';\r
                        echo '<label for="batch',$id,'">';\r
                        echo $current->cbody;\r
                        echo '</label>';\r
                        echo '</td>';\r
-                       \r
-                       echo "<td style=\"white-space:nowrap\"><a href='index.php?action=commentedit&amp;commentid=$current->cnumber'>"._LISTS_EDIT."</a></td>";\r
-                       echo "<td style=\"white-space:nowrap\"><a href='index.php?action=commentdelete&amp;commentid=$current->cnumber'>"._LISTS_DELETE."</a></td>";\r
+\r
+                       echo "<td><a href='index.php?action=commentedit&amp;commentid=$current->cnumber'>"._LISTS_EDIT."</a></td>";\r
+                       echo "<td><a href='index.php?action=commentdelete&amp;commentid=$current->cnumber'>"._LISTS_DELETE."</a></td>";\r
                        if ($template['canAddBan'])\r
-                               echo "<td style=\"white-space:nowrap\"><a href='index.php?action=banlistnewfromitem&amp;itemid=$current->citem&amp;ip=", htmlspecialchars($current->cip), "' title='", htmlspecialchars($current->chost), "'>"._LIST_COMMENT_BANIP."</a></td>";\r
+                               echo "<td><a href='index.php?action=banlistnewfromitem&amp;itemid=$current->citem&amp;ip=", htmlspecialchars($current->cip), "' title='", htmlspecialchars($current->chost), "'>"._LIST_COMMENT_BANIP."</a></td>";\r
                        break;\r
        }\r
 }\r
@@ -5950,28 +6327,28 @@ function listplug_table_commentlist($template, $type) {
 function listplug_table_bloglist($template, $type) {\r
        switch($type) {\r
                case 'HEAD':\r
-                       echo "<th>" . _NAME . "</th><th colspan='7'>" ._LISTS_ACTIONS. "</th>";         \r
+                       echo "<th>" . _NAME . "</th><th colspan='7'>" ._LISTS_ACTIONS. "</th>";\r
                        break;\r
                case 'BODY':\r
                        $current = $template['current'];\r
-                       \r
+\r
                        echo "<td title='blogid:$current->bnumber shortname:$current->bshortname'><a href='$current->burl'><img src='images/globe.gif' width='13' height='13' alt='". _BLOGLIST_TT_VISIT."' /></a> " . htmlspecialchars($current->bname) . "</td>";\r
                        echo "<td><a href='index.php?action=createitem&amp;blogid=$current->bnumber' title='" . _BLOGLIST_TT_ADD ."'>" . _BLOGLIST_ADD . "</a></td>";\r
                        echo "<td><a href='index.php?action=itemlist&amp;blogid=$current->bnumber' title='". _BLOGLIST_TT_EDIT."'>". _BLOGLIST_EDIT."</a></td>";\r
-                       echo "<td><a href='index.php?action=blogcommentlist&amp;blogid=$current->bnumber'>". _BLOGLIST_COMMENTS."</a></td>";\r
+                       echo "<td><a href='index.php?action=blogcommentlist&amp;blogid=$current->bnumber' title='". _BLOGLIST_TT_COMMENTS."'>". _BLOGLIST_COMMENTS."</a></td>";\r
                        echo "<td><a href='index.php?action=bookmarklet&amp;blogid=$current->bnumber' title='". _BLOGLIST_TT_BMLET."'>". _BLOGLIST_BMLET . "</a></td>";\r
 \r
                        if ($current->tadmin == 1) {\r
                                echo "<td><a href='index.php?action=blogsettings&amp;blogid=$current->bnumber' title='" . _BLOGLIST_TT_SETTINGS . "'>" ._BLOGLIST_SETTINGS. "</a></td>";\r
                                echo "<td><a href='index.php?action=banlist&amp;blogid=$current->bnumber' title='" . _BLOGLIST_TT_BANS. "'>". _BLOGLIST_BANS."</a></td>";\r
                        }\r
-                       \r
+\r
                        if ($template['superadmin']) {\r
                                echo "<td><a href='index.php?action=deleteblog&amp;blogid=$current->bnumber' title='". _BLOGLIST_TT_DELETE."'>" ._BLOGLIST_DELETE. "</a></td>";\r
                        }\r
-                       \r
-               \r
-               \r
+\r
+\r
+\r
                        break;\r
        }\r
 }\r
@@ -5979,14 +6356,14 @@ function listplug_table_bloglist($template, $type) {
 function listplug_table_shortblognames($template, $type) {\r
        switch($type) {\r
                case 'HEAD':\r
-                       echo "<th>" . _NAME . "</th><th>" . _NAME. "</th>";             \r
+                       echo "<th>" . _NAME . "</th><th>" . _NAME. "</th>";\r
                        break;\r
                case 'BODY':\r
                        $current = $template['current'];\r
-                       \r
+\r
                        echo '<td>' , htmlspecialchars($current->bshortname) , '</td>';\r
                        echo '<td>' , htmlspecialchars($current->bname) , '</td>';\r
-       \r
+\r
                        break;\r
        }\r
 }\r
@@ -5994,14 +6371,14 @@ function listplug_table_shortblognames($template, $type) {
 function listplug_table_shortnames($template, $type) {\r
        switch($type) {\r
                case 'HEAD':\r
-                       echo "<th>" . _NAME . "</th><th>" . _LISTS_DESC. "</th>";               \r
+                       echo "<th>" . _NAME . "</th><th>" . _LISTS_DESC. "</th>";\r
                        break;\r
                case 'BODY':\r
                        $current = $template['current'];\r
-                       \r
+\r
                        echo '<td>' , htmlspecialchars($current->name) , '</td>';\r
                        echo '<td>' , htmlspecialchars($current->description) , '</td>';\r
-       \r
+\r
                        break;\r
        }\r
 }\r
@@ -6010,94 +6387,97 @@ function listplug_table_shortnames($template, $type) {
 function listplug_table_categorylist($template, $type) {\r
        switch($type) {\r
                case 'HEAD':\r
-                       echo "<th>"._LISTS_NAME."</th><th>"._LISTS_DESC."</th><th colspan='2'>"._LISTS_ACTIONS."</th>";         \r
+                       echo "<th>"._LISTS_NAME."</th><th>"._LISTS_DESC."</th><th colspan='2'>"._LISTS_ACTIONS."</th>";\r
                        break;\r
                case 'BODY':\r
                        $current = $template['current'];\r
-                       \r
+\r
                        echo '<td>';\r
-                       $id = listplug_nextBatchId();                   \r
+                       $id = listplug_nextBatchId();\r
                        echo '<input type="checkbox" id="batch',$id,'" name="batch[',$id,']" value="',$current->catid,'" />';\r
                        echo '<label for="batch',$id,'">';\r
                        echo htmlspecialchars($current->cname);\r
                        echo '</label>';\r
                        echo '</td>';\r
-                       \r
+\r
                        echo '<td>', htmlspecialchars($current->cdesc), '</td>';\r
-                       echo "<td><a href='index.php?action=categorydelete&amp;blogid=$current->cblog&amp;catid=$current->catid' tabindex='".$template['tabindex']."'>"._LISTS_DELETE."</a></td>";                      \r
-                       echo "<td><a href='index.php?action=categoryedit&amp;blogid=$current->cblog&amp;catid=$current->catid' tabindex='".$template['tabindex']."'>"._LISTS_EDIT."</a></td>";                  \r
-               \r
+                       echo "<td><a href='index.php?action=categorydelete&amp;blogid=$current->cblog&amp;catid=$current->catid' tabindex='".$template['tabindex']."'>"._LISTS_DELETE."</a></td>";\r
+                       echo "<td><a href='index.php?action=categoryedit&amp;blogid=$current->cblog&amp;catid=$current->catid' tabindex='".$template['tabindex']."'>"._LISTS_EDIT."</a></td>";\r
+\r
                        break;\r
        }\r
 }\r
 \r
 \r
 function listplug_table_templatelist($template, $type) {\r
+       global $manager;\r
        switch($type) {\r
                case 'HEAD':\r
-                       echo "<th>"._LISTS_NAME."</th><th>"._LISTS_DESC."</th><th colspan='3'>"._LISTS_ACTIONS."</th>";         \r
+                       echo "<th>"._LISTS_NAME."</th><th>"._LISTS_DESC."</th><th colspan='3'>"._LISTS_ACTIONS."</th>";\r
                        break;\r
                case 'BODY':\r
                        $current = $template['current'];\r
-                       \r
+\r
                        echo "<td>" , htmlspecialchars($current->tdname), "</td>";\r
                        echo "<td>" , htmlspecialchars($current->tddesc), "</td>";\r
-                       echo "<td style=\"white-space:nowrap\"><a href='index.php?action=templateedit&amp;templateid=$current->tdnumber' tabindex='".$template['tabindex']."'>"._LISTS_EDIT."</a></td>";\r
-                       echo "<td style=\"white-space:nowrap\"><a href='index.php?action=templateclone&amp;templateid=$current->tdnumber' tabindex='".$template['tabindex']."'>"._LISTS_CLONE."</a></td>";\r
-                       echo "<td style=\"white-space:nowrap\"><a href='index.php?action=templatedelete&amp;templateid=$current->tdnumber' tabindex='".$template['tabindex']."'>"._LISTS_DELETE."</a></td>";                    \r
-               \r
+                       echo "<td><a href='index.php?action=templateedit&amp;templateid=$current->tdnumber' tabindex='".$template['tabindex']."'>"._LISTS_EDIT."</a></td>";\r
+\r
+                       $url = $manager->addTicketToUrl('index.php?action=templateclone&templateid=' . intval($current->tdnumber));\r
+                       echo "<td><a href='",htmlspecialchars($url),"' tabindex='".$template['tabindex']."'>"._LISTS_CLONE."</a></td>";\r
+                       echo "<td><a href='index.php?action=templatedelete&amp;templateid=$current->tdnumber' tabindex='".$template['tabindex']."'>"._LISTS_DELETE."</a></td>";\r
+\r
                        break;\r
        }\r
 }\r
 \r
 function listplug_table_skinlist($template, $type) {\r
-       global $CONF, $DIR_SKINS;\r
+       global $CONF, $DIR_SKINS, $manager;\r
        switch($type) {\r
                case 'HEAD':\r
-                       echo "<th>"._LISTS_NAME."</th><th>"._LISTS_DESC."</th><th colspan='3'>"._LISTS_ACTIONS."</th>";         \r
+                       echo "<th>"._LISTS_NAME."</th><th>"._LISTS_DESC."</th><th colspan='3'>"._LISTS_ACTIONS."</th>";\r
                        break;\r
                case 'BODY':\r
                        $current = $template['current'];\r
-                       \r
+\r
                        echo '<td>';\r
-                       \r
+\r
                        // use a special style for the default skin\r
                        if ($current->sdnumber == $CONF['BaseSkin']) {\r
                                echo '<strong>',htmlspecialchars($current->sdname),'</strong>';\r
                        } else {\r
                                echo htmlspecialchars($current->sdname);\r
                        }\r
-                       \r
+\r
                        echo '<br /><br />';\r
                        echo _LISTS_TYPE ,': ' , htmlspecialchars($current->sdtype);\r
                        echo '<br />', _LIST_SKINS_INCMODE , ' ' , (($current->sdincmode=='skindir') ?_PARSER_INCMODE_SKINDIR:_PARSER_INCMODE_NORMAL);\r
                        if ($current->sdincpref) echo '<br />' , _LIST_SKINS_INCPREFIX , ' ', htmlspecialchars($current->sdincpref);\r
-                       \r
+\r
                        // add preview image when present\r
                        if ($current->sdincpref && @file_exists($DIR_SKINS . $current->sdincpref . 'preview.png'))\r
                        {\r
                                echo '<br /><br />';\r
-                               \r
+\r
                                $hasEnlargement = @file_exists($DIR_SKINS . $current->sdincpref . 'preview-large.png');\r
                                if ($hasEnlargement)\r
                                        echo '<a href="',$CONF['SkinsURL'], htmlspecialchars($current->sdincpref),'preview-large.png" title="View larger">';\r
-                               \r
+\r
                                echo '<img class="skinpreview" src="',$CONF['SkinsURL'], htmlspecialchars($current->sdincpref),'preview.png" width="100" height="75" alt="Preview for \'',htmlspecialchars($current->sdname),'\' skin" />';\r
-                               \r
+\r
                                if ($hasEnlargement)\r
                                        echo '</a>';\r
-                                       \r
+\r
                                if (@file_exists($DIR_SKINS . $current->sdincpref . 'readme.html'))\r
                                {\r
                                        echo '<br /><a href="',$CONF['SkinsURL'], htmlspecialchars($current->sdincpref),'readme.html" title="More info on the \'',htmlspecialchars($current->sdname),'\' skin">Readme</a>';\r
                                }\r
-                                       \r
-                                       \r
+\r
+\r
                        }\r
-                       \r
+\r
                        echo "</td>";\r
-                       \r
-                                               \r
+\r
+\r
                        echo "<td>" , htmlspecialchars($current->sddesc);\r
                                // show list of defined parts\r
                                $r = sql_query('SELECT stype FROM '.sql_table('skin').' WHERE sdesc='.$current->sdnumber . ' ORDER BY stype');\r
@@ -6113,10 +6493,12 @@ function listplug_table_skinlist($template, $type) {
                                        echo '<br /><br />',_LIST_SKINS_DEFINED,' <ul>',implode($types,'') ,'</ul>';\r
                                }\r
                        echo "</td>";\r
-                       echo "<td style=\"white-space:nowrap\"><a href='index.php?action=skinedit&amp;skinid=$current->sdnumber' tabindex='".$template['tabindex']."'>"._LISTS_EDIT."</a></td>";\r
-                       echo "<td style=\"white-space:nowrap\"><a href='index.php?action=skinclone&amp;skinid=$current->sdnumber' tabindex='".$template['tabindex']."'>"._LISTS_CLONE."</a></td>";\r
-                       echo "<td style=\"white-space:nowrap\"><a href='index.php?action=skindelete&amp;skinid=$current->sdnumber' tabindex='".$template['tabindex']."'>"._LISTS_DELETE."</a></td>";\r
-                       \r
+                       echo "<td><a href='index.php?action=skinedit&amp;skinid=$current->sdnumber' tabindex='".$template['tabindex']."'>"._LISTS_EDIT."</a></td>";\r
+\r
+                       $url = $manager->addTicketToUrl('index.php?action=skinclone&skinid=' . intval($current->sdnumber));\r
+                       echo "<td><a href='",htmlspecialchars($url),"' tabindex='".$template['tabindex']."'>"._LISTS_CLONE."</a></td>";\r
+                       echo "<td><a href='index.php?action=skindelete&amp;skinid=$current->sdnumber' tabindex='".$template['tabindex']."'>"._LISTS_DELETE."</a></td>";\r
+\r
                        break;\r
        }\r
 }\r
@@ -6124,16 +6506,16 @@ function listplug_table_skinlist($template, $type) {
 function listplug_table_draftlist($template, $type) {\r
        switch($type) {\r
                case 'HEAD':\r
-                       echo "<th>"._LISTS_BLOG."</th><th>"._LISTS_TITLE."</th><th colspan='2'>"._LISTS_ACTIONS."</th>";                \r
+                       echo "<th>"._LISTS_BLOG."</th><th>"._LISTS_TITLE."</th><th colspan='2'>"._LISTS_ACTIONS."</th>";\r
                        break;\r
                case 'BODY':\r
                        $current = $template['current'];\r
 \r
-                       echo '<td>', htmlspecialchars($current->bshortname) , '</td>';                  \r
+                       echo '<td>', htmlspecialchars($current->bshortname) , '</td>';\r
                        echo '<td>', htmlspecialchars(strip_tags($current->ititle)) , '</td>';\r
                        echo "<td><a href='index.php?action=itemedit&amp;itemid=$current->inumber'>"._LISTS_EDIT."</a></td>";\r
-                       echo "<td><a href='index.php?action=itemdelete&amp;itemid=$current->inumber'>"._LISTS_DELETE."</a></td>";                       \r
-               \r
+                       echo "<td><a href='index.php?action=itemdelete&amp;itemid=$current->inumber'>"._LISTS_DELETE."</a></td>";\r
+\r
                        break;\r
        }\r
 }\r
@@ -6142,14 +6524,14 @@ function listplug_table_draftlist($template, $type) {
 function listplug_table_actionlist($template, $type) {\r
        switch($type) {\r
                case 'HEAD':\r
-                       echo '<th>'._LISTS_TIME.'</th><th>'._LIST_ACTION_MSG.'</th>';           \r
+                       echo '<th>'._LISTS_TIME.'</th><th>'._LIST_ACTION_MSG.'</th>';\r
                        break;\r
                case 'BODY':\r
                        $current = $template['current'];\r
-                       \r
+\r
                        echo '<td>' , htmlspecialchars($current->timestamp), '</td>';\r
                        echo '<td>' , htmlspecialchars($current->message), '</td>';\r
-               \r
+\r
                        break;\r
        }\r
 }\r
@@ -6157,11 +6539,11 @@ function listplug_table_actionlist($template, $type) {
 function listplug_table_banlist($template, $type) {\r
        switch($type) {\r
                case 'HEAD':\r
-                       echo '<th>'._LIST_BAN_IPRANGE.'</th><th>'. _LIST_BAN_REASON.'</th><th>'._LISTS_ACTIONS.'</th>';         \r
+                       echo '<th>'._LIST_BAN_IPRANGE.'</th><th>'. _LIST_BAN_REASON.'</th><th>'._LISTS_ACTIONS.'</th>';\r
                        break;\r
                case 'BODY':\r
                        $current = $template['current'];\r
-               \r
+\r
                        echo '<td>' , htmlspecialchars($current->iprange) , '</td>';\r
                        echo '<td>' , htmlspecialchars($current->reason) , '</td>';\r
                        echo "<td><a href='index.php?action=banlistdelete&amp;blogid=", intval($current->blogid) , "&amp;iprange=" , htmlspecialchars($current->iprange) , "'>",_LISTS_DELETE,"</a></td>";\r
@@ -6181,7 +6563,7 @@ function getBookmarklet($blogid) {
        $document = 'document';\r
        $bookmarkletline = "javascript:Q='';x=".$document.";y=window;if(x.selection){Q=x.selection.createRange().text;}else if(y.getSelection){Q=y.getSelection();}else if(x.getSelection){Q=x.getSelection();}wingm=window.open('";\r
        $bookmarkletline .= $CONF['AdminURL'] . "bookmarklet.php?blogid=$blogid";\r
-       $bookmarkletline .="&logtext='+escape(Q)+'&loglink='+escape(x.location.href)+'&loglinktitle='+escape(x.title),'nucleusbm','scrollbars=yes,width=600,height=500,left=10,top=10,status=yes,resizable=yes');wingm.focus();";       \r
+       $bookmarkletline .="&logtext='+escape(Q)+'&loglink='+escape(x.location.href)+'&loglinktitle='+escape(x.title),'nucleusbm','scrollbars=yes,width=600,height=500,left=10,top=10,status=yes,resizable=yes');wingm.focus();";\r
 \r
        return $bookmarkletline;\r
 }\r