X-Git-Url: http://git.sourceforge.jp/view?p=nucleus-jp%2Fnucleus-jp-ancient.git;a=blobdiff_plain;f=utf8%2Fnucleus%2Flibs%2FADMIN.php;h=682ce2aede6e1ff32c06c5178992faa920aa3050;hp=dbeef1a02b16bb8b92d69763a3279cc7d9ace2b7;hb=b5f3f1bf515d9979f70fd0043dc562d6c6ca3a4b;hpb=4b16861085a5a9bc281f4782b9e1547f5ad15e2d

diff --git a/utf8/nucleus/libs/ADMIN.php b/utf8/nucleus/libs/ADMIN.php
index dbeef1a..682ce2a 100755
--- a/utf8/nucleus/libs/ADMIN.php
+++ b/utf8/nucleus/libs/ADMIN.php
@@ -1,78 +1,165 @@
 <?php
+/*
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
+ * Copyright (C) 2002-2009 The Nucleus Group
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * (see nucleus/documentation/index.html#license for more info)
+ */
+/**
+ * The code for the Nucleus admin area
+ *
+ * @license http://nucleuscms.org/license.txt GNU General Public License
+ * @copyright Copyright (C) 2002-2009 The Nucleus Group
+ * @version $Id$
+ * @version $NucleusJP: ADMIN.php,v 1.21.2.4 2007/10/30 19:04:24 kmorimatsu Exp $
+ */
+
+if ( !function_exists('requestVar') ) exit;
+require_once dirname(__FILE__) . '/showlist.php';
+
 /**
-  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/) 
-  * Copyright (C) 2002-2004 The Nucleus Group
-  *
-  * This program is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU General Public License
-  * as published by the Free Software Foundation; either version 2
-  * of the License, or (at your option) any later version.
-  * (see nucleus/documentation/index.html#license for more info)
-  *
-  * The code for the Nucleus admin area   
-  */
- 
+ * Builds the admin area and executes admin actions
+ */
 class ADMIN {
 
-	// action currently being executed ($action=xxxx -> action_xxxx method)
+	/**
+	 * @var string $action action currently being executed ($action=xxxx -> action_xxxx method)
+	 */
 	var $action;
 
+	/**
+	 * Class constructor
+	 */
 	function ADMIN() {
 
 	}
-	
+
 	/**
-	  * Executes an action
-	  *
-	  * @param $action
-	  *		action to be performed
-	  */
+	 * Executes an action
+	 *
+	 * @param string $action action to be performed
+	 */
 	function action($action) {
+		global $CONF, $manager;
+
 		// list of action aliases
 		$alias = array(
 			'login' => 'overview',
 			'' => 'overview'
 		);
 
-		if ($alias[$action])
+		if (isset($alias[$action]))
 			$action = $alias[$action];
 
 		$methodName = 'action_' . $action;
-		
-		$this->action = $action;
+
+		$this->action = strtolower($action);
+
+		// check ticket. All actions need a ticket, unless they are considered to be safe (a safe action
+		// is an action that requires user interaction before something is actually done)
+		// all safe actions are in this array:
+		$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',
+			'skinremovetype',
+			'skindelete',
+			'skinedit',
+			'templateedit',
+			'templatedelete',
+			'activate',
+			'systemoverview'
+		);
+/*
+		// the rest of the actions needs to be checked
+		$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');
+*/
+		if (!in_array($this->action, $aActionsNotToCheck))
+		{
+			if (!$manager->checkTicket())
+				$this->error(_ERROR_BADTICKET);
+		}
 
 		if (method_exists($this, $methodName))
 			call_user_func(array(&$this, $methodName));
 		else
-			$this->error(_BADACTION . " ($action)");
-		
-	}
+			$this->error(_BADACTION . htmlspecialchars(" ($action)"));
 
+	}
 
+	/**
+	 * @todo document this
+	 */
 	function action_showlogin() {
 		global $error;
 		$this->action_login($error);
 	}
 
+	/**
+	 * @todo document this
+	 */
 	function action_login($msg = '', $passvars = 1) {
 		global $member;
-		
+
 		// skip to overview when allowed
 		if ($member->isLoggedIn() && $member->canLogin()) {
 			$this->action_overview();
 			exit;
 		}
-			
+
 		$this->pagehead();
-		
+
 		echo '<h2>', _LOGIN ,'</h2>';
 		if ($msg) echo _MESSAGE , ': ', htmlspecialchars($msg);
 		?>
-		
+
 		<form action="index.php" method="post"><p>
-		<?php echo _LOGIN_NAME?>: <br /><input name="login"  tabindex="10" />
+		<?php echo _LOGIN_NAME; ?> <br /><input name="login"  tabindex="10" />
 		<br />
-		<?php echo _LOGIN_PASSWORD?>: <br /><input name="password"  tabindex="20" type="password" />
+		<?php echo _LOGIN_PASSWORD; ?> <br /><input name="password"  tabindex="20" type="password" />
 		<br />
 		<input name="action" value="login" type="hidden" />
 		<br />
@@ -83,13 +170,13 @@ class ADMIN {
 			<br /><a href="forgotpassword.html"><?php echo _LOGIN_FORGOT?></a>
 		</small>
 		<?php			// pass through vars
-			
+
 			$oldaction = postVar('oldaction');
 			if (  ($oldaction != 'logout')  && ($oldaction != 'login')  && $passvars ) {
 				passRequestVars();
 			}
 
-			
+
 		?>
 		</p></form>
 		<?php		$this->pagefoot();
@@ -97,56 +184,57 @@ class ADMIN {
 
 
 	/**
-	  * provides a screen with the overview of the actions available
-	  */
+	 * provides a screen with the overview of the actions available
+	 * @todo document parameter
+	 */
 	function action_overview($msg = '') {
 		global $member;
-		
+
 		$this->pagehead();
-		
+
 		if ($msg)
 			echo _MESSAGE , ': ', $msg;
-		
+
 		/* ---- add items ---- */
 		echo '<h2>' . _OVERVIEW_YRBLOGS . '</h2>';
-		
+
 		$showAll = requestVar('showall');
-		
+
 		if (($member->isAdmin()) && ($showAll == 'yes')) {
 			// Super-Admins have access to all blogs! (no add item support though)
 			$query =  'SELECT bnumber, bname, 1 as tadmin, burl, bshortname'
-			       . ' FROM ' . sql_table('blog')
-			       . ' ORDER BY bname';
+				   . ' FROM ' . sql_table('blog')
+				   . ' ORDER BY bname';
 		} else {
 			$query =  'SELECT bnumber, bname, tadmin, burl, bshortname'
-			       . ' FROM ' . sql_table('blog') . ', ' . sql_table('team')
-			       . ' WHERE tblog=bnumber and tmember=' . $member->getID()
-			       . ' ORDER BY bname';		
+				   . ' FROM ' . sql_table('blog') . ', ' . sql_table('team')
+				   . ' WHERE tblog=bnumber and tmember=' . $member->getID()
+				   . ' ORDER BY bname';
 		}
 		$template['content'] = 'bloglist';
 		$template['superadmin'] = $member->isAdmin();
 		$amount = showlist($query,'table',$template);
-		
+
 		if (($showAll != 'yes') && ($member->isAdmin())) {
 			$total = quickQuery('SELECT COUNT(*) as result FROM ' . sql_table('blog'));
-			if ($total > $amount) 
-				echo '<p><a href="index.php?action=overview&amp;showall=yes">Show all blogs</a></p>';
+			if ($total > $amount)
+				echo '<p><a href="index.php?action=overview&amp;showall=yes">' . _OVERVIEW_SHOWALL . '</a></p>';
 		}
 
 		if ($amount == 0)
 			echo _OVERVIEW_NOBLOGS;
-			
+
 		if ($amount != 0) {
 			echo '<h2>' . _OVERVIEW_YRDRAFTS . '</h2>';
 			$query =  'SELECT ititle, inumber, bshortname'
 				   . ' FROM ' . sql_table('item'). ', ' . sql_table('blog')
-			       . ' WHERE iauthor='.$member->getID().' and iblog=bnumber and idraft=1';
+				   . ' WHERE iauthor='.$member->getID().' and iblog=bnumber and idraft=1';
 			$template['content'] = 'draftlist';
 			$amountdrafts = showlist($query, 'table', $template);
-			if ($amountdrafts == 0) 
+			if ($amountdrafts == 0)
 				echo _OVERVIEW_NODRAFTS;
 		}
-		
+
 		/* ---- user settings ---- */
 		echo '<h2>' . _OVERVIEW_YRSETTINGS . '</h2>';
 		echo '<ul>';
@@ -154,7 +242,7 @@ class ADMIN {
 		echo '<li><a href="index.php?action=browseownitems">' . _OVERVIEW_BROWSEITEMS.'</a></li>';
 		echo '<li><a href="index.php?action=browseowncomments">'._OVERVIEW_BROWSECOMM.'</a></li>';
 		echo '</ul>';
-		
+
 		/* ---- general settings ---- */
 		if ($member->isAdmin()) {
 			echo '<h2>' . _OVERVIEW_MANAGEMENT. '</h2>';
@@ -162,144 +250,158 @@ class ADMIN {
 			echo '<li><a href="index.php?action=manage">',_OVERVIEW_MANAGE,'</a></li>';
 			echo '</ul>';
 		}
-		
-		
+
+
 		$this->pagefoot();
 	}
-	
-	// returns a link to a weblog (takes BLOG object as parameter)
+
+	/**
+	 * Returns a link to a weblog
+	 * @param object BLOG
+	 */
 	function bloglink(&$blog) {
-		return '<a href="'.htmlspecialchars($blog->getURL()).'" title="'._BLOGLIST_TT_VISIT.'">'.$blog->getName() .'</a>';
+		return '<a href="'.htmlspecialchars($blog->getURL()).'" title="'._BLOGLIST_TT_VISIT.'">'. htmlspecialchars( $blog->getName() ) .'</a>';
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_manage($msg = '') {
 		global $member;
-		
+
 		$member->isAdmin() or $this->disallow();
-		
+
 		$this->pagehead();
-		
+
 		echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';
-		
+
 		if ($msg)
 			echo '<p>' , _MESSAGE , ': ', $msg , '</p>';
 
 
 		echo '<h2>' . _MANAGE_GENERAL. '</h2>';
-		
+
 		echo '<ul>';
 		echo '<li><a href="index.php?action=createnewlog">'._OVERVIEW_NEWLOG.'</a></li>';
 		echo '<li><a href="index.php?action=settingsedit">'._OVERVIEW_SETTINGS.'</a></li>';
-		echo '<li><a href="index.php?action=usermanagement">'._OVERVIEW_MEMBERS.'</a></li>';		
-		echo '<li><a href="index.php?action=actionlog">'._OVERVIEW_VIEWLOG.'</a></li>';		
+		echo '<li><a href="index.php?action=usermanagement">'._OVERVIEW_MEMBERS.'</a></li>';
+		echo '<li><a href="index.php?action=actionlog">'._OVERVIEW_VIEWLOG.'</a></li>';
 		echo '</ul>';
-		
+
 		echo '<h2>' . _MANAGE_SKINS . '</h2>';
 		echo '<ul>';
 		echo '<li><a href="index.php?action=skinoverview">'._OVERVIEW_SKINS.'</a></li>';
 		echo '<li><a href="index.php?action=templateoverview">'._OVERVIEW_TEMPLATES.'</a></li>';
-		echo '<li><a href="index.php?action=skinieoverview">'._OVERVIEW_SKINIMPORT.'</a></li>';		
+		echo '<li><a href="index.php?action=skinieoverview">'._OVERVIEW_SKINIMPORT.'</a></li>';
 		echo '</ul>';
-		
-		echo '<h2>' . _MANAGE_EXTRA . '</h2>';		
+
+		echo '<h2>' . _MANAGE_EXTRA . '</h2>';
 		echo '<ul>';
-		echo '<li><a href="index.php?action=backupoverview">'._OVERVIEW_BACKUP.'</a></li>';			
-		echo '<li><a href="index.php?action=pluginlist">'._OVERVIEW_PLUGINS.'</a></li>';			
-		echo '</ul>';	
-		
-		$this->pagefoot();	
+		echo '<li><a href="index.php?action=backupoverview">'._OVERVIEW_BACKUP.'</a></li>';
+		echo '<li><a href="index.php?action=pluginlist">'._OVERVIEW_PLUGINS.'</a></li>';
+		echo '</ul>';
+
+		$this->pagefoot();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_itemlist($blogid = '') {
-		global $member, $manager;
-		
+		global $member, $manager, $CONF;
+
 		if ($blogid == '')
 			$blogid = intRequestVar('blogid');
-		
-		$member->teamRights($blogid) or $member->isAdmin() or $this->disallow();		
-		
+
+		$member->teamRights($blogid) or $member->isAdmin() or $this->disallow();
+
 		$this->pagehead();
 		$blog =& $manager->getBlog($blogid);
-		
-		echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';		
+
+		echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';
 		echo '<h2>' . _ITEMLIST_BLOG . ' ' . $this->bloglink($blog) . '</h2>';
-		
+
 		// start index
 		if (postVar('start'))
 			$start = intPostVar('start');
 		else
-			$start = 0; 	
-			
+			$start = 0;
+
 		if ($start == 0)
-			echo '<p><a href="index.php?action=createitem&amp;blogid='.$blogid.'">',_ITEMLIST_ADDNEW,'</a></p>';		
-			
+			echo '<p><a href="index.php?action=createitem&amp;blogid='.$blogid.'">',_ITEMLIST_ADDNEW,'</a></p>';
+
 		// amount of items to show
 		if (postVar('amount'))
 			$amount = intPostVar('amount');
-		else
-			$amount = 10;	
-		
+		else {
+			$amount = intval($CONF['DefaultListSize']);
+			if ($amount < 1)
+				$amount = 10;
+		}
+
 		$search = postVar('search');	// search through items
-			
+
 		$query =  'SELECT bshortname, cname, mname, ititle, ibody, inumber, idraft, itime'
-		       . ' FROM ' . sql_table('item') . ', ' . sql_table('blog') . ', ' . sql_table('member') . ', ' . sql_table('category')
-		       . ' WHERE iblog=bnumber and iauthor=mnumber and icat=catid and iblog=' . $blogid;
-		
-		if ($search) 
-			$query .= ' and ((ititle LIKE "%' . addslashes($search) . '%") or (ibody LIKE "%' . addslashes($search) . '%") or (imore LIKE "%' . addslashes($search) . '%"))';			
-			
+			   . ' FROM ' . sql_table('item') . ', ' . sql_table('blog') . ', ' . sql_table('member') . ', ' . sql_table('category')
+			   . ' WHERE iblog=bnumber and iauthor=mnumber and icat=catid and iblog=' . $blogid;
+
+		if ($search)
+			$query .= ' and ((ititle LIKE "%' . addslashes($search) . '%") or (ibody LIKE "%' . addslashes($search) . '%") or (imore LIKE "%' . addslashes($search) . '%"))';
+
 		// non-blog-admins can only edit/delete their own items
-		if (!$member->blogAdminRights($blogid)) 
+		if (!$member->blogAdminRights($blogid))
 			$query .= ' and iauthor=' . $member->getID();
 
-				
+
 		$query .= ' ORDER BY itime DESC'
-		        . " LIMIT $start,$amount";
-		
+				. " LIMIT $start,$amount";
+
 		$template['content'] = 'itemlist';
 		$template['now'] = $blog->getCorrectTime(time());
 
-
-		$navList = new NAVLIST('itemlist', $start, $amount, 0, 1000, $blogid, $search, 0);
+		$manager->loadClass("ENCAPSULATE");
+		$navList =& new NAVLIST('itemlist', $start, $amount, 0, 1000, $blogid, $search, 0);
 		$navList->showBatchList('item',$query,'table',$template);
 
-		
+
 		$this->pagefoot();
 	}
-	
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_batchitem() {
 		global $member, $manager;
-		
+
 		// check if logged in
 		$member->isLoggedIn() or $this->disallow();
-		
-		// more precise check will be done for each performed operation 
-	
+
+		// more precise check will be done for each performed operation
+
 		// get array of itemids from request
 		$selected = requestIntArray('batch');
 		$action = requestVar('batchaction');
-		
+
 		// Show error when no items were selected
 		if (!is_array($selected) || sizeof($selected) == 0)
 			$this->error(_BATCH_NOSELECTION);
-			
+
 		// On move: when no destination blog/category chosen, show choice now
 		$destCatid = intRequestVar('destcatid');
-		if (($action == 'move') && (!$manager->existsCategory($destCatid))) 
+		if (($action == 'move') && (!$manager->existsCategory($destCatid)))
 			$this->batchMoveSelectDestination('item',$selected);
-		
+
 		// On delete: check if confirmation has been given
-		if (($action == 'delete') && (requestVar('confirmation') != 'yes')) 
+		if (($action == 'delete') && (requestVar('confirmation') != 'yes'))
 			$this->batchAskDeleteConfirmation('item',$selected);
 
 		$this->pagehead();
-		
-		echo '<a href="index.php?action=overview">(',_BACKHOME,')</a>';		
+
+		echo '<a href="index.php?action=overview">(',_BACKHOME,')</a>';
 		echo '<h2>',_BATCH_ITEMS,'</h2>';
 		echo '<p>',_BATCH_EXECUTING,' <b>',htmlspecialchars($action),'</b></p>';
 		echo '<ul>';
-		
+
 
 		// walk over all itemids and perform action
 		foreach ($selected as $itemid) {
@@ -315,48 +417,51 @@ class ADMIN {
 					$error = $this->moveOneItem($itemid, $destCatid);
 					break;
 				default:
-					$error = _BATCH_UNKNOWN . $action;
+					$error = _BATCH_UNKNOWN . htmlspecialchars($action);
 			}
 
 			echo '<b>',($error ? $error : _BATCH_SUCCESS),'</b>';
 			echo '</li>';
 		}
-		
+
 		echo '</ul>';
 		echo '<b>',_BATCH_DONE,'</b>';
-		
+
 		$this->pagefoot();
 
-		
+
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_batchcomment() {
 		global $member;
-		
+
 		// check if logged in
 		$member->isLoggedIn() or $this->disallow();
-		
-		// more precise check will be done for each performed operation 
-	
+
+		// more precise check will be done for each performed operation
+
 		// get array of itemids from request
 		$selected = requestIntArray('batch');
 		$action = requestVar('batchaction');
-		
+
 		// Show error when no items were selected
 		if (!is_array($selected) || sizeof($selected) == 0)
 			$this->error(_BATCH_NOSELECTION);
-			
+
 		// On delete: check if confirmation has been given
-		if (($action == 'delete') && (requestVar('confirmation') != 'yes')) 
+		if (($action == 'delete') && (requestVar('confirmation') != 'yes'))
 			$this->batchAskDeleteConfirmation('comment',$selected);
 
 		$this->pagehead();
-		
-		echo '<a href="index.php?action=overview">(',_BACKHOME,')</a>';		
+
+		echo '<a href="index.php?action=overview">(',_BACKHOME,')</a>';
 		echo '<h2>',_BATCH_COMMENTS,'</h2>';
 		echo '<p>',_BATCH_EXECUTING,' <b>',htmlspecialchars($action),'</b></p>';
 		echo '<ul>';
-		
+
 		// walk over all itemids and perform action
 		foreach ($selected as $commentid) {
 			$commentid = intval($commentid);
@@ -368,46 +473,49 @@ class ADMIN {
 					$error = $this->deleteOneComment($commentid);
 					break;
 				default:
-					$error = _BATCH_UNKNOWN . $action;
+					$error = _BATCH_UNKNOWN . htmlspecialchars($action);
 			}
 
 			echo '<b>',($error ? $error : _BATCH_SUCCESS),'</b>';
 			echo '</li>';
 		}
-		
+
 		echo '</ul>';
 		echo '<b>',_BATCH_DONE,'</b>';
-		
+
 		$this->pagefoot();
 
-		
+
 	}
 
+	/**
+	 * @todo document this
+	 */
 	function action_batchmember() {
 		global $member;
-		
+
 		// check if logged in and admin
 		($member->isLoggedIn() && $member->isAdmin()) or $this->disallow();
-		
+
 		// get array of itemids from request
 		$selected = requestIntArray('batch');
 		$action = requestVar('batchaction');
-		
+
 		// Show error when no members selected
 		if (!is_array($selected) || sizeof($selected) == 0)
 			$this->error(_BATCH_NOSELECTION);
-			
+
 		// On delete: check if confirmation has been given
-		if (($action == 'delete') && (requestVar('confirmation') != 'yes')) 
+		if (($action == 'delete') && (requestVar('confirmation') != 'yes'))
 			$this->batchAskDeleteConfirmation('member',$selected);
 
 		$this->pagehead();
-		
-		echo '<a href="index.php?action=usermanagement">(',_MEMBERS_BACKTOOVERVIEW,')</a>';		
+
+		echo '<a href="index.php?action=usermanagement">(',_MEMBERS_BACKTOOVERVIEW,')</a>';
 		echo '<h2>',_BATCH_MEMBERS,'</h2>';
 		echo '<p>',_BATCH_EXECUTING,' <b>',htmlspecialchars($action),'</b></p>';
 		echo '<ul>';
-		
+
 		// walk over all itemids and perform action
 		foreach ($selected as $memberid) {
 			$memberid = intval($memberid);
@@ -426,56 +534,58 @@ class ADMIN {
 				case 'unsetadmin':
 					// there should always remain at least one super-admin
 					$r = sql_query('SELECT * FROM '.sql_table('member'). ' WHERE madmin=1 and mcanlogin=1');
-					if (mysql_num_rows($r) < 2)
+					if (sql_num_rows($r) < 2)
 						$error = _ERROR_ATLEASTONEADMIN;
 					else
 						sql_query('UPDATE ' . sql_table('member') .' SET madmin=0 WHERE mnumber='.$memberid);
 					break;
 				default:
-					$error = _BATCH_UNKNOWN . $action;
+					$error = _BATCH_UNKNOWN . htmlspecialchars($action);
 			}
 
 			echo '<b>',($error ? $error : _BATCH_SUCCESS),'</b>';
 			echo '</li>';
 		}
-		
+
 		echo '</ul>';
 		echo '<b>',_BATCH_DONE,'</b>';
-		
+
 		$this->pagefoot();
 
-		
-	}	
-	
 
+	}
+
+	/**
+	 * @todo document this
+	 */
 	function action_batchteam() {
 		global $member;
-		
+
 		$blogid = intRequestVar('blogid');
-		
+
 		// check if logged in and admin
 		($member->isLoggedIn() && $member->blogAdminRights($blogid)) or $this->disallow();
-		
+
 		// get array of itemids from request
 		$selected = requestIntArray('batch');
 		$action = requestVar('batchaction');
-		
+
 		// Show error when no members selected
 		if (!is_array($selected) || sizeof($selected) == 0)
 			$this->error(_BATCH_NOSELECTION);
-			
+
 		// On delete: check if confirmation has been given
-		if (($action == 'delete') && (requestVar('confirmation') != 'yes')) 
+		if (($action == 'delete') && (requestVar('confirmation') != 'yes'))
 			$this->batchAskDeleteConfirmation('team',$selected);
 
 		$this->pagehead();
-		
+
 		echo '<p><a href="index.php?action=manageteam&amp;blogid=',$blogid,'">(',_BACK,')</a></p>';
 
 		echo '<h2>',_BATCH_TEAM,'</h2>';
 		echo '<p>',_BATCH_EXECUTING,' <b>',htmlspecialchars($action),'</b></p>';
 		echo '<ul>';
-		
+
 		// walk over all itemids and perform action
 		foreach ($selected as $memberid) {
 			$memberid = intval($memberid);
@@ -494,61 +604,62 @@ class ADMIN {
 				case 'unsetadmin':
 					// there should always remain at least one admin
 					$r = sql_query('SELECT * FROM '.sql_table('team').' WHERE tadmin=1 and tblog='.$blogid);
-					if (mysql_num_rows($r) < 2)
+					if (sql_num_rows($r) < 2)
 						$error = _ERROR_ATLEASTONEBLOGADMIN;
 					else
 						sql_query('UPDATE '.sql_table('team').' SET tadmin=0 WHERE tblog='.$blogid.' and tmember='.$memberid);
 					break;
 				default:
-					$error = _BATCH_UNKNOWN . $action;
+					$error = _BATCH_UNKNOWN . htmlspecialchars($action);
 			}
 
 			echo '<b>',($error ? $error : _BATCH_SUCCESS),'</b>';
 			echo '</li>';
 		}
-		
+
 		echo '</ul>';
 		echo '<b>',_BATCH_DONE,'</b>';
-		
+
 		$this->pagefoot();
 
-		
-	}	
 
+	}
 
-	
+	/**
+	 * @todo document this
+	 */
 	function action_batchcategory() {
 		global $member, $manager;
-		
+
 		// check if logged in
 		$member->isLoggedIn() or $this->disallow();
-		
-		// more precise check will be done for each performed operation 
-	
+
+		// more precise check will be done for each performed operation
+
 		// get array of itemids from request
 		$selected = requestIntArray('batch');
 		$action = requestVar('batchaction');
-		
+
 		// Show error when no items were selected
 		if (!is_array($selected) || sizeof($selected) == 0)
 			$this->error(_BATCH_NOSELECTION);
-			
+
 		// On move: when no destination blog chosen, show choice now
 		$destBlogId = intRequestVar('destblogid');
-		if (($action == 'move') && (!$manager->existsBlogID($destBlogId))) 
+		if (($action == 'move') && (!$manager->existsBlogID($destBlogId)))
 			$this->batchMoveCategorySelectDestination('category',$selected);
-		
+
 		// On delete: check if confirmation has been given
-		if (($action == 'delete') && (requestVar('confirmation') != 'yes')) 
+		if (($action == 'delete') && (requestVar('confirmation') != 'yes'))
 			$this->batchAskDeleteConfirmation('category',$selected);
 
 		$this->pagehead();
-		
-		echo '<a href="index.php?action=overview">(',_BACKHOME,')</a>';		
+
+		echo '<a href="index.php?action=overview">(',_BACKHOME,')</a>';
 		echo '<h2>',BATCH_CATEGORIES,'</h2>';
 		echo '<p>',_BATCH_EXECUTING,' <b>',htmlspecialchars($action),'</b></p>';
 		echo '<ul>';
-		
+
 		// walk over all itemids and perform action
 		foreach ($selected as $catid) {
 			$catid = intval($catid);
@@ -563,21 +674,25 @@ class ADMIN {
 					$error = $this->moveOneCategory($catid, $destBlogId);
 					break;
 				default:
-					$error = _BATCH_UNKNOWN . $action;
+					$error = _BATCH_UNKNOWN . htmlspecialchars($action);
 			}
 
-			echo '<b>',($error ? 'Error: '.$error : _BATCH_SUCCESS),'</b>';
+			echo '<b>',($error ? _ERROR . ': '.$error : _BATCH_SUCCESS),'</b>';
 			echo '</li>';
 		}
-		
+
 		echo '</ul>';
 		echo '<b>',_BATCH_DONE,'</b>';
-		
+
 		$this->pagefoot();
-		
+
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function batchMoveSelectDestination($type, $ids) {
+		global $manager;
 		$this->pagehead();
 		?>
 		<h2><?php echo _MOVE_TITLE?></h2>
@@ -585,25 +700,32 @@ class ADMIN {
 
 			<input type="hidden" name="action" value="batch<?php echo $type?>" />
 			<input type="hidden" name="batchaction" value="move" />
-			<?php				// insert selected item numbers
+			<?php
+				$manager->addTicketHidden();
+
+				// insert selected item numbers
 				$idx = 0;
 				foreach ($ids as $id)
 					echo '<input type="hidden" name="batch[',($idx++),']" value="',intval($id),'" />';
-			
+
 				// show blog/category selection list
 				$this->selectBlogCategory('destcatid');
-			
+
 			?>
-			
-			
+
+
 			<input type="submit" value="<?php echo _MOVE_BTN?>" onclick="return checkSubmit();" />
 
 		</div></form>
 		<?php		$this->pagefoot();
 		exit;
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function batchMoveCategorySelectDestination($type, $ids) {
+		global $manager;
 		$this->pagehead();
 		?>
 		<h2><?php echo _MOVECAT_TITLE?></h2>
@@ -611,94 +733,106 @@ class ADMIN {
 
 			<input type="hidden" name="action" value="batch<?php echo $type?>" />
 			<input type="hidden" name="batchaction" value="move" />
-			<?php				// insert selected item numbers
+			<?php
+				$manager->addTicketHidden();
+
+				// insert selected item numbers
 				$idx = 0;
 				foreach ($ids as $id)
 					echo '<input type="hidden" name="batch[',($idx++),']" value="',intval($id),'" />';
-			
+
 				// show blog/category selection list
 				$this->selectBlog('destblogid');
-			
+
 			?>
-			
-			
+
+
 			<input type="submit" value="<?php echo _MOVECAT_BTN?>" onclick="return checkSubmit();" />
 
 		</div></form>
 		<?php		$this->pagefoot();
 		exit;
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function batchAskDeleteConfirmation($type, $ids) {
+		global $manager;
+
 		$this->pagehead();
 		?>
 		<h2><?php echo _BATCH_DELETE_CONFIRM?></h2>
 		<form method="post" action="index.php"><div>
 
 			<input type="hidden" name="action" value="batch<?php echo $type?>" />
+			<?php $manager->addTicketHidden() ?>
 			<input type="hidden" name="batchaction" value="delete" />
-			<input type="hidden" name="confirmation" value="yes" />			
+			<input type="hidden" name="confirmation" value="yes" />
 			<?php				// insert selected item numbers
 				$idx = 0;
 				foreach ($ids as $id)
 					echo '<input type="hidden" name="batch[',($idx++),']" value="',intval($id),'" />';
-					
+
 				// add hidden vars for team & comment
-				if ($type == 'team') 
+				if ($type == 'team')
 				{
 					echo '<input type="hidden" name="blogid" value="',intRequestVar('blogid'),'" />';
 				}
-				if ($type == 'comment') 
+				if ($type == 'comment')
 				{
 					echo '<input type="hidden" name="itemid" value="',intRequestVar('itemid'),'" />';
 				}
-					
+
 			?>
-			
+
 			<input type="submit" value="<?php echo _BATCH_DELETE_CONFIRM_BTN?>" onclick="return checkSubmit();" />
 
 		</div></form>
 		<?php		$this->pagefoot();
 		exit;
 	}
-	
-	
+
+
 	/**
-	  * Inserts a HTML select element with choices for all categories to which the current
-	  * member has access
-	  */
+	 * Inserts a HTML select element with choices for all categories to which the current
+	 * member has access
+	 * @see function selectBlog
+	 */
 	function selectBlogCategory($name, $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1) {
 		ADMIN::selectBlog($name, 'category', $selected, $tabindex, $showNewCat, $iForcedBlogInclude);
 	}
-	
+
 	/**
-	  * Inserts a HTML select element with choices for all blogs to which the user has access
-	  *		mode = 'blog' => shows blognames and values are blogids
-	  *		mode = 'category' => show category names and values are catids
-	  *
-	  * @param $iForcedBlogInclude
-	  *		ID of a blog that always needs to be included, without checking if the member is on the blog team (-1 = none)
-	  */
+	 * Inserts a HTML select element with choices for all blogs to which the user has access
+	 *		mode = 'blog' => shows blognames and values are blogids
+	 *		mode = 'category' => show category names and values are catids
+	 *
+	 * @param $iForcedBlogInclude
+	 *		ID of a blog that always needs to be included, without checking if the
+	 *		member is on the blog team (-1 = none)
+	 * @todo document parameters
+	 */
 	function selectBlog($name, $mode='blog', $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1) {
 		global $member, $CONF;
-		
+
 		// 0. get IDs of blogs to which member can post items (+ forced blog)
 		$aBlogIds = array();
 		if ($iForcedBlogInclude != -1)
 			$aBlogIds[] = intval($iForcedBlogInclude);
 
-		if (($member->isAdmin()) && ($CONF['ShowAllBlogs'])) 
+		if (($member->isAdmin()) && ($CONF['ShowAllBlogs']))
 			$queryBlogs =  'SELECT bnumber FROM '.sql_table('blog').' ORDER BY bname';
 		else
-			$queryBlogs =  'SELECT bnumber FROM '.sql_table('blog').', '.sql_table('team').' WHERE tblog=bnumber and tmember=' . $member->getID();		
+			$queryBlogs =  'SELECT bnumber FROM '.sql_table('blog').', '.sql_table('team').' WHERE tblog=bnumber and tmember=' . $member->getID();
 		$rblogids = sql_query($queryBlogs);
-		while ($o = mysql_fetch_object($rblogids))
+		while ($o = sql_fetch_object($rblogids))
 			if ($o->bnumber != $iForcedBlogInclude)
 				$aBlogIds[] = intval($o->bnumber);
-				
+
 		if (count($aBlogIds) == 0)
 			return;
-		
+
 		echo '<select name="',$name,'" tabindex="',$tabindex,'">';
 
 		// 1. select blogs (we'll create optiongroups)
@@ -706,10 +840,10 @@ class ADMIN {
 		$queryBlogs =  'SELECT bnumber, bname FROM '.sql_table('blog').' WHERE bnumber in ('.implode(',',$aBlogIds).') ORDER BY bname';
 		$blogs = sql_query($queryBlogs);
 		if ($mode == 'category') {
-			if (mysql_num_rows($blogs) > 1)
+			if (sql_num_rows($blogs) > 1)
 				$multipleBlogs = 1;
 
-			while ($oBlog = mysql_fetch_object($blogs)) {
+			while ($oBlog = sql_fetch_object($blogs)) {
 				if ($multipleBlogs)
 					echo '<optgroup label="',htmlspecialchars($oBlog->bname),'">';
 
@@ -722,7 +856,7 @@ class ADMIN {
 
 				// 2. for each category in that blog
 				$categories = sql_query('SELECT cname, catid FROM '.sql_table('category').' WHERE cblog=' . $oBlog->bnumber . ' ORDER BY cname ASC');
-				while ($oCat = mysql_fetch_object($categories)) {
+				while ($oCat = sql_fetch_object($categories)) {
 					if ($oCat->catid == $selected)
 						$selectText = ' selected="selected" ';
 					else
@@ -735,344 +869,369 @@ class ADMIN {
 			}
 		} else {
 			// blog mode
-			while ($oBlog = mysql_fetch_object($blogs)) {
+			while ($oBlog = sql_fetch_object($blogs)) {
 				echo '<option value="',$oBlog->bnumber,'"';
 				if ($oBlog->bnumber == $selected)
 					echo ' selected="selected"';
-				echo'>',htmlspecialchars($oBlog->bname),'</option>';			
+				echo'>',htmlspecialchars($oBlog->bname),'</option>';
 			}
 		}
 		echo '</select>';
-		
+
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_browseownitems() {
-		global $member;
-		
+		global $member, $manager, $CONF;
+
 		$this->pagehead();
-		
-		echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';		
+
+		echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';
 		echo '<h2>' . _ITEMLIST_YOUR. '</h2>';
-		
+
 		// start index
 		if (postVar('start'))
-			$start = postVar('start');
+			$start = intPostVar('start');
 		else
-			$start = 0; 	
-			
+			$start = 0;
+
 		// amount of items to show
 		if (postVar('amount'))
-			$amount = postVar('amount');
-		else
-			$amount = 10;	
-		
+			$amount = intPostVar('amount');
+		else {
+			$amount = intval($CONF['DefaultListSize']);
+			if ($amount < 1)
+				$amount = 10;
+		}
+
 		$search = postVar('search');	// search through items
-			
+
 		$query =  'SELECT bshortname, cname, mname, ititle, ibody, idraft, inumber, itime'
-		       . ' FROM '.sql_table('item').', '.sql_table('blog') . ', '.sql_table('member') . ', '.sql_table('category')
-		       . ' WHERE iauthor='. $member->getID() .' and iauthor=mnumber and iblog=bnumber and icat=catid';
-		
-		if ($search) 
+			   . ' FROM '.sql_table('item').', '.sql_table('blog') . ', '.sql_table('member') . ', '.sql_table('category')
+			   . ' WHERE iauthor='. $member->getID() .' and iauthor=mnumber and iblog=bnumber and icat=catid';
+
+		if ($search)
 			$query .= ' and ((ititle LIKE "%' . addslashes($search) . '%") or (ibody LIKE "%' . addslashes($search) . '%") or (imore LIKE "%' . addslashes($search) . '%"))';
-			
+
 		$query .= ' ORDER BY itime DESC'
-		        . " LIMIT $start,$amount";
-		
+				. " LIMIT $start,$amount";
+
 		$template['content'] = 'itemlist';
 		$template['now'] = time();
 
-		$navList = new NAVLIST('browseownitems', $start, $amount, 0, 1000, $blogid, $search, 0);
+		$manager->loadClass("ENCAPSULATE");
+		$navList =& new NAVLIST('browseownitems', $start, $amount, 0, 1000, /*$blogid*/ 0, $search, 0);
 		$navList->showBatchList('item',$query,'table',$template);
 
-		$this->pagefoot();		
-		
+		$this->pagefoot();
+
 	}
-	
+
 	/**
-	  * Show all the comments for a given item
-	  */
+	 * Show all the comments for a given item
+	 * @param int $itemid
+	 */
 	function action_itemcommentlist($itemid = '') {
-		global $member;
-		
+		global $member, $manager, $CONF;
+
 		if ($itemid == '')
 			$itemid = intRequestVar('itemid');
-		
+
 		// only allow if user is allowed to alter item
 		$member->canAlterItem($itemid) or $this->disallow();
-		
+
 		$blogid = getBlogIdFromItemId($itemid);
-	
+
 		$this->pagehead();
-		
+
 		// start index
 		if (postVar('start'))
-			$start = postVar('start');
+			$start = intPostVar('start');
 		else
-			$start = 0; 	
-			
+			$start = 0;
+
 		// amount of items to show
 		if (postVar('amount'))
-			$amount = postVar('amount');
-		else
-			$amount = 10;	
-		
-		$search = postVar('search');	
-		
+			$amount = intPostVar('amount');
+		else {
+			$amount = intval($CONF['DefaultListSize']);
+			if ($amount < 1)
+				$amount = 10;
+		}
+
+		$search = postVar('search');
+
 		echo '<p>(<a href="index.php?action=itemlist&amp;blogid=',$blogid,'">',_BACKTOOVERVIEW,'</a>)</p>';
 		echo '<h2>',_COMMENTS,'</h2>';
-		
-		$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;
 
-		if ($search) 
+		$query = 'SELECT cbody, cuser, cmail, cemail, mname, ctime, chost, cnumber, cip, citem FROM ' . sql_table('comment') . ' LEFT OUTER JOIN ' . sql_table('member') . ' ON mnumber = cmember WHERE citem = ' . $itemid;
+
+		if ($search)
 			$query .= ' and cbody LIKE "%' . addslashes($search) . '%"';
 
 		$query .= ' ORDER BY ctime ASC'
-		        . " LIMIT $start,$amount";
+				. " LIMIT $start,$amount";
 
 		$template['content'] = 'commentlist';
 		$template['canAddBan'] = $member->blogAdminRights(getBlogIDFromItemID($itemid));
 
-		$navList = new NAVLIST('itemcommentlist', $start, $amount, 0, 1000, 0, $search, $itemid);
+		$manager->loadClass("ENCAPSULATE");
+		$navList =& new NAVLIST('itemcommentlist', $start, $amount, 0, 1000, 0, $search, $itemid);
 		$navList->showBatchList('comment',$query,'table',$template,_NOCOMMENTS);
-		
+
 		$this->pagefoot();
 	}
-	
+
 	/**
-	  * Browse own comments
-	  */
+	 * Browse own comments
+	 */
 	function action_browseowncomments() {
-		global $member;
-		
+		global $member, $manager, $CONF;
+
 		// start index
 		if (postVar('start'))
-			$start = postVar('start');
+			$start = intPostVar('start');
 		else
-			$start = 0; 	
-			
+			$start = 0;
+
 		// amount of items to show
 		if (postVar('amount'))
-			$amount = postVar('amount');
-		else
-			$amount = 10;	
-		
-		$search = postVar('search');			
+			$amount = intPostVar('amount');
+		else {
+			$amount = intval($CONF['DefaultListSize']);
+			if ($amount < 1)
+				$amount = 10;
+		}
+
+		$search = postVar('search');
 
 
 		$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();
 
-		if ($search) 
+		if ($search)
 			$query .= ' and cbody LIKE "%' . addslashes($search) . '%"';
 
 		$query .= ' ORDER BY ctime DESC'
-		        . " LIMIT $start,$amount";
-		
+				. " LIMIT $start,$amount";
+
 		$this->pagehead();
-		
-		echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';		
+
+		echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';
 		echo '<h2>', _COMMENTS_YOUR ,'</h2>';
-	
+
 		$template['content'] = 'commentlist';
 		$template['canAddBan'] = 0;	// doesn't make sense to allow banning yourself
-		
-		$navList = new NAVLIST('browseowncomments', $start, $amount, 0, 1000, 0, $search, 0);
+
+		$manager->loadClass("ENCAPSULATE");
+		$navList =& new NAVLIST('browseowncomments', $start, $amount, 0, 1000, 0, $search, 0);
 		$navList->showBatchList('comment',$query,'table',$template,_NOCOMMENTS_YOUR);
-	
+
 		$this->pagefoot();
 	}
-	
+
 	/**
-	  * Browse all comments for a weblog
-	  */
-	function action_blogcommentlist($blogid = '') 
+	 * Browse all comments for a weblog
+	 * @param int $blogid
+	 */
+	function action_blogcommentlist($blogid = '')
 	{
-		global $member, $manager;
-		
+		global $member, $manager, $CONF;
+
 		if ($blogid == '')
 			$blogid = intRequestVar('blogid');
 		else
 			$blogid = intval($blogid);
-			
-		$member->teamRights($blogid) or $member->isAdmin() or $this->disallow();		
-		
+
+		$member->teamRights($blogid) or $member->isAdmin() or $this->disallow();
+
 		// start index
 		if (postVar('start'))
-			$start = postVar('start');
+			$start = intPostVar('start');
 		else
-			$start = 0; 	
-			
+			$start = 0;
+
 		// amount of items to show
 		if (postVar('amount'))
-			$amount = postVar('amount');
-		else
-			$amount = 10;	
-		
+			$amount = intPostVar('amount');
+		else {
+			$amount = intval($CONF['DefaultListSize']);
+			if ($amount < 1)
+				$amount = 10;
+		}
+
 		$search = postVar('search');		// search through comments
 
 
-		$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);
+		$query =  'SELECT cbody, cuser, cemail, cmail, mname, ctime, chost, cnumber, cip, citem FROM '.sql_table('comment').' LEFT OUTER JOIN '.sql_table('member').' ON mnumber=cmember WHERE cblog=' . intval($blogid);
 
-		if ($search != '') 
+		if ($search != '')
 			$query .= ' and cbody LIKE "%' . addslashes($search) . '%"';
-			
-				
+
+
 		$query .= ' ORDER BY ctime DESC'
-		        . " LIMIT $start,$amount";
+				. " LIMIT $start,$amount";
 
 
 		$blog =& $manager->getBlog($blogid);
 
 		$this->pagehead();
-				
-		echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';		
+
+		echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';
 		echo '<h2>', _COMMENTS_BLOG , ' ' , $this->bloglink($blog), '</h2>';
-		
+
 		$template['content'] = 'commentlist';
 		$template['canAddBan'] = $member->blogAdminRights($blogid);
-		
+
+		$manager->loadClass("ENCAPSULATE");
 		$navList =& new NAVLIST('blogcommentlist', $start, $amount, 0, 1000, $blogid, $search, 0);
-		$navList->showBatchList('comment',$query,'table',$template, 'No comments were made on items of this blog');
-	
+		$navList->showBatchList('comment',$query,'table',$template, _NOCOMMENTS_BLOG);
+
 		$this->pagefoot();
 	}
 
 	/**
-	  * Provide a page to item a new item to the given blog
-	  */
+	 * Provide a page to item a new item to the given blog
+	 */
 	function action_createitem() {
 		global $member, $manager;
-		
+
 		$blogid = intRequestVar('blogid');
-		
+
 		// check if allowed
-		$member->teamRights($blogid) or $this->disallow();		
-		
+		$member->teamRights($blogid) or $this->disallow();
+
 		$memberid = $member->getID();
-		
+
 		$blog =& $manager->getBlog($blogid);
-				
+
 		$this->pagehead();
-	
+
 		// generate the add-item form
-		$formfactory = new PAGEFACTORY($blogid);
+		$formfactory =& new PAGEFACTORY($blogid);
 		$formfactory->createAddForm('admin');
 
-		$this->pagefoot();	
+		$this->pagefoot();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_itemedit() {
 		global $member, $manager;
-		
+
 		$itemid = intRequestVar('itemid');
-		
+
 		// only allow if user is allowed to alter item
 		$member->canAlterItem($itemid) or $this->disallow();
-		
+
 		$item =& $manager->getItem($itemid,1,1);
 		$blog =& $manager->getBlog(getBlogIDFromItemID($itemid));
-		
+
 		$manager->notify('PrepareItemForEdit', array('item' => &$item));
-		
+
 		if ($blog->convertBreaks()) {
 			$item['body'] = removeBreaks($item['body']);
 			$item['more'] = removeBreaks($item['more']);
 		}
-	
+
 		// form to edit blog items
 		$this->pagehead();
-		$formfactory = new PAGEFACTORY($blog->getID());
-		$formfactory->createEditForm('admin',$item);		
-		$this->pagefoot();	
+		$formfactory =& new PAGEFACTORY($blog->getID());
+		$formfactory->createEditForm('admin',$item);
+		$this->pagefoot();
 	}
-	
-	function action_itemupdate() {
+
+	/**
+	 * @todo document this
+	 */
+	function action_itemupdate() {
 		global $member, $manager, $CONF;
-		
+
 		$itemid = intRequestVar('itemid');
 		$catid = postVar('catid');
-		
+
 		// only allow if user is allowed to alter item
 		$member->canUpdateItem($itemid, $catid) or $this->disallow();
 
 		$actiontype = postVar('actiontype');
-		
+
 		// delete actions are handled by itemdelete (which has confirmation)
 		if ($actiontype == 'delete') {
 			$this->action_itemdelete();
-			return; 
+			return;
 		}
-				
+
 		$body 	= postVar('body');
 		$title 	= postVar('title');
 		$more 	= postVar('more');
 		$closed = intPostVar('closed');
+		$draftid = intPostVar('draftid');
 
 		// default action = add now
-		if (!$actiontype) 
+		if (!$actiontype)
 			$actiontype='addnow';
-			
-		// create new category if needed 
+
+		// create new category if needed
 		if (strstr($catid,'newcat')) {
-			// get blogid 
+			// get blogid
 			list($blogid) = sscanf($catid,"newcat-%d");
-			
+
 			// create
 			$blog =& $manager->getBlog($blogid);
 			$catid = $blog->createNewCategory();
 
 			// show error when sth goes wrong
-			if (!$catid) 
+			if (!$catid)
 				$this->doError(_ERROR_CATCREATEFAIL);
-		} 
+		}
 
 		/*
 			set some variables based on actiontype
-			
+
 			actiontypes:
 				draft items -> addnow, addfuture, adddraft, delete
 				non-draft items -> edit, changedate, delete
-			
+
 			variables set:
 				$timestamp: set to a nonzero value for future dates or date changes
 				$wasdraft: set to 1 when the item used to be a draft item
 				$publish: set to 1 when the edited item is not a draft
 		*/
-		switch ($actiontype) {
-			case 'adddraft':
-				$publish = 0;
-				$wasdraft = 1;
-				$timestamp = 0;
-				break;
-			case 'addfuture':
-				$wasdraft = 1;
-				$publish = 1;
-			 	$timestamp = mktime(postVar('hour'), postVar('minutes'), 0, postVar('month'), postVar('day'), postVar('year'));
-				break;
-			case 'addnow':
-				$wasdraft = 1;
-				$publish = 1;
-				$timestamp = 0;
-				break;
-			case 'changedate':
-				$timestamp = mktime(postVar('hour'), postVar('minutes'), 0, postVar('month'), postVar('day'), postVar('year'));
-				$publish = 1;
-				$wasdraft = 0;
-				break;
-			case 'edit':
-			default:
-				$publish = 1;
-				$wasdraft = 0;
-				$timestamp = 0;
+		$blogid =  getBlogIDFromItemID($itemid);
+		$blog   =& $manager->getBlog($blogid);
+
+		$wasdrafts = array('adddraft', 'addfuture', 'addnow');
+		$wasdraft  = in_array($actiontype, $wasdrafts) ? 1 : 0;
+		$publish   = ($actiontype != 'adddraft' && $actiontype != 'backtodrafts') ? 1 : 0;
+		if ($actiontype == 'addfuture' || $actiontype == 'changedate') {
+			$timestamp = mktime(intPostVar('hour'), intPostVar('minutes'), 0, intPostVar('month'), intPostVar('day'), intPostVar('year'));
+		} else {
+			$timestamp =0;
 		}
-		
+		$doping = ($publish && $timestamp < $blog->getCorrectTime() && postVar('dosendping')) ? 1 : 0;
+
 		// edit the item for real
 		ITEM::update($itemid, $catid, $title, $body, $more, $closed, $wasdraft, $publish, $timestamp);
-		
+
+		$this->updateFuturePosted($blogid);
+
+		if ($draftid > 0) {
+			// delete permission is checked inside ITEM::delete()
+			ITEM::delete($draftid);
+		}
+
+		if (!$closed && $doping && $blog->sendPing() && numberOfEventSubscriber('SendPing') > 0) {		//<mod by shizuki />
+			$this->action_sendping($blogid);
+			return;
+		}
+
 		// show category edit window when we created a new category
 		// ($catid will then be a new category ID, while postVar('catid') will be 'newcat-x')
 		if ($catid != intPostVar('catid')) {
 			$this->action_categoryedit(
-				$catid, 
+				$catid,
 				$blog->getID(),
 				$CONF['AdminURL'] . 'index.php?action=itemlist&blogid=' . getBlogIDFromItemID($itemid)
 			);
@@ -1081,136 +1240,191 @@ class ADMIN {
 			$this->action_itemlist(getBlogIDFromItemID($itemid));
 		}
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_itemdelete() {
 		global $member, $manager;
-		
+
 		$itemid = intRequestVar('itemid');
-		
+
 		// only allow if user is allowed to alter item
 		$member->canAlterItem($itemid) or $this->disallow();
-		
+
 		if (!$manager->existsItem($itemid,1,1))
 			$this->error(_ERROR_NOSUCHITEM);
-			
+
 		$item =& $manager->getItem($itemid,1,1);
 		$title = htmlspecialchars(strip_tags($item['title']));
 		$body = strip_tags($item['body']);
 		$body = htmlspecialchars(shorten($body,300,'...'));
-		
+
 		$this->pagehead();
 		?>
 			<h2><?php echo _DELETE_CONFIRM?></h2>
-			
+
 			<p><?php echo _CONFIRMTXT_ITEM?></p>
-			
+
 			<div class="note">
 				<b>"<?php echo  $title ?>"</b>
 				<br />
 				<?php echo $body?>
 			</div>
-			
+
 			<form method="post" action="index.php"><div>
 				<input type="hidden" name="action" value="itemdeleteconfirm" />
+				<?php $manager->addTicketHidden() ?>
 				<input type="hidden" name="itemid" value="<?php echo  $itemid; ?>" />
 				<input type="submit" value="<?php echo _DELETE_CONFIRM_BTN?>"  tabindex="10" />
 			</div></form>
-		<?php		
+		<?php
 		$this->pagefoot();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_itemdeleteconfirm() {
 		global $member;
-		
+
 		$itemid = intRequestVar('itemid');
-		
+
 		// only allow if user is allowed to alter item
 		$member->canAlterItem($itemid) or $this->disallow();
 
 		// get blogid first
 		$blogid = getBlogIdFromItemId($itemid);
-		
+
 		// delete item (note: some checks will be performed twice)
 		$this->deleteOneItem($itemid);
-		
+
 		$this->action_itemlist($blogid);
 	}
-	
-	// deletes one item and returns error if something goes wrong
+
+	/**
+	 * Deletes one item and returns error if something goes wrong
+	 * @param int $itemid
+	 */
 	function deleteOneItem($itemid) {
 		global $member, $manager;
-		
+
 		// only allow if user is allowed to alter item (also checks if itemid exists)
 		if (!$member->canAlterItem($itemid))
 			return _ERROR_DISALLOWED;
-		
+
+		// need to get blogid before the item is deleted
+		$blogid = getBlogIDFromItemId($itemid);
+
 		$manager->loadClass('ITEM');
 		ITEM::delete($itemid);
+
+		// update blog's futureposted
+		$this->updateFuturePosted($blogid);
+	}
+
+	/**
+	 * Update a blog's future posted flag
+	 * @param int $blogid
+	 */
+	function updateFuturePosted($blogid) {
+		global $manager;
+
+		$blog =& $manager->getBlog($blogid);
+		$currenttime = $blog->getCorrectTime(time());
+		$result = sql_query("SELECT * FROM ".sql_table('item').
+			" WHERE iblog='".$blogid."' AND iposted=0 AND itime>".mysqldate($currenttime));
+		if (sql_num_rows($result) > 0) {
+				$blog->setFuturePost();
+		}
+		else {
+				$blog->clearFuturePost();
+		}
 	}
 
+	/**
+	 * @todo document this
+	 */
 	function action_itemmove() {
 		global $member, $manager;
-		
-		$itemid = intRequestVar('itemid');		
-		
+
+		$itemid = intRequestVar('itemid');
+
 		// only allow if user is allowed to alter item
 		$member->canAlterItem($itemid) or $this->disallow();
 
 		$item =& $manager->getItem($itemid,1,1);
-		
+
 		$this->pagehead();
 		?>
 			<h2><?php echo _MOVE_TITLE?></h2>
 			<form method="post" action="index.php"><div>
 				<input type="hidden" name="action" value="itemmoveto" />
 				<input type="hidden" name="itemid" value="<?php echo  $itemid; ?>" />
-				
-				<?php $this->selectBlogCategory('catid',$item['catid'],10,1);?>
-				
+
+				<?php
+
+					$manager->addTicketHidden();
+					$this->selectBlogCategory('catid',$item['catid'],10,1);
+				?>
+
 				<input type="submit" value="<?php echo _MOVE_BTN?>" tabindex="10000" onclick="return checkSubmit();" />
 			</div></form>
-		<?php		
+		<?php
 		$this->pagefoot();
 	}
 
+	/**
+	 * @todo document this
+	 */
 	function action_itemmoveto() {
 		global $member, $manager;
-		
+
 		$itemid = intRequestVar('itemid');
 		$catid = requestVar('catid');
-		
-		// create new category if needed 
+
+		// create new category if needed
 		if (strstr($catid,'newcat')) {
-			// get blogid 
+			// get blogid
 			list($blogid) = sscanf($catid,'newcat-%d');
-			
+
 			// create
 			$blog =& $manager->getBlog($blogid);
 			$catid = $blog->createNewCategory();
 
 			// show error when sth goes wrong
-			if (!$catid) 
+			if (!$catid)
 				$this->doError(_ERROR_CATCREATEFAIL);
-		} 
-		
+		}
+
 		// only allow if user is allowed to alter item
 		$member->canUpdateItem($itemid, $catid) or $this->disallow();
 
-		ITEM::move($itemid, $catid);		
-		
+		$old_blogid = getBlogIDFromItemId($itemid);
+
+		ITEM::move($itemid, $catid);
+
+		// set the futurePosted flag on the blog
+		$this->updateFuturePosted(getBlogIDFromItemId($itemid));
+
+		// reset the futurePosted in case the item is moved from one blog to another
+		$this->updateFuturePosted($old_blogid);
+
 		if ($catid != intRequestVar('catid'))
 			$this->action_categoryedit($catid, $blog->getID());
 		else
-			$this->action_itemlist(getBlogIDFromCatID($catid));		
+			$this->action_itemlist(getBlogIDFromCatID($catid));
 	}
-	
+
 	/**
-	  * Moves one item to a given category (category existance should be checked by caller)
-	  * errors are returned
-	  */
+	 * Moves one item to a given category (category existance should be checked by caller)
+	 * errors are returned
+	 * @param int $itemid
+	 * @param int $destCatid category ID to which the item will be moved
+	 */
 	function moveOneItem($itemid, $destCatid) {
 		global $member;
-		
+
 		// only allow if user is allowed to move item
 		if (!$member->canUpdateItem($itemid, $destCatid))
 			return _ERROR_DISALLOWED;
@@ -1219,129 +1433,131 @@ class ADMIN {
 	}
 
 	/**
-	  * Adds a item to the chosen blog
-	  */
+	 * Adds a item to the chosen blog
+	 */
 	function action_additem() {
 		global $member, $manager, $CONF;
-		 
+
 		$manager->loadClass('ITEM');
 
 		$result = ITEM::createFromRequest();
-		
+
 		if ($result['status'] == 'error')
 			$this->error($result['message']);
-		
+
 		$blogid = getBlogIDFromItemID($result['itemid']);
 		$blog =& $manager->getBlog($blogid);
-
-		if ($result['status'] == 'newcategory')
-			$this->action_categoryedit(
-				$result['catid'],
-				$blogid, 
-				$blog->pingUserland() ? $CONF['AdminURL'] . 'index.php?action=sendping&blogid=' . intval($blogid) : ''
-			);
-		elseif ((postVar('actiontype') == 'addnow') && $blog->pingUserland())
-			$this->action_sendping($blogid);
-		else
-			$this->action_itemlist($blogid);
+		$btimestamp = $blog->getCorrectTime();
+		$item       = $manager->getItem(intval($result['itemid']), 1, 1);
+		if (!$item['draft'] && postVar('dosendping') && $item['timestamp'] <= $btimestamp) {
+			$nextAction = 'sendping';
+		} else {
+			$nextAction = 'itemlist';
+		}
+		if ($result['status'] == 'newcategory') {
+			$distURI = $manager->addTicketToUrl($CONF['AdminURL'] . 'index.php?action=' . $nextAction . '&blogid=' . intval($blogid));
+			$this->action_categoryedit($result['catid'], $blogid, $distURI);
+		} else {
+			$methodName = 'action_' . $nextAction;
+			call_user_func(array(&$this, $methodName), $blogid);
+		}
 	}
-	
+
 	/**
-	  * Shows a window that says we're about to ping weblogs.com.
-	  * immediately refresh to the real pinging page, which will 
-	  * show an error, or redirect to the blog.
-	  *
-	  * @param $blogid ID of blog for which ping needs to be sent out
-	  */
+	 * Shows a window that says we're about to ping.
+	 * immediately refresh to the real pinging page, which will
+	 * show an error, or redirect to the blog.
+	 *
+	 * @param int $blogid ID of blog for which ping needs to be sent out
+	 */
 	function action_sendping($blogid = -1) {
-		global $member;
-		
+		global $member, $manager;
+
 		if ($blogid == -1)
 			$blogid = intRequestVar('blogid');
-		
+
 		$member->isLoggedIn() or $this->disallow();
-		
-		$this->pagehead('<meta http-equiv="refresh" content="1; url=index.php?action=rawping&amp;blogid=' . $blogid . '" />');
-		?>		
-		<h2>Site Updated, Now pinging weblogs.com</h2>
 
-		<p>
-			Pinging weblogs.com! This can a while...
-			<br />
-			When the ping is complete (and successfull), your weblog will show up in the weblogs.com updates list.
-		</p>
-		
-		<p>
-			If you aren't automatically passed through, <a href="index.php?action=rawping&amp;blogid=<?php echo $blogid?>">try again</a>
+		$rawPingUrl = $manager->addTicketToUrl('index.php?action=rawping&blogid=' . intval($blogid));
+
+		$this->pagehead('<meta http-equiv="refresh" content="1; url='.htmlspecialchars($rawPingUrl).'" />');
+		echo _UPDATEDPING_MESSAGE;
+		?>
+		<a href="index.php?action=rawping&amp;blogid=<?php echo $blogid?>"><?php echo _UPDATEDPING_GOPINGPAGE ?></a>
 		</p>
-		<?php		$this->pagefoot();
+		<?php
+		$this->pagefoot();
 	}
-	
-	// ping to Weblogs.com
-	// sends the real ping (can take up to 10 seconds!)
+
+	/**
+	 * Sends the real ping (can take up to 10 seconds!)
+	 */
 	function action_rawping() {
 		global $manager;
 		// TODO: checks?
-				
+
 		$blogid = intRequestVar('blogid');
 		$blog =& $manager->getBlog($blogid);
-		
-		$result = $blog->sendUserlandPing();
-		
+
 		$this->pagehead();
-		
+
 		?>
-		
-		<h2>Ping Results</h2>
-		
-		<p>The following message was returned by weblogs.com:</p>
-		
-		<div class='note'><?php echo  $result ?></div>
-		
+
+		<h2><?php echo _UPDATEDPING_PINGING ?></h2>
+		<div class='note'>
+                <?php
+
+		// send sendPing event
+		$manager->notify('SendPing', array('blogid' => $blogid));
+
+                ?>
+                </div>
+
 		<ul>
-			<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>
-			<li><a href="<?php echo $blog->getURL()?>">Visit your own site</a></li>
+			<li><a href="index.php?action=itemlist&amp;blogid=<?php echo $blog->getID()?>"><?php echo _UPDATEDPING_VIEWITEM . htmlspecialchars($blog->getName())?></a></li>
+			<li><a href="<?php echo $blog->getURL()?>"><?php echo _UPDATEDPING_VISITOWNSITE ?></a></li>
 		</ul>
-		
+
 		<?php		$this->pagefoot();
 	}
-	
-	/** 
-	  * Allows to edit previously made comments
-	  */
+
+	/**
+	 * Allows to edit previously made comments
+	 */
 	function action_commentedit() {
 		global $member, $manager;
-		
+
 		$commentid = intRequestVar('commentid');
-		
+
 		$member->canAlterComment($commentid) or $this->disallow();
 
 		$comment = COMMENT::getComment($commentid);
-		
+
 		$manager->notify('PrepareCommentForEdit',array('comment' => &$comment));
 
 		// change <br /> to \n
 		$comment['body'] = str_replace('<br />','',$comment['body']);
-		
-		$comment['body'] = eregi_replace("<a href=['\"]([^'\"]+)['\"]>[^<]*</a>","\\1",$comment['body']);
-		
+
+		$comment['body'] = eregi_replace("<a href=['\"]([^'\"]+)['\"]( rel=\"nofollow\")?>[^<]*</a>","\\1",$comment['body']);
+
 		$this->pagehead();
-		
+
 		?>
 		<h2><?php echo _EDITC_TITLE?></h2>
-		
+
 		<form action="index.php" method="post"><div>
-		
+
 		<input type="hidden" name="action" value="commentupdate" />
+		<?php $manager->addTicketHidden(); ?>
 		<input type="hidden" name="commentid" value="<?php echo  $commentid; ?>" />
 		<table><tr>
 			<th colspan="2"><?php echo _EDITC_TITLE?></th>
 		</tr><tr>
 			<td><?php echo _EDITC_WHO?></td>
 			<td>
-			<?php				if ($comment['member']) 
+			<?php				if ($comment['member'])
 					echo $comment['member'] . " (" . _EDITC_MEMBER . ")";
-				else 
+				else
 					echo $comment['user'] . " (" . _EDITC_NONMEMBER . ")";
 			?>
 			</td>
@@ -1351,7 +1567,16 @@ class ADMIN {
 		</tr><tr>
 			<td><?php echo _EDITC_HOST?></td>
 			<td><?php echo  $comment['host']; ?></td>
-		</tr><tr>
+		</tr>
+		<tr>
+			<td><?php echo _EDITC_URL; ?></td>
+			<td><input type="text" name="url" size="30" tabindex="6" value="<?php echo $comment['userid']; ?>" /></td>
+		</tr>
+		<tr>
+			<td><?php echo _EDITC_EMAIL; ?></td>
+			<td><input type="text" name="email" size="30" tabindex="8" value="<?php echo $comment['email']; ?>" /></td>
+		</tr>
+		<tr>
 			<td><?php echo _EDITC_TEXT?></td>
 			<td>
 				<textarea name="body" tabindex="10" rows="10" cols="50"><?php					// htmlspecialchars not needed (things should be escaped already)
@@ -1362,23 +1587,28 @@ class ADMIN {
 			<td><?php echo _EDITC_EDIT?></td>
 			<td><input type="submit"  tabindex="20" value="<?php echo _EDITC_EDIT?>" onclick="return checkSubmit();" /></td>
 		</tr></table>
-		
+
 		</div></form>
-		<?php		
+		<?php
 		$this->pagefoot();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_commentupdate() {
 		global $member, $manager;
-		
+
 		$commentid = intRequestVar('commentid');
-		
+
 		$member->canAlterComment($commentid) or $this->disallow();
-		
+
+		$url = postVar('url');
+		$email = postVar('email');
 		$body = postVar('body');
-		
+
 		// intercept words that are too long
-		if (eregi("[a-zA-Z0-9|\.,;:!\?=\/\\]{90,90}",$body) != false) 
+		if (eregi("[a-zA-Z0-9|\.,;:!\?=\/\\]{90,90}",$body) != false)
 			$this->error(_ERROR_COMMENT_LONGWORD);
 
 		// check length
@@ -1386,147 +1616,159 @@ class ADMIN {
 			$this->error(_ERROR_COMMENT_NOCOMMENT);
 		if (strlen($body)>5000)
 			$this->error(_ERROR_COMMENT_TOOLONG);
-		
-		
+
+
 		// prepare body
 		$body = COMMENT::prepareBody($body);
-		
+
 		// call plugins
 		$manager->notify('PreUpdateComment',array('body' => &$body));
-		
+
 		$query =  'UPDATE '.sql_table('comment')
-		       . " SET cbody='" .addslashes($body). "'"
-		       . " WHERE cnumber=" . $commentid;
+			   . " SET cmail = '" . addslashes($url) . "', cemail = '" . addslashes($email) . "', cbody = '" . addslashes($body) . "'"
+			   . " WHERE cnumber=" . $commentid;
 		sql_query($query);
-		
+
 		// get itemid
 		$res = sql_query('SELECT citem FROM '.sql_table('comment').' WHERE cnumber=' . $commentid);
-		$o = mysql_fetch_object($res);
+		$o = sql_fetch_object($res);
 		$itemid = $o->citem;
-		
+
 		if ($member->canAlterItem($itemid))
-			$this->action_itemcommentlist($itemid); 
+			$this->action_itemcommentlist($itemid);
 		else
 			$this->action_browseowncomments();
-	
+
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_commentdelete() {
-		global $member;
-		
+		global $member, $manager;
+
 		$commentid = intRequestVar('commentid');
-		
+
 		$member->canAlterComment($commentid) or $this->disallow();
 
 		$comment = COMMENT::getComment($commentid);
 
 		$body = strip_tags($comment['body']);
 		$body = htmlspecialchars(shorten($body, 300, '...'));
-		
+
 		if ($comment['member'])
 			$author = $comment['member'];
 		else
 			$author = $comment['user'];
-		
+
 		$this->pagehead();
 		?>
-		
+
 			<h2><?php echo _DELETE_CONFIRM?></h2>
-			
+
 			<p><?php echo _CONFIRMTXT_COMMENT?></p>
-			
+
 			<div class="note">
 			<b><?php echo _EDITC_WHO?>:</b> <?php echo  $author ?>
 			<br />
 			<b><?php echo _EDITC_TEXT?>:</b> <?php echo  $body ?>
 			</div>
-			
+
 			<form method="post" action="index.php"><div>
 				<input type="hidden" name="action" value="commentdeleteconfirm" />
+				<?php $manager->addTicketHidden() ?>
 				<input type="hidden" name="commentid" value="<?php echo  $commentid; ?>" />
 				<input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />
 			</div></form>
-		<?php		
+		<?php
 		$this->pagefoot();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_commentdeleteconfirm() {
 		global $member;
-		
+
 		$commentid = intRequestVar('commentid');
-		
+
 		// get item id first
 		$res = sql_query('SELECT citem FROM '.sql_table('comment') .' WHERE cnumber=' . $commentid);
-		$o = mysql_fetch_object($res);
+		$o = sql_fetch_object($res);
 		$itemid = $o->citem;
 
 		$error = $this->deleteOneComment($commentid);
 		if ($error)
 			$this->doError($error);
-			
+
 		if ($member->canAlterItem($itemid))
-			$this->action_itemcommentlist($itemid); 
+			$this->action_itemcommentlist($itemid);
 		else
 			$this->action_browseowncomments();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function deleteOneComment($commentid) {
 		global $member, $manager;
-		
+
 		$commentid = intval($commentid);
-		
+
 		if (!$member->canAlterComment($commentid))
 			return _ERROR_DISALLOWED;
-			
+
 		$manager->notify('PreDeleteComment', array('commentid' => $commentid));
-				
+
 		// delete the comments associated with the item
 		$query = 'DELETE FROM '.sql_table('comment').' WHERE cnumber=' . $commentid;
 		sql_query($query);
-		
-		$manager->notify('PostDeleteComment', array('commentid' => $commentid));		
-		
+
+		$manager->notify('PostDeleteComment', array('commentid' => $commentid));
+
 		return '';
 	}
-	
+
 	/**
-	  * Usermanagement main
-	  */
+	 * Usermanagement main
+	 */
 	function action_usermanagement() {
-		global $member;
-		
+		global $member, $manager;
+
 		// check if allowed
 		$member->isAdmin() or $this->disallow();
 
 		$this->pagehead();
-	
+
 		echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
-		
+
 		echo '<h2>' . _MEMBERS_TITLE .'</h2>';
-		
+
 		echo '<h3>' . _MEMBERS_CURRENT .'</h3>';
-		
+
 		// show list of members with actions
 		$query =  'SELECT *'
-		       . ' FROM '.sql_table('member');
+			   . ' FROM '.sql_table('member');
 		$template['content'] = 'memberlist';
 		$template['tabindex'] = 10;
-		
-		$batch = new BATCH('member');
+
+		$manager->loadClass("ENCAPSULATE");
+		$batch =& new BATCH('member');
 		$batch->showlist($query,'table',$template);
 
 		echo '<h3>' . _MEMBERS_NEW .'</h3>';
 		?>
-			<form method="post" action="index.php"><div>
-			
+			<form method="post" action="index.php" name="memberedit"><div>
+
 			<input type="hidden" name="action" value="memberadd" />
-			
+			<?php $manager->addTicketHidden() ?>
+
 			<table>
 			<tr>
 				<th colspan="2"><?php echo _MEMBERS_NEW?></th>
 			</tr><tr>
 				<td><?php echo _MEMBERS_DISPLAY?> <?php help('shortnames');?>
-				    <br /><small>(This is the name used to logon)</small>
+				<br /><small><?php echo _MEMBERS_DISPLAY_INFO?></small>
 				</td>
 				<td><input tabindex="10010" name="name" size="16" maxlength="16" /></td>
 			</tr><tr>
@@ -1557,28 +1799,33 @@ class ADMIN {
 				<td><?php echo _MEMBERS_NEW?></td>
 				<td><input type="submit" value="<?php echo _MEMBERS_NEW_BTN?>" tabindex="10090" onclick="return checkSubmit();" /></td>
 			</tr></table>
-			
-			</div></form>		
-		<?php		
+
+			</div></form>
+		<?php
 		$this->pagefoot();
 	}
-	
+
 	/**
-	  * Edit member settings
-	  */
+	 * Edit member settings
+	 */
 	function action_memberedit() {
 		$this->action_editmembersettings(intRequestVar('memberid'));
 	}
+
+	/**
+	 * @todo document this
+	 */
 	function action_editmembersettings($memberid = '') {
 		global $member, $manager, $CONF;
-		
+
 		if ($memberid == '')
 			$memberid = $member->getID();
-		
+
 		// check if allowed
 		($member->getID() == $memberid) or $member->isAdmin() or $this->disallow();
-	
-		$this->pagehead();
+
+		$extrahead = '<script type="text/javascript" src="javascript/numbercheck.js"></script>';
+		$this->pagehead($extrahead);
 
 		// show message to go back to member overview (only for admins)
 		if ($member->isAdmin())
@@ -1587,19 +1834,21 @@ class ADMIN {
 			echo '<a href="index.php?action=overview">(' ._BACKHOME. ')</a>';
 
 		echo '<h2>' . _MEMBERS_EDIT . '</h2>';
-		
+
 		$mem = MEMBER::createFromID($memberid);
-		
+
 		?>
-		<form method="post" action="index.php"><div>
-		
+		<form method="post" action="index.php" name="memberedit"><div>
+
 		<input type="hidden" name="action" value="changemembersettings" />
 		<input type="hidden" name="memberid" value="<?php echo  $memberid; ?>" />
+		<?php $manager->addTicketHidden() ?>
+
 		<table><tr>
 			<th colspan="2"><?php echo _MEMBERS_EDIT?></th>
 		</tr><tr>
 			<td><?php echo _MEMBERS_DISPLAY?> <?php help('shortnames');?>
-			    <br /><small><?php echo _MEMBERS_DISPLAY_INFO?></small>
+				<br /><small><?php echo _MEMBERS_DISPLAY_INFO?></small>
 			</td>
 			<td>
 			<?php if ($CONF['AllowLoginEdit'] || $member->isAdmin()) { ?>
@@ -1612,7 +1861,7 @@ class ADMIN {
 		</tr><tr>
 			<td><?php echo _MEMBERS_REALNAME?></td>
 			<td><input name="realname" tabindex="20" maxlength="60" size="40" value="<?php echo  htmlspecialchars($mem->getRealName()); ?>" /></td>
-		</tr><tr>		
+		</tr><tr>
 		<?php if ($CONF['AllowLoginEdit'] || $member->isAdmin()) { ?>
 			<td><?php echo _MEMBERS_PWD?></td>
 			<td><input type="password" tabindex="30" maxlength="40" size="16" name="password" /></td>
@@ -1622,31 +1871,31 @@ class ADMIN {
 		<?php } ?>
 		</tr><tr>
 			<td><?php echo _MEMBERS_EMAIL?>
-			    <br /><small><?php echo _MEMBERS_EMAIL_EDIT?></small>
+				<br /><small><?php echo _MEMBERS_EMAIL_EDIT?></small>
 			</td>
 			<td><input name="email" tabindex="40" size="40" maxlength="60" value="<?php echo  htmlspecialchars($mem->getEmail()); ?>" /></td>
 		</tr><tr>
 			<td><?php echo _MEMBERS_URL?></td>
-			<td><input name="url" tabindex="50" size="40" maxlength="100" value="<?php echo  htmlspecialchars($mem->getURL()); ?>" /></td>			
+			<td><input name="url" tabindex="50" size="40" maxlength="100" value="<?php echo  htmlspecialchars($mem->getURL()); ?>" /></td>
 		<?php // only allow to change this by super-admins
 		   // we don't want normal users to 'upgrade' themselves to super-admins, do we? ;-)
 		   if ($member->isAdmin()) {
 		?>
 			</tr><tr>
 				<td><?php echo _MEMBERS_SUPERADMIN?> <?php help('superadmin'); ?></td>
-				<td><?php $this->input_yesno('admin',$mem->isAdmin(),60); ?></td>	
+				<td><?php $this->input_yesno('admin',$mem->isAdmin(),60); ?></td>
 			</tr><tr>
 				<td><?php echo _MEMBERS_CANLOGIN?> <?php help('canlogin'); ?></td>
-				<td><?php $this->input_yesno('canlogin',$mem->canLogin(),70); ?></td>
+				<td><?php $this->input_yesno('canlogin',$mem->canLogin(),70,1,0,_YES,_NO,$mem->isAdmin()); ?></td>
 		<?php } ?>
 		</tr><tr>
 			<td><?php echo _MEMBERS_NOTES?></td>
-			<td><input name="notes" tabindex="80" size="40" maxlength="100" value="<?php echo  htmlspecialchars($mem->getNotes()); ?>" /></td>			
-		</tr><tr>		
+			<td><input name="notes" tabindex="80" size="40" maxlength="100" value="<?php echo  htmlspecialchars($mem->getNotes()); ?>" /></td>
+		</tr><tr>
 			<td><?php echo _MEMBERS_DEFLANG?> <?php help('language'); ?>
 			</td>
 			<td>
-			
+
 				<select name="deflang" tabindex="85">
 					<option value=""><?php echo _MEMBERS_USESITELANG?></option>
 				<?php				// show a dropdown list of all available languages
@@ -1664,13 +1913,17 @@ class ADMIN {
 				closedir($dirhandle);
 
 				?>
-				</select>			
-			
+				</select>
+
 			</td>
 		</tr>
+		<tr>
+			<td><?php echo _MEMBERS_USEAUTOSAVE?> <?php help('autosave'); ?></td>
+			<td><?php $this->input_yesno('autosave', $mem->getAutosave(), 87); ?></td>
+		</tr>
 		<?php
 			// plugin options
-			$this->_insertPluginOptions('member',$memberid);			
+			$this->_insertPluginOptions('member',$memberid);
 		?>
 		<tr>
 			<th colspan="2"><?php echo _MEMBERS_EDIT ?></th>
@@ -1678,37 +1931,39 @@ class ADMIN {
 			<td><?php echo _MEMBERS_EDIT?></td>
 			<td><input type="submit" tabindex="90" value="<?php echo _MEMBERS_EDIT_BTN?>" onclick="return checkSubmit();" /></td>
 		</tr></table>
-		
+
 		</div></form>
-		
-		
-		<?php		
-			echo '<h3>', _PLUGINS_EXTRA , '</h3>';
+
+		<?php
+			echo '<h3>',_PLUGINS_EXTRA,'</h3>';
+
 			$manager->notify(
-				'MemberSettingsFormExtras', 	
+				'MemberSettingsFormExtras',
 				array(
 					'member' => &$mem
 				)
 			);
-			
+
 		$this->pagefoot();
 	}
-	
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_changemembersettings() {
 		global $member, $CONF, $manager;
-		
+
 		$memberid = intRequestVar('memberid');
-		
+
 		// check if allowed
 		($member->getID() == $memberid) or $member->isAdmin() or $this->disallow();
-		
-		$name			= trim(postVar('name'));
-		$realname		= trim(postVar('realname'));
+
+		$name			= trim(strip_tags(postVar('name')));
+		$realname		= trim(strip_tags(postVar('realname')));
 		$password		= postVar('password');
-		$repeatpassword	= postVar('repeatpassword');		
-		$email			= postVar('email');
-		$url			= postVar('url');
+		$repeatpassword	= postVar('repeatpassword');
+		$email			= strip_tags(postVar('email'));
+		$url			= strip_tags(postVar('url'));
 
 		// Sometimes user didn't prefix the URL with http://, this cause a malformed URL. Let's fix it.
 		if (!eregi("^https?://", $url))
@@ -1716,9 +1971,9 @@ class ADMIN {
 
 		$admin			= postVar('admin');
 		$canlogin		= postVar('canlogin');
-		$notes			= postVar('notes');
+		$notes			= strip_tags(postVar('notes'));
 		$deflang		= postVar('deflang');
-		
+
 		$mem = MEMBER::createFromID($memberid);
 
 		if ($CONF['AllowLoginEdit'] || $member->isAdmin()) {
@@ -1728,238 +1983,436 @@ class ADMIN {
 
 			if (($name != $mem->getDisplayName()) && MEMBER::exists($name))
 				$this->error(_ERROR_NICKNAMEINUSE);
-				
+
 			if ($password != $repeatpassword)
 				$this->error(_ERROR_PASSWORDMISMATCH);
-				
+
 			if ($password && (strlen($password) < 6))
 				$this->error(_ERROR_PASSWORDTOOSHORT);
+
+			$pwdvalid = true;
+			$pwderror = '';
+			$manager->notify('PrePasswordSet',array('password' => $password, 'errormessage' => &$pwderror, 'valid' => &$pwdvalid));
+			if (!pwdvalid) {
+				$this->error($pwderror);
+			}
 		}
-		
+
 		if (!isValidMailAddress($email))
 			$this->error(_ERROR_BADMAILADDRESS);
 
-	
+
 		if (!$realname)
 			$this->error(_ERROR_REALNAMEMISSING);
-			
-		if (($deflang != '') && (!checkLanguage($deflang))) 
+
+		if (($deflang != '') && (!checkLanguage($deflang)))
 			$this->error(_ERROR_NOSUCHLANGUAGE);
-		
+
 		// check if there will remain at least one site member with both the logon and admin rights
 		// (check occurs when taking away one of these rights from such a member)
 		if (    (!$admin && $mem->isAdmin() && $mem->canLogin())
-		     || (!$canlogin && $mem->isAdmin() && $mem->canLogin())
+			 || (!$canlogin && $mem->isAdmin() && $mem->canLogin())
 		   )
 		{
 			$r = sql_query('SELECT * FROM '.sql_table('member').' WHERE madmin=1 and mcanlogin=1');
-			if (mysql_num_rows($r) < 2)
+			if (sql_num_rows($r) < 2)
 				$this->error(_ERROR_ATLEASTONEADMIN);
 		}
-		
-		
-		// if email changed, generate new password
-		if ($email != $mem->getEmail())
-		{
-			$password = genPassword(10);
-			$newpass = 1;
-		} else {
-			$newpass = 0;
-		}
 
 		if ($CONF['AllowLoginEdit'] || $member->isAdmin()) {
 			$mem->setDisplayName($name);
-			if ($password) 
+			if ($password)
 				$mem->setPassword($password);
 		}
 
-		if ($newpass)
-			$mem->setPassword($password);
-		
+		$oldEmail = $mem->getEmail();
+
 		$mem->setRealName($realname);
 		$mem->setEmail($email);
 		$mem->setURL($url);
 		$mem->setNotes($notes);
 		$mem->setLanguage($deflang);
 
-		
+
 		// only allow super-admins to make changes to the admin status
 		if ($member->isAdmin()) {
 			$mem->setAdmin($admin);
 			$mem->setCanLogin($canlogin);
 		}
 
-	
+		$autosave = postVar ('autosave');
+		$mem->setAutosave($autosave);
+
 		$mem->write();
-		
+
 		// store plugin options
 		$aOptions = requestArray('plugoption');
 		NucleusPlugin::_applyPluginOptions($aOptions);
-		$manager->notify('PostPluginOptionsUpdate',array('context' => 'member', 'memberid' => $memberid, 'member' => &$mem));		
-		
-		// if new password was generated, send out mail message and logout
-		if ($newpass) 
-			$mem->sendPassword($password);
-
-		if (  ( $mem->getID() == $member->getID() ) 
-		   && ( $newpass || ( $mem->getDisplayName() != $member->getDisplayName() ) )
+		$manager->notify('PostPluginOptionsUpdate',array('context' => 'member', 'memberid' => $memberid, 'member' => &$mem));
+
+		// if email changed, generate new password
+		if ($oldEmail != $mem->getEmail())
+		{
+			$mem->sendActivationLink('addresschange', $oldEmail);
+			// logout member
+			$mem->newCookieKey();
+
+			// only log out if the member being edited is the current member.
+			if ($member->getID() == $memberid)
+				$member->logout();
+			$this->action_login(_MSG_ACTIVATION_SENT, 0);
+			return;
+		}
+
+
+		if (  ( $mem->getID() == $member->getID() )
+		   && ( $mem->getDisplayName() != $member->getDisplayName() )
 		   ) {
+			$mem->newCookieKey();
 			$member->logout();
 			$this->action_login(_MSG_LOGINAGAIN, 0);
 		} else {
 			$this->action_overview(_MSG_SETTINGSCHANGED);
 		}
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_memberadd() {
-		global $member;
-		
+		global $member, $manager;
+
 		// check if allowed
 		$member->isAdmin() or $this->disallow();
-		
+
 		if (postVar('password') != postVar('repeatpassword'))
 			$this->error(_ERROR_PASSWORDMISMATCH);
-		if (strlen(postVar('password')) < 6)  
+		if (strlen(postVar('password')) < 6)
 			$this->error(_ERROR_PASSWORDTOOSHORT);
-		
-		$res = MEMBER::create(postVar('name'), postVar('realname'), postVar('password'), postVar('email'), postVar('url'), postVar('admin'), postVar('canlogin'), postVar('notes'));	
+
+		$res = MEMBER::create(postVar('name'), postVar('realname'), postVar('password'), postVar('email'), postVar('url'), postVar('admin'), postVar('canlogin'), postVar('notes'));
 		if ($res != 1)
 			$this->error($res);
-		
-		$this->action_usermanagement();		
+
+		// fire PostRegister event
+		$newmem = new MEMBER();
+		$newmem->readFromName(postVar('name'));
+		$manager->notify('PostRegister',array('member' => &$newmem));
+
+		$this->action_usermanagement();
 	}
-	
+
 	/**
-	  * Manage team
-	  */
-	function action_manageteam() {
-		global $member;
-		
-		$blogid = intRequestVar('blogid');
-		
+	 * Account activation
+	 *
+	 * @author dekarma
+	 */
+	function action_activate() {
+
+		$key = getVar('key');
+		$this->_showActivationPage($key);
+	}
+
+	/**
+	 * @todo document this
+	 */
+	function _showActivationPage($key, $message = '')
+	{
+		global $manager;
+
+		// clean up old activation keys
+		MEMBER::cleanupActivationTable();
+
+		// get activation info
+		$info = MEMBER::getActivationInfo($key);
+
+		if (!$info)
+			$this->error(_ERROR_ACTIVATE);
+
+		$mem = MEMBER::createFromId($info->vmember);
+
+		if (!$mem)
+			$this->error(_ERROR_ACTIVATE);
+
+		$text = '';
+		$title = '';
+		$bNeedsPasswordChange = true;
+
+		switch ($info->vtype)
+		{
+			case 'forgot':
+				$title = _ACTIVATE_FORGOT_TITLE;
+				$text = _ACTIVATE_FORGOT_TEXT;
+				break;
+			case 'register':
+				$title = _ACTIVATE_REGISTER_TITLE;
+				$text = _ACTIVATE_REGISTER_TEXT;
+				break;
+			case 'addresschange':
+				$title = _ACTIVATE_CHANGE_TITLE;
+				$text = _ACTIVATE_CHANGE_TEXT;
+				$bNeedsPasswordChange = false;
+				MEMBER::activate($key);
+				break;
+		}
+
+		$aVars = array(
+			'memberName' => htmlspecialchars($mem->getDisplayName())
+		);
+		$title = TEMPLATE::fill($title, $aVars);
+		$text = TEMPLATE::fill($text, $aVars);
+
+		$this->pagehead();
+
+			echo '<h2>' , $title, '</h2>';
+			echo '<p>' , $text, '</p>';
+
+			if ($message != '')
+			{
+				echo '<p class="error">',$message,'</p>';
+			}
+
+			if ($bNeedsPasswordChange)
+			{
+				?>
+					<div><form action="index.php" method="post">
+
+						<input type="hidden" name="action" value="activatesetpwd" />
+						<?php $manager->addTicketHidden() ?>
+						<input type="hidden" name="key" value="<?php echo htmlspecialchars($key) ?>" />
+
+						<table><tr>
+							<td><?php echo _MEMBERS_PWD?></td>
+							<td><input type="password" maxlength="40" size="16" name="password" /></td>
+						</tr><tr>
+							<td><?php echo _MEMBERS_REPPWD?></td>
+							<td><input type="password" maxlength="40" size="16" name="repeatpassword" /></td>
+						<?php
+
+							global $manager;
+							$manager->notify('FormExtra', array('type' => 'activation', 'member' => $mem));
+
+						?>
+						</tr><tr>
+							<td><?php echo _MEMBERS_SETPWD ?></td>
+							<td><input type='submit' value='<?php echo _MEMBERS_SETPWD_BTN ?>' /></td>
+						</tr></table>
+
+
+					</form></div>
+
+				<?php
+
+			}
+
+		$this->pagefoot();
+
+	}
+
+	/**
+	 * Account activation - set password part
+	 *
+	 * @author dekarma
+	 */
+	function action_activatesetpwd() {
+
+		$key = postVar('key');
+
+		// clean up old activation keys
+		MEMBER::cleanupActivationTable();
+
+		// get activation info
+		$info = MEMBER::getActivationInfo($key);
+
+		if (!$info || ($info->type == 'addresschange'))
+			return $this->_showActivationPage($key, _ERROR_ACTIVATE);
+
+		$mem = MEMBER::createFromId($info->vmember);
+
+		if (!$mem)
+			return $this->_showActivationPage($key, _ERROR_ACTIVATE);
+
+		$password 		= postVar('password');
+		$repeatpassword	= postVar('repeatpassword');
+
+		if ($password != $repeatpassword)
+			return $this->_showActivationPage($key, _ERROR_PASSWORDMISMATCH);
+
+		if ($password && (strlen($password) < 6))
+			return $this->_showActivationPage($key, _ERROR_PASSWORDTOOSHORT);
+
+		$pwdvalid = true;
+		$pwderror = '';
+		$manager->notify('PrePasswordSet',array('password' => $password, 'errormessage' => &$pwderror, 'valid' => &$pwdvalid));
+		if (!pwdvalid) {
+			return $this->_showActivationPage($key,$pwderror);
+		}
+
+		$error = '';
+		global $manager;
+		$manager->notify('ValidateForm', array('type' => 'activation', 'member' => $mem, 'error' => &$error));
+		if ($error != '')
+			return $this->_showActivationPage($key, $error);
+
+
+		// set password
+		$mem->setPassword($password);
+		$mem->write();
+
+		// do the activation
+		MEMBER::activate($key);
+
+		$this->pagehead();
+			echo '<h2>',_ACTIVATE_SUCCESS_TITLE,'</h2>';
+			echo '<p>',_ACTIVATE_SUCCESS_TEXT,'</p>';
+		$this->pagefoot();
+	}
+
+	/**
+	 * Manage team
+	 */
+	function action_manageteam() {
+		global $member, $manager;
+
+		$blogid = intRequestVar('blogid');
+
 		// check if allowed
 		$member->blogAdminRights($blogid) or $this->disallow();
-	
+
 		$this->pagehead();
-		
+
 		echo "<p><a href='index.php?action=blogsettings&amp;blogid=$blogid'>(",_BACK_TO_BLOGSETTINGS,")</a></p>";
-		
+
 		echo '<h2>' . _TEAM_TITLE . getBlogNameFromID($blogid) . '</h2>';
-		
+
 		echo '<h3>' . _TEAM_CURRENT . '</h3>';
 
 
 
 		$query =  'SELECT tblog, tmember, mname, mrealname, memail, tadmin'
-		       . ' FROM '.sql_table('member').', '.sql_table('team')
-		       . ' WHERE tmember=mnumber and tblog=' . $blogid;
+			   . ' FROM '.sql_table('member').', '.sql_table('team')
+			   . ' WHERE tmember=mnumber and tblog=' . $blogid;
 
 		$template['content'] = 'teamlist';
 		$template['tabindex'] = 10;
-		
-		$batch = new BATCH('team');
+
+		$manager->loadClass("ENCAPSULATE");
+		$batch =& new BATCH('team');
 		$batch->showlist($query, 'table', $template);
 
 		?>
 			<h3><?php echo _TEAM_ADDNEW?></h3>
 
 			<form method='post' action='index.php'><div>
-			
+
 			<input type='hidden' name='action' value='teamaddmember' />
 			<input type='hidden' name='blogid' value='<?php echo  $blogid; ?>' />
+			<?php $manager->addTicketHidden() ?>
 
 			<table><tr>
 				<td><?php echo _TEAM_CHOOSEMEMBER?></td>
 				<td><?php					// TODO: try to make it so only non-team-members are listed
 					$query =  'SELECT mname as text, mnumber as value'
-					       . ' FROM '.sql_table('member');
+						   . ' FROM '.sql_table('member');
 
 					$template['name'] = 'memberid';
 					$template['tabindex'] = 10000;
-					showlist($query,'select',$template);			
+					showlist($query,'select',$template);
 				?></td>
 			</tr><tr>
 				<td><?php echo _TEAM_ADMIN?><?php help('teamadmin'); ?></td>
 				<td><?php $this->input_yesno('admin',0,10020); ?></td>
 			</tr><tr>
 				<td><?php echo _TEAM_ADD?></td>
-				<td><input type='submit' value='<?php echo _TEAM_ADD_BTN?>' tabindex="10030" /></td>		
+				<td><input type='submit' value='<?php echo _TEAM_ADD_BTN?>' tabindex="10030" /></td>
 			</tr></table>
-			
+
 			</div></form>
-		<?php		
+		<?php
 		$this->pagefoot();
 	}
-	
+
 	/**
-	  * Add member tot tram
-	  */
+	 * Add member to team
+	 */
 	function action_teamaddmember() {
 		global $member, $manager;
-		
+
 		$memberid = intPostVar('memberid');
 		$blogid = intPostVar('blogid');
 		$admin = intPostVar('admin');
-		
+
 		// check if allowed
 		$member->blogAdminRights($blogid) or $this->disallow();
-		
+
 		$blog =& $manager->getBlog($blogid);
 		if (!$blog->addTeamMember($memberid, $admin))
 			$this->error(_ERROR_ALREADYONTEAM);
-		
+
 		$this->action_manageteam();
-		
+
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_teamdelete() {
 		global $member, $manager;
-		
+
 		$memberid = intRequestVar('memberid');
 		$blogid = intRequestVar('blogid');
-		
+
 		// check if allowed
 		$member->blogAdminRights($blogid) or $this->disallow();
-		
+
 		$teammem = MEMBER::createFromID($memberid);
 		$blog =& $manager->getBlog($blogid);
-		
+
 		$this->pagehead();
 		?>
 			<h2><?php echo _DELETE_CONFIRM?></h2>
-			
-			<p><?php echo _CONFIRMTXT_TEAM1?><b><?php echo  $teammem->getDisplayName() ?></b><?php echo _CONFIRMTXT_TEAM2?><b><?php echo  htmlspecialchars(strip_tags($blog->getName())) ?></b>
+
+			<p><?php echo _CONFIRMTXT_TEAM1?><b><?php echo  htmlspecialchars($teammem->getDisplayName()) ?></b><?php echo _CONFIRMTXT_TEAM2?><b><?php echo  htmlspecialchars(strip_tags($blog->getName())) ?></b>
 			</p>
-			
-			
+
+
 			<form method="post" action="index.php"><div>
 			<input type="hidden" name="action" value="teamdeleteconfirm" />
+			<?php $manager->addTicketHidden() ?>
 			<input type="hidden" name="memberid" value="<?php echo  $memberid; ?>" />
 			<input type="hidden" name="blogid" value="<?php echo  $blogid; ?>" />
 			<input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />
 			</div></form>
-		<?php		
+		<?php
 		$this->pagefoot();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_teamdeleteconfirm() {
 		global $member;
-		
+
 		$memberid = intRequestVar('memberid');
 		$blogid = intRequestVar('blogid');
 
 		$error = $this->deleteOneTeamMember($blogid, $memberid);
-		
-		
+		if ($error)
+			$this->error($error);
+
+
 		$this->action_manageteam();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function deleteOneTeamMember($blogid, $memberid) {
 		global $member, $manager;
-		
+
 		$blogid = intval($blogid);
 		$memberid = intval($memberid);
-		
+
 		// check if allowed
 		if (!$member->blogAdminRights($blogid))
 			return _ERROR_DISALLOWED;
@@ -1967,98 +2420,106 @@ class ADMIN {
 		// check if: - there remains at least one blog admin
 		//           - (there remains at least one team member)
 		$tmem = MEMBER::createFromID($memberid);
-		
-		$manager->notify('PreDeleteTeamMember', array('member' => &$mem, 'blogid' => $blogid));				
-		
+
+		$manager->notify('PreDeleteTeamMember', array('member' => &$tmem, 'blogid' => $blogid));
+
 		if ($tmem->isBlogAdmin($blogid)) {
 			// check if there are more blog members left and at least one admin
 			// (check for at least two admins before deletion)
 			$query = 'SELECT * FROM '.sql_table('team') . ' WHERE tblog='.$blogid.' and tadmin=1';
 			$r = sql_query($query);
-			if (mysql_num_rows($r) < 2)
+			if (sql_num_rows($r) < 2)
 				return _ERROR_ATLEASTONEBLOGADMIN;
 		}
-		
+
 		$query = 'DELETE FROM '.sql_table('team')." WHERE tblog=$blogid and tmember=$memberid";
 		sql_query($query);
-		
-		$manager->notify('PostDeleteTeamMember', array('member' => &$mem, 'blogid' => $blogid));						
-		
+
+		$manager->notify('PostDeleteTeamMember', array('member' => &$tmem, 'blogid' => $blogid));
+
 		return '';
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_teamchangeadmin() {
 		global $member;
-		
+
 		$blogid = intRequestVar('blogid');
 		$memberid = intRequestVar('memberid');
-		
+
 		// check if allowed
 		$member->blogAdminRights($blogid) or $this->disallow();
 
 		$mem = MEMBER::createFromID($memberid);
-		
+
 		// don't allow when there is only one admin at this moment
 		if ($mem->isBlogAdmin($blogid)) {
 			$r = sql_query('SELECT * FROM '.sql_table('team') . " WHERE tblog=$blogid and tadmin=1");
-			if (mysql_num_rows($r) == 1)
+			if (sql_num_rows($r) == 1)
 				$this->error(_ERROR_ATLEASTONEBLOGADMIN);
 		}
-		
+
 		if ($mem->isBlogAdmin($blogid))
 			$newval = 0;
-		else	
+		else
 			$newval = 1;
-			
+
 		$query = 'UPDATE '.sql_table('team') ." SET tadmin=$newval WHERE tblog=$blogid and tmember=$memberid";
 		sql_query($query);
-		
+
 		// only show manageteam if member did not change its own admin privileges
 		if ($member->isBlogAdmin($blogid))
 			$this->action_manageteam();
 		else
 			$this->action_overview(_MSG_ADMINCHANGED);
 	}
-	  
+
+	/**
+	 * @todo document this
+	 */
 	function action_blogsettings() {
 		global $member, $manager;
-		
+
 		$blogid = intRequestVar('blogid');
-		
+
 		// check if allowed
 		$member->blogAdminRights($blogid) or $this->disallow();
-		
+
 		$blog =& $manager->getBlog($blogid);
-		
-		$this->pagehead();
-		
-		echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';		
+
+		$extrahead = '<script type="text/javascript" src="javascript/numbercheck.js"></script>';
+		$this->pagehead($extrahead);
+
+		echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';
 		?>
 		<h2><?php echo _EBLOG_TITLE?>: '<?php echo $this->bloglink($blog)?>'</h2>
 
 		<h3><?php echo _EBLOG_TEAM_TITLE?></h3>
-		
-		<p>Members currently on your team: 
+
+		<p><?php echo _EBLOG_CURRENT_TEAM_MEMBER; ?>
 		<?php
 			$res = sql_query('SELECT mname, mrealname FROM ' . sql_table('member') . ',' . sql_table('team') . ' WHERE mnumber=tmember AND tblog=' . intval($blogid));
 			$aMemberNames = array();
-			while ($o = mysql_fetch_object($res))
+			while ($o = sql_fetch_object($res))
 				array_push($aMemberNames, htmlspecialchars($o->mname) . ' (' . htmlspecialchars($o->mrealname). ')');
 			echo implode(',', $aMemberNames);
 		?>
 		</p>
-		
-		
+
+
 
 		<p>
 		<a href="index.php?action=manageteam&amp;blogid=<?php echo $blogid?>"><?php echo _EBLOG_TEAM_TEXT?></a>
 		</p>
 
 		<h3><?php echo _EBLOG_SETTINGS_TITLE?></h3>
-		
+
 		<form method="post" action="index.php"><div>
-		
+
 		<input type="hidden" name="action" value="blogsettingsupdate" />
+		<?php $manager->addTicketHidden() ?>
 		<input type="hidden" name="blogid" value="<?php echo  $blogid; ?>" />
 		<table><tr>
 			<td><?php echo _EBLOG_NAME?></td>
@@ -2076,36 +2537,40 @@ class ADMIN {
 			<td><input name="url" tabindex="40" size="40" maxlength="100" value="<?php echo  htmlspecialchars($blog->getURL()) ?>" /></td>
 		</tr><tr>
 			<td><?php echo _EBLOG_DEFSKIN?>
-			    <?php help('blogdefaultskin'); ?>
+				<?php help('blogdefaultskin'); ?>
 			</td>
 			<td>
-				<?php 
+				<?php
 					$query =  'SELECT sdname as text, sdnumber as value'
-					       . ' FROM '.sql_table('skin_desc');
+						   . ' FROM '.sql_table('skin_desc');
 					$template['name'] = 'defskin';
 					$template['selected'] = $blog->getDefaultSkin();
 					$template['tabindex'] = 50;
-					showlist($query,'select',$template);		
+					showlist($query,'select',$template);
 				?>
-				
+
 			</td>
 		</tr><tr>
 			<td><?php echo _EBLOG_LINEBREAKS?> <?php help('convertbreaks'); ?>
 			</td>
-			<td><?php $this->input_yesno('convertbreaks',$blog->convertBreaks(),55); ?></td>	
+			<td><?php $this->input_yesno('convertbreaks',$blog->convertBreaks(),55); ?></td>
 		</tr><tr>
 			<td><?php echo _EBLOG_ALLOWPASTPOSTING?> <?php help('allowpastposting'); ?>
 			</td>
-			<td><?php $this->input_yesno('allowpastposting',$blog->allowPastPosting(),57); ?></td>	
-		</tr><tr>					
+			<td><?php $this->input_yesno('allowpastposting',$blog->allowPastPosting(),57); ?></td>
+		</tr><tr>
 			<td><?php echo _EBLOG_DISABLECOMMENTS?>
 			</td>
-			<td><?php $this->input_yesno('comments',$blog->commentsEnabled(),60); ?></td>	
+			<td><?php $this->input_yesno('comments',$blog->commentsEnabled(),60); ?></td>
 		</tr><tr>
 			<td><?php echo _EBLOG_ANONYMOUS?>
 			</td>
-			<td><?php $this->input_yesno('public',$blog->isPublic(),70); ?></td>	
-		</tr><tr>		
+			<td><?php $this->input_yesno('public',$blog->isPublic(),70); ?></td>
+		</tr><tr>
+	<td><?php echo _EBLOG_REQUIREDEMAIL?>
+		 </td>
+		 <td><?php $this->input_yesno('reqemail',$blog->emailRequired(),72); ?></td>
+	  </tr><tr>
 			<td><?php echo _EBLOG_NOTIFY?> <?php help('blognotify'); ?></td>
 			<td><input name="notify" tabindex="80" maxlength="60" size="40" value="<?php echo  htmlspecialchars($blog->getNotifyAddress()); ?>" /></td>
 		</tr><tr>
@@ -2116,17 +2581,23 @@ class ADMIN {
 				/><label for="notifyComment"><?php echo _EBLOG_NOTIFY_COMMENT?></label>
 				<br />
 				<input name="notifyVote" value="5" type="checkbox" tabindex="82" id="notifyVote"
-					<?php if  ($blog->notifyOnVote()) echo "checked='checked'" ?>				
+					<?php if  ($blog->notifyOnVote()) echo "checked='checked'" ?>
 				/><label for="notifyVote"><?php echo _EBLOG_NOTIFY_KARMA?></label>
 				<br />
 				<input name="notifyNewItem" value="7" type="checkbox" tabindex="83" id="notifyNewItem"
-					<?php if  ($blog->notifyOnNewItem()) echo "checked='checked'" ?>				
+					<?php if  ($blog->notifyOnNewItem()) echo "checked='checked'" ?>
 				/><label for="notifyNewItem"><?php echo _EBLOG_NOTIFY_ITEM?></label>
 			</td>
 		</tr><tr>
-			<td><?php echo _EBLOG_PING?> <?php help('pinguserland'); ?></td>
-			<td><?php $this->input_yesno('pinguserland',$blog->pingUserland(),85); ?></td>				
-		</tr><tr>		
+		<?php
+		if (numberOfEventSubscriber('SendPing') > 0) {
+		?>
+			<td><?php echo _EBLOG_PING?> <?php help('sendping'); ?></td>
+			<td><?php $this->input_yesno('sendping',$blog->sendPing(),85); ?></td>
+		</tr><tr>
+		<?php
+		}
+		?>
 			<td><?php echo _EBLOG_MAXCOMMENTS?> <?php help('blogmaxcomments'); ?></td>
 			<td><input name="maxcomments" tabindex="90" size="3" value="<?php echo  htmlspecialchars($blog->getMaxComments()); ?>" /></td>
 		</tr><tr>
@@ -2135,25 +2606,25 @@ class ADMIN {
 		</tr><tr>
 			<td><?php echo _EBLOG_DEFCAT?></td>
 			<td>
-				<?php 
+				<?php
 					$query =  'SELECT cname as text, catid as value'
-					       . ' FROM '.sql_table('category')
-					       . ' WHERE cblog=' . $blog->getID();
+						   . ' FROM '.sql_table('category')
+						   . ' WHERE cblog=' . $blog->getID();
 					$template['name'] = 'defcat';
 					$template['selected'] = $blog->getDefaultCategory();
 					$template['tabindex'] = 110;
-					showlist($query,'select',$template);		
+					showlist($query,'select',$template);
 				?>
-			</td>			
+			</td>
 		</tr><tr>
 			<td><?php echo _EBLOG_OFFSET?> <?php help('blogtimeoffset'); ?>
-			    <br /><?php echo _EBLOG_STIME?> <b><?php echo  strftime("%H:%M",time()); ?></b>
-			    <br /><?php echo _EBLOG_BTIME?> <b><?php echo  strftime("%H:%M",$blog->getCorrectTime()); ?></b>
-			    </td>
-			<td><input name="timeoffset" tabindex="120" size="3" value="<?php echo  htmlspecialchars($blog->getTimeOffset()); ?>" /></td>			
+				<br /><?php echo _EBLOG_STIME?> <b><?php echo  strftime("%H:%M",time()); ?></b>
+				<br /><?php echo _EBLOG_BTIME?> <b><?php echo  strftime("%H:%M",$blog->getCorrectTime()); ?></b>
+				</td>
+			<td><input name="timeoffset" tabindex="120" size="3" value="<?php echo  htmlspecialchars($blog->getTimeOffset()); ?>" /></td>
 		</tr><tr>
 			<td><?php echo _EBLOG_SEARCH?> <?php help('blogsearchable'); ?></td>
-			<td><?php $this->input_yesno('searchable',$blog->getSearchable(),122); ?></td>	
+			<td><?php $this->input_yesno('searchable',$blog->getSearchable(),122); ?></td>
 		</tr>
 		<?php
 			// plugin options
@@ -2161,31 +2632,33 @@ class ADMIN {
 		?>
 		<tr>
 			<th colspan="2"><?php echo _EBLOG_CHANGE?></th>
-		</tr><tr>		
+		</tr><tr>
 			<td><?php echo _EBLOG_CHANGE?></td>
 			<td><input type="submit" tabindex="130" value="<?php echo _EBLOG_CHANGE_BTN?>" onclick="return checkSubmit();" /></td>
 		</tr></table>
-		
+
 		</div></form>
-		
+
 		<h3><?php echo _EBLOG_CAT_TITLE?></h3>
-		
 
-		<?php		
+
+		<?php
 		$query = 'SELECT * FROM '.sql_table('category').' WHERE cblog='.$blog->getID().' ORDER BY cname';
 		$template['content'] = 'categorylist';
 		$template['tabindex'] = 200;
-		
-		$batch = new BATCH('category');
+
+		$manager->loadClass("ENCAPSULATE");
+		$batch =& new BATCH('category');
 		$batch->showlist($query,'table',$template);
-		
+
 		?>
 
-		
+
 		<form action="index.php" method="post"><div>
 		<input name="action" value="categorynew" type="hidden" />
+		<?php $manager->addTicketHidden() ?>
 		<input name="blogid" value="<?php echo $blog->getID()?>" type="hidden" />
-		
+
 		<table><tr>
 			<th colspan="2"><?php echo _EBLOG_CAT_CREATE?></th>
 		</tr><tr>
@@ -2198,53 +2671,59 @@ class ADMIN {
 			<td><?php echo _EBLOG_CAT_CREATE?></td>
 			<td><input type="submit" value="<?php echo _EBLOG_CAT_CREATE?>" tabindex="320" /></td>
 		</tr></table>
-		
+
 		</div></form>
-		
-		<?php		
-			echo '<h3>', _PLUGINS_EXTRA , '</h3>';
-		
+
+		<?php
+
+			echo '<h3>',_PLUGINS_EXTRA,'</h3>';
+
 			$manager->notify(
-				'BlogSettingsFormExtras', 	
+				'BlogSettingsFormExtras',
 				array(
 					'blog' => &$blog
 				)
 			);
-		
+
 		$this->pagefoot();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_categorynew() {
 		global $member, $manager;
-		
+
 		$blogid = intRequestVar('blogid');
-		
+
 		$member->blogAdminRights($blogid) or $this->disallow();
-		
+
 		$cname = postVar('cname');
 		$cdesc = postVar('cdesc');
-		
+
 		if (!isValidCategoryName($cname))
 			$this->error(_ERROR_BADCATEGORYNAME);
-			
+
 		$query = 'SELECT * FROM '.sql_table('category') . ' WHERE cname=\'' . addslashes($cname).'\' and cblog=' . intval($blogid);
 		$res = sql_query($query);
-		if (mysql_num_rows($res) > 0)
+		if (sql_num_rows($res) > 0)
 			$this->error(_ERROR_DUPCATEGORYNAME);
-			
+
 		$blog 		=& $manager->getBlog($blogid);
 		$newCatID	=  $blog->createNewCategory($cname, $cdesc);
-		
+
 		$this->action_blogsettings();
 	}
-	
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_categoryedit($catid = '', $blogid = '', $desturl = '') {
-		global $member;
-		
+		global $member, $manager;
+
 		if ($blogid == '')
 			$blogid = intGetVar('blogid');
-		else 
+		else
 			$blogid = intval($blogid);
 		if ($catid == '')
 			$catid = intGetVar('catid');
@@ -2254,21 +2733,25 @@ class ADMIN {
 		$member->blogAdminRights($blogid) or $this->disallow();
 
 		$res = sql_query('SELECT * FROM '.sql_table('category')." WHERE cblog=$blogid AND catid=$catid");
-		$obj = mysql_fetch_object($res);
+		$obj = sql_fetch_object($res);
 
 		$cname = $obj->cname;
 		$cdesc = $obj->cdesc;
 
-		$this->pagehead();
+		$extrahead = '<script type="text/javascript" src="javascript/numbercheck.js"></script>';
+		$this->pagehead($extrahead);
+
+		echo "<p><a href='index.php?action=blogsettings&amp;blogid=$blogid'>(",_BACK_TO_BLOGSETTINGS,")</a></p>";
 
 		?>
 		<h2><?php echo _EBLOG_CAT_UPDATE?> '<?php echo htmlspecialchars($cname)?>'</h2>
 		<form method='post' action='index.php'><div>
 		<input name="blogid" type="hidden" value="<?php echo $blogid?>" />
-		<input name="catid" type="hidden" value="<?php echo $catid?>" />			
-		<input name="desturl" type="hidden" value="<?php echo htmlspecialchars($desturl) ?>" />					
-		<input name="action" type="hidden" value="categoryupdate" />		
-		
+		<input name="catid" type="hidden" value="<?php echo $catid?>" />
+		<input name="desturl" type="hidden" value="<?php echo htmlspecialchars($desturl) ?>" />
+		<input name="action" type="hidden" value="categoryupdate" />
+		<?php $manager->addTicketHidden(); ?>
+
 		<table><tr>
 			<th colspan="2"><?php echo _EBLOG_CAT_UPDATE ?></th>
 		</tr><tr>
@@ -2278,7 +2761,7 @@ class ADMIN {
 			<td><?php echo _EBLOG_CAT_DESC?></td>
 			<td><input type="text" name="cdesc" value="<?php echo htmlspecialchars($cdesc)?>" size="40" maxlength="200" /></td>
 		</tr>
-		<?php 
+		<?php
 			// insert plugin options
 			$this->_insertPluginOptions('category',$catid);
 		?>
@@ -2288,16 +2771,18 @@ class ADMIN {
 			<td><?php echo _EBLOG_CAT_UPDATE?></td>
 			<td><input type="submit" value="<?php echo _EBLOG_CAT_UPDATE_BTN?>" /></td>
 		</tr></table>
-			
+
 		</div></form>
-		<?php		
+		<?php
 		$this->pagefoot();
 	}
-	
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_categoryupdate() {
 		global $member, $manager;
-		
+
 		$blogid = intPostVar('blogid');
 		$catid = intPostVar('catid');
 		$cname = postVar('cname');
@@ -2305,28 +2790,28 @@ class ADMIN {
 		$desturl = postVar('desturl');
 
 		$member->blogAdminRights($blogid) or $this->disallow();
-		
+
 		if (!isValidCategoryName($cname))
 			$this->error(_ERROR_BADCATEGORYNAME);
-			
+
 		$query = 'SELECT * FROM '.sql_table('category').' WHERE cname=\'' . addslashes($cname).'\' and cblog=' . intval($blogid) . " and not(catid=$catid)";
 		$res = sql_query($query);
-		if (mysql_num_rows($res) > 0)
+		if (sql_num_rows($res) > 0)
 			$this->error(_ERROR_DUPCATEGORYNAME);
-			
+
 		$query =  'UPDATE '.sql_table('category').' SET'
 			   . " cname='" . addslashes($cname) . "',"
-			   . " cdesc='" . addslashes($cdesc) . "'"			   
+			   . " cdesc='" . addslashes($cdesc) . "'"
 			   . " WHERE catid=" . $catid;
-			   
+
 		sql_query($query);
-		
+
 		// store plugin options
 		$aOptions = requestArray('plugoption');
 		NucleusPlugin::_applyPluginOptions($aOptions);
-		$manager->notify('PostPluginOptionsUpdate',array('context' => 'category', 'catid' => $catid));		
+		$manager->notify('PostPluginOptionsUpdate',array('context' => 'category', 'catid' => $catid));
+
 
-		
 		if ($desturl) {
 			redirect($desturl);
 			exit;
@@ -2335,55 +2820,62 @@ class ADMIN {
 		}
 	}
 
+	/**
+	 * @todo document this
+	 */
 	function action_categorydelete() {
-		global $member, $manager; 
-		
+		global $member, $manager;
+
 		$blogid = intRequestVar('blogid');
 		$catid = intRequestVar('catid');
-		
+
 		$member->blogAdminRights($blogid) or $this->disallow();
-		
+
 		$blog =& $manager->getBlog($blogid);
-	
+
 		// check if the category is valid
-		if (!$blog->isValidCategory($catid)) 
+		if (!$blog->isValidCategory($catid))
 			$this->error(_ERROR_NOSUCHCATEGORY);
-	
+
 		// don't allow deletion of default category
 		if ($blog->getDefaultCategory() == $catid)
 			$this->error(_ERROR_DELETEDEFCATEGORY);
-		
+
 		// check if catid is the only category left for blogid
 		$query = 'SELECT catid FROM '.sql_table('category').' WHERE cblog=' . $blogid;
 		$res = sql_query($query);
-		if (mysql_num_rows($res) == 1)
+		if (sql_num_rows($res) == 1)
 			$this->error(_ERROR_DELETELASTCATEGORY);
-		
-		
+
+
 		$this->pagehead();
 		?>
 			<h2><?php echo _DELETE_CONFIRM?></h2>
-			
+
 			<div>
-			<?php echo _CONFIRMTXT_CATEGORY?><b><?php echo  $blog->getCategoryName($catid)?></b>
+			<?php echo _CONFIRMTXT_CATEGORY?><b><?php echo  htmlspecialchars($blog->getCategoryName($catid))?></b>
 			</div>
-			
+
 			<form method="post" action="index.php"><div>
 			<input type="hidden" name="action" value="categorydeleteconfirm" />
+			<?php $manager->addTicketHidden() ?>
 			<input type="hidden" name="blogid" value="<?php echo $blogid?>" />
-			<input type="hidden" name="catid" value="<?php echo $catid?>" />						
+			<input type="hidden" name="catid" value="<?php echo $catid?>" />
 			<input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />
 			</div></form>
-		<?php		
+		<?php
 		$this->pagefoot();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_categorydeleteconfirm() {
-		global $member, $manager; 
-		
+		global $member, $manager;
+
 		$blogid = intRequestVar('blogid');
 		$catid = intRequestVar('catid');
-		
+
 		$member->blogAdminRights($blogid) or $this->disallow();
 
 		$error = $this->deleteOneCategory($catid);
@@ -2391,84 +2883,90 @@ class ADMIN {
 			$this->error($error);
 
 		$this->action_blogsettings();
-	}	
+	}
 
+	/**
+	 * @todo document this
+	 */
 	function deleteOneCategory($catid) {
 		global $manager, $member;
-		
+
 		$catid = intval($catid);
-		
-		$manager->notify('PreDeleteCategory', array('catid' => $catid));		
+
+		$manager->notify('PreDeleteCategory', array('catid' => $catid));
 
 		$blogid = getBlogIDFromCatID($catid);
-		
+
 		if (!$member->blogAdminRights($blogid))
 			return ERROR_DISALLOWED;
-		
+
 		// get blog
 		$blog =& $manager->getBlog($blogid);
 
 		// check if the category is valid
-		if (!$blog || !$blog->isValidCategory($catid)) 
+		if (!$blog || !$blog->isValidCategory($catid))
 			return _ERROR_NOSUCHCATEGORY;
-	
+
 		$destcatid = $blog->getDefaultCategory();
-		
+
 		// don't allow deletion of default category
 		if ($blog->getDefaultCategory() == $catid)
 			return _ERROR_DELETEDEFCATEGORY;
-		
+
 		// check if catid is the only category left for blogid
 		$query = 'SELECT catid FROM '.sql_table('category').' WHERE cblog=' . $blogid;
 		$res = sql_query($query);
-		if (mysql_num_rows($res) == 1)
+		if (sql_num_rows($res) == 1)
 			return _ERROR_DELETELASTCATEGORY;
-			
+
 		// change category for all items to the default category
 		$query = 'UPDATE '.sql_table('item')." SET icat=$destcatid WHERE icat=$catid";
 		sql_query($query);
-		
+
 		// delete all associated plugin options
 		NucleusPlugin::_deleteOptionValues('category', $catid);
-		
+
 		// delete category
 		$query = 'DELETE FROM '.sql_table('category').' WHERE catid=' .$catid;
 		sql_query($query);
-		
-		$manager->notify('PostDeleteCategory', array('catid' => $catid));				
+
+		$manager->notify('PostDeleteCategory', array('catid' => $catid));
 
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function moveOneCategory($catid, $destblogid) {
 		global $manager, $member;
 
 		$catid = intval($catid);
 		$destblogid = intval($destblogid);
-		
+
 		$blogid = getBlogIDFromCatID($catid);
-		
+
 		// mover should have admin rights on both blogs
 		if (!$member->blogAdminRights($blogid))
 			return _ERROR_DISALLOWED;
 		if (!$member->blogAdminRights($destblogid))
 			return _ERROR_DISALLOWED;
-			
+
 		// cannot move to self
 		if ($blogid == $destblogid)
 			return _ERROR_MOVETOSELF;
-		
+
 		// get blogs
 		$blog =& $manager->getBlog($blogid);
-		$destblog =& $manager->getBlog($destblogid);		
-		
+		$destblog =& $manager->getBlog($destblogid);
+
 		// check if the category is valid
-		if (!$blog || !$blog->isValidCategory($catid)) 
+		if (!$blog || !$blog->isValidCategory($catid))
 			return _ERROR_NOSUCHCATEGORY;
-			
+
 		// don't allow default category to be moved
 		if ($blog->getDefaultCategory() == $catid)
 			return _ERROR_MOVEDEFCATEGORY;
-			
+
 		$manager->notify(
 			'PreMoveCategory',
 			array(
@@ -2477,11 +2975,11 @@ class ADMIN {
 				'destblog' => &$destblog
 			)
 		);
-		
+
 		// update comments table (cblog)
 		$query = 'SELECT inumber FROM '.sql_table('item').' WHERE icat='.$catid;
 		$items = sql_query($query);
-		while ($oItem = mysql_fetch_object($items)) {
+		while ($oItem = sql_fetch_object($items)) {
 			sql_query('UPDATE '.sql_table('comment').' SET cblog='.$destblogid.' WHERE citem='.$oItem->inumber);
 		}
 
@@ -2489,7 +2987,7 @@ class ADMIN {
 		$query = 'UPDATE '.sql_table('item').' SET iblog='.$destblogid.' WHERE icat='.$catid;
 		sql_query($query);
 
-		// move category 
+		// move category
 		$query = 'UPDATE '.sql_table('category').' SET cblog='.$destblogid.' WHERE catid='.$catid;
 		sql_query($query);
 
@@ -2500,47 +2998,50 @@ class ADMIN {
 				'sourceblog' => &$blog,
 				'destblog' => $destblog
 			)
-		);		
-		
+		);
+
 	}
 
+	/**
+	 * @todo document this
+	 */
 	function action_blogsettingsupdate() {
 		global $member, $manager;
-		
+
 		$blogid = intRequestVar('blogid');
-		
+
 		$member->blogAdminRights($blogid) or $this->disallow();
-		
+
 		$blog =& $manager->getBlog($blogid);
-		
+
 		$notify			= trim(postVar('notify'));
 		$shortname		= trim(postVar('shortname'));
 		$updatefile		= trim(postVar('update'));
-		
+
 		$notifyComment	= intPostVar('notifyComment');
 		$notifyVote		= intPostVar('notifyVote');
-		$notifyNewItem	= intPostVar('notifyNewItem');		
-		
+		$notifyNewItem	= intPostVar('notifyNewItem');
+
 		if ($notifyComment == 0)	$notifyComment = 1;
-		if ($notifyVote == 0)		$notifyVote = 1;		
-		if ($notifyNewItem == 0)	$notifyNewItem = 1;		
-		
+		if ($notifyVote == 0)		$notifyVote = 1;
+		if ($notifyNewItem == 0)	$notifyNewItem = 1;
+
 		$notifyType = $notifyComment * $notifyVote * $notifyNewItem;
-		
-		
+
+
 		if ($notify) {
-			$not = new NOTIFICATION($notify);
+			$not =& new NOTIFICATION($notify);
 			if (!$not->validAddresses())
 				$this->error(_ERROR_BADNOTIFY);
-			
+
 		}
-			
+
 		if (!isValidShortName($shortname))
 			$this->error(_ERROR_BADSHORTBLOGNAME);
-			
+
 		if (($blog->getShortName() != $shortname) && $manager->existsBlog($shortname))
 			$this->error(_ERROR_DUPSHORTBLOGNAME);
-			
+
 		// check if update file is writable
 		if ($updatefile && !is_writeable($updatefile))
 			$this->error(_ERROR_UPDATEFILE);
@@ -2548,7 +3049,7 @@ class ADMIN {
 		$blog->setName(trim(postVar('name')));
 		$blog->setShortName($shortname);
 		$blog->setNotifyAddress($notify);
-		$blog->setNotifyType($notifyType);		
+		$blog->setNotifyType($notifyType);
 		$blog->setMaxComments(postVar('maxcomments'));
 		$blog->setCommentsEnabled(postVar('comments'));
 		$blog->setTimeOffset(postVar('timeoffset'));
@@ -2557,65 +3058,73 @@ class ADMIN {
 		$blog->setDefaultSkin(intPostVar('defskin'));
 		$blog->setDescription(trim(postVar('desc')));
 		$blog->setPublic(postVar('public'));
-		$blog->setPingUserland(postVar('pinguserland'));
+		$blog->setPingUserland(postVar('sendping'));
 		$blog->setConvertBreaks(intPostVar('convertbreaks'));
-		$blog->setAllowPastPosting(intPostVar('allowpastposting'));		
+		$blog->setAllowPastPosting(intPostVar('allowpastposting'));
 		$blog->setDefaultCategory(intPostVar('defcat'));
 		$blog->setSearchable(intPostVar('searchable'));
+		$blog->setEmailRequired(intPostVar('reqemail'));
 
 		$blog->writeSettings();
-		
+
 		// store plugin options
 		$aOptions = requestArray('plugoption');
 		NucleusPlugin::_applyPluginOptions($aOptions);
-		$manager->notify('PostPluginOptionsUpdate',array('context' => 'blog', 'blogid' => $blogid, 'blog' => &$blog));		
-		
-		
+		$manager->notify('PostPluginOptionsUpdate',array('context' => 'blog', 'blogid' => $blogid, 'blog' => &$blog));
+
+
 		$this->action_overview(_MSG_SETTINGSCHANGED);
 	}
-	
-	function action_deleteblog() {
+
+	/**
+	 * @todo document this
+	 */
+	function action_deleteblog() {
 		global $member, $CONF, $manager;
-		
-		$blogid = intRequestVar('blogid');		
-		
+
+		$blogid = intRequestVar('blogid');
+
 		$member->blogAdminRights($blogid) or $this->disallow();
 
 		// check if blog is default blog
 		if ($CONF['DefaultBlog'] == $blogid)
 			$this->error(_ERROR_DELDEFBLOG);
-			
+
 		$blog =& $manager->getBlog($blogid);
-		
+
 		$this->pagehead();
 		?>
 			<h2><?php echo _DELETE_CONFIRM?></h2>
-			
+
 			<p><?php echo _WARNINGTXT_BLOGDEL?>
 			</p>
-			
+
 			<div>
 			<?php echo _CONFIRMTXT_BLOG?><b><?php echo  htmlspecialchars($blog->getName())?></b>
 			</div>
-			
+
 			<form method="post" action="index.php"><div>
 			<input type="hidden" name="action" value="deleteblogconfirm" />
+			<?php $manager->addTicketHidden() ?>
 			<input type="hidden" name="blogid" value="<?php echo  $blogid; ?>" />
 			<input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />
 			</div></form>
-		<?php		
+		<?php
 		$this->pagefoot();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_deleteblogconfirm() {
 		global $member, $CONF, $manager;
-		
-		$blogid = intRequestVar('blogid');		
-		
-		$manager->notify('PreDeleteBlog', array('blogid' => $blogid));				
-		
+
+		$blogid = intRequestVar('blogid');
+
+		$manager->notify('PreDeleteBlog', array('blogid' => $blogid));
+
 		$member->blogAdminRights($blogid) or $this->disallow();
-		
+
 		// check if blog is default blog
 		if ($CONF['DefaultBlog'] == $blogid)
 			$this->error(_ERROR_DELDEFBLOG);
@@ -2624,143 +3133,170 @@ class ADMIN {
 		$query = 'DELETE FROM '.sql_table('comment').' WHERE cblog='.$blogid;
 		sql_query($query);
 
-		// delete all items		
+		// delete all items
 		$query = 'DELETE FROM '.sql_table('item').' WHERE iblog='.$blogid;
 		sql_query($query);
-		
+
 		// delete all team members
 		$query = 'DELETE FROM '.sql_table('team').' WHERE tblog='.$blogid;
 		sql_query($query);
-		
+
 		// delete all bans
 		$query = 'DELETE FROM '.sql_table('ban').' WHERE blogid='.$blogid;
 		sql_query($query);
-		
+
 		// delete all categories
 		$query = 'DELETE FROM '.sql_table('category').' WHERE cblog='.$blogid;
 		sql_query($query);
-		
+
 		// delete all associated plugin options
 		NucleusPlugin::_deleteOptionValues('blog', $blogid);
-		
+
 		// delete the blog itself
 		$query = 'DELETE FROM '.sql_table('blog').' WHERE bnumber='.$blogid;
 		sql_query($query);
-		
-		$manager->notify('PostDeleteBlog', array('blogid' => $blogid));						
-		
+
+		$manager->notify('PostDeleteBlog', array('blogid' => $blogid));
+
 		$this->action_overview(_DELETED_BLOG);
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_memberdelete() {
-		global $member;
-		
+		global $member, $manager;
+
 		$memberid = intRequestVar('memberid');
-	
+
 		($member->getID() == $memberid) or $member->isAdmin() or $this->disallow();
-		
+
 		$mem = MEMBER::createFromID($memberid);
-		
+
 		$this->pagehead();
 		?>
 			<h2><?php echo _DELETE_CONFIRM?></h2>
-			
-			<p><?php echo _CONFIRMTXT_MEMBER?><b><?php echo  $mem->getDisplayName() ?></b>
+
+			<p><?php echo _CONFIRMTXT_MEMBER?><b><?php echo htmlspecialchars($mem->getDisplayName()) ?></b>
 			</p>
-			
+
 			<p>
-			Please note that media files will <b>NOT</b> be deleted. (At least not in this Nucleus version)
+			<?php echo _WARNINGTXT_NOTDELMEDIAFILES ?>
 			</p>
-			
+
 			<form method="post" action="index.php"><div>
 			<input type="hidden" name="action" value="memberdeleteconfirm" />
+			<?php $manager->addTicketHidden() ?>
 			<input type="hidden" name="memberid" value="<?php echo  $memberid; ?>" />
 			<input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />
 			</div></form>
-		<?php		
+		<?php
 		$this->pagefoot();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_memberdeleteconfirm() {
 		global $member;
-		
-		$memberid = intRequestVar('memberid');		
-		
+
+		$memberid = intRequestVar('memberid');
+
 		($member->getID() == $memberid) or $member->isAdmin() or $this->disallow();
-		
+
 		$error = $this->deleteOneMember($memberid);
 		if ($error)
 			$this->error($error);
-		
+
 		if ($member->isAdmin())
 			$this->action_usermanagement();
 		else
 			$this->action_overview(_DELETED_MEMBER);
-	}	
-	
+	}
+
+	/**
+	 * @static
+	 * @todo document this
+	 */
 	function deleteOneMember($memberid) {
 		global $manager;
-		
+
 		$memberid = intval($memberid);
 		$mem = MEMBER::createFromID($memberid);
-		
-		if (!$mem->canBeDeleted()) 
-			return _ERROR_DELETEMEMBER;	
 
-		$manager->notify('PreDeleteMember', array('member' => &$mem));				
-		
+		if (!$mem->canBeDeleted())
+			return _ERROR_DELETEMEMBER;
+
+		$manager->notify('PreDeleteMember', array('member' => &$mem));
+
+		/* unlink comments from memberid */
+		if ($memberid) {
+			$query = 'UPDATE ' . sql_table('comment') . ' SET cmember="0", cuser="'. addslashes($mem->getDisplayName())
+				   .'" WHERE cmember='.$memberid;
+			sql_query($query);
+		}
+
 		$query = 'DELETE FROM '.sql_table('member').' WHERE mnumber='.$memberid;
 		sql_query($query);
 
 		$query = 'DELETE FROM '.sql_table('team').' WHERE tmember='.$memberid;
-		sql_query($query);	
-		
+		sql_query($query);
+
+		$query = 'DELETE FROM '.sql_table('activation').' WHERE vmember='.$memberid;
+		sql_query($query);
+
 		// delete all associated plugin options
 		NucleusPlugin::_deleteOptionValues('member', $memberid);
-		
-		$manager->notify('PostDeleteMember', array('member' => &$mem));						
-		
+
+		$manager->notify('PostDeleteMember', array('member' => &$mem));
+
 		return '';
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_createnewlog() {
-		global $member, $CONF;
-		
+		global $member, $CONF, $manager;
+
 		// Only Super-Admins can do this
 		$member->isAdmin() or $this->disallow();
-		
+
 		$this->pagehead();
 
 		echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
 		?>
 		<h2><?php echo _EBLOG_CREATE_TITLE?></h2>
-		
-		<h3>注意事項</h3>
-		
-		<p>作成にあたって、下記の<strong>注意事項</strong> をまずお読み下さい</p>
-		
-		<p>新しいweblogを作成した後に、このblogにアクセスするための方法を紹介しておきます。方法は2つあります:</p>
-		
+
+		<h3><?php echo _ADMIN_NOTABILIA ?></h3>
+
+		<p><?php echo _ADMIN_PLEASE_READ ?></p>
+
+		<p><?php echo _ADMIN_HOW_TO_ACCESS ?></p>
+
 		<ol>
-			<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>
-			<li><strong>高度な方法:</strong> 現在のblogで使用しているスキンに<code>otherblog</code>というコードを使った記述を加えます。この方法では、同じページ内で複数のblogを展開することが可能となります。</li>
+			<li><?php echo _ADMIN_SIMPLE_WAY ?></li>
+			<li><?php echo _ADMIN_ADVANCED_WAY ?></li>
 		</ol>
-		
-		<h3>Weblogの作成</h3>
-		
+
+		<h3><?php echo _ADMIN_HOW_TO_CREATE ?></h3>
+
 		<p>
 		<?php echo _EBLOG_CREATE_TEXT?>
 		</p>
-		
+
 		<form method="post" action="index.php"><div>
-		
+
 		<input type="hidden" name="action" value="addnewlog" />
+		<?php $manager->addTicketHidden() ?>
+
+
 		<table><tr>
 			<td><?php echo _EBLOG_NAME?></td>
 			<td><input name="name" tabindex="10" size="40" maxlength="60" /></td>
 		</tr><tr>
 			<td><?php echo _EBLOG_SHORTNAME?>
-			    <?php help('shortblogname'); ?>
+				<?php help('shortblogname'); ?>
 			</td>
 			<td><input name="shortname" tabindex="20" maxlength="15" size="15" /></td>
 		</tr><tr>
@@ -2768,126 +3304,134 @@ class ADMIN {
 			<td><input name="desc" tabindex="30" maxlength="200" size="40" /></td>
 		</tr><tr>
 			<td><?php echo _EBLOG_DEFSKIN?>
-			    <?php help('blogdefaultskin'); ?>
+				<?php help('blogdefaultskin'); ?>
 			</td>
 			<td>
-				<?php 
+				<?php
 					$query =  'SELECT sdname as text, sdnumber as value'
-					       . ' FROM '.sql_table('skin_desc');
+						   . ' FROM '.sql_table('skin_desc');
 					$template['name'] = 'defskin';
 					$template['tabindex'] = 50;
 					$template['selected'] = $CONF['BaseSkin'];	// set default selected skin to be globally defined base skin
-					showlist($query,'select',$template);		
+					showlist($query,'select',$template);
 				?>
 			</td>
 		</tr><tr>
 			<td><?php echo _EBLOG_OFFSET?>
-			    <?php help('blogtimeoffset'); ?>
-			    <br /><?php echo _EBLOG_STIME?> <b><?php echo  strftime("%H:%M",time()); ?></b>
+				<?php help('blogtimeoffset'); ?>
+				<br /><?php echo _EBLOG_STIME?> <b><?php echo  strftime("%H:%M",time()); ?></b>
 			</td>
-			<td><input name="timeoffset" tabindex="110" size="3" value="0" /></td>			
+			<td><input name="timeoffset" tabindex="110" size="3" value="0" /></td>
 		</tr><tr>
 			<td><?php echo _EBLOG_ADMIN?>
-			    <?php help('blogadmin'); ?>
+				<?php help('teamadmin'); ?>
 			</td>
 			<td><?php echo _EBLOG_ADMIN_MSG?></td>
 		</tr><tr>
 			<td><?php echo _EBLOG_CREATE?></td>
 			<td><input type="submit" tabindex="120" value="<?php echo _EBLOG_CREATE_BTN?>" onclick="return checkSubmit();" /></td>
 		</tr></table>
-		
+
 		</div></form>
-		<?php		
-		$this->pagefoot();	
+		<?php
+		$this->pagefoot();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_addnewlog() {
 		global $member, $manager, $CONF;
-		
+
 		// Only Super-Admins can do this
 		$member->isAdmin() or $this->disallow();
-		
+
 		$bname			= trim(postVar('name'));
 		$bshortname		= trim(postVar('shortname'));
 		$btimeoffset	= postVar('timeoffset');
 		$bdesc			= trim(postVar('desc'));
 		$bdefskin		= postVar('defskin');
-		
+
 		if (!isValidShortName($bshortname))
 			$this->error(_ERROR_BADSHORTBLOGNAME);
-			
+
 		if ($manager->existsBlog($bshortname))
 			$this->error(_ERROR_DUPSHORTBLOGNAME);
-			
+
 		$manager->notify(
 			'PreAddBlog',
 			array(
-				'name' => &$bname,
-				'shortname' => &$bshortname,
-				'timeoffset' => &$btimeoffset,
-				'description' => &$bdescription,
+				'name'        => &$bname,
+				'shortname'   => &$bshortname,
+				'timeoffset'  => &$btimeoffset,
+				'description' => &$bdesc,
 				'defaultskin' => &$bdefskin
 			)
 		);
 
 
 		// add slashes for sql queries
-		$bname = 		addslashes($bname);
-		$bshortname = 	addslashes($bshortname);
-		$btimeoffset = 	addslashes($btimeoffset);
-		$bdesc = 		addslashes($bdesc);
-		$bdefskin = 	addslashes($bdefskin);
-		
+		$bname       = addslashes($bname);
+		$bshortname  = addslashes($bshortname);
+		$btimeoffset = addslashes($btimeoffset);
+		$bdesc       = addslashes($bdesc);
+		$bdefskin    = addslashes($bdefskin);
+
 		// create blog
 		$query = 'INSERT INTO '.sql_table('blog')." (bname, bshortname, bdesc, btimeoffset, bdefskin) VALUES ('$bname', '$bshortname', '$bdesc', '$btimeoffset', '$bdefskin')";
 		sql_query($query);
-		$blogid	= mysql_insert_id();
+		$blogid	= sql_insert_id();
 		$blog	=& $manager->getBlog($blogid);
-		
+
 		// create new category
-		sql_query('INSERT INTO '.sql_table('category')." (cblog, cname, cdesc) VALUES ($blogid, 'General','Items that do not fit in other categories')");
-		$catid = mysql_insert_id();
+		$sql = 'INSERT INTO %s (cblog, cname, cdesc) VALUES (%d, "%s", "%s")';
+		sql_query(sprintf($sql, sql_table('category'), $blogid, _EBLOGDEFAULTCATEGORY_NAME, _EBLOGDEFAULTCATEGORY_DESC));
+//		sql_query('INSERT INTO '.sql_table('category')." (cblog, cname, cdesc) VALUES ($blogid, _EBLOGDEFAULTCATEGORY_NAME, _EBLOGDEFAULTCATEGORY_DESC)");
+		$catid = sql_insert_id();
 
 		// set as default category
 		$blog->setDefaultCategory($catid);
 		$blog->writeSettings();
-	
-		// create team member	
+
+		// create team member
 		$memberid = $member->getID();
 		$query = 'INSERT INTO '.sql_table('team')." (tmember, tblog, tadmin) VALUES ($memberid, $blogid, 1)";
 		sql_query($query);
-	
 
-		$blog->additem($blog->getDefaultCategory(),'First Item','これはあなたのweblogにおける最初のアイテムです。自由に削除していただいてかまいません。','',$blogid, $memberid,$blog->getCorrectTime(),0,0,0);
-		
+
+		$blog->additem($blog->getDefaultCategory(),_EBLOG_FIRSTITEM_TITLE,_EBLOG_FIRSTITEM_BODY,'',$blogid, $memberid,$blog->getCorrectTime(),0,0,0);
+
 		$manager->notify(
 			'PostAddBlog',
 			array(
 				'blog' => &$blog
 			)
 		);
-		
+
 		$manager->notify(
 			'PostAddCategory',
 			array(
-				'catid' => $catid
+				'blog'        => &$blog,
+				'name'        => _EBLOGDEFAULTCATEGORY_NAME,
+				'description' => _EBLOGDEFAULTCATEGORY_DESC,
+				'catid'       => $catid
 			)
 		);
-		
+
 		$this->pagehead();
 		?>
-		<h2>新しいweblogが作成されました</h2>
-		
-		<p>新しいweblog 「<?php echo htmlspecialchars($bname)?>」が作成されました。続けて、これにアクセスするために以下のどちらかの手順に進んでください。</p>
-		
+		<h2><?php echo _BLOGCREATED_TITLE ?></h2>
+
+		<p><?php echo sprintf(_BLOGCREATED_ADDEDTXT, htmlspecialchars($bname)) ?></p>
+
 		<ol>
-			<li><a href="#index_php">簡単な方法: 下のコードを貼付けた <code><?php echo htmlspecialchars($bshortname)?>.php</code> というファイルを作成する</a></li>
-			<li><a href="#skins">高度な方法: 現在使用しているスキンに新しいweblogを展開させるための記述を加える</a></li>			
+			<li><a href="#index_php"><?php echo sprintf(_BLOGCREATED_SIMPLEWAY, htmlspecialchars($bshortname)) ?></a></li>
+			<li><a href="#skins"><?php echo _BLOGCREATED_ADVANCEDWAY ?></a></li>
 		</ol>
-		
-		<h3><a id="index_php">方法 1: <code><?php echo htmlspecialchars($bshortname)?>.php</code> というファイルを作成</a></h3>
-		
-		<p><code><?php echo htmlspecialchars($bshortname)?>.php</code> というファイルを作成して、中身に以下のコードを貼り付ける:</p>
+
+		<h3><a id="index_php"><?php echo sprintf(_BLOGCREATED_SIMPLEDESC1, htmlspecialchars($bshortname)) ?></a></h3>
+
+		<p><?php echo sprintf(_BLOGCREATED_SIMPLEDESC2, htmlspecialchars($bshortname)) ?></p>
 <pre><code>&lt;?php
 
 $CONF['Self'] = '<b><?php echo htmlspecialchars($bshortname)?>.php</b>';
@@ -2899,13 +3443,14 @@ selector();
 
 ?&gt;</code></pre>
 
-		<p>すでにある<code>index.php</code>と同じディレクトリにアップロードします。</p>
-		
-		<p>新しいweblogの作成を完了するためには、下にこのファイルのURLを入力してください。 (すでに用意した値で合っているとは思いますが保証はしません):</p>
-		
+		<p><?php echo _BLOGCREATED_SIMPLEDESC3 ?></p>
+
+		<p><?php echo _BLOGCREATED_SIMPLEDESC4 ?></p>
+
 		<form action="index.php" method="post"><div>
-			<input type="hidden" name="action" value="addnewlog2" />		
-			<input type="hidden" name="blogid" value="<?php echo intval($blogid)?>" />						
+			<input type="hidden" name="action" value="addnewlog2" />
+			<?php $manager->addTicketHidden() ?>
+			<input type="hidden" name="blogid" value="<?php echo intval($blogid)?>" />
 			<table><tr>
 				<td><?php echo _EBLOG_URL?></td>
 				<td><input name="url" maxlength="100" size="40" value="<?php echo htmlspecialchars($CONF['IndexURL'].$bshortname.'.php')?>" /></td>
@@ -2914,14 +3459,15 @@ selector();
 				<td><input type="submit" value="<?php echo _EBLOG_CREATE_BTN?>" onclick="return checkSubmit();" /></td>
 			</tr></table>
 		</div></form>
-		
-		<h3><a id="skins">方法 2: 現在使用しているスキンに新しいweblogを展開する記述を加える</a></h3>
 
-		<p>新しいweblogの作成を完了するためには、下にURLを入力してください。 (大抵は既存blogと同じURL)</p>
-		
+		<h3><a id="skins"><?php echo _BLOGCREATED_ADVANCEDWAY2 ?></a></h3>
+
+		<p><?php echo _BLOGCREATED_ADVANCEDWAY3 ?></p>
+
 		<form action="index.php" method="post"><div>
 			<input type="hidden" name="action" value="addnewlog2" />
-			<input type="hidden" name="blogid" value="<?php echo intval($blogid)?>" />			
+			<?php $manager->addTicketHidden() ?>
+			<input type="hidden" name="blogid" value="<?php echo intval($blogid)?>" />
 			<table><tr>
 				<td><?php echo _EBLOG_URL?></td>
 				<td><input name="url" maxlength="100" size="40" /></td>
@@ -2930,41 +3476,47 @@ selector();
 				<td><input type="submit" value="<?php echo _EBLOG_CREATE_BTN?>" onclick="return checkSubmit();" /></td>
 			</tr></table>
 		</div></form>
-		
-		<?php		$this->pagefoot();		
-		
+
+		<?php		$this->pagefoot();
+
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_addnewlog2() {
 		global $member, $manager;
-		
+
 		$member->blogAdminRights($blogid) or $this->disallow();
-		
+
 		$burl	= requestVar('url');
 		$blogid	= intRequestVar('blogid');
-		
-		$blog =& $manager->getBlog($blogid);		
+
+		$blog =& $manager->getBlog($blogid);
 		$blog->setURL(trim($burl));
-		$blog->writeSettings();		
-		
+		$blog->writeSettings();
+
 		$this->action_overview(_MSG_NEWBLOG);
 	}
 
+	/**
+	 * @todo document this
+	 */
 	function action_skinieoverview() {
-		global $member, $DIR_LIBS;
-		
+		global $member, $DIR_LIBS, $manager;
+
 		$member->isAdmin() or $this->disallow();
 
 		// load skinie class
 		include_once($DIR_LIBS . 'skinie.php');
-		
+
 		$this->pagehead();
-		
-		echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';		
-		
+
+		echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
+
 	?>
-		<h2><?php echo _SKINIE_TITLE_IMPORT?></h2>	
-			
+		<h2><?php echo _SKINIE_TITLE_IMPORT?></h2>
+
 				<p><label for="skinie_import_local"><?php echo _SKINIE_LOCAL?></label>
 				<?php					global $DIR_SKINS;
 
@@ -2974,6 +3526,7 @@ selector();
 						?>
 							<form method="post" action="index.php"><div>
 								<input type="hidden" name="action" value="skinieimport" />
+								<?php $manager->addTicketHidden() ?>
 								<input type="hidden" name="mode" value="file" />
 								<select name="skinfile" id="skinie_import_local">
 								<?php									foreach ($candidates as $skinname => $skinfile) {
@@ -2989,99 +3542,108 @@ selector();
 					}
 				?>
 				</p>
-				
+
 				<p><em><?php echo _OR?></em></p>
-				
+
 				<form method="post" action="index.php"><p>
+					<?php $manager->addTicketHidden() ?>
 					<input type="hidden" name="action" value="skinieimport" />
-					<input type="hidden" name="mode" value="url" />					
+					<input type="hidden" name="mode" value="url" />
 					<label for="skinie_import_url"><?php echo _SKINIE_FROMURL?></label>
 					<input type="text" name="skinfile" id="skinie_import_url" size="60" value="http://" />
 					<input type="submit" value="<?php echo _SKINIE_BTN_IMPORT?>" />
 				</p></form>
 
-	
+
 		<h2><?php echo _SKINIE_TITLE_EXPORT?></h2>
 		<form method="post" action="index.php"><div>
 			<input type="hidden" name="action" value="skinieexport" />
-			
+			<?php $manager->addTicketHidden() ?>
+
 			<p><?php echo _SKINIE_EXPORT_INTRO?></p>
-			
+
 			<table><tr>
 				<th colspan="2"><?php echo _SKINIE_EXPORT_SKINS?></th>
 			</tr><tr>
 	<?php		// show list of skins
 		$res = sql_query('SELECT * FROM '.sql_table('skin_desc'));
-		while ($skinObj = mysql_fetch_object($res)) {
+		while ($skinObj = sql_fetch_object($res)) {
 			$id = 'skinexp' . $skinObj->sdnumber;
 			echo '<td><input type="checkbox" name="skin[',$skinObj->sdnumber,']"  id="',$id,'" />';
 			echo '<label for="',$id,'">',htmlspecialchars($skinObj->sdname),'</label></td>';
-			echo '<td>',htmlspecialchars($skinObj->sddesc),'</td>';			
+			echo '<td>',htmlspecialchars($skinObj->sddesc),'</td>';
 			echo '</tr><tr>';
 		}
-		
+
 		echo '<th colspan="2">',_SKINIE_EXPORT_TEMPLATES,'</th></tr><tr>';
-		
+
 		// show list of templates
 		$res = sql_query('SELECT * FROM '.sql_table('template_desc'));
-		while ($templateObj = mysql_fetch_object($res)) {
-			$id = 'templateexp' . $templateObj->tdnumber;		
+		while ($templateObj = sql_fetch_object($res)) {
+			$id = 'templateexp' . $templateObj->tdnumber;
 			echo '<td><input type="checkbox" name="template[',$templateObj->tdnumber,']" id="',$id,'" />';
 			echo '<label for="',$id,'">',htmlspecialchars($templateObj->tdname),'</label></td>';
-			echo '<td>',htmlspecialchars($templateObj->tddesc),'</td>';			
+			echo '<td>',htmlspecialchars($templateObj->tddesc),'</td>';
 			echo '</tr><tr>';
 		}
-		
+
 	?>
 				<th colspan="2"><?php echo _SKINIE_EXPORT_EXTRA?></th>
 			</tr><tr>
 				<td colspan="2"><textarea cols="40" rows="5" name="info"></textarea></td>
-			</tr><tr>				
+			</tr><tr>
 				<th colspan="2"><?php echo _SKINIE_TITLE_EXPORT?></th>
 			</tr><tr>
 				<td colspan="2"><input type="submit" value="<?php echo _SKINIE_BTN_EXPORT?>" /></td>
 			</tr></table>
 		</div></form>
-	
-	<?php	
+
+	<?php
 		$this->pagefoot();
-		
+
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_skinieimport() {
-		global $member, $DIR_LIBS, $DIR_SKINS;
-		
+		global $member, $DIR_LIBS, $DIR_SKINS, $manager;
+
 		$member->isAdmin() or $this->disallow();
-		
+
 		// load skinie class
 		include_once($DIR_LIBS . 'skinie.php');
-		
+
 		$skinFileRaw= postVar('skinfile');
 		$mode 		= postVar('mode');
 
-		$importer = new SKINIMPORT();
-		
+		$importer =& new SKINIMPORT();
+
 		// get full filename
 		if ($mode == 'file')
 		{
 			$skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml';
-			
+
 			// backwards compatibilty (in v2.0, exports were saved as skindata.xml)
 			if (!file_exists($skinFile))
 				$skinFile = $DIR_SKINS . $skinFileRaw . '/skindata.xml';
 		} else {
 			$skinFile = $skinFileRaw;
 		}
-		
+
 		// read only metadata
-		$error = $importer->readFile($skinFile, 1);	
-		
+		$error = $importer->readFile($skinFile, 1);
+
+		// clashes
+		$skinNameClashes = $importer->checkSkinNameClashes();
+		$templateNameClashes = $importer->checkTemplateNameClashes();
+		$hasNameClashes = (count($skinNameClashes) > 0) || (count($templateNameClashes)	> 0);
 
 		if ($error) $this->error($error);
 
 		$this->pagehead();
 
-		echo '<p><a href="index.php?action=skinieoverview">(',_BACK,')</a></p>';		
+		echo '<p><a href="index.php?action=skinieoverview">(',_BACK,')</a></p>';
 		?>
 		<h2><?php echo _SKINIE_CONFIRM_TITLE?></h2>
 
@@ -3089,29 +3651,47 @@ selector();
 			<li><p><strong><?php echo _SKINIE_INFO_GENERAL?></strong> <?php echo htmlspecialchars($importer->getInfo())?></p></li>
 			<li><p><strong><?php echo _SKINIE_INFO_SKINS?></strong> <?php echo implode(' <em>'._AND.'</em> ',$importer->getSkinNames())?></p></li>
 			<li><p><strong><?php echo _SKINIE_INFO_TEMPLATES?></strong> <?php echo implode(' <em>'._AND.'</em> ',$importer->getTemplateNames())?></p></li>
-			<li><p><strong style="color: red;"><?php echo _SKINIE_INFO_SKINCLASH?></strong> <?php echo implode(' <em>'._AND.'</em> ',$importer->checkSkinNameClashes())?></p></li>		
-			<li><p><strong style="color: red;"><?php echo _SKINIE_INFO_TEMPLCLASH?></strong> <?php echo implode(' <em>'._AND.'</em> ',$importer->checkTemplateNameClashes())?></p></li>
+			<?php
+				if ($hasNameClashes)
+				{
+			?>
+			<li><p><strong style="color: red;"><?php echo _SKINIE_INFO_SKINCLASH?></strong> <?php echo implode(' <em>'._AND.'</em> ',$skinNameClashes)?></p></li>
+			<li><p><strong style="color: red;"><?php echo _SKINIE_INFO_TEMPLCLASH?></strong> <?php echo implode(' <em>'._AND.'</em> ',$templateNameClashes)?></p></li>
+			<?php
+				} // if (hasNameClashes)
+			?>
 		</ul>
 
 		<form method="post" action="index.php"><div>
 			<input type="hidden" name="action" value="skiniedoimport" />
+			<?php $manager->addTicketHidden() ?>
 			<input type="hidden" name="skinfile" value="<?php echo htmlspecialchars(postVar('skinfile'))?>" />
-			<input type="hidden" name="mode" value="<?php echo htmlspecialchars($mode)?>" />			
+			<input type="hidden" name="mode" value="<?php echo htmlspecialchars($mode)?>" />
 			<input type="submit" value="<?php echo _SKINIE_CONFIRM_IMPORT?>" />
+			<?php
+				if ($hasNameClashes)
+				{
+			?>
 			<br />
 			<input type="checkbox" name="overwrite" value="1" id="cb_overwrite" /><label for="cb_overwrite"><?php echo _SKINIE_CONFIRM_OVERWRITE?></label>
+			<?php
+				} // if (hasNameClashes)
+			?>
 		</div></form>
 
 
-		<?php		
+		<?php
 		$this->pagefoot();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_skiniedoimport() {
 		global $member, $DIR_LIBS, $DIR_SKINS;
-		
+
 		$member->isAdmin() or $this->disallow();
-		
+
 		// load skinie class
 		include_once($DIR_LIBS . 'skinie.php');
 
@@ -3119,23 +3699,23 @@ selector();
 		$mode		= postVar('mode');
 
 		$allowOverwrite = intPostVar('overwrite');
-		
+
 		// get full filename
 		if ($mode == 'file')
 		{
-			$skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml';		
-			
+			$skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml';
+
 			// backwards compatibilty (in v2.0, exports were saved as skindata.xml)
 			if (!file_exists($skinFile))
 				$skinFile = $DIR_SKINS . $skinFileRaw . '/skindata.xml';
-			
+
 		} else {
 			$skinFile = $skinFileRaw;
 		}
 
-		$importer = new SKINIMPORT();
+		$importer =& new SKINIMPORT();
 
-		$error = $importer->readFile($skinFile);	
+		$error = $importer->readFile($skinFile);
 
 		if ($error)
 			$this->error($error);
@@ -3147,7 +3727,7 @@ selector();
 
 		$this->pagehead();
 
-		echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';				
+		echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
 	?>
 		<h2><?php echo _SKINIE_DONE?></h2>
 
@@ -3160,15 +3740,18 @@ selector();
 	<?php		$this->pagefoot();
 
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_skinieexport() {
 		global $member, $DIR_LIBS;
-		
+
 		$member->isAdmin() or $this->disallow();
-		
+
 		// load skinie class
 		include_once($DIR_LIBS . 'skinie.php');
-		
+
 		$aSkins = requestIntArray('skin');
 		$aTemplates = requestIntArray('template');
 
@@ -3176,11 +3759,11 @@ selector();
 		if (!is_array($aSkins)) $aSkins = array();
 
 		$skinList = array_keys($aSkins);
-		$templateList = array_keys($aTemplates);	
+		$templateList = array_keys($aTemplates);
 
 		$info = postVar('info');
 
-		$exporter = new SKINEXPORT();
+		$exporter =& new SKINEXPORT();
 		foreach ($skinList as $skinId) {
 			$exporter->addSkin($skinId);
 		}
@@ -3189,32 +3772,36 @@ selector();
 		}
 		$exporter->setInfo($info);
 
-		$exporter->export();	
+		$exporter->export();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_templateoverview() {
-		global $member;
-		
+		global $member, $manager;
+
 		$member->isAdmin() or $this->disallow();
-		
+
 		$this->pagehead();
-		
-		echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';		
-		
+
+		echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
+
 		echo '<h2>' . _TEMPLATE_TITLE . '</h2>';
 		echo '<h3>' . _TEMPLATE_AVAILABLE_TITLE . '</h3>';
-		
+
 		$query = 'SELECT * FROM '.sql_table('template_desc').' ORDER BY tdname';
 		$template['content'] = 'templatelist';
 		$template['tabindex'] = 10;
 		showlist($query,'table',$template);
-		
+
 		echo '<h3>' . _TEMPLATE_NEW_TITLE . '</h3>';
-		
+
 		?>
 		<form method="post" action="index.php"><div>
-		
+
 		<input name="action" value="templatenew" type="hidden" />
+		<?php $manager->addTicketHidden() ?>
 		<table><tr>
 			<td><?php echo _TEMPLATE_NAME?> <?php help('shortnames');?></td>
 			<td><input name="name" tabindex="10010" maxlength="20" size="20" /></td>
@@ -3225,47 +3812,51 @@ selector();
 			<td><?php echo _TEMPLATE_CREATE?></td>
 			<td><input type="submit" tabindex="10030" value="<?php echo _TEMPLATE_CREATE_BTN?>" onclick="return checkSubmit();" /></td>
 		</tr></table>
-		
+
 		</div></form>
-		
-		<?php		
+
+		<?php
 		$this->pagefoot();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_templateedit($msg = '') {
-		global $member;
-		
+		global $member, $manager;
+
 		$templateid = intRequestVar('templateid');
-		
+
 		$member->isAdmin() or $this->disallow();
-		
+
 		$extrahead = '<script type="text/javascript" src="javascript/templateEdit.js"></script>';
 		$extrahead .= '<script type="text/javascript">setTemplateEditText("'.addslashes(_EDITTEMPLATE_EMPTY).'");</script>';
 
 		$this->pagehead($extrahead);
-		
+
 		$templatename = TEMPLATE::getNameFromId($templateid);
 		$templatedescription = TEMPLATE::getDesc($templateid);
-		$template = TEMPLATE::read($templatename);
-		
+		$template =& $manager->getTemplate($templatename);
+
 		?>
 		<p>
 		<a href="index.php?action=templateoverview">(<?php echo _TEMPLATE_BACK?>)</a>
 		</p>
 
-		<h2><?php echo _TEMPLATE_EDIT_TITLE?> '<?php echo  $templatename; ?>'</h2>
-		
+		<h2><?php echo _TEMPLATE_EDIT_TITLE?> '<?php echo  htmlspecialchars($templatename); ?>'</h2>
+
 		<?php					if ($msg) echo "<p>"._MESSAGE.": $msg</p>";
 		?>
-		
+
 		<p><?php echo _TEMPLATE_EDIT_MSG?></p>
-		
+
 		<form method="post" action="index.php">
 		<div>
-		
+
 		<input type="hidden" name="action" value="templateupdate" />
+		<?php $manager->addTicketHidden() ?>
 		<input type="hidden" name="templateid" value="<?php echo  $templateid; ?>" />
-		
+
 		<table><tr>
 			<th colspan="2"><?php echo _TEMPLATE_SETTINGS?></th>
 		</tr><tr>
@@ -3284,125 +3875,153 @@ selector();
 			</td>
 		</tr><tr>
 			<th colspan="2"><?php echo _TEMPLATE_ITEMS?> <?php help('templateitems'); ?></th>
-<?php	$this->_templateEditRow($template, _TEMPLATE_ITEMHEADER, 'ITEM_HEADER', '', 8);		
-	$this->_templateEditRow($template, _TEMPLATE_ITEMBODY, 'ITEM', '', 9, 1);		
-	$this->_templateEditRow($template, _TEMPLATE_ITEMFOOTER, 'ITEM_FOOTER', '', 10);		
-	$this->_templateEditRow($template, _TEMPLATE_MORELINK, 'MORELINK', 'morelink', 20);		
-	$this->_templateEditRow($template, _TEMPLATE_EDITLINK, 'EDITLINK', 'editlink', 25);			
-	$this->_templateEditRow($template, _TEMPLATE_NEW, 'NEW', 'new', 30);		
+<?php	$this->_templateEditRow($template, _TEMPLATE_ITEMHEADER, 'ITEM_HEADER', '', 8);
+	$this->_templateEditRow($template, _TEMPLATE_ITEMBODY, 'ITEM', '', 9, 1);
+	$this->_templateEditRow($template, _TEMPLATE_ITEMFOOTER, 'ITEM_FOOTER', '', 10);
+	$this->_templateEditRow($template, _TEMPLATE_MORELINK, 'MORELINK', 'morelink', 20);
+	$this->_templateEditRow($template, _TEMPLATE_EDITLINK, 'EDITLINK', 'editlink', 25);
+	$this->_templateEditRow($template, _TEMPLATE_NEW, 'NEW', 'new', 30);
 ?>
-		</tr><tr>	
+		</tr><tr>
 			<th colspan="2"><?php echo _TEMPLATE_COMMENTS_ANY?> <?php help('templatecomments'); ?></th>
-<?php	$this->_templateEditRow($template, _TEMPLATE_CHEADER, 'COMMENTS_HEADER', 'commentheaders', 40);		
-	$this->_templateEditRow($template, _TEMPLATE_CBODY, 'COMMENTS_BODY', 'commentbody', 50, 1);		
-	$this->_templateEditRow($template, _TEMPLATE_CFOOTER, 'COMMENTS_FOOTER', 'commentheaders', 60);		
-	$this->_templateEditRow($template, _TEMPLATE_CONE, 'COMMENTS_ONE', 'commentwords', 70);		
-	$this->_templateEditRow($template, _TEMPLATE_CMANY, 'COMMENTS_MANY', 'commentwords', 80);		
-	$this->_templateEditRow($template, _TEMPLATE_CMORE, 'COMMENTS_CONTINUED', 'commentcontinued', 90);		
-	$this->_templateEditRow($template, _TEMPLATE_CMEXTRA, 'COMMENTS_AUTH', 'memberextra', 100);		
+<?php	$this->_templateEditRow($template, _TEMPLATE_CHEADER, 'COMMENTS_HEADER', 'commentheaders', 40);
+	$this->_templateEditRow($template, _TEMPLATE_CBODY, 'COMMENTS_BODY', 'commentbody', 50, 1);
+	$this->_templateEditRow($template, _TEMPLATE_CFOOTER, 'COMMENTS_FOOTER', 'commentheaders', 60);
+	$this->_templateEditRow($template, _TEMPLATE_CONE, 'COMMENTS_ONE', 'commentwords', 70);
+	$this->_templateEditRow($template, _TEMPLATE_CMANY, 'COMMENTS_MANY', 'commentwords', 80);
+	$this->_templateEditRow($template, _TEMPLATE_CMORE, 'COMMENTS_CONTINUED', 'commentcontinued', 90);
+	$this->_templateEditRow($template, _TEMPLATE_CMEXTRA, 'COMMENTS_AUTH', 'memberextra', 100);
 ?>
-		</tr><tr>	
+		</tr><tr>
 			<th colspan="2"><?php echo _TEMPLATE_COMMENTS_NONE?> <?php help('templatecomments'); ?></th>
 <?php
-	$this->_templateEditRow($template, _TEMPLATE_CNONE, 'COMMENTS_NONE', '', 110);		
+	$this->_templateEditRow($template, _TEMPLATE_CNONE, 'COMMENTS_NONE', '', 110);
 ?>
-		</tr><tr>	
+		</tr><tr>
 			<th colspan="2"><?php echo _TEMPLATE_COMMENTS_TOOMUCH?> <?php help('templatecomments'); ?></th>
-<?php	$this->_templateEditRow($template, _TEMPLATE_CTOOMUCH, 'COMMENTS_TOOMUCH', '', 120);		
+<?php	$this->_templateEditRow($template, _TEMPLATE_CTOOMUCH, 'COMMENTS_TOOMUCH', '', 120);
 ?>
-		</tr><tr>	
+		</tr><tr>
 			<th colspan="2"><?php echo _TEMPLATE_ARCHIVELIST?> <?php help('templatearchivelists'); ?></th>
-<?php	$this->_templateEditRow($template, _TEMPLATE_AHEADER, 'ARCHIVELIST_HEADER', '', 130);		
-	$this->_templateEditRow($template, _TEMPLATE_AITEM, 'ARCHIVELIST_LISTITEM', '', 140);			
-	$this->_templateEditRow($template, _TEMPLATE_AFOOTER, 'ARCHIVELIST_FOOTER', '', 150);		
+<?php	$this->_templateEditRow($template, _TEMPLATE_AHEADER, 'ARCHIVELIST_HEADER', '', 130);
+	$this->_templateEditRow($template, _TEMPLATE_AITEM, 'ARCHIVELIST_LISTITEM', '', 140);
+	$this->_templateEditRow($template, _TEMPLATE_AFOOTER, 'ARCHIVELIST_FOOTER', '', 150);
+?>
+		</tr><tr>
+			<th colspan="2"><?php echo _TEMPLATE_BLOGLIST?> <?php help('templatebloglists'); ?></th>
+<?php	$this->_templateEditRow($template, _TEMPLATE_BLOGHEADER, 'BLOGLIST_HEADER', '', 160);
+	$this->_templateEditRow($template, _TEMPLATE_BLOGITEM, 'BLOGLIST_LISTITEM', '', 170);
+	$this->_templateEditRow($template, _TEMPLATE_BLOGFOOTER, 'BLOGLIST_FOOTER', '', 180);
 ?>
-		</tr><tr>	
+		</tr><tr>
 			<th colspan="2"><?php echo _TEMPLATE_CATEGORYLIST?> <?php help('templatecategorylists'); ?></th>
-<?php	$this->_templateEditRow($template, _TEMPLATE_CATHEADER, 'CATLIST_HEADER', '', 160);		
-	$this->_templateEditRow($template, _TEMPLATE_CATITEM, 'CATLIST_LISTITEM', '', 170);			
-	$this->_templateEditRow($template, _TEMPLATE_CATFOOTER, 'CATLIST_FOOTER', '', 180);		
+<?php	$this->_templateEditRow($template, _TEMPLATE_CATHEADER, 'CATLIST_HEADER', '', 190);
+	$this->_templateEditRow($template, _TEMPLATE_CATITEM, 'CATLIST_LISTITEM', '', 200);
+	$this->_templateEditRow($template, _TEMPLATE_CATFOOTER, 'CATLIST_FOOTER', '', 210);
 ?>
 		</tr><tr>
 			<th colspan="2"><?php echo _TEMPLATE_DATETIME?></th>
-<?php	$this->_templateEditRow($template, _TEMPLATE_DHEADER, 'DATE_HEADER', 'dateheads', 190);		
-	$this->_templateEditRow($template, _TEMPLATE_DFOOTER, 'DATE_FOOTER', 'dateheads', 200);			
-	$this->_templateEditRow($template, _TEMPLATE_DFORMAT, 'FORMAT_DATE', 'datetime', 210);		
-	$this->_templateEditRow($template, _TEMPLATE_TFORMAT, 'FORMAT_TIME', 'datetime', 220);			
-	$this->_templateEditRow($template, _TEMPLATE_LOCALE, 'LOCALE', 'locale', 230);		
+<?php	$this->_templateEditRow($template, _TEMPLATE_DHEADER, 'DATE_HEADER', 'dateheads', 220);
+	$this->_templateEditRow($template, _TEMPLATE_DFOOTER, 'DATE_FOOTER', 'dateheads', 230);
+	$this->_templateEditRow($template, _TEMPLATE_DFORMAT, 'FORMAT_DATE', 'datetime', 240);
+	$this->_templateEditRow($template, _TEMPLATE_TFORMAT, 'FORMAT_TIME', 'datetime', 250);
+	$this->_templateEditRow($template, _TEMPLATE_LOCALE, 'LOCALE', 'locale', 260);
 ?>
-		</tr><tr>	
+		</tr><tr>
 			<th colspan="2"><?php echo _TEMPLATE_IMAGE?> <?php help('templatepopups'); ?></th>
-<?php	$this->_templateEditRow($template, _TEMPLATE_PCODE, 'POPUP_CODE', '', 240);		
-	$this->_templateEditRow($template, _TEMPLATE_ICODE, 'IMAGE_CODE', '', 250);			
-	$this->_templateEditRow($template, _TEMPLATE_MCODE, 'MEDIA_CODE', '', 260);		
+<?php	$this->_templateEditRow($template, _TEMPLATE_PCODE, 'POPUP_CODE', '', 270);
+	$this->_templateEditRow($template, _TEMPLATE_ICODE, 'IMAGE_CODE', '', 280);
+	$this->_templateEditRow($template, _TEMPLATE_MCODE, 'MEDIA_CODE', '', 290);
 ?>
 		</tr><tr>
 			<th colspan="2"><?php echo _TEMPLATE_SEARCH?></th>
-<?php	$this->_templateEditRow($template, _TEMPLATE_SHIGHLIGHT, 'SEARCH_HIGHLIGHT', 'highlight',270);		
-	$this->_templateEditRow($template, _TEMPLATE_SNOTFOUND, 'SEARCH_NOTHINGFOUND', 'nothingfound',280);		
-?>			
+<?php	$this->_templateEditRow($template, _TEMPLATE_SHIGHLIGHT, 'SEARCH_HIGHLIGHT', 'highlight',300);
+	$this->_templateEditRow($template, _TEMPLATE_SNOTFOUND, 'SEARCH_NOTHINGFOUND', 'nothingfound',310);
+?>
+		</tr><tr>
+			<th colspan="2"><?php echo _TEMPLATE_PLUGIN_FIELDS?></th>
+<?php
+		$tab = 600;
+		$pluginfields = array();
+		$manager->notify('TemplateExtraFields',array('fields'=>&$pluginfields));
+
+		foreach ($pluginfields as $pfkey=>$pfvalue) {
+			echo "</tr><tr>\n";
+			echo '<th colspan="2">'.htmlentities($pfkey)."</th>\n";
+			foreach ($pfvalue as $pffield=>$pfdesc) {
+				$this->_templateEditRow($template, $pfdesc, $pffield, '',++$tab,0);
+			}
+		}
+?>
 		</tr><tr>
 			<th colspan="2"><?php echo _TEMPLATE_UPDATE?></th>
 		</tr><tr>
 			<td><?php echo _TEMPLATE_UPDATE?></td>
 			<td>
-				<input type="submit" tabindex="290" value="<?php echo _TEMPLATE_UPDATE_BTN?>" onclick="return checkSubmit();" />
-				<input type="reset" tabindex="300" value="<?php echo _TEMPLATE_RESET_BTN?>" />
+				<input type="submit" tabindex="800" value="<?php echo _TEMPLATE_UPDATE_BTN?>" onclick="return checkSubmit();" />
+				<input type="reset" tabindex="810" value="<?php echo _TEMPLATE_RESET_BTN?>" />
 			</td>
 		</tr></table>
-		
+
 		</div>
 		</form>
-		<?php	
+		<?php
 		$this->pagefoot();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function _templateEditRow(&$template, $description, $name, $help = '', $tabindex = 0, $big = 0) {
 		static $count = 1;
+		if (!isset($template[$name])) $template[$name] = '';
 	?>
-		</tr><tr>	
+		</tr><tr>
 			<td><?php echo $description?> <?php if ($help) help('template'.$help); ?></td>
 			<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>
 	<?php		$count++;
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_templateupdate() {
-		global $member;
-		
-		$templateid = intRequestVar('templateid');		
+		global $member, $manager;
+
+		$templateid = intRequestVar('templateid');
 
 		$member->isAdmin() or $this->disallow();
-		
+
 		$name = postVar('tname');
 		$desc = postVar('tdesc');
-		
+
 		if (!isValidTemplateName($name))
 			$this->error(_ERROR_BADTEMPLATENAME);
-		
+
 		if ((TEMPLATE::getNameFromId($templateid) != $name) && TEMPLATE::exists($name))
 			$this->error(_ERROR_DUPTEMPLATENAME);
-				
+
 
 		$name = addslashes($name);
 		$desc = addslashes($desc);
-		
+
 		// 1. Remove all template parts
 		$query = 'DELETE FROM '.sql_table('template').' WHERE tdesc=' . $templateid;
 		sql_query($query);
-		
+
 		// 2. Update description
 		$query =  'UPDATE '.sql_table('template_desc').' SET'
-		       . " tdname='" . $name . "',"
-		       . " tddesc='" . $desc . "'"
-		       . " WHERE tdnumber=" . $templateid;
+			   . " tdname='" . $name . "',"
+			   . " tddesc='" . $desc . "'"
+			   . " WHERE tdnumber=" . $templateid;
 		sql_query($query);
-		
+
 		// 3. Add non-empty template parts
 		$this->addToTemplate($templateid, 'ITEM_HEADER', postVar('ITEM_HEADER'));
 		$this->addToTemplate($templateid, 'ITEM', postVar('ITEM'));
 		$this->addToTemplate($templateid, 'ITEM_FOOTER', postVar('ITEM_FOOTER'));
 		$this->addToTemplate($templateid, 'MORELINK', postVar('MORELINK'));
-		$this->addToTemplate($templateid, 'EDITLINK', postVar('EDITLINK'));		
+		$this->addToTemplate($templateid, 'EDITLINK', postVar('EDITLINK'));
 		$this->addToTemplate($templateid, 'NEW', postVar('NEW'));
 		$this->addToTemplate($templateid, 'COMMENTS_HEADER', postVar('COMMENTS_HEADER'));
 		$this->addToTemplate($templateid, 'COMMENTS_BODY', postVar('COMMENTS_BODY'));
@@ -3416,6 +4035,9 @@ selector();
 		$this->addToTemplate($templateid, 'ARCHIVELIST_HEADER', postVar('ARCHIVELIST_HEADER'));
 		$this->addToTemplate($templateid, 'ARCHIVELIST_LISTITEM', postVar('ARCHIVELIST_LISTITEM'));
 		$this->addToTemplate($templateid, 'ARCHIVELIST_FOOTER', postVar('ARCHIVELIST_FOOTER'));
+		$this->addToTemplate($templateid, 'BLOGLIST_HEADER', postVar('BLOGLIST_HEADER'));
+		$this->addToTemplate($templateid, 'BLOGLIST_LISTITEM', postVar('BLOGLIST_LISTITEM'));
+		$this->addToTemplate($templateid, 'BLOGLIST_FOOTER', postVar('BLOGLIST_FOOTER'));
 		$this->addToTemplate($templateid, 'CATLIST_HEADER', postVar('CATLIST_HEADER'));
 		$this->addToTemplate($templateid, 'CATLIST_LISTITEM', postVar('CATLIST_LISTITEM'));
 		$this->addToTemplate($templateid, 'CATLIST_FOOTER', postVar('CATLIST_FOOTER'));
@@ -3429,155 +4051,182 @@ selector();
 		$this->addToTemplate($templateid, 'POPUP_CODE', postVar('POPUP_CODE'));
 		$this->addToTemplate($templateid, 'MEDIA_CODE', postVar('MEDIA_CODE'));
 		$this->addToTemplate($templateid, 'IMAGE_CODE', postVar('IMAGE_CODE'));
-		
-		
+
+		$pluginfields = array();
+		$manager->notify('TemplateExtraFields',array('fields'=>&$pluginfields));
+		foreach ($pluginfields as $pfkey=>$pfvalue) {
+			foreach ($pfvalue as $pffield=>$pfdesc) {
+				$this->addToTemplate($templateid, $pffield, postVar($pffield));
+			}
+		}
+
 		// jump back to template edit
 		$this->action_templateedit(_TEMPLATE_UPDATED);
-	
-	}	
 
+	}
+
+	/**
+	 * @todo document this
+	 */
 	function addToTemplate($id, $partname, $content) {
 		$partname = addslashes($partname);
-		$content = addslashes($content);	
-		
+		$content = addslashes($content);
+
 		$id = intval($id);
-		
+
 		// don't add empty parts:
 		if (!trim($content)) return -1;
-		
+
 		$query = 'INSERT INTO '.sql_table('template')." (tdesc, tpartname, tcontent) "
-		       . "VALUES ($id, '$partname', '$content')";
-		mysql_query($query) or die("Query error: " . mysql_error());
-		return mysql_insert_id();
-	}	
-	
+			   . "VALUES ($id, '$partname', '$content')";
+		sql_query($query) or exit(_ADMIN_SQLDIE_QUERYERROR . sql_error());
+		return sql_insert_id();
+	}
+
+	/**
+	 * @todo document this
+	 */
 	function action_templatedelete() {
-		global $member;
-		
+		global $member, $manager;
+
 		$member->isAdmin() or $this->disallow();
-		
+
 		$templateid = intRequestVar('templateid');
 		// TODO: check if template can be deleted
-		
+
 		$this->pagehead();
-		
+
 		$name = TEMPLATE::getNameFromId($templateid);
 		$desc = TEMPLATE::getDesc($templateid);
-		
+
 		?>
 			<h2><?php echo _DELETE_CONFIRM?></h2>
-			
+
 			<p>
-			<?php echo _CONFIRMTXT_TEMPLATE?><b><?php echo $name?></b> (<?php echo  htmlspecialchars($desc) ?>)
+			<?php echo _CONFIRMTXT_TEMPLATE?><b><?php echo htmlspecialchars($name)?></b> (<?php echo  htmlspecialchars($desc) ?>)
 			</p>
-			
+
 			<form method="post" action="index.php"><div>
 				<input type="hidden" name="action" value="templatedeleteconfirm" />
+				<?php $manager->addTicketHidden() ?>
 				<input type="hidden" name="templateid" value="<?php echo  $templateid ?>" />
 				<input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />
 			</div></form>
-		<?php		
+		<?php
 		$this->pagefoot();
-	}	
-	
+	}
+
+	/**
+	 * @todo document this
+	 */
 	function action_templatedeleteconfirm() {
 		global $member, $manager;
-		
+
 		$templateid = intRequestVar('templateid');
-		
+
 		$member->isAdmin() or $this->disallow();
-		
+
 		$manager->notify('PreDeleteTemplate', array('templateid' => $templateid));
-		
+
 		// 1. delete description
 		sql_query('DELETE FROM '.sql_table('template_desc').' WHERE tdnumber=' . $templateid);
-		
+
 		// 2. delete parts
 		sql_query('DELETE FROM '.sql_table('template').' WHERE tdesc=' . $templateid);
-		
-		$manager->notify('PostDeleteTemplate', array('templateid' => $templateid));		
-		
+
+		$manager->notify('PostDeleteTemplate', array('templateid' => $templateid));
+
 		$this->action_templateoverview();
-	}	
-	
+	}
+
+	/**
+	 * @todo document this
+	 */
 	function action_templatenew() {
 		global $member;
-		
+
 		$member->isAdmin() or $this->disallow();
-		
+
 		$name = postVar('name');
 		$desc = postVar('desc');
-		
+
 		if (!isValidTemplateName($name))
 			$this->error(_ERROR_BADTEMPLATENAME);
-		
+
 		if (TEMPLATE::exists($name))
-			$this->error(_ERROR_DUPTEMPLATENAME);		
+			$this->error(_ERROR_DUPTEMPLATENAME);
 
 		$newTemplateId = TEMPLATE::createNew($name, $desc);
 
 		$this->action_templateoverview();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_templateclone() {
 		global $member;
-		
+
 		$templateid = intRequestVar('templateid');
-		
+
 		$member->isAdmin() or $this->disallow();
-				
+
 		// 1. read old template
 		$name = TEMPLATE::getNameFromId($templateid);
 		$desc = TEMPLATE::getDesc($templateid);
 
 		// 2. create desc thing
 		$name = "cloned" . $name;
-		
+
 		// if a template with that name already exists:
 		if (TEMPLATE::exists($name)) {
 			$i = 1;
 			while (TEMPLATE::exists($name . $i))
 				$i++;
 			$name .= $i;
-		}		
-		
+		}
+
 		$newid = TEMPLATE::createNew($name, $desc);
 
 		// 3. create clone
 		// go through parts of old template and add them to the new one
 		$res = sql_query('SELECT tpartname, tcontent FROM '.sql_table('template').' WHERE tdesc=' . $templateid);
-		while ($o = mysql_fetch_object($res)) {
+		while ($o = sql_fetch_object($res)) {
 			$this->addToTemplate($newid, $o->tpartname, $o->tcontent);
 		}
 
 		$this->action_templateoverview();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_skinoverview() {
-		global $member;
-		
+		global $member, $manager;
+
 		$member->isAdmin() or $this->disallow();
-		
+
 		$this->pagehead();
-		
-		echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';		
-		
+
+		echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
+
 		echo '<h2>' . _SKIN_EDIT_TITLE . '</h2>';
-		
+
 		echo '<h3>' . _SKIN_AVAILABLE_TITLE . '</h3>';
-		
+
 		$query = 'SELECT * FROM '.sql_table('skin_desc').' ORDER BY sdname';
 		$template['content'] = 'skinlist';
 		$template['tabindex'] = 10;
 		showlist($query,'table',$template);
-		
+
 		echo '<h3>' . _SKIN_NEW_TITLE . '</h3>';
-		
+
 		?>
 		<form method="post" action="index.php">
 		<div>
-		
+
 		<input name="action" value="skinnew" type="hidden" />
+		<?php $manager->addTicketHidden() ?>
 		<table><tr>
 			<td><?php echo _SKIN_NAME?> <?php help('shortnames');?></td>
 			<td><input name="name" tabindex="10010" maxlength="20" size="20" /></td>
@@ -3588,49 +4237,55 @@ selector();
 			<td><?php echo _SKIN_CREATE?></td>
 			<td><input type="submit" tabindex="10030" value="<?php echo _SKIN_CREATE_BTN?>" onclick="return checkSubmit();" /></td>
 		</tr></table>
-		
+
 		</div>
 		</form>
-		
-		<?php		
+
+		<?php
 		$this->pagefoot();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_skinnew() {
 		global $member;
-		
+
 		$member->isAdmin() or $this->disallow();
-		
+
 		$name = trim(postVar('name'));
 		$desc = trim(postVar('desc'));
-		
+
 		if (!isValidSkinName($name))
 			$this->error(_ERROR_BADSKINNAME);
-		
+
 		if (SKIN::exists($name))
-			$this->error(_ERROR_DUPSKINNAME);		
-			
+			$this->error(_ERROR_DUPSKINNAME);
+
 		$newId = SKIN::createNew($name, $desc);
-		
+
 		$this->action_skinoverview();
-	}	
+	}
 
+	/**
+	 * @todo document this
+	 */
 	function action_skinedit() {
-		global $member;
-		
+		global $member, $manager;
+
 		$skinid = intRequestVar('skinid');
-		
+
 		$member->isAdmin() or $this->disallow();
-		
-		$skin = new SKIN($skinid);
-		
+
+		$skin =& new SKIN($skinid);
+
 		$this->pagehead();
 		?>
 		<p>
-			<a href="index.php?action=skinoverview">(<?php echo _SKIN_BACK?>)</a>		
+			<a href="index.php?action=skinoverview">(<?php echo _SKIN_BACK?>)</a>
 		</p>
 		<h2><?php echo _SKIN_EDITONE_TITLE?> '<?php echo  $skin->getName() ?>'</h2>
-		
+
 		<h3><?php echo _SKIN_PARTS_TITLE?></h3>
 		<?php echo _SKIN_PARTS_MSG?>
 		<ul>
@@ -3643,12 +4298,39 @@ 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>
 			<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>
 		</ul>
-		
-		<h3><?php echo _SKIN_GENSETTINGS_TITLE?></h3>
+
+		<?php
+
+		$query = "SELECT stype FROM " . sql_table('skin') . " WHERE stype NOT IN ('index', 'item', 'error', 'search', 'archive', 'archivelist', 'imagepopup', 'member') and sdesc = " . $skinid;
+		$res = sql_query($query);
+
+		echo '<h3>' . _SKIN_PARTS_SPECIAL . '</h3>';
+		echo '<form method="get" action="index.php">' . "\r\n";
+		echo '<input type="hidden" name="action" value="skinedittype" />' . "\r\n";
+		echo '<input type="hidden" name="skinid" value="' . $skinid . '" />' . "\r\n";
+		echo '<input name="type" tabindex="89" size="20" maxlength="20" />' . "\r\n";
+		echo '<input type="submit" tabindex="140" value="' . _SKIN_CREATE . '" onclick="return checkSubmit();" />' . "\r\n";
+		echo '</form>' . "\r\n";
+
+		if ($res && sql_num_rows($res) > 0) {
+			echo '<ul>';
+			$tabstart = 75;
+
+			while ($row = sql_fetch_assoc($res)) {
+				echo '<li><a tabindex="' . ($tabstart++) . '" href="index.php?action=skinedittype&amp;skinid=' . $skinid . '&amp;type=' . htmlspecialchars(strtolower($row['stype'])) . '">' . htmlspecialchars(ucfirst($row['stype'])) . '</a> (<a tabindex="' . ($tabstart++) . '" href="index.php?action=skinremovetype&amp;skinid=' . $skinid . '&amp;type=' . htmlspecialchars(strtolower($row['stype'])) . '">remove</a>)</li>';
+			}
+
+			echo '</ul>';
+		}
+
+		?>
+
+		<h3><?php echo _SKIN_GENSETTINGS_TITLE; ?></h3>
 		<form method="post" action="index.php">
 		<div>
-		
+
 		<input type="hidden" name="action" value="skineditgeneral" />
+		<?php $manager->addTicketHidden() ?>
 		<input type="hidden" name="skinid" value="<?php echo  $skinid ?>" />
 		<table><tr>
 			<td><?php echo _SKIN_NAME?> <?php help('shortnames');?></td>
@@ -3662,40 +4344,43 @@ selector();
 		</tr><tr>
 			<td><?php echo _SKIN_INCLUDE_MODE?> <?php help('includemode')?></td>
 			<td><?php $this->input_yesno('inc_mode',$skin->getIncludeMode(),120,'skindir','normal',_PARSER_INCMODE_SKINDIR,_PARSER_INCMODE_NORMAL);?></td>
-		</tr><tr>		
+		</tr><tr>
 			<td><?php echo _SKIN_INCLUDE_PREFIX?> <?php help('includeprefix')?></td>
 			<td><input name="inc_prefix" tabindex="130" value="<?php echo  htmlspecialchars($skin->getIncludePrefix()) ?>" maxlength="40" size="20" /></td>
-		</tr><tr>		
+		</tr><tr>
 			<td><?php echo _SKIN_CHANGE?></td>
 			<td><input type="submit" tabindex="140" value="<?php echo _SKIN_CHANGE_BTN?>" onclick="return checkSubmit();" /></td>
 		</tr></table>
-		
+
 		</div>
 		</form>
-		
-		
+
+
 		<?php		$this->pagefoot();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_skineditgeneral() {
 		global $member;
-		
-		$skinid = intRequestVar('skinid');		
-		
+
+		$skinid = intRequestVar('skinid');
+
 		$member->isAdmin() or $this->disallow();
-		
+
 		$name = postVar('name');
 		$desc = postVar('desc');
 		$type = postVar('type');
 		$inc_mode = postVar('inc_mode');
 		$inc_prefix = postVar('inc_prefix');
-		
-		$skin = new SKIN($skinid);
-		
+
+		$skin =& new SKIN($skinid);
+
 		// 1. Some checks
 		if (!isValidSkinName($name))
 			$this->error(_ERROR_BADSKINNAME);
-		
+
 		if (($skin->getName() != $name) && SKIN::exists($name))
 			$this->error(_ERROR_DUPSKINNAME);
 
@@ -3704,185 +4389,277 @@ selector();
 
 		// 2. Update description
 		$skin->updateGeneralInfo($name, $desc, $type, $inc_mode, $inc_prefix);
-		
+
 		$this->action_skinedit();
-		
+
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_skinedittype($msg = '') {
-		global $member;
-		
+		global $member, $manager;
+
 		$skinid = intRequestVar('skinid');
 		$type = requestVar('type');
-		
+
 		$member->isAdmin() or $this->disallow();
-		
-		$skin = new SKIN($skinid);
-		
+
+		$type = trim($type);
+		$type = strtolower($type);
+
+		if (!isValidShortName($type)) {
+			$this->error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT);
+		}
+
+		$skin =& new SKIN($skinid);
+
 		$friendlyNames = SKIN::getFriendlyNames();
-		
+
 		$this->pagehead();
 		?>
 		<p>(<a href="index.php?action=skinoverview"><?php echo _SKIN_GOBACK?></a>)</p>
-		
-		<h2><?php echo _SKIN_EDITPART_TITLE?> '<?php echo  $skin->getName() ?>': <?php echo  $friendlyNames[$type] ?></h2>
-		
+
+		<h2><?php echo _SKIN_EDITPART_TITLE?> '<?php echo htmlspecialchars($skin->getName()) ?>': <?php echo htmlspecialchars(isset($friendlyNames[$type]) ? $friendlyNames[$type] : ucfirst($type)); ?></h2>
+
 		<?php			if ($msg) echo "<p>"._MESSAGE.": $msg</p>";
 		?>
-		
-		
+
+
+		<div style="width:100%;">
 		<form method="post" action="index.php">
 		<div>
-		
+
 		<input type="hidden" name="action" value="skinupdate" />
+		<?php $manager->addTicketHidden() ?>
 		<input type="hidden" name="skinid" value="<?php echo  $skinid ?>" />
 		<input type="hidden" name="type" value="<?php echo  $type ?>" />
-		
+
 		<input type="submit" value="<?php echo _SKIN_UPDATE_BTN?>" onclick="return checkSubmit();" />
 		<input type="reset" value="<?php echo _SKIN_RESET_BTN?>" />
-		(skin type: <?php echo  $friendlyNames[$type] ?>)
-		<?php help('skinpart' . $type);?>
+		(skin type: <?php echo htmlspecialchars(isset($friendlyNames[$type]) ? $friendlyNames[$type] : ucfirst($type)); ?>)
+		<?php if (in_array($type, array('index', 'item', 'archivelist', 'archive', 'search', 'error', 'member', 'imagepopup'))) {
+			help('skinpart' . $type);
+		} else {
+			help('skinpartspecial');
+		}?>
 		<br />
-		
+
 		<textarea class="skinedit" tabindex="10" rows="20" cols="80" name="content"><?php echo  htmlspecialchars($skin->getContent($type)) ?></textarea>
-		
+
 		<br />
 		<input type="submit" tabindex="20" value="<?php echo _SKIN_UPDATE_BTN?>" onclick="return checkSubmit();" />
 		<input type="reset" value="<?php echo _SKIN_RESET_BTN?>" />
-		(skin type: <?php echo  $friendlyNames[$type] ?>)
-		
+		(skin type: <?php echo htmlspecialchars(isset($friendlyNames[$type]) ? $friendlyNames[$type] : ucfirst($type)); ?>)
+
 		<br /><br />
-		<?php echo _SKIN_ALLOWEDVARS?> 
+		<?php echo _SKIN_ALLOWEDVARS?>
 		<?php			$actions = SKIN::getAllowedActionsForType($type);
 
 			sort($actions);
-			
+
 			while ($current = array_shift($actions)) {
 				// skip deprecated vars
 				if ($current == 'ifcat') continue;
 				if ($current == 'imagetext') continue;
 				if ($current == 'vars') continue;
-				
+
 				echo helplink('skinvar-' . $current) . "$current</a>";
 				if (count($actions) != 0) echo ", ";
 			}
-		?>
-		<br /><br />
-		Short blog names:
-		<?php			$query = 'SELECT bshortname, bname FROM '.sql_table('blog');
+		echo '<br /><br />' . _SKINEDIT_ALLOWEDBLOGS;
+		$query = 'SELECT bshortname, bname FROM '.sql_table('blog');
 			showlist($query,'table',array('content'=>'shortblognames'));
-		?>
-
-		<br />
-		Template names:
-		<?php			$query = 'SELECT tdname as name, tddesc as description FROM '.sql_table('template_desc');
+		echo '<br />' . _SKINEDIT_ALLOWEDTEMPLATESS;
+		$query = 'SELECT tdname as name, tddesc as description FROM '.sql_table('template_desc');
 			showlist($query,'table',array('content'=>'shortnames'));
-		?>
-
-		
-		</div>
-		</form>
-		
-		
-		<?php		$this->pagefoot();	
+		echo '</div></form></div>';
+		$this->pagefoot();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_skinupdate() {
 		global $member;
-		
-		$skinid = intRequestVar('skinid');		
+
+		$skinid = intRequestVar('skinid');
 		$content = trim(postVar('content'));
-		$type = postVar('type');		
+		$type = postVar('type');
 
 		$member->isAdmin() or $this->disallow();
-		
-		$skin = new SKIN($skinid);
+
+		$skin =& new SKIN($skinid);
 		$skin->update($type, $content);
-		
+
 		$this->action_skinedittype(_SKIN_UPDATED);
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_skindelete() {
-		global $member, $CONF;
-		
+		global $member, $manager, $CONF;
+
 		$skinid = intRequestVar('skinid');
-		
+
 		$member->isAdmin() or $this->disallow();
-		
+
 		// don't allow default skin to be deleted
 		if ($skinid == $CONF['BaseSkin'])
 			$this->error(_ERROR_DEFAULTSKIN);
-			
+
 		// don't allow deletion of default skins for blogs
 		$query = 'SELECT bname FROM '.sql_table('blog').' WHERE bdefskin=' . $skinid;
 		$r = sql_query($query);
-		if ($o = mysql_fetch_object($r))
-			$this->error(_ERROR_SKINDEFDELETE . $o->bname);
-		
+		if ($o = sql_fetch_object($r))
+			$this->error(_ERROR_SKINDEFDELETE . htmlspecialchars($o->bname));
+
 		$this->pagehead();
-		
-		$skin = new SKIN($skinid);
+
+		$skin =& new SKIN($skinid);
 		$name = $skin->getName();
 		$desc = $skin->getDescription();
-		
+
 		?>
 			<h2><?php echo _DELETE_CONFIRM?></h2>
-			
+
 			<p>
-				<?php echo _CONFIRMTXT_SKIN?><b><?php echo  $name ?></b> (<?php echo  htmlspecialchars($desc)?>)
+				<?php echo _CONFIRMTXT_SKIN?><b><?php echo htmlspecialchars($name) ?></b> (<?php echo  htmlspecialchars($desc)?>)
 			</p>
-			
+
 			<form method="post" action="index.php"><div>
 				<input type="hidden" name="action" value="skindeleteconfirm" />
+				<?php $manager->addTicketHidden() ?>
 				<input type="hidden" name="skinid" value="<?php echo  $skinid ?>" />
 				<input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />
 			</div></form>
-		<?php		
+		<?php
 		$this->pagefoot();
-	}	
-	
+	}
+
+	/**
+	 * @todo document this
+	 */
 	function action_skindeleteconfirm() {
 		global $member, $CONF, $manager;
-		
-		$skinid = intRequestVar('skinid');		
-		
+
+		$skinid = intRequestVar('skinid');
+
 		$member->isAdmin() or $this->disallow();
-		
+
 		// don't allow default skin to be deleted
 		if ($skinid == $CONF['BaseSkin'])
 			$this->error(_ERROR_DEFAULTSKIN);
-			
+
 		// don't allow deletion of default skins for blogs
 		$query = 'SELECT bname FROM '.sql_table('blog').' WHERE bdefskin=' . $skinid;
 		$r = sql_query($query);
-		if ($o = mysql_fetch_object($r))
-			$this->error(_ERROR_SKINDEFDELETE .$o->bname);		
-		
-		$manager->notify('PreDeleteSkin', array('skinid' => $skinid));	
-		
+		if ($o = sql_fetch_object($r))
+			$this->error(_ERROR_SKINDEFDELETE .$o->bname);
+
+		$manager->notify('PreDeleteSkin', array('skinid' => $skinid));
+
 		// 1. delete description
 		sql_query('DELETE FROM '.sql_table('skin_desc').' WHERE sdnumber=' . $skinid);
-		
+
 		// 2. delete parts
 		sql_query('DELETE FROM '.sql_table('skin').' WHERE sdesc=' . $skinid);
-		
-		$manager->notify('PostDeleteSkin', array('skinid' => $skinid));			
-		
+
+		$manager->notify('PostDeleteSkin', array('skinid' => $skinid));
+
 		$this->action_skinoverview();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
+	function action_skinremovetype() {
+		global $member, $manager, $CONF;
+
+		$skinid = intRequestVar('skinid');
+		$skintype = requestVar('type');
+
+		if (!isValidShortName($skintype)) {
+			$this->error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);
+		}
+
+		$member->isAdmin() or $this->disallow();
+
+		// don't allow default skinparts to be deleted
+		if (in_array($skintype, array('index', 'item', 'archivelist', 'archive', 'search', 'error', 'member', 'imagepopup'))) {
+			$this->error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);
+		}
+
+		$this->pagehead();
+
+		$skin =& new SKIN($skinid);
+		$name = $skin->getName();
+		$desc = $skin->getDescription();
+
+		?>
+			<h2><?php echo _DELETE_CONFIRM?></h2>
+
+			<p>
+				<?php echo _CONFIRMTXT_SKIN_PARTS_SPECIAL; ?> <b><?php echo htmlspecialchars($skintype); ?> (<?php echo htmlspecialchars($name); ?>)</b> (<?php echo  htmlspecialchars($desc)?>)
+			</p>
+
+			<form method="post" action="index.php"><div>
+				<input type="hidden" name="action" value="skinremovetypeconfirm" />
+				<?php $manager->addTicketHidden() ?>
+				<input type="hidden" name="skinid" value="<?php echo $skinid; ?>" />
+				<input type="hidden" name="type" value="<?php echo htmlspecialchars($skintype); ?>" />
+				<input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />
+			</div></form>
+		<?php
+		$this->pagefoot();
+	}
+
+	/**
+	 * @todo document this
+	 */
+	function action_skinremovetypeconfirm() {
+		global $member, $CONF, $manager;
+
+		$skinid = intRequestVar('skinid');
+		$skintype = requestVar('type');
+
+		if (!isValidShortName($skintype)) {
+			$this->error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);
+		}
+
+		$member->isAdmin() or $this->disallow();
+
+		// don't allow default skinparts to be deleted
+		if (in_array($skintype, array('index', 'item', 'archivelist', 'archive', 'search', 'error', 'member', 'imagepopup'))) {
+			$this->error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);
+		}
+
+		$manager->notify('PreDeleteSkinPart', array('skinid' => $skinid, 'skintype' => $skintype));
+
+		// delete part
+		sql_query('DELETE FROM '.sql_table('skin').' WHERE sdesc=' . $skinid . ' AND stype=\'' . $skintype . '\'');
+
+		$manager->notify('PostDeleteSkinPart', array('skinid' => $skinid, 'skintype' => $skintype));
+
+		$this->action_skinedit();
+	}
+
+	/**
+	 * @todo document this
+	 */
 	function action_skinclone() {
 		global $member;
-		
-		$skinid = intRequestVar('skinid');		
-		
+
+		$skinid = intRequestVar('skinid');
+
 		$member->isAdmin() or $this->disallow();
-		
+
 		// 1. read skin to clone
-		$skin = new SKIN($skinid);
-		
+		$skin =& new SKIN($skinid);
+
 		$name = "clone_" . $skin->getName();
-		
+
 		// if a skin with that name already exists:
 		if (SKIN::exists($name)) {
 			$i = 1;
@@ -3890,7 +4667,7 @@ selector();
 				$i++;
 			$name .= $i;
 		}
-		
+
 		// 2. create skin desc
 		$newid = SKIN::createNew(
 			$name,
@@ -3899,9 +4676,10 @@ selector();
 			$skin->getIncludeMode(),
 			$skin->getIncludePrefix()
 		);
-		
-		
+
+
 		// 3. clone
+		/*
 		$this->skinclonetype($skin, $newid, 'index');
 		$this->skinclonetype($skin, $newid, 'item');
 		$this->skinclonetype($skin, $newid, 'archivelist');
@@ -3910,11 +4688,21 @@ selector();
 		$this->skinclonetype($skin, $newid, 'error');
 		$this->skinclonetype($skin, $newid, 'member');
 		$this->skinclonetype($skin, $newid, 'imagepopup');
-		
+		*/
+
+		$query = "SELECT stype FROM " . sql_table('skin') . " WHERE sdesc = " . $skinid;
+		$res = sql_query($query);
+		while ($row = sql_fetch_assoc($res)) {
+			$this->skinclonetype($skin, $newid, $row['stype']);
+		}
+
 		$this->action_skinoverview();
-		
+
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function skinclonetype($skin, $newid, $type) {
 		$newid = intval($newid);
 		$content = $skin->getContent($type);
@@ -3923,48 +4711,52 @@ selector();
 			sql_query($query);
 		}
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_settingsedit() {
 		global $member, $manager, $CONF, $DIR_NUCLEUS, $DIR_MEDIA;
-		
+
 		$member->isAdmin() or $this->disallow();
-		
+
 		$this->pagehead();
-		
-		echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';		
+
+		echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
 		?>
 
 		<h2><?php echo _SETTINGS_TITLE?></h2>
-		
+
 		<form action="index.php" method="post">
 		<div>
-		
+
 		<input type="hidden" name="action" value="settingsupdate" />
-		
+		<?php $manager->addTicketHidden() ?>
+
 		<table><tr>
 			<th colspan="2"><?php echo _SETTINGS_SUB_GENERAL?></th>
 		</tr><tr>
 			<td><?php echo _SETTINGS_DEFBLOG?> <?php help('defaultblog'); ?></td>
 			<td>
-				<?php 
+				<?php
 					$query =  'SELECT bname as text, bnumber as value'
-					       . ' FROM '.sql_table('blog');
+						   . ' FROM '.sql_table('blog');
 					$template['name'] = 'DefaultBlog';
 					$template['selected'] = $CONF['DefaultBlog'];
 					$template['tabindex'] = 10;
-					showlist($query,'select',$template);		
+					showlist($query,'select',$template);
 				?>
 			</td>
 		</tr><tr>
 			<td><?php echo _SETTINGS_BASESKIN?> <?php help('baseskin'); ?></td>
 			<td>
-				<?php 
+				<?php
 					$query =  'SELECT sdname as text, sdnumber as value'
-					       . ' FROM '.sql_table('skin_desc');
+						   . ' FROM '.sql_table('skin_desc');
 					$template['name'] = 'BaseSkin';
 					$template['selected'] = $CONF['BaseSkin'];
 					$template['tabindex'] = 1;
-					showlist($query,'select',$template);		
+					showlist($query,'select',$template);
 				?>
 			</td>
 		</tr><tr>
@@ -3988,11 +4780,11 @@ selector();
 		</tr><tr>
 			<td><?php echo _SETTINGS_ACTIONSURL?> <?php help('actionurl');?></td>
 			<td><input name="ActionURL" tabindex="10047" size="40" value="<?php echo  htmlspecialchars($CONF['ActionURL']) ?>" /></td>
-		</tr><tr>		
+		</tr><tr>
 			<td><?php echo _SETTINGS_LANGUAGE?> <?php help('language'); ?>
 			</td>
 			<td>
-			
+
 				<select name="Language" tabindex="10050">
 				<?php				// show a dropdown list of all available languages
 				global $DIR_LANG;
@@ -4009,78 +4801,100 @@ selector();
 				closedir($dirhandle);
 
 				?>
-				</select>			
-			
+				</select>
+
 			</td>
 		</tr><tr>
 			<td><?php echo _SETTINGS_DISABLESITE?> <?php help('disablesite'); ?>
 			</td>
 			<td><?php $this->input_yesno('DisableSite',$CONF['DisableSite'],10060); ?>
-    			    <br />
-			    URL: <input name="DisableSiteURL" tabindex="10070" size="40" value="<?php echo  htmlspecialchars($CONF['DisableSiteURL'])?>" />
+					<br />
+				<?php echo _SETTINGS_DISABLESITEURL ?> <input name="DisableSiteURL" tabindex="10070" size="40" value="<?php echo  htmlspecialchars($CONF['DisableSiteURL'])?>" />
 			</td>
 		</tr><tr>
 			<td><?php echo _SETTINGS_DIRS?></td>
 			<td><?php echo  htmlspecialchars($DIR_NUCLEUS) ?>
-			    <i><?php echo _SETTINGS_SEECONFIGPHP?></i></td>				
-		</tr><tr>		
+				<i><?php echo _SETTINGS_SEECONFIGPHP?></i></td>
+		</tr><tr>
 			<td><?php echo _SETTINGS_DBLOGIN?></td>
 			<td><i><?php echo _SETTINGS_SEECONFIGPHP?></i></td>
 		</tr><tr>
 			<td>
-			<?php echo _SETTINGS_JSTOOLBAR;
-				 /* =_SETTINGS_DISABLEJS 
-
+			<?php
+				echo _SETTINGS_JSTOOLBAR
+				/* =_SETTINGS_DISABLEJS
 
-			
 					I temporary changed the meaning of DisableJsTools, until I can find a good
-					way to select the javascript version to use 
-					
-					now, its: 
+					way to select the javascript version to use
+
+					now, its:
 						0 : IE
 						1 : all javascript disabled
 						2 : 'simpler' javascript (for mozilla/opera/mac)
-			    */
+				*/
 			   ?>
 			</td>
 			<td><?php /* $this->input_yesno('DisableJsTools',$CONF['DisableJsTools'],10075); */?>
 				<select name="DisableJsTools" tabindex="10075">
-			<?php					$extra = ($CONF['DisableJsTools'] == 1) ? 'selected="selected"' : ''; 
+			<?php					$extra = ($CONF['DisableJsTools'] == 1) ? 'selected="selected"' : '';
 					echo "<option $extra value='1'>",_SETTINGS_JSTOOLBAR_NONE,"</option>";
-					$extra = ($CONF['DisableJsTools'] == 2) ? 'selected="selected"' : ''; 					
+					$extra = ($CONF['DisableJsTools'] == 2) ? 'selected="selected"' : '';
 					echo "<option $extra value='2'>",_SETTINGS_JSTOOLBAR_SIMPLE,"</option>";
-					$extra = ($CONF['DisableJsTools'] == 0) ? 'selected="selected"' : ''; 										
-					echo "<option $extra value='0'>",_SETTINGS_JSTOOLBAR_FULL,"</option>";					
+					$extra = ($CONF['DisableJsTools'] == 0) ? 'selected="selected"' : '';
+					echo "<option $extra value='0'>",_SETTINGS_JSTOOLBAR_FULL,"</option>";
 			?>
 				</select>
-			</td>			
+			</td>
 		</tr><tr>
 			<td><?php echo _SETTINGS_URLMODE?> <?php help('urlmode');?></td>
-                       <td><?php $this->input_yesno('URLMode',$CONF['URLMode'],10077,
-					          'normal','pathinfo',_SETTINGS_URLMODE_NORMAL,_SETTINGS_URLMODE_PATHINFO);
-					          
-					          echo ' ', _SETTINGS_URLMODE_HELP;
-					          
-					           ?>
-                       </td>
+					   <td><?php
+
+					   $this->input_yesno('URLMode',$CONF['URLMode'],10077,
+							  'normal','pathinfo',_SETTINGS_URLMODE_NORMAL,_SETTINGS_URLMODE_PATHINFO);
+
+					   echo ' ', _SETTINGS_URLMODE_HELP;
+
+							 ?>
+
+					   </td>
+		</tr><tr>
+			<td><?php echo _SETTINGS_DEBUGVARS?> <?php help('debugvars');?></td>
+					   <td><?php
+
+						$this->input_yesno('DebugVars',$CONF['DebugVars'],10078);
+
+							 ?>
+
+					   </td>
+		</tr><tr>
+			<td><?php echo _SETTINGS_DEFAULTLISTSIZE?> <?php help('defaultlistsize');?></td>
+			<td>
+			<?php
+				if (!array_key_exists('DefaultListSize',$CONF)) {
+					sql_query("INSERT INTO ".sql_table('config')." VALUES ('DefaultListSize', '10')");
+					$CONF['DefaultListSize'] = 10;
+				}
+			?>
+				<input name="DefaultListSize" tabindex="10079" size="40" value="<?php echo  htmlspecialchars((intval($CONF['DefaultListSize']) < 1 ? '10' : $CONF['DefaultListSize'])) ?>" />
+			</td>
 		</tr><tr>
 			<th colspan="2"><?php echo _SETTINGS_MEDIA?> <?php help('media'); ?></th>
 		</tr><tr>
 			<td><?php echo _SETTINGS_MEDIADIR?></td>
 			<td><?php echo  htmlspecialchars($DIR_MEDIA) ?>
-			    <i><?php echo _SETTINGS_SEECONFIGPHP?></i>
-			    <?php			    	if (!is_dir($DIR_MEDIA))
-			    		echo "<br /><b>" . _WARNING_NOTADIR . "</b>";
-			    	if (!is_readable($DIR_MEDIA))
-			    		echo "<br /><b>" . _WARNING_NOTREADABLE . "</b>";			    		
-			    	if (!is_writeable($DIR_MEDIA))
-			    		echo "<br /><b>" . _WARNING_NOTWRITABLE . "</b>";			 
-			    ?>
+				<i><?php echo _SETTINGS_SEECONFIGPHP?></i>
+				<?php			    	if (!is_dir($DIR_MEDIA))
+						echo "<br /><b>" . _WARNING_NOTADIR . "</b>";
+					if (!is_readable($DIR_MEDIA))
+						echo "<br /><b>" . _WARNING_NOTREADABLE . "</b>";
+					if (!is_writeable($DIR_MEDIA))
+						echo "<br /><b>" . _WARNING_NOTWRITABLE . "</b>";
+				?>
 			</td>
 		</tr><tr>
 			<td><?php echo _SETTINGS_MEDIAURL?></td>
 			<td>
-			    <input name="MediaURL" tabindex="10080" size="40" value="<?php echo  htmlspecialchars($CONF['MediaURL']) ?>" />
+				<input name="MediaURL" tabindex="10080" size="40" value="<?php echo  htmlspecialchars($CONF['MediaURL']) ?>" />
 			</td>
 		</tr><tr>
 			<td><?php echo _SETTINGS_ALLOWUPLOAD?></td>
@@ -4088,13 +4902,13 @@ selector();
 		</tr><tr>
 			<td><?php echo _SETTINGS_ALLOWUPLOADTYPES?></td>
 			<td>
-			    <input name="AllowedTypes" tabindex="10100" size="40" value="<?php echo  htmlspecialchars($CONF['AllowedTypes']) ?>" />
+				<input name="AllowedTypes" tabindex="10100" size="40" value="<?php echo  htmlspecialchars($CONF['AllowedTypes']) ?>" />
 			</td>
 		</tr><tr>
 			<td><?php echo _SETTINGS_MAXUPLOADSIZE?></td>
 			<td>
-			    <input name="MaxUploadSize" tabindex="10105" size="40" value="<?php echo  htmlspecialchars($CONF['MaxUploadSize']) ?>" />
-			</td>			
+				<input name="MaxUploadSize" tabindex="10105" size="40" value="<?php echo  htmlspecialchars($CONF['MaxUploadSize']) ?>" />
+			</td>
 		</tr><tr>
 			<td><?php echo _SETTINGS_MEDIAPREFIX?></td>
 			<td><?php $this->input_yesno('MediaPrefix',$CONF['MediaPrefix'],10110); ?></td>
@@ -4104,33 +4918,33 @@ selector();
 		</tr><tr>
 			<td><?php echo _SETTINGS_CHANGELOGIN?></td>
 			<td><?php $this->input_yesno('AllowLoginEdit',$CONF['AllowLoginEdit'],10120); ?></td>
-		</tr><tr>		
+		</tr><tr>
 			<td><?php echo _SETTINGS_ALLOWCREATE?>
-			    <?php help('allowaccountcreation'); ?>
+				<?php help('allowaccountcreation'); ?>
 			</td>
 			<td><?php $this->input_yesno('AllowMemberCreate',$CONF['AllowMemberCreate'],10130); ?>
 			</td>
 		</tr><tr>
 			<td><?php echo _SETTINGS_NEWLOGIN?> <?php help('allownewmemberlogin'); ?>
-			    <br /><?php echo _SETTINGS_NEWLOGIN2?>
+				<br /><?php echo _SETTINGS_NEWLOGIN2?>
 			</td>
 			<td><?php $this->input_yesno('NewMemberCanLogon',$CONF['NewMemberCanLogon'],10140); ?>
 			</td>
-		</tr><tr>		
+		</tr><tr>
 			<td><?php echo _SETTINGS_MEMBERMSGS?>
-			    <?php help('messageservice'); ?>
+				<?php help('messageservice'); ?>
 			</td>
 			<td><?php $this->input_yesno('AllowMemberMail',$CONF['AllowMemberMail'],10150); ?>
 			</td>
-		</tr><tr>		
+		</tr><tr>
 			<td><?php echo _SETTINGS_NONMEMBERMSGS?>
-			    <?php help('messageservice'); ?>
+				<?php help('messageservice'); ?>
 			</td>
 			<td><?php $this->input_yesno('NonmemberMail',$CONF['NonmemberMail'],10155); ?>
 			</td>
-		</tr><tr>		
+		</tr><tr>
 			<td><?php echo _SETTINGS_PROTECTMEMNAMES?>
-			    <?php help('protectmemnames'); ?>
+				<?php help('protectmemnames'); ?>
 			</td>
 			<td><?php $this->input_yesno('ProtectMemNames',$CONF['ProtectMemNames'],10156); ?>
 			</td>
@@ -4140,6 +4954,9 @@ selector();
 		</tr><tr>
 			<th colspan="2"><?php echo _SETTINGS_COOKIES_TITLE?> <?php help('cookies'); ?></th>
 		</tr><tr>
+			<td><?php echo _SETTINGS_COOKIEPREFIX?></td>
+			<td><input name="CookiePrefix" tabindex="10159" size="40" value="<?php echo  htmlspecialchars($CONF['CookiePrefix'])?>" /></td>
+		</tr><tr>
 			<td><?php echo _SETTINGS_COOKIEDOMAIN?></td>
 			<td><input name="CookieDomain" tabindex="10160" size="40" value="<?php echo  htmlspecialchars($CONF['CookieDomain'])?>" /></td>
 		</tr><tr>
@@ -4151,7 +4968,7 @@ selector();
 		</tr><tr>
 			<td><?php echo _SETTINGS_COOKIELIFE?></td>
 			<td><?php $this->input_yesno('SessionCookie',$CONF['SessionCookie'],10190,
-					          1,0,_SETTINGS_COOKIESESSION,_SETTINGS_COOKIEMONTH); ?>
+							  1,0,_SETTINGS_COOKIESESSION,_SETTINGS_COOKIEMONTH); ?>
 			</td>
 		</tr><tr>
 			<td><?php echo _SETTINGS_LASTVISIT?></td>
@@ -4165,47 +4982,50 @@ selector();
 			<td><?php echo _SETTINGS_UPDATE?></td>
 			<td><input type="submit" tabindex="10210" value="<?php echo _SETTINGS_UPDATE_BTN?>" onclick="return checkSubmit();" /></td>
 		</tr></table>
-		
+
 		</div>
 		</form>
 
-		<?php		
-			echo '<h2>',_PLUGINS_EXTRA,'</h2>';		
+		<?php
+			echo '<h2>',_PLUGINS_EXTRA,'</h2>';
 
 			$manager->notify(
-				'GeneralSettingsFormExtras', 	
+				'GeneralSettingsFormExtras',
 				array()
 			);
-		
+
 		$this->pagefoot();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_settingsupdate() {
 		global $member, $CONF;
-		
+
 		$member->isAdmin() or $this->disallow();
-		
+
 		// check if email address for admin is valid
 		if (!isValidMailAddress(postVar('AdminEmail')))
 			$this->error(_ERROR_BADMAILADDRESS);
 
-		
-		// save settings	
-		$this->updateConfig('DefaultBlog',		postVar('DefaultBlog'));	
-		$this->updateConfig('BaseSkin',			postVar('BaseSkin'));			
-		$this->updateConfig('IndexURL',			postVar('IndexURL'));	
+
+		// save settings
+		$this->updateConfig('DefaultBlog',		postVar('DefaultBlog'));
+		$this->updateConfig('BaseSkin',			postVar('BaseSkin'));
+		$this->updateConfig('IndexURL',			postVar('IndexURL'));
 		$this->updateConfig('AdminURL',			postVar('AdminURL'));
-		$this->updateConfig('PluginURL',		postVar('PluginURL'));		
-		$this->updateConfig('SkinsURL',			postVar('SkinsURL'));				
-		$this->updateConfig('ActionURL',		postVar('ActionURL'));						
-		$this->updateConfig('Language',			postVar('Language'));	
-		$this->updateConfig('AdminEmail',		postVar('AdminEmail'));	
-		$this->updateConfig('SessionCookie',	postVar('SessionCookie'));	
-		$this->updateConfig('AllowMemberCreate',postVar('AllowMemberCreate'));	
-		$this->updateConfig('AllowMemberMail',	postVar('AllowMemberMail'));	
-		$this->updateConfig('NonmemberMail',	postVar('NonmemberMail'));			
-		$this->updateConfig('ProtectMemNames',	postVar('ProtectMemNames'));					
-		$this->updateConfig('SiteName',			postVar('SiteName'));	
+		$this->updateConfig('PluginURL',		postVar('PluginURL'));
+		$this->updateConfig('SkinsURL',			postVar('SkinsURL'));
+		$this->updateConfig('ActionURL',		postVar('ActionURL'));
+		$this->updateConfig('Language',			postVar('Language'));
+		$this->updateConfig('AdminEmail',		postVar('AdminEmail'));
+		$this->updateConfig('SessionCookie',	postVar('SessionCookie'));
+		$this->updateConfig('AllowMemberCreate',postVar('AllowMemberCreate'));
+		$this->updateConfig('AllowMemberMail',	postVar('AllowMemberMail'));
+		$this->updateConfig('NonmemberMail',	postVar('NonmemberMail'));
+		$this->updateConfig('ProtectMemNames',	postVar('ProtectMemNames'));
+		$this->updateConfig('SiteName',			postVar('SiteName'));
 		$this->updateConfig('NewMemberCanLogon',postVar('NewMemberCanLogon'));
 		$this->updateConfig('DisableSite',		postVar('DisableSite'));
 		$this->updateConfig('DisableSiteURL',	postVar('DisableSiteURL'));
@@ -4214,39 +5034,185 @@ selector();
 		$this->updateConfig('AllowedTypes',		postVar('AllowedTypes'));
 		$this->updateConfig('AllowUpload',		postVar('AllowUpload'));
 		$this->updateConfig('MaxUploadSize',	postVar('MaxUploadSize'));
-		$this->updateConfig('MediaPrefix',		postVar('MediaPrefix'));		
+		$this->updateConfig('MediaPrefix',		postVar('MediaPrefix'));
 		$this->updateConfig('AllowLoginEdit',	postVar('AllowLoginEdit'));
-		$this->updateConfig('DisableJsTools',	postVar('DisableJsTools'));		
+		$this->updateConfig('DisableJsTools',	postVar('DisableJsTools'));
 		$this->updateConfig('CookieDomain',		postVar('CookieDomain'));
 		$this->updateConfig('CookiePath',		postVar('CookiePath'));
 		$this->updateConfig('CookieSecure',		postVar('CookieSecure'));
-		$this->updateConfig('URLMode',			postVar('URLMode'));		
-		
+		$this->updateConfig('URLMode',			postVar('URLMode'));
+		$this->updateConfig('CookiePrefix',		postVar('CookiePrefix'));
+		$this->updateConfig('DebugVars',		postVar('DebugVars'));
+		$this->updateConfig('DefaultListSize',	postVar('DefaultListSize'));
+
 		// load new config and redirect (this way, the new language will be used is necessary)
 		// note that when changing cookie settings, this redirect might cause the user
 		// to have to log in again.
 		getConfig();
 		redirect($CONF['AdminURL'] . '?action=manage');
 		exit;
-	
+
 	}
-	
-	
+
+	/**
+	 *  Give an overview over the used system
+	 */
+	function action_systemoverview() {
+		global $member, $nucleus, $CONF;
+
+		$this->pagehead();
+
+		echo '<h2>' . _ADMIN_SYSTEMOVERVIEW_HEADING . "</h2>\n";
+
+		if ($member->isLoggedIn() && $member->isAdmin()) {
+
+			// Information about the used PHP and MySQL installation
+			echo '<h3>' . _ADMIN_SYSTEMOVERVIEW_PHPANDMYSQL . "</h3>\n";
+
+			// Version of PHP MySQL
+			echo "<table>\n";
+			echo "\t<tr>\n";
+			echo "\t\t" . '<th colspan="2">' . _ADMIN_SYSTEMOVERVIEW_VERSIONS . "</th>\n";
+			echo "\t</tr><tr>\n";
+			echo "\t\t" . '<td width="50%">' . _ADMIN_SYSTEMOVERVIEW_PHPVERSION . "</td>\n";
+			echo "\t\t" . '<td>' . phpversion() . "</td>\n";
+			echo "\t</tr><tr>\n";
+			echo "\t\t" . '<td>' . _ADMIN_SYSTEMOVERVIEW_MYSQLVERSION . "</td>\n";
+			echo "\t\t" . '<td>' . sql_get_server_info() . ' (' . sql_get_client_info() . ')' . "</td>\n";
+			echo "\t</tr>";
+			echo "</table>\n";
+
+			// Important PHP settings
+			echo "<table>\n";
+			echo "\t<tr>\n";
+			echo "\t\t" . '<th colspan="2">' . _ADMIN_SYSTEMOVERVIEW_SETTINGS . "</th>\n";
+			echo "\t</tr><tr>\n";
+			echo "\t\t" . '<td width="50%">magic_quotes_gpc' . "</td>\n";
+			$mqg = get_magic_quotes_gpc() ? 'On' : 'Off';
+			echo "\t\t" . '<td>' . $mqg . "</td>\n";
+			echo "\t</tr><tr>\n";
+			echo "\t\t" . '<td>magic_quotes_runtime' . "</td>\n";
+			$mqr = get_magic_quotes_runtime() ? 'On' : 'Off';
+			echo "\t\t" . '<td>' . $mqr . "</td>\n";
+			echo "\t</tr><tr>\n";
+			echo "\t\t" . '<td>register_globals' . "</td>\n";
+			$rg = ini_get('register_globals') ? 'On' : 'Off';
+			echo "\t\t" . '<td>' . $rg . "</td>\n";
+			echo "\t</tr>";
+			echo "</table>\n";
+
+			// Information about GD library
+			$gdinfo = gd_info();
+			echo "<table>\n";
+			echo "\t<tr>";
+			echo "\t\t" . '<th colspan="2">' . _ADMIN_SYSTEMOVERVIEW_GDLIBRALY . "</th>\n";
+			echo "\t</tr>\n";
+			foreach ($gdinfo as $key=>$value) {
+				if (is_bool($value)) {
+					$value = $value ? _ADMIN_SYSTEMOVERVIEW_ENABLE : _ADMIN_SYSTEMOVERVIEW_DISABLE;
+				} else {
+					$value = htmlspecialchars($value, ENT_QUOTES);
+				}
+				echo "\t<tr>";
+				echo "\t\t" . '<td width="50%">' . $key . "</td>\n";
+				echo "\t\t" . '<td>' . $value . "</td>\n";
+				echo "\t</tr>\n";
+			}
+			echo "</table>\n";
+
+			// Check if special modules are loaded
+			ob_start();
+			phpinfo(INFO_MODULES);
+			$im = ob_get_contents();
+			ob_clean();
+			echo "<table>\n";
+			echo "\t<tr>";
+			echo "\t\t" . '<th colspan="2">' . _ADMIN_SYSTEMOVERVIEW_MODULES . "</th>\n";
+			echo "\t</tr><tr>\n";
+			echo "\t\t" . '<td width="50%">mod_rewrite' . "</td>\n";
+			$modrewrite = (strstr($im, 'mod_rewrite') != '') ?
+						_ADMIN_SYSTEMOVERVIEW_ENABLE :
+						_ADMIN_SYSTEMOVERVIEW_DISABLE;
+			echo "\t\t" . '<td>' . $modrewrite . "</td>\n";
+			echo "\t</tr>\n";
+			echo "</table>\n";
+
+			// Information about the used Nucleus CMS
+			echo '<h3>' . _ADMIN_SYSTEMOVERVIEW_NUCLEUSSYSTEM . "</h3>\n";
+			global $nucleus;
+			$nv = getNucleusVersion() / 100 . '(' . $nucleus['version'] . ')';
+			$np = getNucleusPatchLevel();
+			echo "<table>\n";
+			echo "\t<tr>";
+			echo "\t\t" . '<th colspan="2">Nucleus CMS' . "</th>\n";
+			echo "\t</tr><tr>\n";
+			echo "\t\t" . '<td width="50%">' . _ADMIN_SYSTEMOVERVIEW_NUCLEUSVERSION . "</td>\n";
+			echo "\t\t" . '<td>' . $nv . "</td>\n";
+			echo "\t</tr><tr>\n";
+			echo "\t\t" . '<td width="50%">' . _ADMIN_SYSTEMOVERVIEW_NUCLEUSPATCHLEVEL . "</td>\n";
+			echo "\t\t" . '<td>' . $np . "</td>\n";
+			echo "\t</tr>\n";
+			echo "</table>\n";
+
+			// Important settings of the installation
+			echo "<table>\n";
+			echo "\t<tr>";
+			echo "\t\t" . '<th colspan="2">' . _ADMIN_SYSTEMOVERVIEW_NUCLEUSSETTINGS . "</th>\n";
+			echo "\t</tr><tr>\n";
+			echo "\t\t" . '<td width="50%">' . '$CONF[' . "'Self']</td>\n";
+			echo "\t\t" . '<td>' . $CONF['Self'] . "</td>\n";
+			echo "\t</tr><tr>\n";
+			echo "\t\t" . '<td width="50%">' . '$CONF[' . "'ItemURL']</td>\n";
+			echo "\t\t" . '<td>' . $CONF['ItemURL'] . "</td>\n";
+			echo "\t</tr><tr>\n";
+			echo "\t\t" . '<td width="50%">' . '$CONF[' . "'alertOnHeadersSent']</td>\n";
+			$ohs = $CONF['alertOnHeadersSent'] ?
+						_ADMIN_SYSTEMOVERVIEW_ENABLE :
+						_ADMIN_SYSTEMOVERVIEW_DISABLE;
+			echo "\t\t" . '<td>' . $ohs . "</td>\n";
+			echo "\t</tr>\n";
+			echo "</table>\n";
+
+			// Link to the online version test at the Nucleus CMS website
+			echo '<h3>' . _ADMIN_SYSTEMOVERVIEW_VERSIONCHECK . "</h3>\n";
+			if ($nucleus['codename'] != '') {
+				$codenamestring = ' &quot;' . $nucleus['codename'] . '&quot;';
+			} else {
+				$codenamestring = '';
+			}
+			echo _ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TXT;
+			$checkURL = sprintf(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_URL, getNucleusVersion(), getNucleusPatchLevel());
+			echo '<a href="' . $checkURL . '" title="' . _ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE . '">';
+			echo 'Nucleus CMS ' . $nv . $codenamestring;
+			echo '</a>';
+		//echo '<br />';
+		}
+		else {
+			echo _ADMIN_SYSTEMOVERVIEW_NOT_ADMIN;
+		}
+
+		$this->pagefoot();
+	}
+
+	/**
+	 * @todo document this
+	 */
 	function updateConfig($name, $val) {
 		$name = addslashes($name);
 		$val = trim(addslashes($val));
-		
+
 		$query = 'UPDATE '.sql_table('config')
-		       . " SET value='$val'"
-		       . " WHERE name='$name'";
+			   . " SET value='$val'"
+			   . " WHERE name='$name'";
 
-		mysql_query($query) or die("Query error: " . mysql_error());
-		return mysql_insert_id();
+		sql_query($query) or die(_ADMIN_SQLDIE_QUERYERROR . sql_error());
+		return sql_insert_id();
 	}
-	
+
 	/**
-	  * Error message
-	  */
+	 * Error message
+	 * @param string $msg message that will be shown
+	 */
 	function error($msg) {
 		$this->pagehead();
 		?>
@@ -4257,17 +5223,22 @@ selector();
 		$this->pagefoot();
 		exit;
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function disallow() {
 		ACTIONLOG::add(WARNING, _ACTIONLOG_DISALLOWED . serverVar('REQUEST_URI'));
-		
+
 		$this->error(_ERROR_DISALLOWED);
 	}
-	
-	
+
+	/**
+	 * @todo document this
+	 */
 	function pagehead($extrahead = '') {
 		global $member, $nucleus, $CONF, $manager;
-		
+
 		$manager->notify(
 			'AdminPrePageHead',
 			array(
@@ -4275,66 +5246,80 @@ selector();
 				'action' => $this->action
 			)
 		);
-		
+
 		$baseUrl = htmlspecialchars($CONF['AdminURL']);
 
 		?>
 		<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-		<html xmlns="http://www.w3.org/1999/xhtml">
+		<html <?php echo _HTML_XML_NAME_SPACE_AND_LANG_CODE; ?>>
 		<head>
 			<meta http-equiv="Content-Type" content="text/html; charset=<?php echo _CHARSET ?>" />
-			<title><?php echo htmlspecialchars($CONF['SiteName'])?> - Admin</title>		
+			<title><?php echo htmlspecialchars($CONF['SiteName'])?> - Admin</title>
 			<link rel="stylesheet" title="Nucleus Admin Default" type="text/css" href="<?php echo $baseUrl?>styles/admin.css" />
-			<link rel="stylesheet" title="Nucleus Admin Default" type="text/css" 
+			<link rel="stylesheet" title="Nucleus Admin Default" type="text/css"
 			href="<?php echo $baseUrl?>styles/addedit.css" />
-			
+
 			<script type="text/javascript" src="<?php echo $baseUrl?>javascript/edit.js"></script>
 			<script type="text/javascript" src="<?php echo $baseUrl?>javascript/admin.js"></script>
 			<script type="text/javascript" src="<?php echo $baseUrl?>javascript/compatibility.js"></script>
 
-      <meta http-equiv='Pragma' content='no-cache' />
-      <meta http-equiv='Cache-Control' content='no-cache, must-revalidate' />
-      <meta http-equiv='Expires' content='-1' />
+	  <meta http-equiv='Pragma' content='no-cache' />
+	  <meta http-equiv='Cache-Control' content='no-cache, must-revalidate' />
+	  <meta http-equiv='Expires' content='-1' />
 
 			<?php echo $extrahead?>
 		</head>
 		<body>
+		<div id="adminwrapper">
 		<div class="header">
 		<h1><?php echo htmlspecialchars($CONF['SiteName'])?></h1>
 		</div>
 		<div id="container">
 		<div id="content">
 		<div class="loginname">
-		<?php			if ($member->isLoggedIn()) 
+		<?php			if ($member->isLoggedIn())
 				echo _LOGGEDINAS . ' ' . $member->getDisplayName()
-				    ." - <a href='index.php?action=logout'>" . _LOGOUT. "</a>"
-				    . "<br /><a href='index.php?action=overview'>" . _ADMINHOME . "</a> - ";
-			else 
-				echo _NOTLOGGEDIN . ' <br />';
+					." - <a href='index.php?action=logout'>" . _LOGOUT. "</a>"
+					. "<br /><a href='index.php?action=overview'>" . _ADMINHOME . "</a> - ";
+			else
+				echo '<a href="index.php?action=showlogin" title="Log in">' , _NOTLOGGEDIN , '</a> <br />';
 
 			echo "<a href='".$CONF['IndexURL']."'>"._YOURSITE."</a>";
-			
+
 			echo '<br />(';
-			
-			if ($member->isLoggedIn() && $member->isAdmin())
-				echo '<a href="http://nucleuscms.org/version.php?v=',getNucleusVersion(),'&amp;pl=',getNucleusPatchLevel(),'" title="Check for upgrade">Nucleus ', $nucleus['version'], '</a>';
-			else
-				echo 'Nucleus ' , $nucleus['version'];
+
+			$codenamestring = ($nucleus['codename']!='')? ' &quot;'.$nucleus['codename'].'&quot;':'';
+
+			if ($member->isLoggedIn() && $member->isAdmin()) {
+				$checkURL = sprintf(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_URL, getNucleusVersion(), getNucleusPatchLevel());
+				echo '<a href="' . $checkURL . '" title="' . _ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE . '">Nucleus CMS ' . $nucleus['version'] . $codenamestring . '</a>';
+				$newestVersion = getLatestVersion();
+				$newestCompare = str_replace('/','.',$newestVersion);
+				$currentVersion = str_replace(array('/','v'),array('.',''),$nucleus['version']);
+				if ($newestVersion && version_compare($newestCompare,$currentVersion)) {
+					echo '<br /><a style="color:red" href="http://nucleuscms.org/upgrade.php" title="'._ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TITLE.'">'._ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TEXT.$newestVersion.'</a>';
+				}
+			} else {
+				echo 'Nucleus CMS ' . $nucleus['version'] . $codenamestring;
+			}
 			echo ')';
 		echo '</div>';
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function pagefoot() {
 		global $action, $member, $manager;
-		
+
 		$manager->notify(
 			'AdminPrePageFoot',
 			array(
 				'action' => $this->action
 			)
-		);		
-		
-		if ($action != 'showlogin') {
+		);
+
+		if ($member->isLoggedIn() && ($action != 'showlogin')) {
 			?>
 			<h2><?php echo  _LOGOUT ?></h2>
 			<ul>
@@ -4344,21 +5329,21 @@ selector();
 			<?php		}
 		?>
 			<div class="foot">
-				<a href="http://nucleuscms.org/">Nucleus</a> &copy; 2002-2004 The Nucleus Group
+				<a href="<?php echo _ADMINPAGEFOOT_OFFICIALURL ?>">Nucleus CMS</a> &copy; 2002-<?php echo date('Y') . ' ' . _ADMINPAGEFOOT_COPYRIGHT; ?>
 				-
-				<a href="http://nucleuscms.org/donate.php">Donate!</a>
-			</div>		
-			
+				<a href="<?php echo _ADMINPAGEFOOT_DONATEURL ?>"><?php echo _ADMINPAGEFOOT_DONATE ?></a>
+			</div>
+
 			</div><!-- content -->
-			
+
 			<div id="quickmenu">
-	
-				<?php				// ---- user settings ---- 
+
+				<?php				// ---- user settings ----
 				if (($action != 'showlogin') && ($member->isLoggedIn())) {
 					echo '<ul>';
 					echo '<li><a href="index.php?action=overview">',_QMENU_HOME,'</a></li>';
-					echo '</ul>';				
-				
+					echo '</ul>';
+
 					echo '<h2>',_QMENU_ADD,'</h2>';
 					echo '<form method="get" action="index.php"><div>';
 					echo '<input type="hidden" name="action" value="createitem" />';
@@ -4373,7 +5358,7 @@ selector();
 							$query =  'SELECT bnumber as value, bname as text'
 								   . ' FROM ' . sql_table('blog') . ', ' . sql_table('team')
 								   . ' WHERE tblog=bnumber and tmember=' . $member->getID()
-								   . ' ORDER BY bname';		
+								   . ' ORDER BY bname';
 						}
 						$template['name'] = 'blogid';
 						$template['tabindex'] = 15000;
@@ -4381,44 +5366,45 @@ selector();
 						$template['selected'] = -1;
 						$template['shorten'] = 10;
 						$template['shortenel'] = '';
-						$template['javascript'] = 'onchange="return form.submit()"';					
+						$template['javascript'] = 'onchange="return form.submit()"';
 						showlist($query,'select',$template);
 
 					echo '</div></form>';
 
 					echo '<h2>' . $member->getDisplayName(). '</h2>';
 					echo '<ul>';
-					echo '<li><a href="index.php?action=editmembersettings">',_QMENU_USER_SETTINGS,'</a></li>';
-					echo '<li><a href="index.php?action=browseownitems">',_QMENU_USER_ITEMS,'</a></li>';
-					echo '<li><a href="index.php?action=browseowncomments">',_QMENU_USER_COMMENTS,'</a></li>';
+					echo '<li><a href="index.php?action=editmembersettings">' . _QMENU_USER_SETTINGS . '</a></li>';
+					echo '<li><a href="index.php?action=browseownitems">' . _QMENU_USER_ITEMS . '</a></li>';
+					echo '<li><a href="index.php?action=browseowncomments">' . _QMENU_USER_COMMENTS . '</a></li>';
 					echo '</ul>';
 
 
 
 
-					// ---- general settings ---- 
+					// ---- general settings ----
 					if ($member->isAdmin()) {
 
 						echo '<h2>',_QMENU_MANAGE,'</h2>';
 
 						echo '<ul>';
-						echo '<li><a href="index.php?action=actionlog">',_QMENU_MANAGE_LOG,'</a></li>';		
-						echo '<li><a href="index.php?action=settingsedit">',_QMENU_MANAGE_SETTINGS,'</a></li>';
-						echo '<li><a href="index.php?action=usermanagement">',_QMENU_MANAGE_MEMBERS,'</a></li>';		
-						echo '<li><a href="index.php?action=createnewlog">',_QMENU_MANAGE_NEWBLOG,'</a></li>';											
-						echo '<li><a href="index.php?action=backupoverview">',_QMENU_MANAGE_BACKUPS,'</a></li>';			
-						echo '<li><a href="index.php?action=pluginlist">',_QMENU_MANAGE_PLUGINS,'</a></li>';			
+						echo '<li><a href="index.php?action=actionlog">' . _QMENU_MANAGE_LOG . '</a></li>';
+						echo '<li><a href="index.php?action=settingsedit">' . _QMENU_MANAGE_SETTINGS . '</a></li>';
+						echo '<li><a href="index.php?action=systemoverview">' . _QMENU_MANAGE_SYSTEM . '</a></li>';
+						echo '<li><a href="index.php?action=usermanagement">' . _QMENU_MANAGE_MEMBERS . '</a></li>';
+						echo '<li><a href="index.php?action=createnewlog">' . _QMENU_MANAGE_NEWBLOG . '</a></li>';
+						echo '<li><a href="index.php?action=backupoverview">' . _QMENU_MANAGE_BACKUPS . '</a></li>';
+						echo '<li><a href="index.php?action=pluginlist">' . _QMENU_MANAGE_PLUGINS . '</a></li>';
 						echo '</ul>';
 
 						echo '<h2>',_QMENU_LAYOUT,'</h2>';
 						echo '<ul>';
-						echo '<li><a href="index.php?action=skinoverview">',_QMENU_LAYOUT_SKINS,'</a></li>';
-						echo '<li><a href="index.php?action=templateoverview">',_QMENU_LAYOUT_TEMPL,'</a></li>';
-						echo '<li><a href="index.php?action=skinieoverview">',_QMENU_LAYOUT_IEXPORT,'</a></li>';		
+						echo '<li><a href="index.php?action=skinoverview">' . _QMENU_LAYOUT_SKINS . '</a></li>';
+						echo '<li><a href="index.php?action=templateoverview">' . _QMENU_LAYOUT_TEMPL . '</a></li>';
+						echo '<li><a href="index.php?action=skinieoverview">' . _QMENU_LAYOUT_IEXPORT . '</a></li>';
 						echo '</ul>';
 
 					}
-					
+
 					$aPluginExtras = array();
 					$manager->notify(
 						'QuickMenu',
@@ -4436,218 +5422,245 @@ selector();
 						}
 						echo '</ul>';
 					}
-					
-				} else {
 
-						echo '<h2>', _QMENU_INTRO, '</h2>', _QMENU_INTRO_TEXT;
-						
+				} else if (($action == 'activate') || ($action == 'activatesetpwd')) {
+
+					echo '<h2>', _QMENU_ACTIVATE, '</h2>', _QMENU_ACTIVATE_TEXT;
+				} else {
+					// introduction text on login screen
+					echo '<h2>', _QMENU_INTRO, '</h2>', _QMENU_INTRO_TEXT;
 				}
 				?>
 			</div>
-			
+
 			<!-- content / quickmenu container -->
- 			</div>
-			
-		
+			<div class="clear"></div>    <!-- new -->
+			</div>
+
+			<!-- adminwrapper -->    <!-- new -->
+			</div>     <!-- new -->
 			</body>
 			</html>
 		<?php	}
-	
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_regfile() {
 		global $member, $CONF;
-		
+
 		$blogid = intRequestVar('blogid');
-		
+
 		$member->teamRights($blogid) or $this->disallow();
-		
+
 		// header-code stolen from phpMyAdmin
 		// REGEDIT and bookmarklet code stolen from GreyMatter
 
-		$sjisBlogName = getBlogNameFromID($blogid);
+		$sjisBlogName = sprintf(_WINREGFILE_TEXT, getBlogNameFromID($blogid));
 		$sjisBlogName = mb_convert_encoding($sjisBlogName, "SJIS", "auto");
 
 		header('Content-Type: application/octetstream');
 		header('Content-Disposition: filename="nucleus.reg"');
 		header('Pragma: no-cache');
-		header('Expires: 0');		
-		
+		header('Expires: 0');
+
 		echo "REGEDIT4\n";
-		echo "[HKEY_CURRENT_USER\\Software\\Microsoft\\Internet Explorer\\MenuExt\\Post To &Nucleus (".$sjisBlogName.")]\n";
+		echo "[HKEY_CURRENT_USER\\Software\\Microsoft\\Internet Explorer\\MenuExt\\" . $sjisBlogName . "]\n";
 		echo '@="' . $CONF['AdminURL'] . "bookmarklet.php?action=contextmenucode&blogid=".intval($blogid)."\"\n";
-		echo '"contexts"=hex:31';		
+		echo '"contexts"=hex:31';
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_bookmarklet() {
 		global $member, $manager;
-		
+
 		$blogid = intRequestVar('blogid');
-		
+
 		$member->teamRights($blogid) or $this->disallow();
-		
+
 		$blog =& $manager->getBlog($blogid);
 		$bm = getBookmarklet($blogid);
-		
+
 		$this->pagehead();
 
 		echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';
-		
+
 		?>
-		
-		<h2>Bookmarklet<!-- and Right Click Menu --></h2>
-		
+
+		<h2><?php echo _BOOKMARKLET_TITLE ?></h2>
+
 		<p>
-		Bookmarklet とは、クリック1回で記事の投稿ができるシステムです。 この Bookmarklet をインストールすると、ブラウザのツールバーの'add to weblog'ボタンが利用可能となり、Nucleusの新規アイテムの追加ウィンドウがポップアップします。任意のWebページを開いた状態でこのボタンを押せば、そのWebページのタイトルと、そのページへのリンクタグがすでに埋め込まれた状態でアイテム追加ウィンドウが開き、さらに、そのページ内に引用したい文を選択した状態であればその引用文も自動的に引用します。
+		<?php echo _BOOKMARKLET_DESC1 . _BOOKMARKLET_DESC2 . _BOOKMARKLET_DESC3 . _BOOKMARKLET_DESC4 . _BOOKMARKLET_DESC5 ?>
 		</p>
-		
-		<h3>Bookmarklet</h3>
+
+		<h3><?php echo _BOOKMARKLET_BOOKARKLET ?></h3>
 		<p>
-			下のリンク部分を「お気に入り」もしくはツールバーにドラッグできます。<small>(その前にテストしてみたい場合は単純に下のリンクをクリックしてみてください)</small>
+			<?php echo _BOOKMARKLET_BMARKTEXT ?><small><?php echo _BOOKMARKLET_BMARKTEST ?></small>
 			<br />
 			<br />
-			<a href="<?php echo htmlspecialchars($bm)?>">Add to <?php echo $blog->getShortName()?></a> (ほとんどのブラウザで動作します)
+			<?php echo '<a href="' . htmlspecialchars($bm, ENT_QUOTES) . '">' . sprintf(_BOOKMARKLET_ANCHOR, htmlspecialchars($blog->getName(), ENT_QUOTES)) . '</a>' . _BOOKMARKLET_BMARKFOLLOW; ?>
 		</p>
-		
-		<h3>右クリックメニューにインストール (WindowsでIE使用時)</h3>
+
+		<h3><?php echo _BOOKMARKLET_RIGHTCLICK ?></h3>
 		<p>
-			あるいは<a href="index.php?action=regfile&amp;blogid=<?php echo $blogid?>">右クリックメニュー</a>にインストールすることもできます (「開く」を選択すれば直接レジストリに登録します)
+			<?php
+				$url = 'index.php?action=regfile&blogid=' . intval($blogid);
+				$url = $manager->addTicketToUrl($url);
+			?>
+			<?php echo _BOOKMARKLET_RIGHTTEXT1 . '<a href="' . htmlspecialchars($url, ENT_QUOTES, "SJIS") . '">' . _BOOKMARKLET_RIGHTLABEL . '</a>' . _BOOKMARKLET_RIGHTTEXT2; ?>
 		</p>
-		
+
 		<p>
-			このインストールした右クリックメニューを表示するためにはIEの再起動が必要です
+			<?php echo _BOOKMARKLET_RIGHTTEXT3 ?>
 		</p>
-		
-		<h3>アンインストール</h3>
+
+		<h3><?php echo _BOOKMARKLET_UNINSTALLTT ?></h3>
 		<p>
-			「お気に入り」もしくはツールバーから消すには、単に削除するだけです。
+			<?php echo _BOOKMARKLET_DELETEBAR ?>
 		</p>
-		
+
 		<p>
-			右クリックメニューから消したい時は、以下の手順を踏んでください:
+			<?php echo _BOOKMARKLET_DELETERIGHTT ?>
 		</p>
-		
+
 		<ol>
-			<li>スタートメニューから「ファイルを指定して実行...」を選択</li>
-			<li>"regedit" と入力</li>
-			<li>"OK" ボタンを押す</li>
-			<li>"\HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\MenuExt" をツリーの中から検索</li>
-			<li>"add to weblog" エントリを削除</li>				
+			<li><?php echo _BOOKMARKLET_DELETERIGHT1 ?></li>
+			<li><?php echo _BOOKMARKLET_DELETERIGHT2 ?></li>
+			<li><?php echo _BOOKMARKLET_DELETERIGHT3 ?></li>
+			<li><?php echo _BOOKMARKLET_DELETERIGHT4 ?></li>
+			<li><?php echo _BOOKMARKLET_DELETERIGHT5 ?></li>
 		</ol>
 
 		<?php
 		$this->pagefoot();
-		
-	}
 
+	}
 
+	/**
+	 * @todo document this
+	 */
 	function action_actionlog() {
-		global $member;
-		
+		global $member, $manager;
+
 		$member->isAdmin() or $this->disallow();
-		
+
 		$this->pagehead();
-		
-		echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';		
-		
+
+		echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
+
+		$url = $manager->addTicketToUrl('index.php?action=clearactionlog');
+
 		?>
 			<h2><?php echo _ACTIONLOG_CLEAR_TITLE?></h2>
-			<p><a href="index.php?action=clearactionlog"><?php echo _ACTIONLOG_CLEAR_TEXT?></a></p>
+			<p><a href="<?php echo htmlspecialchars($url)?>"><?php echo _ACTIONLOG_CLEAR_TEXT?></a></p>
 		<?php
 		echo '<h2>' . _ACTIONLOG_TITLE . '</h2>';
-		
+
 		$query =  'SELECT * FROM '.sql_table('actionlog').' ORDER BY timestamp DESC';
 		$template['content'] = 'actionlist';
 		$amount = showlist($query,'table',$template);
-		
+
 		$this->pagefoot();
 
 	}
 
-
+	/**
+	 * @todo document this
+	 */
 	function action_banlist() {
 		global $member, $manager;
-		
+
 		$blogid = intRequestVar('blogid');
-		
+
 		$member->blogAdminRights($blogid) or $this->disallow();
-		
+
 		$blog =& $manager->getBlog($blogid);
-		
+
 		$this->pagehead();
 
-		echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';		
-		
+		echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';
+
 		echo '<h2>' . _BAN_TITLE . " '". $this->bloglink($blog) ."'</h2>";
-		
+
 		$query =  'SELECT * FROM '.sql_table('ban').' WHERE blogid='.$blogid.' ORDER BY iprange';
 		$template['content'] = 'banlist';
 		$amount = showlist($query,'table',$template);
-		
+
 		if ($amount == 0)
 			echo _BAN_NONE;
-			
+
 		echo '<h2>'._BAN_NEW_TITLE.'</h2>';
 		echo "<p><a href='index.php?action=banlistnew&amp;blogid=$blogid'>"._BAN_NEW_TEXT."</a></p>";
-		
-		
+
+
 		$this->pagefoot();
 
 	}
 
-
+	/**
+	 * @todo document this
+	 */
 	function action_banlistdelete() {
 		global $member, $manager;
-		
-		$blogid = intRequestVar('blogid');		
-		$iprange = requestVar('iprange');		
-		
+
+		$blogid = intRequestVar('blogid');
+		$iprange = requestVar('iprange');
+
 		$member->blogAdminRights($blogid) or $this->disallow();
-		
+
 		$blog =& $manager->getBlog($blogid);
-		
+		$banBlogName =  htmlspecialchars($blog->getName(), ENT_QUOTES);
+
 		$this->pagehead();
 		?>
 			<h2><?php echo _BAN_REMOVE_TITLE?></h2>
-			
+
 			<form method="post" action="index.php">
-			
+
 			<h3><?php echo _BAN_IPRANGE?></h3>
-			
+
 			<p>
 				<?php echo _CONFIRMTXT_BAN?> <?php echo htmlspecialchars($iprange) ?>
 				<input name="iprange" type="hidden" value="<?php echo htmlspecialchars($iprange)?>" />
 			</p>
-			
+
 			<h3><?php echo _BAN_BLOGS?></h3>
-			
+
 			<div>
 				<input type="hidden" name="blogid" value="<?php echo $blogid?>" />
-				<input name="allblogs" type="radio" value="0" id="allblogs_one" /><label for="allblogs_one">Only blog '<?php echo htmlspecialchars($blog->getName())?>'</label>
+				<input name="allblogs" type="radio" value="0" id="allblogs_one" />
+				<label for="allblogs_one"><?php echo sprintf(_BAN_BANBLOGNAME, $banBlogName) ?></label>
 				<br />
 				<input name="allblogs" type="radio" value="1" checked="checked" id="allblogs_all" /><label for="allblogs_all"><?php echo _BAN_ALLBLOGS?></label>
 			</div>
-			
+
 			<h3><?php echo _BAN_DELETE_TITLE?></h3>
-			
+
 			<div>
+				<?php $manager->addTicketHidden() ?>
 				<input type="hidden" name="action" value="banlistdeleteconfirm" />
 				<input type="submit" value="<?php echo _DELETE_CONFIRM_BTN?>" />
 			</div>
-			
+
 			</form>
-		<?php		
+		<?php
 		$this->pagefoot();
 	}
 
+	/**
+	 * @todo document this
+	 */
 	function action_banlistdeleteconfirm() {
 		global $member, $manager;
-		
+
 		$blogid = intPostVar('blogid');
 		$allblogs = postVar('allblogs');
 		$iprange = postVar('iprange');
-		
+
 		$member->blogAdminRights($blogid) or $this->disallow();
-		
+
 		$deleted = array();
 
 		if (!$allblogs) {
@@ -4662,113 +5675,130 @@ selector();
 			}
 		}
 
-		if (sizeof($deleted) == 0) 
-			$this->error(_ERROR_DELETEBAN);		
+		if (sizeof($deleted) == 0)
+			$this->error(_ERROR_DELETEBAN);
 
 		$this->pagehead();
-		
+
 		echo '<a href="index.php?action=banlist&amp;blogid=',$blogid,'">(',_BACK,')</a>';
 		echo '<h2>'._BAN_REMOVED_TITLE.'</h2>';
 		echo "<p>"._BAN_REMOVED_TEXT."</p>";
-		
+
 		echo "<ul>";
 		foreach ($deleted as $delblog) {
 			$b =& $manager->getBlog($delblog);
 			echo "<li>" . htmlspecialchars($b->getName()). "</li>";
 		}
 		echo "</ul>";
-		
+
 		$this->pagefoot();
 
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_banlistnewfromitem() {
 		$this->action_banlistnew(getBlogIDFromItemID(intRequestVar('itemid')));
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_banlistnew($blogid = '') {
 		global $member, $manager;
-		
+
 		if ($blogid == '')
 			$blogid = intRequestVar('blogid');
-		
+
 		$ip = requestVar('ip');
-		
+
 		$member->blogAdminRights($blogid) or $this->disallow();
-		
+
 		$blog =& $manager->getBlog($blogid);
-		
+
 		$this->pagehead();
 		?>
 		<h2><?php echo _BAN_ADD_TITLE?></h2>
-		
-		
+
+
 		<form method="post" action="index.php">
-		
+
 		<h3><?php echo _BAN_IPRANGE?></h3>
-		
+
 		<p><?php echo _BAN_IPRANGE_TEXT?></p>
-		
+
 		<div class="note">
-		<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.
+			<strong><?php echo _BAN_EXAMPLE_TITLE ?></strong>
+			<?php echo _BAN_EXAMPLE_TEXT ?>
 		</div>
-		
+
 		<div>
-		<?php			if ($ip) { 
+		<?php
+		if ($ip) {
+			$iprangeVal = htmlspecialchars($ip, ENT_QUOTES);
 		?>
-			<input name="iprange" type="radio" value="<?php echo htmlspecialchars($ip)?>" checked="checked" id="ip_fixed" /><label for="ip_fixed"><?php echo htmlspecialchars($ip)?></label>
+			<input name="iprange" type="radio" value="<?php echo $iprangeVal ?>" checked="checked" id="ip_fixed" />
+			<label for="ip_fixed"><?php echo $iprangeVal ?></label>
 			<br />
-			<input name="iprange" type="radio" value="custom" id="ip_custom" /><label for="ip_custom">Custom: </label><input name='customiprange' value='<?php echo htmlspecialchars($ip)?>' maxlength='15' size='15' />
-		<?php	} else {
+			<input name="iprange" type="radio" value="custom" id="ip_custom" />
+			<label for="ip_custom"><?php echo _BAN_IP_CUSTOM ?></label>
+			<input name='customiprange' value='<?php echo $iprangeVal ?>' maxlength='15' size='15' />
+		<?php
+		} else {
 				echo "<input name='iprange' value='custom' type='hidden' />";
 				echo "<input name='customiprange' value='' maxlength='15' size='15' />";
 			}
 		?>
 		</div>
-		
+
 		<h3><?php echo _BAN_BLOGS?></h3>
 
 		<p><?php echo _BAN_BLOGS_TEXT?></p>
 
-		<div>		
+		<div>
 			<input type="hidden" name="blogid" value="<?php echo $blogid?>" />
 			<input name="allblogs" type="radio" value="0" id="allblogs_one" /><label for="allblogs_one">'<?php echo htmlspecialchars($blog->getName())?>'</label>
 			<br />
 			<input name="allblogs" type="radio" value="1" checked="checked" id="allblogs_all" /><label for="allblogs_all"><?php echo _BAN_ALLBLOGS?></label>
 		</div>
-		
+
 		<h3><?php echo _BAN_REASON_TITLE?></h3>
 
 		<p><?php echo _BAN_REASON_TEXT?></p>
-		
+
 		<div><textarea name="reason" cols="40" rows="5"></textarea></div>
 
 		<h3><?php echo _BAN_ADD_TITLE?></h3>
-		
+
 		<div>
 			<input name="action" type="hidden" value="banlistadd" />
+			<?php $manager->addTicketHidden() ?>
 			<input type="submit" value="<?php echo _BAN_ADD_BTN?>" />
 		</div>
-		
+
 		</form>
-		
+
 		<?php		$this->pagefoot();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_banlistadd() {
 		global $member;
-		
+
 		$blogid = 		intPostVar('blogid');
 		$allblogs = 	postVar('allblogs');
 		$iprange = 		postVar('iprange');
 		if ($iprange == "custom")
 			$iprange = postVar('customiprange');
 		$reason = 		postVar('reason');
-		
+
 		$member->blogAdminRights($blogid) or $this->disallow();
-		
+
 		// TODO: check IP range validity
-		
+
 		if (!$allblogs) {
 			if (!BAN::addBan($blogid, $iprange, $reason))
 				$this->error(_ERROR_ADDBAN);
@@ -4783,61 +5813,69 @@ selector();
 			if ($failed)
 				$this->error(_ERROR_ADDBAN);
 		}
-		
+
 		$this->action_banlist();
-		
+
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_clearactionlog() {
 		global $member;
-		
+
 		$member->isAdmin() or $this->disallow();
-		
+
 		ACTIONLOG::clear();
-		
+
 		$this->action_manage(_MSG_ACTIONLOGCLEARED);
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_backupoverview() {
-		global $member;
-		
+		global $member, $manager;
+
 		$member->isAdmin() or $this->disallow();
-		
+
 		$this->pagehead();
 
-		echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';				
+		echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
 		?>
 		<h2><?php echo _BACKUPS_TITLE?></h2>
-		
+
 		<h3><?php echo _BACKUP_TITLE?></h3>
-		
+
 		<p><?php echo _BACKUP_INTRO?></p>
-		
+
 		<form method="post" action="index.php"><p>
 		<input type="hidden" name="action" value="backupcreate" />
+		<?php $manager->addTicketHidden() ?>
 
 		<input type="radio" name="gzip" value="1" checked="checked" id="gzip_yes" tabindex="10" /><label for="gzip_yes"><?php echo _BACKUP_ZIP_YES?></label>
 		<br />
 		<input type="radio" name="gzip" value="0" id="gzip_no" tabindex="10" /><label for="gzip_no" ><?php echo _BACKUP_ZIP_NO?></label>
 		<br /><br />
 		<input type="submit" value="<?php echo _BACKUP_BTN?>" tabindex="20" />
-		
+
 		</p></form>
-		
+
 		<div class="note"><?php echo _BACKUP_NOTE?></div>
 
-	
+
 		<h3><?php echo _RESTORE_TITLE?></h3>
-		
+
 		<div class="note"><?php echo _RESTORE_NOTE?></div>
-		
+
 		<p><?php echo _RESTORE_INTRO?></p>
-		
+
 		<form method="post" action="index.php" enctype="multipart/form-data"><p>
 			<input type="hidden" name="action" value="backuprestore" />
+			<?php $manager->addTicketHidden() ?>
 			<input name="backup_file" type="file" tabindex="30" />
 			<br /><br />
-			<input type="submit" value="<?php echo _RESTORE_BTN?>" tabindex="40" />		
+			<input type="submit" value="<?php echo _RESTORE_BTN?>" tabindex="40" />
 			<br /><input type="checkbox" name="letsgo" value="1" id="letsgo" tabindex="50" /><label for="letsgo"><?php echo _RESTORE_IMSURE?></label>
 			<br /><?php echo _RESTORE_WARNING?>
 		</p></form>
@@ -4845,82 +5883,92 @@ selector();
 		<?php		$this->pagefoot();
 	}
 
+	/**
+	 * @todo document this
+	 */
 	function action_backupcreate() {
 		global $member, $DIR_LIBS;
-		
+
 		$member->isAdmin() or $this->disallow();
 
 		// use compression ?
 		$useGzip = intval(postVar('gzip'));
-		
+
 		include($DIR_LIBS . 'backup.php');
-		
-		// try to extend time limit 
+
+		// try to extend time limit
 		// (creating/restoring dumps might take a while)
 		@set_time_limit(1200);
-		
-		do_backup($useGzip);
+
+		$bu = new Backup();
+		$bu->do_backup($useGzip);
 		exit;
 	}
 
-
+	/**
+	 * @todo document this
+	 */
 	function action_backuprestore() {
 		global $member, $DIR_LIBS;
-		
+
 		$member->isAdmin() or $this->disallow();
-		
+
 		if (intPostVar('letsgo') != 1)
 			$this->error(_ERROR_BACKUP_NOTSURE);
 
 		include($DIR_LIBS . 'backup.php');
-		
-		// try to extend time limit 
+
+		// try to extend time limit
 		// (creating/restoring dumps might take a while)
 		@set_time_limit(1200);
-		
-		$message = do_restore();
+
+		$bu = new Backup();
+		$message = $bu->do_restore();
 		if ($message != '')
 			$this->error($message);
-			
+
 		$this->pagehead();
 		?>
 		<h2><?php echo _RESTORE_COMPLETE?></h2>
 		<?php		$this->pagefoot();
 
 	}
-	
 
+	/**
+	 * @todo document this
+	 */
 	function action_pluginlist() {
-		global $member;
-		
+		global $member, $manager;
+
 		// check if allowed
 		$member->isAdmin() or $this->disallow();
-	
+
 		$this->pagehead();
-		
-		echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';		
-		
+
+		echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
+
 		echo '<h2>' , _PLUGS_TITLE_MANAGE , ' ', help('plugins'), '</h2>';
-		
-		echo '<h3>' , _PLUGS_TITLE_INSTALLED , '</h3>';
-		
-		
+
+		echo '<h3>' , _PLUGS_TITLE_INSTALLED , ' &nbsp;&nbsp;<span style="font-size:smaller">', helplink('getplugins'), _PLUGS_TITLE_GETPLUGINS, '</a></span></h3>';
+
+
 		$query =  'SELECT * FROM '.sql_table('plugin').' ORDER BY porder ASC';
 
 		$template['content'] = 'pluginlist';
 		$template['tabindex'] = 10;
 		showlist($query, 'table', $template);
-	
+
 		?>
 			<h3><?php echo _PLUGS_TITLE_UPDATE?></h3>
-			
+
 			<p><?php echo _PLUGS_TEXT_UPDATE?></p>
-			
+
 			<form method="post" action="index.php"><div>
 				<input type="hidden" name="action" value="pluginupdate" />
+				<?php $manager->addTicketHidden() ?>
 				<input type="submit" value="<?php echo _PLUGS_BTN_UPDATE ?>" tabindex="20" />
 			</div></form>
-			
+
 			<h3><?php echo _PLUGS_TITLE_NEW?></h3>
 
 			<?php				// find a list of possibly non-installed plugins
@@ -4931,20 +5979,22 @@ selector();
 					if (ereg('^NP_(.*)\.php$',$filename,$matches)) {
 						$name = $matches[1];
 						// only show in list when not yet installed
-						if (mysql_num_rows(sql_query('SELECT * FROM '.sql_table('plugin').' WHERE pfile="NP_'.addslashes($name).'"')) == 0)
+						$res = sql_query('SELECT * FROM '.sql_table('plugin').' WHERE pfile="NP_'.addslashes($name).'"');
+						if (sql_num_rows($res) == 0)
 							array_push($candidates,$name);
 					}
 				}
 				closedir($dirhandle);
-				
+
 				if (sizeof($candidates) > 0) {
 			?>
 
 			<p><?php echo _PLUGS_ADD_TEXT?></p>
-			
+
 
 			<form method='post' action='index.php'><div>
 				<input type='hidden' name='action' value='pluginadd' />
+				<?php $manager->addTicketHidden() ?>
 				<select name="filename" tabindex="30">
 				<?php					foreach($candidates as $name)
 						echo '<option value="NP_',$name,'">',htmlspecialchars($name),'</option>';
@@ -4956,280 +6006,397 @@ selector();
 		<?php			} else {	// sizeof(candidates) == 0
 				echo '<p>',_PLUGS_NOCANDIDATES,'</p>';
 			}
-		
+
 		$this->pagefoot();
 	}
-	
-	
+
+	/**
+	 * @todo document this
+	 */
+	function action_pluginhelp() {
+		global $member, $manager, $DIR_PLUGINS, $CONF;
+
+		// check if allowed
+		$member->isAdmin() or $this->disallow();
+
+		$plugid = intGetVar('plugid');
+
+		if (!$manager->pidInstalled($plugid))
+			$this->error(_ERROR_NOSUCHPLUGIN);
+
+		$plugName = getPluginNameFromPid($plugid);
+
+		$this->pagehead();
+
+		echo '<p><a href="index.php?action=pluginlist">(',_PLUGS_BACK,')</a></p>';
+
+		echo '<h2>',_PLUGS_HELP_TITLE,': ',htmlspecialchars($plugName),'</h2>';
+
+		$plug =& $manager->getPlugin($plugName);
+		$helpFile = $DIR_PLUGINS.$plug->getShortName().'/help.html';
+
+		if (($plug->supportsFeature('HelpPage') > 0) && (@file_exists($helpFile))) {
+			@readfile($helpFile);
+		} else {
+			echo '<p>' . _ERROR .': ', _ERROR_PLUGNOHELPFILE,'</p>';
+			echo '<p><a href="index.php?action=pluginlist">(',_BACK,')</a></p>';
+		}
+
+
+		$this->pagefoot();
+	}
+
+	/**
+	 * @todo document this
+	 */
 	function action_pluginadd() {
 		global $member, $manager, $DIR_PLUGINS;
-		
+
 		// check if allowed
 		$member->isAdmin() or $this->disallow();
-		
+
 		$name = postVar('filename');
-		
+
 		if ($manager->pluginInstalled($name))
 			$this->error(_ERROR_DUPPLUGIN);
 		if (!checkPlugin($name))
-			$this->error(_ERROR_PLUGFILEERROR . ' (' . $name . ')');
-		
+			$this->error(_ERROR_PLUGFILEERROR . ' (' . htmlspecialchars($name) . ')');
+
 		// get number of currently installed plugins
-		$numCurrent = mysql_num_rows(sql_query('SELECT * FROM '.sql_table('plugin')));
+		$res = sql_query('SELECT * FROM '.sql_table('plugin'));
+		$numCurrent = sql_num_rows($res);
 
 		// plugin will be added as last one in the list
 		$newOrder = $numCurrent + 1;
-		
+
 		$manager->notify(
 			'PreAddPlugin',
 			array(
 				'file' => &$name
 			)
 		);
-		
+
 		// do this before calling getPlugin (in case the plugin id is used there)
 		$query = 'INSERT INTO '.sql_table('plugin').' (porder, pfile) VALUES ('.$newOrder.',"'.addslashes($name).'")';
 		sql_query($query);
-		$iPid = mysql_insert_id();
+		$iPid = sql_insert_id();
 
 		$manager->clearCachedInfo('installedPlugins');
 
-		// call the install method of the plugin
+		// Load the plugin for condition checking and instalation
 		$plugin =& $manager->getPlugin($name);
-		
+
+		// check if it got loaded (could have failed)
 		if (!$plugin)
 		{
 			sql_query('DELETE FROM ' . sql_table('plugin') . ' WHERE pid='. intval($iPid));
 			$manager->clearCachedInfo('installedPlugins');
-			$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)');
+			$this->error(_ERROR_PLUGIN_LOAD);
 		}
-		
+
 		// check if plugin needs a newer Nucleus version
 		if (getNucleusVersion() < $plugin->getMinNucleusVersion())
 		{
 			// uninstall plugin again...
 			$this->deleteOnePlugin($plugin->getID());
-			
+
 			// ...and show error
-			$this->error(_ERROR_NUCLEUSVERSIONREQ . $plugin->getMinNucleusVersion());
+			$this->error(_ERROR_NUCLEUSVERSIONREQ . htmlspecialchars($plugin->getMinNucleusVersion()));
 		}
-		
+
 		// check if plugin needs a newer Nucleus version
 		if ((getNucleusVersion() == $plugin->getMinNucleusVersion()) && (getNucleusPatchLevel() < $plugin->getMinNucleusPatchLevel()))
 		{
 			// uninstall plugin again...
 			$this->deleteOnePlugin($plugin->getID());
-			
+
 			// ...and show error
-			$this->error(_ERROR_NUCLEUSVERSIONREQ . $plugin->getMinNucleusVersion() . ' patch ' . $plugin->getMinNucleusPatchLevel());
+			$this->error(_ERROR_NUCLEUSVERSIONREQ . htmlspecialchars( $plugin->getMinNucleusVersion() . ' patch ' . $plugin->getMinNucleusPatchLevel() ) );
 		}
-		
+
+		$pluginList = $plugin->getPluginDep();
+		foreach ($pluginList as $pluginName)
+		{
+
+			$res = sql_query('SELECT * FROM '.sql_table('plugin') . ' WHERE pfile="' . $pluginName . '"');
+			if (sql_num_rows($res) == 0)
+			{
+				// uninstall plugin again...
+				$this->deleteOnePlugin($plugin->getID());
+
+				$this->error(sprintf(_ERROR_INSREQPLUGIN, htmlspecialchars($pluginName, ENT_QUOTES)));
+			}
+		}
+
+		// call the install method of the plugin
 		$plugin->install();
-		
+
 		$manager->notify(
 			'PostAddPlugin',
 			array(
 				'plugin' => &$plugin
 			)
-		);		
-		
+		);
+
 		// update all events
 		$this->action_pluginupdate();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_pluginupdate() {
-		global $member, $manager;
-		
+		global $member, $manager, $CONF;
+
 		// check if allowed
 		$member->isAdmin() or $this->disallow();
-		
+
 		// delete everything from plugin_events
 		sql_query('DELETE FROM '.sql_table('plugin_event'));
-		
+
 		// loop over all installed plugins
 		$res = sql_query('SELECT pid, pfile FROM '.sql_table('plugin'));
-		while($o = mysql_fetch_object($res)) {
+		while($o = sql_fetch_object($res)) {
 			$pid = $o->pid;
 			$plug =& $manager->getPlugin($o->pfile);
 			if ($plug)
 			{
 				$eventList = $plug->getEventList();
-				foreach ($eventList as $eventName) 
+				foreach ($eventList as $eventName)
 					sql_query('INSERT INTO '.sql_table('plugin_event').' (pid, event) VALUES ('.$pid.', \''.addslashes($eventName).'\')');
 			}
 		}
-		
-		$this->action_pluginlist();
+
+		redirect($CONF['AdminURL'] . '?action=pluginlist');
+//		$this->action_pluginlist();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_plugindelete() {
 		global $member, $manager;
-		
+
 		// check if allowed
 		$member->isAdmin() or $this->disallow();
-		
+
 		$pid = intGetVar('plugid');
-		
+
 		if (!$manager->pidInstalled($pid))
 			$this->error(_ERROR_NOSUCHPLUGIN);
-			
+
 		$this->pagehead();
 		?>
 			<h2><?php echo _DELETE_CONFIRM?></h2>
-			
+
 			<p><?php echo _CONFIRMTXT_PLUGIN?> <strong><?php echo getPluginNameFromPid($pid)?></strong>?</p>
-			
+
 			<form method="post" action="index.php"><div>
+			<?php $manager->addTicketHidden() ?>
 			<input type="hidden" name="action" value="plugindeleteconfirm" />
 			<input type="hidden" name="plugid" value="<?php echo $pid; ?>" />
 			<input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN?>" />
 			</div></form>
-		<?php		$this->pagefoot();
+		<?php
+		$this->pagefoot();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_plugindeleteconfirm() {
-		global $member, $manager;
-		
+		global $member, $manager, $CONF;
+
 		// check if allowed
 		$member->isAdmin() or $this->disallow();
-		
+
 		$pid = intPostVar('plugid');
-		
+
 		$error = $this->deleteOnePlugin($pid, 1);
 		if ($error) {
 			$this->error($error);
 		}
 
-		$this->action_pluginlist();
+		redirect($CONF['AdminURL'] . '?action=pluginlist');
+//		$this->action_pluginlist();
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function deleteOnePlugin($pid, $callUninstall = 0) {
 		global $manager;
-		
+
 		$pid = intval($pid);
-		
+
 		if (!$manager->pidInstalled($pid))
 			return _ERROR_NOSUCHPLUGIN;
-			
+
+		$name = quickQuery('SELECT pfile as result FROM '.sql_table('plugin').' WHERE pid='.$pid);
+
+/*		// call the unInstall method of the plugin
+		if ($callUninstall) {
+			$plugin =& $manager->getPlugin($name);
+			if ($plugin) $plugin->unInstall();
+		}*/
+
+		// check dependency before delete
+		$res = sql_query('SELECT pfile FROM '.sql_table('plugin'));
+		while($o = sql_fetch_object($res)) {
+			$plug =& $manager->getPlugin($o->pfile);
+			if ($plug)
+			{
+				$depList = $plug->getPluginDep();
+				foreach ($depList as $depName)
+				{
+					if ($name == $depName)
+					{
+						return sprintf(_ERROR_DELREQPLUGIN, $o->pfile);
+					}
+				}
+			}
+		}
+
+		$manager->notify('PreDeletePlugin', array('plugid' => $pid));
+
 		// call the unInstall method of the plugin
 		if ($callUninstall) {
-			$name = quickQuery('SELECT pfile as result FROM '.sql_table('plugin').' WHERE pid='.$pid);
 			$plugin =& $manager->getPlugin($name);
 			if ($plugin) $plugin->unInstall();
 		}
 
-		$manager->notify('PreDeletePlugin', array('plugid' => $pid));	
-		
 		// delete all subscriptions
 		sql_query('DELETE FROM '.sql_table('plugin_event').' WHERE pid=' . $pid);
-		
+
 		// delete all options
 		// get OIDs from plugin_option_desc
 		$res = sql_query('SELECT oid FROM ' . sql_table('plugin_option_desc') . ' WHERE opid=' . $pid);
 		$aOIDs = array();
-		while ($o = mysql_fetch_object($res)) {
+		while ($o = sql_fetch_object($res)) {
 			array_push($aOIDs, $o->oid);
 		}
-		
+
 		// delete from plugin_option and plugin_option_desc
 		sql_query('DELETE FROM '.sql_table('plugin_option_desc').' WHERE opid=' . $pid);
 		if (count($aOIDs) > 0)
-			sql_query('DELETE FROM '.sql_table('plugin_option').' WHERE oid in ('.implode(',',$aOIDs).')');		
-		
+			sql_query('DELETE FROM '.sql_table('plugin_option').' WHERE oid in ('.implode(',',$aOIDs).')');
+
 		// update order numbers
-		$o = mysql_fetch_object(sql_query('SELECT porder FROM '.sql_table('plugin').' WHERE pid=' . $pid));
+		$res = sql_query('SELECT porder FROM '.sql_table('plugin').' WHERE pid=' . $pid);
+		$o = sql_fetch_object($res);
 		sql_query('UPDATE '.sql_table('plugin').' SET porder=(porder - 1) WHERE porder>'.$o->porder);
-		
+
 		// delete row
 		sql_query('DELETE FROM '.sql_table('plugin').' WHERE pid='.$pid);
-		
+
 		$manager->clearCachedInfo('installedPlugins');
-		$manager->notify('PostDeletePlugin', array('plugid' => $pid));			
-		
+		$manager->notify('PostDeletePlugin', array('plugid' => $pid));
+
 		return '';
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_pluginup() {
-		global $member, $manager;
-		
+		global $member, $manager, $CONF;
+
 		// check if allowed
 		$member->isAdmin() or $this->disallow();
-		
+
 		$plugid = intGetVar('plugid');
 
 		if (!$manager->pidInstalled($plugid))
 			$this->error(_ERROR_NOSUCHPLUGIN);
-			
+
 		// 1. get old order number
-		$o = mysql_fetch_object(sql_query('SELECT porder FROM '.sql_table('plugin').' WHERE pid='.$plugid));
+		$res = sql_query('SELECT porder FROM '.sql_table('plugin').' WHERE pid='.$plugid);
+		$o = sql_fetch_object($res);
 		$oldOrder = $o->porder;
-				
+
 		// 2. calculate new order number
 		$newOrder = ($oldOrder > 1) ? ($oldOrder - 1) : 1;
-		
+
 		// 3. update plug numbers
-		sql_query('UPDATE '.sql_table('plugin').' SET porder='.$oldOrder.' WHERE porder='.$newOrder);		
-		sql_query('UPDATE '.sql_table('plugin').' SET porder='.$newOrder.' WHERE pid='.$plugid);		
-		
-		$this->action_pluginlist();
+		sql_query('UPDATE '.sql_table('plugin').' SET porder='.$oldOrder.' WHERE porder='.$newOrder);
+		sql_query('UPDATE '.sql_table('plugin').' SET porder='.$newOrder.' WHERE pid='.$plugid);
+
+		//$this->action_pluginlist();
+		// To avoid showing ticket in the URL, redirect to pluginlist, instead.
+		redirect($CONF['AdminURL'] . '?action=pluginlist');
 	}
 
+	/**
+	 * @todo document this
+	 */
 	function action_plugindown() {
-		global $member, $manager;
-		
+		global $member, $manager, $CONF;
+
 		// check if allowed
 		$member->isAdmin() or $this->disallow();
-		
+
 		$plugid = intGetVar('plugid');
 		if (!$manager->pidInstalled($plugid))
 			$this->error(_ERROR_NOSUCHPLUGIN);
-			
+
 		// 1. get old order number
-		$o = mysql_fetch_object(sql_query('SELECT porder FROM '.sql_table('plugin').' WHERE pid='.$plugid));
+		$res = sql_query('SELECT porder FROM '.sql_table('plugin').' WHERE pid='.$plugid);
+		$o = sql_fetch_object($res);
 		$oldOrder = $o->porder;
-		
-		$maxOrder = mysql_num_rows(sql_query('SELECT * FROM '.sql_table('plugin')));
-				
+
+		$res = sql_query('SELECT * FROM '.sql_table('plugin'));
+		$maxOrder = sql_num_rows($res);
+
 		// 2. calculate new order number
 		$newOrder = ($oldOrder < $maxOrder) ? ($oldOrder + 1) : $maxOrder;
-		
+
 		// 3. update plug numbers
-		sql_query('UPDATE '.sql_table('plugin').' SET porder='.$oldOrder.' WHERE porder='.$newOrder);		
-		sql_query('UPDATE '.sql_table('plugin').' SET porder='.$newOrder.' WHERE pid='.$plugid);		
-		
-		$this->action_pluginlist();
+		sql_query('UPDATE '.sql_table('plugin').' SET porder='.$oldOrder.' WHERE porder='.$newOrder);
+		sql_query('UPDATE '.sql_table('plugin').' SET porder='.$newOrder.' WHERE pid='.$plugid);
+
+		//$this->action_pluginlist();
+		// To avoid showing ticket in the URL, redirect to pluginlist, instead.
+		redirect($CONF['AdminURL'] . '?action=pluginlist');
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_pluginoptions($message = '') {
 		global $member, $manager;
 
 		// check if allowed
 		$member->isAdmin() or $this->disallow();
-		
+
 		$pid = intRequestVar('plugid');
 		if (!$manager->pidInstalled($pid))
 			$this->error(_ERROR_NOSUCHPLUGIN);
 
-		$this->pagehead();
+		$extrahead = '<script type="text/javascript" src="javascript/numbercheck.js"></script>';
+		$pluginName = htmlspecialchars(getPluginNameFromPid($pid), ENT_QUOTES);
+		$this->pagehead($extrahead);
 
 		?>
 			<p><a href="index.php?action=pluginlist">(<?php echo _PLUGS_BACK?>)</a></p>
-			
-			<h2>Options for <?php echo htmlspecialchars(getPluginNameFromPid($pid))?></h2>
+
+			<h2><?php echo sprintf(_PLUGIN_OPTIONS_TITLE, $pluginName) ?></h2>
 
 			<?php if  ($message) echo $message?>
 
 			<form action="index.php" method="post">
 			<div>
 				<input type="hidden" name="action" value="pluginoptionsupdate" />
-				<input type="hidden" name="plugid" value="<?php echo $pid?>" />				
-		<?php		
+				<input type="hidden" name="plugid" value="<?php echo $pid?>" />
+
+		<?php
+
+		$manager->addTicketHidden();
 
-		$aOptions = array(); 
+		$aOptions = array();
 		$aOIDs = array();
 		$query = 'SELECT * FROM ' . sql_table('plugin_option_desc') . ' WHERE ocontext=\'global\' and opid=' . $pid . ' ORDER BY oid ASC';
 		$r = sql_query($query);
-		while ($o = mysql_fetch_object($r)) {
+		while ($o = sql_fetch_object($r)) {
 			array_push($aOIDs, $o->oid);
 			$aOptions[$o->oid] = array(
 						'oid' => $o->oid,
@@ -5244,27 +6411,30 @@ selector();
 		// fill out actual values
 		if (count($aOIDs) > 0) {
 			$r = sql_query('SELECT oid, ovalue FROM ' . sql_table('plugin_option') . ' WHERE oid in ('.implode(',',$aOIDs).')');
-			while ($o = mysql_fetch_object($r)) 
+			while ($o = sql_fetch_object($r))
 				$aOptions[$o->oid]['value'] = $o->ovalue;
 		}
-		
+
 		// call plugins
 		$manager->notify('PrePluginOptionsEdit',array('context' => 'global', 'plugid' => $pid, 'options'=>&$aOptions));
-		
+
 		$template['content'] = 'plugoptionlist';
 		$amount = showlist($aOptions,'table',$template);
 		if ($amount == 0)
 			echo '<p>',_ERROR_NOPLUGOPTIONS,'</p>';
-		
+
 		?>
 			</div>
 			</form>
 		<?php		$this->pagefoot();
-		
-		
-		
+
+
+
 	}
-	
+
+	/**
+	 * @todo document this
+	 */
 	function action_pluginoptionsupdate() {
 		global $member, $manager;
 
@@ -5274,31 +6444,34 @@ selector();
 		$pid = intRequestVar('plugid');
 		if (!$manager->pidInstalled($pid))
 			$this->error(_ERROR_NOSUCHPLUGIN);
-			
+
 		$aOptions = requestArray('plugoption');
 		NucleusPlugin::_applyPluginOptions($aOptions);
 
-		$manager->notify('PostPluginOptionsUpdate',array('context' => 'global', 'plugid' => $pid));		
-		
+		$manager->notify('PostPluginOptionsUpdate',array('context' => 'global', 'plugid' => $pid));
+
 		$this->action_pluginoptions(_PLUGS_OPTIONS_UPDATED);
 	}
-	
 
+	/**
+	 * @static
+	 * @todo document this
+	 */
 	function _insertPluginOptions($context, $contextid = 0) {
-		// get all current values for this contextid 
+		// get all current values for this contextid
 		// (note: this might contain doubles for overlapping contextids)
 		$aIdToValue = array();
 		$res = sql_query('SELECT oid, ovalue FROM ' . sql_table('plugin_option') . ' WHERE ocontextid=' . intval($contextid));
-		while ($o = mysql_fetch_object($res)) {
+		while ($o = sql_fetch_object($res)) {
 			$aIdToValue[$o->oid] = $o->ovalue;
 		}
-		
+
 		// get list of oids per pid
 		$query = 'SELECT * FROM ' . sql_table('plugin_option_desc') . ',' . sql_table('plugin')
 			   . ' WHERE opid=pid and ocontext=\''.addslashes($context).'\' ORDER BY porder, oid ASC';
 		$res = sql_query($query);
 		$aOptions = array();
-		while ($o = mysql_fetch_object($res)) {
+		while ($o = sql_fetch_object($res)) {
 			if (in_array($o->oid, array_keys($aIdToValue)))
 				$value = $aIdToValue[$o->oid];
 			else
@@ -5313,14 +6486,15 @@ selector();
 				'description' => $o->odesc,
 				'type' => $o->otype,
 				'typeinfo' => $o->oextra,
-				'contextid' => $contextid
+				'contextid' => $contextid,
+				'extra' => ''
 			));
 		}
-		
+
 		global $manager;
 		$manager->notify('PrePluginOptionsEdit',array('context' => $context, 'contextid' => $contextid, 'options'=>&$aOptions));
-	
-		
+
+
 		$iPrevPid = -1;
 		foreach ($aOptions as $aOption) {
 
@@ -5328,863 +6502,54 @@ selector();
 			if ($iPrevPid != $aOption['pid']) {
 				$iPrevPid = $aOption['pid'];
 
-				echo '<tr><th colspan="2">Options for ', htmlspecialchars($aOption['pfile']),'</th></tr>';
+				echo '<tr><th colspan="2">'.sprintf(_PLUGIN_OPTIONS_TITLE, htmlspecialchars($aOption['pfile']. ENT_QUOTES)).'</th></tr>';
+			}
+
+			$meta = NucleusPlugin::getOptionMeta($aOption['typeinfo']);
+			if (@$meta['access'] != 'hidden') {
+				echo '<tr>';
+				listplug_plugOptionRow($aOption);
+				echo '</tr>';
 			}
-				
-			echo '<tr>';
-			listplug_plugOptionRow($aOption);
-			echo '</tr>';
-	
+
 		}
 
-	
+
 	}
-	
-	/* helper functions to create option forms etc. */
-	function input_yesno($name, $checkedval,$tabindex = 0, $value1 = 1, $value2 = 0, $yesval = _YES, $noval = _NO) {
+
+	/**
+	 * Helper functions to create option forms etc.
+	 * @todo document parameters
+	 */
+	function input_yesno($name, $checkedval,$tabindex = 0, $value1 = 1, $value2 = 0, $yesval = _YES, $noval = _NO, $isAdmin = 0) {
 		$id = htmlspecialchars($name);
 		$id = str_replace('[','-',$id);
-		$id = str_replace(']','-',$id);		
+		$id = str_replace(']','-',$id);
 		$id1 = $id . htmlspecialchars($value1);
 		$id2 = $id . htmlspecialchars($value2);
-		
-		echo '<input type="radio" name="', htmlspecialchars($name),'" value="', htmlspecialchars($value1),'" ';
+
+		if ($name=="admin") {
+			echo '<input onclick="selectCanLogin(true);" type="radio" name="', htmlspecialchars($name),'" value="', htmlspecialchars($value1),'" ';
+	   	} else {
+			echo '<input type="radio" name="', htmlspecialchars($name),'" value="', htmlspecialchars($value1),'" ';
+		}
+
 			if ($checkedval == $value1)
 				echo "tabindex='$tabindex' checked='checked'";
 			echo ' id="'.$id1.'" /><label for="'.$id1.'">' . $yesval . '</label>';
 		echo ' ';
-		echo '<input type="radio" name="', htmlspecialchars($name),'" value="', htmlspecialchars($value2),'" ';
+		if ($name=="admin") {
+			echo '<input onclick="selectCanLogin(false);" type="radio" name="', htmlspecialchars($name),'" value="', htmlspecialchars($value2),'" ';
+		} else {
+			echo '<input type="radio" name="', htmlspecialchars($name),'" value="', htmlspecialchars($value2),'" ';
+		}
 			if ($checkedval != $value1)
-				echo "tabindex='$tabindex' checked='checked'";				
+				echo "tabindex='$tabindex' checked='checked'";
+			if ($isAdmin && $name=="canlogin")
+				echo ' disabled="disabled"';
 			echo ' id="'.$id2.'" /><label for="'.$id2.'">' . $noval . '</label>';
 	}
 
-
-	
 } // class ADMIN
 
-class ENCAPSULATE {
-	/** 
-	  * Uses $call to call a function using parameters $params
-	  * This function should return the amount of entries shown.
-	  * When entries are show, batch operation handlers are shown too.
-	  * When no entries were shown, $errormsg is used to display an error
-	  *
-	  * Passes on the amount of results found (for further encapsulation)
-	  */
-	function doEncapsulate($call, $params, $errorMessage = 'No entries') {
-		// start output buffering
-		ob_start();
-
-		$nbOfRows = call_user_func_array($call, $params);
-
-		// get list contents and stop buffering
-		$list = ob_get_contents();
-		ob_end_clean();
-		
-		if ($nbOfRows > 0) {
-			$this->showHead();
-			echo $list;
-			$this->showFoot();
-		} else {
-			echo $errorMessage;
-		}
-
-		return $nbOfRows;
-	}
-}
-
-
-/**
-  * A class used to encapsulate a list of some sort inside next/prev buttons
-  */
-class NAVLIST extends ENCAPSULATE {
-
-	function NAVLIST($action, $start, $amount, $minamount, $maxamount, $blogid, $search, $itemid) {
-		$this->action = $action;
-		$this->start = $start;
-		$this->amount = $amount;
-		$this->minamount = $minamount;
-		$this->maxamount = $maxamount;
-		$this->blogid = $blogid;
-		$this->search = $search;
-		$this->itemid = $itemid;
-	}
-	
-	function showBatchList($batchtype, $query, $type, $template, $errorMessage = _LISTS_NOMORE) {
-		$batch = new BATCH($batchtype);
-
-		$this->doEncapsulate(
-				array(&$batch, 'showlist'),
-				array(&$query, $type, $template),
-				$errorMessage
-		);
-	
-	}
-
-	
-	function showHead() {
-		$this->showNavigation();
-	}
-	function showFoot() {
-		$this->showNavigation();
-	}
-	
-	/**
-	  * Displays a next/prev bar for long tables
-	  */
-	function showNavigation() {
-		$action = $this->action;
-		$start = $this->start;
-		$amount = $this->amount;
-		$minamount = $this->minamount;
-		$maxamount = $this->maxamount;
-		$blogid = $this->blogid;
-		$search = $this->search;
-		$itemid = $this->itemid;
-		
-		$prev = $start - $amount;
-		if ($prev < $minamount) $prev=$minamount;
-
-		// maxamount not used yet
-	//	if ($start + $amount <= $maxamount)
-			$next = $start + $amount;
-	//	else
-	//		$next = $start;
-
-	?>
-	<table class="navigation">
-	<tr><td>
-		<form method="post" action="index.php"><div>
-		<input type="submit" value="&lt;&lt; <?php echo  _LISTS_PREV?>" />	
-		<input type="hidden" name="blogid" value="<?php echo  $blogid; ?>" />
-		<input type="hidden" name="itemid" value="<?php echo  $itemid; ?>" />	
-		<input type="hidden" name="action" value="<?php echo  $action; ?>" />
-		<input type="hidden" name="amount" value="<?php echo  $amount; ?>" />
-		<input type="hidden" name="search" value="<?php echo  $search; ?>" />
-		<input type="hidden" name="start" value="<?php echo  $prev; ?>" />
-		</div></form>
-	</td><td>
-		<form method="post" action="index.php"><div>
-		<input type="hidden" name="blogid" value="<?php echo  $blogid; ?>" />
-		<input type="hidden" name="itemid" value="<?php echo  $itemid; ?>" />		
-		<input type="hidden" name="action" value="<?php echo  $action; ?>" />
-		<input name="amount" size="3" value="<?php echo  $amount; ?>" /> <?php echo _LISTS_PERPAGE?> 
-		<input type="hidden" name="start" value="<?php echo  $start; ?>" />
-		<input type="hidden" name="search" value="<?php echo  $search; ?>" />
-		<input type="submit" value="&gt; <?php echo _LISTS_CHANGE?>" />	
-		</div></form>
-	</td><td>	
-		<form method="post" action="index.php"><div>
-		<input type="hidden" name="blogid" value="<?php echo  $blogid; ?>" />
-		<input type="hidden" name="itemid" value="<?php echo  $itemid; ?>" />		
-		<input type="hidden" name="action" value="<?php echo  $action; ?>" />
-		<input type="hidden" name="amount" value="<?php echo  $amount; ?>" />
-		<input type="hidden" name="start" value="0" />
-		<input type="text" name="search" value="<?php echo  $search; ?>" size="7" />
-		<input type="submit" value="&gt; <?php echo  _LISTS_SEARCH?>" />	
-		</div></form>
-	</td><td>	
-		<form method="post" action="index.php"><div>
-		<input type="submit" value="<?php echo _LISTS_NEXT?> &gt; &gt;" />	
-		<input type="hidden" name="search" value="<?php echo  $search; ?>" />
-		<input type="hidden" name="blogid" value="<?php echo  $blogid; ?>" />
-		<input type="hidden" name="itemid" value="<?php echo  $itemid; ?>" />		
-		<input type="hidden" name="action" value="<?php echo  $action; ?>" />
-		<input type="hidden" name="amount" value="<?php echo  $amount; ?>" />
-		<input type="hidden" name="start" value="<?php echo  $next; ?>" />
-		</div></form>	
-	</td></tr>
-	</table>
-	<?php	}
-
-
-}
-
-/**
- * A class used to encapsulate a list of some sort in a batch selection 
- */
-class BATCH extends ENCAPSULATE {
-	function BATCH($type) {
-		$this->type = $type;
-	}
-	
-	function showHead() {
-		?>
-			<form method="post" action="index.php">
-		<?php
-// TODO: get a list op operations above the list too 
-// (be careful not to use the same names for the select...)
-//		$this->showOperationList();		
-	}
-
-	function showFoot() {
-		$this->showOperationList();
-		?>
-			</form>
-		<?php	}
-
-	function showOperationList() {
-		?>
-		<div class="batchoperations">
-			<?php echo _BATCH_WITH_SEL ?>
-			<select name="batchaction">
-			<?php				$options = array();
-				switch($this->type) {
-					case 'item':
-						$options = array(
-							'delete'	=> _BATCH_ITEM_DELETE,
-							'move'		=> _BATCH_ITEM_MOVE
-						);
-						break;
-					case 'member': 
-						$options = array(
-							'delete'	=> _BATCH_MEMBER_DELETE,
-							'setadmin'	=> _BATCH_MEMBER_SET_ADM,
-							'unsetadmin' => _BATCH_MEMBER_UNSET_ADM
-						);
-						break;
-					case 'team':
-						$options = array(
-							'delete' 	=> _BATCH_TEAM_DELETE,
-							'setadmin'	=> _BATCH_TEAM_SET_ADM,
-							'unsetadmin' => _BATCH_TEAM_UNSET_ADM,
-						);
-						break;
-					case 'category':
-						$options = array(
-							'delete'	=> _BATCH_CAT_DELETE,
-							'move'		=> _BATCH_CAT_MOVE,
-						);
-						break;
-					case 'comment':
-						$options = array(
-							'delete'	=> _BATCH_COMMENT_DELETE,
-						);
-					break;
-				}
-				foreach ($options as $option => $label) {
-					echo '<option value="',$option,'">',$label,'</option>';
-				}
-			?>
-			</select>
-			<input type="hidden" name="action" value="batch<?php echo $this->type?>" />
-			<?php				// add hidden fields for 'team' and 'comment' batchlists
-				if ($this->type == 'team') 
-				{
-					echo '<input type="hidden" name="blogid" value="',intRequestVar('blogid'),'" />';
-				}
-				if ($this->type == 'comment') 
-				{
-					echo '<input type="hidden" name="itemid" value="',intRequestVar('itemid'),'" />';
-				}
-				
-			?>
-			
-			<input type="submit" value="Execute" />
-			(
-			 <a href="" onclick="if (event &amp;&amp; event.preventDefault) event.preventDefault(); return batchSelectAll(1); "><?php echo _BATCH_SELECTALL?></a> -
-			 <a href="" onclick="if (event &amp;&amp; event.preventDefault) event.preventDefault(); return batchSelectAll(0); "><?php echo _BATCH_DESELECTALL?></a>
-			)
-		</div>
-		<?php	}
-	
-	// shortcut :)
-	function showList($query, $type, $template, $errorMessage = _LISTS_NOMORE) {
-		return $this->doEncapsulate(	'showlist',
-									array($query, $type, $template),
-									$errorMessage
-								);
-	}
-
-}
-
-
-
-// can take either an array of objects, or an SQL query
-function showlist($query, $type, $template) {
-
-	if (is_array($query)) {
-		if (sizeof($query) == 0)
-			return 0;
-
-		call_user_func('listplug_' . $type, $template, 'HEAD');
-
-		// add extra row if needed
-		if ($template['extra']) {
-			echo '<option value="',$template['extraval'],'">',$template['extra'],'</option>';
-		}
-
-		foreach ($query as $currentObj) {
-			$template['current'] = $currentObj;
-			call_user_func('listplug_' . $type, $template, 'BODY');
-		}
-		
-		call_user_func('listplug_' . $type, $template, 'FOOT');
-		
-		return sizeof($query);
-			
-	} else {
-		$res = sql_query($query);
-
-		// don't do anything if there are no results
-		$numrows = mysql_num_rows($res);
-		if ($numrows == 0)
-			return 0;
-
-		call_user_func('listplug_' . $type, $template, 'HEAD');
-
-		// add extra row if needed
-		if ($template['extra']) {
-			echo '<option value="',$template['extraval'],'">',$template['extra'],'</option>';
-		}
-
-		while($template['current'] = mysql_fetch_object($res)) 
-			call_user_func('listplug_' . $type, $template, 'BODY');
-
-		call_user_func('listplug_' . $type, $template, 'FOOT');
-
-		mysql_free_result($res);
-
-		// return amount of results
-		return $numrows;
-	}
-}
-
-function listplug_select($template, $type) {
-	switch($type) {
-		case 'HEAD':
-			echo '<select name="'.$template['name'].'" tabindex="'.$template['tabindex'].'" '.$template['javascript'].'>';
-			break;
-		case 'BODY':
-			$current = $template['current'];
-
-			echo '<option value="' . htmlspecialchars($current->value) . '"';
-			if ($template['selected'] == $current->value)
-				echo ' selected="selected" ';
-			if ($template['shorten'] > 0) {
-				echo ' title="'. htmlspecialchars($current->text).'"';
-				$current->text = shorten($current->text, $template['shorten'], $template['shortenel']);
-			}
-			echo '>' . htmlspecialchars($current->text) . '</option>';
-			break;
-		case 'FOOT':
-			echo '</select>';
-			break;
-	}
-}
-
-function listplug_table($template, $type) {
-	switch($type) {
-		case 'HEAD':
-			echo "<table>";
-			echo "<thead><tr>";
-			// print head
-			call_user_func("listplug_table_" . $template['content'] , $template, 'HEAD');
-			echo "</tr></thead><tbody>";
-			break;
-		case 'BODY':
-			// print tabletype specific thingies
-			echo "<tr onmouseover='focusRow(this);' onmouseout='blurRow(this);'>";
-			call_user_func("listplug_table_" . $template['content'] , $template,  'BODY');
-			echo "</tr>";
-			break;
-		case 'FOOT':
-			call_user_func("listplug_table_" . $template['content'] , $template,  'FOOT');		
-			echo "</tbody></table>";
-			break;
-	}
-}
-
-function listplug_table_memberlist($template, $type) {
-	switch($type) {
-		case 'HEAD':
-			echo '<th>' . _LIST_MEMBER_NAME . '</th><th>' . _LIST_MEMBER_RNAME . '</th><th>' . _LIST_MEMBER_URL . '</th><th>' . _LIST_MEMBER_ADMIN;
-			help('superadmin'); 
-			echo "</th><th>" . _LIST_MEMBER_LOGIN;
-			help('canlogin');
-			echo "</th><th colspan='2'>" . _LISTS_ACTIONS. "</th>";		
-			break;
-		case 'BODY':
-			$current = $template['current'];
-			
-			echo '<td>';
-			$id = listplug_nextBatchId();			
-			echo '<input type="checkbox" id="batch',$id,'" name="batch[',$id,']" value="',$current->mnumber,'" />';
-			echo '<label for="batch',$id,'">';
-			echo "<a href='mailto:", htmlspecialchars($current->memail), "' tabindex='".$template['tabindex']."'>", htmlspecialchars($current->mname), "</a>";
-			echo '</label>';
-			echo '</td>';
-			echo '<td>', htmlspecialchars($current->mrealname), '</td>';
-			echo "<td><a href='$current->murl' tabindex='".$template['tabindex']."'>$current->murl</a></td>";
-			echo '<td>', ($current->madmin ? _YES : _NO),'</td>';
-			echo '<td>', ($current->mcanlogin ? _YES : _NO), '</td>';
-			echo "<td><a href='index.php?action=memberedit&amp;memberid=$current->mnumber' tabindex='".$template['tabindex']."'>"._LISTS_EDIT."</a></td>";
-			echo "<td><a href='index.php?action=memberdelete&amp;memberid=$current->mnumber' tabindex='".$template['tabindex']."'>"._LISTS_DELETE."</a></td>";			
-			break;
-	}
-}
-
-function listplug_table_teamlist($template, $type) {
-	switch($type) {
-		case 'HEAD':
-			echo "<th>"._LIST_MEMBER_NAME."</th><th>"._LIST_MEMBER_RNAME."</th><th>"._LIST_TEAM_ADMIN;
-			help('teamadmin');
-			echo "</th><th colspan='2'>"._LISTS_ACTIONS."</th>";		
-			break;
-		case 'BODY':
-			$current = $template['current'];
-		
-			echo '<td>';
-			$id = listplug_nextBatchId();			
-			echo '<input type="checkbox" id="batch',$id,'" name="batch[',$id,']" value="',$current->tmember,'" />';
-			echo '<label for="batch',$id,'">';
-			echo "<a href='mailto:", htmlspecialchars($current->memail), "' tabindex='".$template['tabindex']."'>", htmlspecialchars($current->mname), "</a>";
-			echo '</label>';
-			echo '</td>';
-			echo '<td>', htmlspecialchars($current->mrealname), '</td>';
-			echo '<td>', ($current->tadmin ? _YES : _NO) , '</td>';
-			echo "<td><a href='index.php?action=teamdelete&amp;memberid=$current->tmember&amp;blogid=$current->tblog' tabindex='".$template['tabindex']."'>"._LISTS_DELETE."</a></td>";
-			echo "<td><a href='index.php?action=teamchangeadmin&amp;memberid=$current->tmember&amp;blogid=$current->tblog' tabindex='".$template['tabindex']."'>"._LIST_TEAM_CHADMIN."</a></td>";			
-			break;
-	}
-}
-function encode_desc(&$data)
-    {   //_$to_entities = get_html_translation_table(HTML_ENTITIES);
-        $to_entities = get_html_translation_table(HTML_SPECIALCHARS);
-        $from_entities = array_flip($to_entities);
-        $data = str_replace('<br />','\n',$data); //hack
-        $data = strtr($data,$from_entities);
-        $data = strtr($data,$to_entities);
-        $data = str_replace('\n','<br />',$data); //hack
-        return $data;
-    }
-function listplug_table_pluginlist($template, $type) {
-	global $manager;
-	switch($type) {
-		case 'HEAD':
-			echo '<th>'._LISTS_INFO.'</th><th>'._LISTS_DESC.'</th>';
-			echo '<th>'._LISTS_ACTIONS.'</th>';
-			break;
-		case 'BODY':
-			$current = $template['current'];
-			
-			$plug =& $manager->getPlugin($current->pfile);
-			if ($plug) {
-				echo '<td>';
-					echo '<strong>' , htmlspecialchars($plug->getName()) , '</strong><br />';
-					echo _LIST_PLUGS_AUTHOR, ' ' , htmlspecialchars($plug->getAuthor()) , '<br />';
-					echo _LIST_PLUGS_VER, ' ' , htmlspecialchars($plug->getVersion()) , '<br />';
-					if ($plug->getURL())
-					echo '<a href="',htmlspecialchars($plug->getURL()),'" tabindex="'.$template['tabindex'].'">',_LIST_PLUGS_SITE,'</a><br />';
-				echo '</td>';
-				echo '<td>';
-					echo _LIST_PLUGS_DESC .'<br/>'. encode_desc($plug->getDescription());
-					if (sizeof($plug->getEventList()) > 0)
-						echo '<br /><br />',_LIST_PLUGS_SUBS,'<br />',htmlspecialchars(implode($plug->getEventList(),', '));
-
-				echo '</td>';
-			} else {
-				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>';
-			}
-			echo '<td>';
-				echo "<a href='index.php?action=pluginup&amp;plugid=$current->pid' tabindex='".$template['tabindex']."'>",_LIST_PLUGS_UP,"</a>";
-				echo "<br /><a href='index.php?action=plugindown&amp;plugid=$current->pid' tabindex='".$template['tabindex']."'>",_LIST_PLUGS_DOWN,"</a>";
-				echo "<br /><a href='index.php?action=plugindelete&amp;plugid=$current->pid' tabindex='".$template['tabindex']."'>",_LIST_PLUGS_UNINSTALL,"</a>";
-				if ($plug && ($plug->hasAdminArea() > 0))
-					echo "<br /><a href='".htmlspecialchars($plug->getAdminURL())."'  tabindex='".$template['tabindex']."'>",_LIST_PLUGS_ADMIN,"</a>";
-				if (quickQuery('SELECT COUNT(*) AS result FROM '.sql_table('plugin_option_desc').' WHERE ocontext=\'global\' and opid='.$current->pid) > 0)
-					echo "<br /><a href='index.php?action=pluginoptions&amp;plugid=$current->pid'  tabindex='".$template['tabindex']."'>",_LIST_PLUGS_OPTIONS,"</a>";
-			echo '</td>';
-			break;
-	}
-}
-
-function listplug_table_plugoptionlist($template, $type) {
-	global $manager;
-	switch($type) {
-		case 'HEAD':
-			echo '<th>'._LISTS_INFO.'</th><th>'._LISTS_VALUE.'</th>';
-			break;
-		case 'BODY':
-			$current = $template['current'];
-			listplug_plugOptionRow($current);
-			break;
-		case 'FOOT':
-			?>
-			<tr>
-				<th colspan="2"><?php echo _PLUGS_SAVE?></th>
-			</tr><tr>
-				<td><?php echo _PLUGS_SAVE?></td>
-				<td><input type="submit" value="<?php echo _PLUGS_SAVE?>" /></td>
-			</tr>
-			<?php			break;
-	}
-}
-
-function listplug_plugOptionRow($current) {
-	$varname = 'plugoption['.$current['oid'].']['.$current['contextid'].']';
-
-	echo '<td>',htmlspecialchars($current['description']?$current['description']:$current['name']),'</td>';
-	echo '<td>';
-	switch($current['type']) {
-		case 'yesno':
-			ADMIN::input_yesno($varname, $current['value'], 0, 'yes', 'no');
-			break;
-		case 'password':
-			echo '<input type="password" size="40" maxlength="128" name="',htmlspecialchars($varname),'" value="',htmlspecialchars($current['value']),'" />';
-			break;
-		case 'select':
-			echo '<select name="'.htmlspecialchars($varname).'">';
-			$aOptions = explode('|', $current['typeinfo']);
-			for ($i=0; $i<(count($aOptions)-1); $i+=2) {
-				echo '<option value="'.htmlspecialchars($aOptions[$i+1]).'"';
-				if ($aOptions[$i+1] == $current['value'])
-					echo ' selected="selected"';
-				echo '>'.htmlspecialchars($aOptions[$i]).'</option>';
-			}
-			echo '</select>';
-			break;
-		case 'textarea':
-			echo '<textarea class="pluginoption" cols="30" rows="5" name="',htmlspecialchars($varname),'">',htmlspecialchars($current['value']),'</textarea>';				
-			break;
-		case 'text':
-		default:
-			echo '<input type="text" size="40" maxlength="128" name="',htmlspecialchars($varname),'" value="',htmlspecialchars($current['value']),'" />';
-	}
-	echo '</td>';
-}
-
-function listplug_table_itemlist($template, $type) {
-	switch($type) {
-		case 'HEAD':
-			echo "<th>"._LIST_ITEM_INFO."</th><th>"._LIST_ITEM_CONTENT."</th><th style=\"white-space:nowrap\" colspan='1'>"._LISTS_ACTIONS."</th>";
-			break;
-		case 'BODY':
-			$current = $template['current'];
-			$current->itime = strtotime($current->itime);	// string -> unix timestamp
-			
-			if ($current->idraft == 1) 
-				$cssclass = "class='draft'";
-
-			// (can't use offset time since offsets might vary between blogs)
-			if ($current->itime > $template['now'])
-				$cssclass = "class='future'";
-			
-			echo "<td $cssclass>",_LIST_ITEM_BLOG," ", htmlspecialchars($current->bshortname);
-			echo "    <br />",_LIST_ITEM_CAT," ", htmlspecialchars($current->cname);			
-			echo "    <br />",_LIST_ITEM_AUTHOR, " ", htmlspecialchars($current->mname);
-			echo "    <br />",_LIST_ITEM_DATE," " . date("Y-m-d",$current->itime);
-			echo "<br />",_LIST_ITEM_TIME," " . date("H:i",$current->itime);
-			echo "</td>";			
-			echo "<td $cssclass>";
-			
-			$id = listplug_nextBatchId(); 
-			
-			echo '<input type="checkbox" id="batch',$id,'" name="batch[',$id,']" value="',$current->inumber,'" />';
-			echo '<label for="batch',$id,'">';
-			echo "<b>" . htmlspecialchars(strip_tags($current->ititle)) . "</b>";
-			echo '</label>';
-			echo "<br />";
-			
-			
-			$current->ibody = strip_tags($current->ibody);
-			$current->ibody = htmlspecialchars(shorten($current->ibody,300,'...'));
-			
-			echo "$current->ibody</td>";
-			echo "<td style=\"white-space:nowrap\" $cssclass>";
-			echo 	"<a href='index.php?action=itemedit&amp;itemid=$current->inumber'>"._LISTS_EDIT."</a>";
-			echo    "<br /><a href='index.php?action=itemcommentlist&amp;itemid=$current->inumber'>"._LISTS_COMMENTS."</a>";
-			echo    "<br /><a href='index.php?action=itemmove&amp;itemid=$current->inumber'>"._LISTS_MOVE."</a>";			
-			echo    "<br /><a href='index.php?action=itemdelete&amp;itemid=$current->inumber'>"._LISTS_DELETE."</a>";			
-			echo "</td>";
-			break;
-	}
-}
-
-// for batch operations: generates the index numbers for checkboxes
-function listplug_nextBatchId() {
-	static $id = 0;
-	return $id++;
-}
-
-function listplug_table_commentlist($template, $type) {
-	switch($type) {
-		case 'HEAD':
-			echo "<th>"._LISTS_INFO."</th><th>"._LIST_COMMENT."</th><th colspan='3'>"._LISTS_ACTIONS."</th>";
-			break;
-		case 'BODY':
-			$current = $template['current'];
-			$current->ctime = strtotime($current->ctime);	// string -> unix timestamp
-			
-			echo '<td>';
-			echo date("Y-m-d@H:i",$current->ctime);
-			echo '<br />';
-			if ($current->mname)
-				echo htmlspecialchars($current->mname), ' ', _LIST_COMMENTS_MEMBER;
-			else
-				echo htmlspecialchars($current->cuser);
-			echo '</td>';
-			
-			
-			$current->cbody = strip_tags($current->cbody);
-			$current->cbody = htmlspecialchars(shorten($current->cbody, 300, '...'));
-
-			echo '<td>';
-			$id = listplug_nextBatchId();			
-			echo '<input type="checkbox" id="batch',$id,'" name="batch[',$id,']" value="',$current->cnumber,'" />';
-			echo '<label for="batch',$id,'">';
-			echo $current->cbody;
-			echo '</label>';
-			echo '</td>';
-			
-			echo "<td style=\"white-space:nowrap\"><a href='index.php?action=commentedit&amp;commentid=$current->cnumber'>"._LISTS_EDIT."</a></td>";
-			echo "<td style=\"white-space:nowrap\"><a href='index.php?action=commentdelete&amp;commentid=$current->cnumber'>"._LISTS_DELETE."</a></td>";
-			if ($template['canAddBan'])
-				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>";
-			break;
-	}
-}
-
-
-function listplug_table_bloglist($template, $type) {
-	switch($type) {
-		case 'HEAD':
-			echo "<th>" . _NAME . "</th><th colspan='7'>" ._LISTS_ACTIONS. "</th>";		
-			break;
-		case 'BODY':
-			$current = $template['current'];
-			
-			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>";
-			echo "<td><a href='index.php?action=createitem&amp;blogid=$current->bnumber' title='" . _BLOGLIST_TT_ADD ."'>" . _BLOGLIST_ADD . "</a></td>";
-			echo "<td><a href='index.php?action=itemlist&amp;blogid=$current->bnumber' title='". _BLOGLIST_TT_EDIT."'>". _BLOGLIST_EDIT."</a></td>";
-			echo "<td><a href='index.php?action=blogcommentlist&amp;blogid=$current->bnumber'>". _BLOGLIST_COMMENTS."</a></td>";
-			echo "<td><a href='index.php?action=bookmarklet&amp;blogid=$current->bnumber' title='". _BLOGLIST_TT_BMLET."'>". _BLOGLIST_BMLET . "</a></td>";
-
-			if ($current->tadmin == 1) {
-				echo "<td><a href='index.php?action=blogsettings&amp;blogid=$current->bnumber' title='" . _BLOGLIST_TT_SETTINGS . "'>" ._BLOGLIST_SETTINGS. "</a></td>";
-				echo "<td><a href='index.php?action=banlist&amp;blogid=$current->bnumber' title='" . _BLOGLIST_TT_BANS. "'>". _BLOGLIST_BANS."</a></td>";
-			}
-			
-			if ($template['superadmin']) {
-				echo "<td><a href='index.php?action=deleteblog&amp;blogid=$current->bnumber' title='". _BLOGLIST_TT_DELETE."'>" ._BLOGLIST_DELETE. "</a></td>";
-			}
-			
-		
-		
-			break;
-	}
-}
-
-function listplug_table_shortblognames($template, $type) {
-	switch($type) {
-		case 'HEAD':
-			echo "<th>" . _NAME . "</th><th>" . _NAME. "</th>";		
-			break;
-		case 'BODY':
-			$current = $template['current'];
-			
-			echo '<td>' , htmlspecialchars($current->bshortname) , '</td>';
-			echo '<td>' , htmlspecialchars($current->bname) , '</td>';
-	
-			break;
-	}
-}
-
-function listplug_table_shortnames($template, $type) {
-	switch($type) {
-		case 'HEAD':
-			echo "<th>" . _NAME . "</th><th>" . _LISTS_DESC. "</th>";		
-			break;
-		case 'BODY':
-			$current = $template['current'];
-			
-			echo '<td>' , htmlspecialchars($current->name) , '</td>';
-			echo '<td>' , htmlspecialchars($current->description) , '</td>';
-	
-			break;
-	}
-}
-
-
-function listplug_table_categorylist($template, $type) {
-	switch($type) {
-		case 'HEAD':
-			echo "<th>"._LISTS_NAME."</th><th>"._LISTS_DESC."</th><th colspan='2'>"._LISTS_ACTIONS."</th>";		
-			break;
-		case 'BODY':
-			$current = $template['current'];
-			
-			echo '<td>';
-			$id = listplug_nextBatchId();			
-			echo '<input type="checkbox" id="batch',$id,'" name="batch[',$id,']" value="',$current->catid,'" />';
-			echo '<label for="batch',$id,'">';
-			echo htmlspecialchars($current->cname);
-			echo '</label>';
-			echo '</td>';
-			
-			echo '<td>', htmlspecialchars($current->cdesc), '</td>';
-			echo "<td><a href='index.php?action=categorydelete&amp;blogid=$current->cblog&amp;catid=$current->catid' tabindex='".$template['tabindex']."'>"._LISTS_DELETE."</a></td>";			
-			echo "<td><a href='index.php?action=categoryedit&amp;blogid=$current->cblog&amp;catid=$current->catid' tabindex='".$template['tabindex']."'>"._LISTS_EDIT."</a></td>";			
-		
-			break;
-	}
-}
-
-
-function listplug_table_templatelist($template, $type) {
-	switch($type) {
-		case 'HEAD':
-			echo "<th>"._LISTS_NAME."</th><th>"._LISTS_DESC."</th><th colspan='3'>"._LISTS_ACTIONS."</th>";		
-			break;
-		case 'BODY':
-			$current = $template['current'];
-			
-			echo "<td>" , htmlspecialchars($current->tdname), "</td>";
-			echo "<td>" , htmlspecialchars($current->tddesc), "</td>";
-			echo "<td style=\"white-space:nowrap\"><a href='index.php?action=templateedit&amp;templateid=$current->tdnumber' tabindex='".$template['tabindex']."'>"._LISTS_EDIT."</a></td>";
-			echo "<td style=\"white-space:nowrap\"><a href='index.php?action=templateclone&amp;templateid=$current->tdnumber' tabindex='".$template['tabindex']."'>"._LISTS_CLONE."</a></td>";
-			echo "<td style=\"white-space:nowrap\"><a href='index.php?action=templatedelete&amp;templateid=$current->tdnumber' tabindex='".$template['tabindex']."'>"._LISTS_DELETE."</a></td>";			
-		
-			break;
-	}
-}
-
-function listplug_table_skinlist($template, $type) {
-	global $CONF, $DIR_SKINS;
-	switch($type) {
-		case 'HEAD':
-			echo "<th>"._LISTS_NAME."</th><th>"._LISTS_DESC."</th><th colspan='3'>"._LISTS_ACTIONS."</th>";		
-			break;
-		case 'BODY':
-			$current = $template['current'];
-			
-			echo '<td>';
-			
-			// use a special style for the default skin
-			if ($current->sdnumber == $CONF['BaseSkin']) {
-				echo '<strong>',htmlspecialchars($current->sdname),'</strong>';
-			} else {
-				echo htmlspecialchars($current->sdname);
-			}
-			
-			echo '<br /><br />';
-			echo _LISTS_TYPE ,': ' , htmlspecialchars($current->sdtype);
-			echo '<br />', _LIST_SKINS_INCMODE , ' ' , (($current->sdincmode=='skindir') ?_PARSER_INCMODE_SKINDIR:_PARSER_INCMODE_NORMAL);
-			if ($current->sdincpref) echo '<br />' , _LIST_SKINS_INCPREFIX , ' ', htmlspecialchars($current->sdincpref);
-			
-			// add preview image when present
-			if ($current->sdincpref && @file_exists($DIR_SKINS . $current->sdincpref . 'preview.png'))
-			{
-				echo '<br /><br />';
-				
-				$hasEnlargement = @file_exists($DIR_SKINS . $current->sdincpref . 'preview-large.png');
-				if ($hasEnlargement)
-					echo '<a href="',$CONF['SkinsURL'], htmlspecialchars($current->sdincpref),'preview-large.png" title="View larger">';
-				
-				echo '<img class="skinpreview" src="',$CONF['SkinsURL'], htmlspecialchars($current->sdincpref),'preview.png" width="100" height="75" alt="Preview for \'',htmlspecialchars($current->sdname),'\' skin" />';
-				
-				if ($hasEnlargement)
-					echo '</a>';
-					
-				if (@file_exists($DIR_SKINS . $current->sdincpref . 'readme.html'))
-				{
-					echo '<br /><a href="',$CONF['SkinsURL'], htmlspecialchars($current->sdincpref),'readme.html" title="More info on the \'',htmlspecialchars($current->sdname),'\' skin">Readme</a>';
-				}
-					
-					
-			}
-			
-			echo "</td>";
-			
-						
-			echo "<td>" , htmlspecialchars($current->sddesc);
-				// show list of defined parts
-				$r = sql_query('SELECT stype FROM '.sql_table('skin').' WHERE sdesc='.$current->sdnumber . ' ORDER BY stype');
-				$types = array();
-				while ($o = mysql_fetch_object($r))
-					array_push($types,$o->stype);
-				if (sizeof($types) > 0) {
-					$friendlyNames = SKIN::getFriendlyNames();
-					for ($i=0;$i<sizeof($types);$i++) {
-						$type = $types[$i];
-						$types[$i] = '<li>' . helpHtml('skinpart'.$type) . ' <a href="index.php?action=skinedittype&amp;skinid='.$current->sdnumber.'&amp;type='.$type.'" tabindex="'.$template['tabindex'].'">' . htmlspecialchars($friendlyNames[$type]) . "</a></li>";
-					}
-					echo '<br /><br />',_LIST_SKINS_DEFINED,' <ul>',implode($types,'') ,'</ul>';
-				}
-			echo "</td>";
-			echo "<td style=\"white-space:nowrap\"><a href='index.php?action=skinedit&amp;skinid=$current->sdnumber' tabindex='".$template['tabindex']."'>"._LISTS_EDIT."</a></td>";
-			echo "<td style=\"white-space:nowrap\"><a href='index.php?action=skinclone&amp;skinid=$current->sdnumber' tabindex='".$template['tabindex']."'>"._LISTS_CLONE."</a></td>";
-			echo "<td style=\"white-space:nowrap\"><a href='index.php?action=skindelete&amp;skinid=$current->sdnumber' tabindex='".$template['tabindex']."'>"._LISTS_DELETE."</a></td>";
-			
-			break;
-	}
-}
-
-function listplug_table_draftlist($template, $type) {
-	switch($type) {
-		case 'HEAD':
-			echo "<th>"._LISTS_BLOG."</th><th>"._LISTS_TITLE."</th><th colspan='2'>"._LISTS_ACTIONS."</th>";		
-			break;
-		case 'BODY':
-			$current = $template['current'];
-
-			echo '<td>', htmlspecialchars($current->bshortname) , '</td>';			
-			echo '<td>', htmlspecialchars(strip_tags($current->ititle)) , '</td>';
-			echo "<td><a href='index.php?action=itemedit&amp;itemid=$current->inumber'>"._LISTS_EDIT."</a></td>";
-			echo "<td><a href='index.php?action=itemdelete&amp;itemid=$current->inumber'>"._LISTS_DELETE."</a></td>";			
-		
-			break;
-	}
-}
-
-
-function listplug_table_actionlist($template, $type) {
-	switch($type) {
-		case 'HEAD':
-			echo '<th>'._LISTS_TIME.'</th><th>'._LIST_ACTION_MSG.'</th>';		
-			break;
-		case 'BODY':
-			$current = $template['current'];
-			
-			echo '<td>' , htmlspecialchars($current->timestamp), '</td>';
-			echo '<td>' , htmlspecialchars($current->message), '</td>';
-		
-			break;
-	}
-}
-
-function listplug_table_banlist($template, $type) {
-	switch($type) {
-		case 'HEAD':
-			echo '<th>'._LIST_BAN_IPRANGE.'</th><th>'. _LIST_BAN_REASON.'</th><th>'._LISTS_ACTIONS.'</th>';		
-			break;
-		case 'BODY':
-			$current = $template['current'];
-		
-			echo '<td>' , htmlspecialchars($current->iprange) , '</td>';
-			echo '<td>' , htmlspecialchars($current->reason) , '</td>';
-			echo "<td><a href='index.php?action=banlistdelete&amp;blogid=", intval($current->blogid) , "&amp;iprange=" , htmlspecialchars($current->iprange) , "'>",_LISTS_DELETE,"</a></td>";
-			break;
-	}
-}
-
-/**
- * Returns the Javascript code for a bookmarklet that works on most modern browsers
- *
- * @param blogid
- */
-function getBookmarklet($blogid) {
-	global $CONF;
-
-	// normal
-	$document = 'document';
-	$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('";
-	$bookmarkletline .= $CONF['AdminURL'] . "bookmarklet.php?blogid=$blogid";
-	$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();";	
-
-	return $bookmarkletline;
-}
-
-
-?>
+?>
\ No newline at end of file