Merge lp:~quam-plures-core/quam-plures/qp5_smallstep into lp:quam-plures

[EdB]

Ran through some quick testing and it doesn't look like anything is broken, so yay one small step :)

http://forums.quamplures.net/viewtopic.php?f=6&t=1891

[lp:~quam-plures-core/quam-plures/qp5_smallstep]

7660. By EdB on 2013-03-05

two more files, tested and still no problems so yay :)

=== modified file 'qp_inc/_application.php'
--- qp_inc/_application.php	2013-02-28 16:40:18 +0000
+++ qp_inc/_application.php	2013-03-05 23:36:23 +0000
@@ -22,7 +22,7 @@
 $files_version = '1.10';
 
 // The database version, incrememented by 1 with each change in upgrade_dbase_tables()
-$app_db_version = 15;
+$app_db_version = 17;
 
 $app_version = $files_version.'.'.$app_db_version;
 

=== modified file 'qp_inc/_core/_template.funcs.php'
--- qp_inc/_core/_template.funcs.php	2012-07-29 20:36:41 +0000
+++ qp_inc/_core/_template.funcs.php	2013-03-05 23:36:23 +0000
@@ -1,63 +1,37 @@
 <?php
 /**
- * This file implements misc functions that handle output of the HTML page.
- *
- * This file is part of Quam Plures - {@link http://quamplures.net/}
- * See also {@link https://launchpad.net/quam-plures}.
- *
- * @copyright (c) 2009 - 2011 by the Quam Plures developers - {@link http://quamplures.net/}
- * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
- * Parts of this file are copyright (c)2004-2006 by Daniel HAHLER - {@link http://thequod.de/contact}.
- *
- * {@internal License choice
- * - If you have received this file as part of a package, please find the license.txt file in
- *   the same folder or the closest folder above for complete license terms.
- * - If you have received this file individually (e-g: from http://evocms.cvs.sourceforge.net/)
- *   then you must choose one of the following licenses before using the file:
- *   - GNU General Public License 2 (GPL) - http://www.opensource.org/licenses/gpl-license.php
- *   - Mozilla Public License 1.1 (MPL) - http://www.opensource.org/licenses/mozilla1.1.php
- * }}
- *
- * {@internal Open Source relicensing agreement:
- * Daniel HAHLER grants Francois PLANQUE the right to license
- * Daniel HAHLER's contributions to this file and the b2evolution project
- * under any OSI approved OSS license (http://www.opensource.org/licenses/).
- * }}
- *
- * {@internal Below is a list of authors who have contributed to design/coding of this file: }}
- * @author blueyed: Daniel HAHLER.
- * @author fplanque: Francois PLANQUE.
- *
- * @package pond
+ * This file implements misc functions that handle output of the HTML page
+ *
+ * @author {@link http://wonderwinds.com/ Ed Bennett}
+ * @author {@link http://daniel.hahler.de/ Daniel HAHLER}
+ * @author {@link http://fplanque.net/ Francois PLANQUE}
+ * @copyright (c) 2009 by {@link http://quamplures.net/ the Quam Plures project}
+ * @license http://www.gnu.org/licenses/gpl.txt GNU General Public License v3
+ * @package core
  */
-if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
-
+if(!defined('QP_MAIN_INIT')) die('fail');
 
 /**
  * T-Tag: Outputs content-type header, sets charset
  */
 function header_content_type( $type = 'text/html', $charset = '#' )
 {
+	global $content_type_header;
 	global $io_charset;
-	global $content_type_header;
 
 	$content_type_header = 'Content-type: '.$type;
-
-	if( !empty($charset) )
+	if( ! empty($charset) )
 	{
 		if( $charset == '#' )
 		{
 			$charset = $io_charset;
 		}
-
 		$content_type_header .= '; charset='.$charset;
 	}
-
 	header( $content_type_header );
 }
 
 
-
 /**
  * Sends HTTP header to redirect to the previous location (which
  * can be given as function parameter, GET parameter (redirect_to),
@@ -78,9 +52,9 @@
 	global $Hit, $app_baseurl, $Blog, $srvc_url_sensitive;
 	global $Session, $Debuglog, $Messages;
 
-	// TODO: fp> get this out to the caller, make a helper func like get_returnto_url()
 	if( empty($redirect_to) )
-	{ // see if there's a redirect_to request param given:
+	{
+		// see if there's a redirect_to request param given:
 		$redirect_to = param( 'redirect_to', 'string', '' );
 
 		if( empty($redirect_to) )
@@ -91,7 +65,7 @@
 			}
 			elseif( isset($Blog) && is_object($Blog) )
 			{
-				$redirect_to = $Blog->get('url');
+				$redirect_to = $Blog->get( 'url' );
 			}
 			else
 			{
@@ -108,7 +82,7 @@
 
 	if( $redirect_to[0] == '/' )
 	{
-		// TODO: until all calls to header_redirect are cleaned up:
+		// @todo (0000): until all calls to header_redirect are cleaned up:
 		global $ReqHost;
 		$redirect_to = $ReqHost.$redirect_to;
 		// debug_die( '$redirect_to must be an absolute URL' );
@@ -122,12 +96,9 @@
 		// blueyed> Removed the removing of "action" here, as it is used to trigger certain views. Instead, "confirm(ed)?" gets removed now
 		// fp> which views please (important to list in order to remove asap)
 		// dh> sorry, don't remember
-		// TODO: fp> action should actually not be used to trigger views. This should be changed at some point.
-		// TODO: fp> confirm should be normalized to confirmed
 		$redirect_to = preg_replace( '~(?<=\?|&) (login|pwd|confirm(ed)?) = [^&]+ ~x', '', $redirect_to );
 	}
 
-	// TODO: fp> change $permanent to $status in the params
 	if( is_integer($permanent) )
 	{
 		$status = $permanent;
@@ -136,7 +107,6 @@
 	{
 		$status = $permanent ? 301 : 303;
 	}
- 	$Debuglog->add('Redirecting to '.$redirect_to.' (status '.$status.')');
 
 	// Transfer of Debuglog to next page:
 	if( $Debuglog->count('all') )
@@ -186,10 +156,10 @@
  */
 function header_nocache()
 {
-	header('Expires: Tue, 25 Mar 2003 05:00:00 GMT');
-	header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-	header('Cache-Control: no-cache, must-revalidate');
-	header('Pragma: no-cache');
+	header( 'Expires: Tue, 25 Mar 2003 05:00:00 GMT' );
+	header( 'Last-Modified: '.gmdate( 'D, d M Y H:i:s' ).' GMT' );
+	header( 'Cache-Control: no-cache, must-revalidate' );
+	header( 'Pragma: no-cache' );
 }
 
 
@@ -200,28 +170,28 @@
  *
  * <code>
  * $params = array_merge( array(
- *   'auto_pilot'          => 'none',
- *   'title_before'        => '',
- *   'title_after'         => '',
- *   'title_none'          => '',
- *   'title_single_disp'   => true,
+ *   'auto_pilot' => 'none',
+ *   'title_before' => '',
+ *   'title_after' => '',
+ *   'title_none' => '',
+ *   'title_single_disp' => true,
  *   'title_single_before' => '#', // see below
- *   'title_single_after'  => '#', // see below
- *   'title_page_disp'     => true,
- *   'title_page_before'   => '#', // see below
- *   'title_page_after'    => '#', // see below
- *   'glue'                => ' - ',
- *   'format'              => 'htmlbody',
- *   'arcdir_text'         => T_('Archive Directory'),
- *   'catdir_text'         => T_('Category Directory'),
- *   'comments_text'       => T_('Latest Comments'),
- *   'credits_text'        => T_('Software Credits'),
+ *   'title_single_after' => '#', // see below
+ *   'title_page_disp' => true,
+ *   'title_page_before' => '#', // see below
+ *   'title_page_after' => '#', // see below
+ *   'glue' => ' - ',
+ *   'format' => 'htmlbody',
+ *   'arcdir_text' => T_('Archive Directory'),
+ *   'catdir_text' => T_('Category Directory'),
+ *   'comments_text' => T_('Latest Comments'),
+ *   'credits_text' => T_('Software Credits'),
  *   'feedback-popup_text' => T_('Feedback'),
- *   'mediaidx_text'       => T_('Photo Index'),
- *   'msgform_text'        => T_('Send an Email Message'),
- *   'profile_text'        => T_('User Profile'),
- *   'subs_text'           => T_('Subscriptions'),
- *   'user_text'           => T_('User'),
+ *   'mediaidx_text' => T_('Photo Index'),
+ *   'msgform_text' => T_('Send an Email Message'),
+ *   'profile_text' => T_('User Profile'),
+ *   'subs_text' => T_('Subscriptions'),
+ *   'user_text' => T_('User'),
  * ), $params );
  * </code>
  *
@@ -232,45 +202,49 @@
  *
  * 'auto_pilot' => 'seo_title' uses the SEO title autopilot. (default: "none")
  *
- * @todo (legacy): single month: Respect locales datefmt
- * @todo (legacy): single post: posts do no get proper checking (wether they are in the requested blog or wether their permissions match user rights,
- * thus the title sometimes gets displayed even when it should not. We need to pre-query the ItemList instead!!
- * @todo (legacy): make it complete with all possible params!
+ * @todo (0000): single month: Respect locales datefmt
+ * @todo (0000): single post: posts do no get proper checking (wether they are in the requested
+ * blog or whether their permissions match user rights, thus the title sometimes gets displayed
+ * even when it should not. We need to pre-query the ItemList instead!!
+ * @todo (0000): make it complete with all possible params!
  */
 function request_title( $params = array() )
 {
-	global $MainList, $preview, $disp;
+	global $disp;
+	global $MainList;
+	global $preview;
 
 	$params = array_merge( array(
-			'auto_pilot'          => 'none',
-			'title_before'        => '',
-			'title_after'         => '',
-			'title_none'          => '',
-			'title_single_disp'   => true,
+			'auto_pilot' => 'none',
+			'title_before' => '',
+			'title_after' => '',
+			'title_none' => '',
+			'title_single_disp' => true,
 			'title_single_before' => '#',
-			'title_single_after'  => '#',
-			'title_page_disp'     => true,
-			'title_page_before'   => '#',
-			'title_page_after'    => '#',
-			'glue'                => ' - ',
-			'format'              => 'htmlbody',
-			'arcdir_text'         => T_('Archive Directory'),
-			'catdir_text'         => T_('Category Directory'),
-			'comments_text'       => T_('Latest Comments'),
-			'credits_text'        => T_('Software Credits'),
+			'title_single_after' => '#',
+			'title_page_disp' => true,
+			'title_page_before' => '#',
+			'title_page_after' => '#',
+			'glue' => ' - ',
+			'format' => 'htmlbody',
+			'arcdir_text' => T_('Archive Directory'),
+			'catdir_text' => T_('Category Directory'),
+			'comments_text' => T_('Latest Comments'),
+			'credits_text' => T_('Software Credits'),
 			'feedback-popup_text' => T_('Feedback'),
-			'mediaidx_text'       => T_('Photo Index'),
-			'msgform_text'        => T_('Send an Email Message'),
-			'profile_text'        => T_('User Profile'),
-			'subs_text'           => T_('Subscriptions'),
-			'user_text'           => T_('User'),
+			'mediaidx_text' => T_('Photo Index'),
+			'msgform_text' => T_('Send an Email Message'),
+			'profile_text' => T_('User Profile'),
+			'subs_text' => T_('Subscriptions'),
+			'user_text' => T_('User'),
 		), $params );
 
 	if( $params['auto_pilot'] == 'seo_title' )
-	{	// We want to use the SEO title autopilot. Do overrides:
+	{
+		// We want to use the SEO title autopilot. Do overrides:
 		global $Blog;
 		$params['format'] = 'htmlhead';
-		$params['title_after'] = $params['glue'].$Blog->get('name');
+		$params['title_after'] = $params['glue'].$Blog->get( 'name' );
 		$params['title_single_after'] = '';
 		$params['title_page_after'] = '';
 		$params['title_none'] = $Blog->dget('name','htmlhead');
@@ -303,7 +277,7 @@
 			global $Item;
 			if( isset( $Item ) )
 			{
-				$r[] = sprintf( /* TRANS: %s is an item title */ $params['comments_text'] . T_(' on %s'), $Item->get('title') );
+				$r[] = sprintf( /* TRANS: %s is an item title */ $params['comments_text'].T_(' on %s'), $Item->get('title') );
 			}
 			else
 			{
@@ -315,7 +289,7 @@
 			// We are requesting the comments on a specific post:
 			// Should be in first position
 			$Item = & $MainList->get_by_idx( 0 );
-			$r[] = sprintf( /* TRANS: %s is an item title */ $params['feedback-popup_text'] . T_(' on %s'), $Item->get('title') );
+			$r[] = sprintf( /* TRANS: %s is an item title */ $params['feedback-popup_text'].T_(' on %s'), $Item->get('title') );
 			break;
 
 		case 'profile':
@@ -342,13 +316,15 @@
 		case 'page':
 			// We are displaying a single message:
 			if( $preview )
-			{	// We are requesting a post preview:
+			{
+				// We are requesting a post preview
 				$r[] = T_('PREVIEW');
 			}
 			elseif( $params['title_'.$disp.'_disp'] && isset( $MainList ) )
 			{
 				$r = array_merge( $r, $MainList->get_filter_titles( array( 'visibility', 'hide_future' ), $params ) );
 			}
+
 			if( $params['title_'.$disp.'_before'] != '#' )
 			{
 				$before = $params['title_'.$disp.'_before'];
@@ -377,12 +353,12 @@
 		$r = implode( $params['glue'], $r );
 		$r = $before.format_to_output( $r, $params['format'] ).$after;
 	}
-	elseif( !empty( $params['title_none'] ) )
+	elseif( ! empty( $params['title_none'] ) )
 	{
 		$r = $params['title_none'];
 	}
 
-	if( !empty( $r ) )
+	if( ! empty( $r ) )
 	{ // We have something to display:
 		echo $r;
 	}
@@ -402,7 +378,7 @@
 	$base_tag_set = $url;
 	echo '<base href="'.$url.'"';
 
-	if( !empty($target) )
+	if( ! empty( $target ) )
 	{
 		echo ' target="'.$target.'"';
 	}
@@ -444,8 +420,7 @@
 
 /**
  * T-Tag: Outputs a <meta name="generator"> tag which contains information about this application.
- *
- * @deprecated No longer outputs meta generator.  Left for backwards compatibility
+ * @deprecated deprecated in Quam Plures v1 due to it adds no value to an installation
  */
 function meta_generator_tag()
 {
@@ -462,11 +437,11 @@
 {
 	global $Blog, $app_baseurl;
 
-	if( !empty( $Blog ) )
+	if( ! empty( $Blog ) )
 	{
 		echo $before.'<a href="'.$Blog->get( 'url' ).'">'.$blog_text.'</a>'.$after;
 	}
-	elseif( !empty($home_text) )
+	elseif( ! empty( $home_text ) )
 	{
 		echo $before.'<a href="'.$app_baseurl.'">'.$home_text.'</a>'.$after;
 	}
@@ -481,7 +456,6 @@
  * If 'jquery' is used and $debug is set to true, the 'jquery_debug' is automatically swapped in.
  * Any javascript added to the page is also added to the $required_js array, which is then checked to prevent adding the same code twice
  *
- * @todo dh>merge with require_css()
  * @param string alias, url or filename (relative to qp_rsc/js) for javascript file
  * @param boolean Is the file's path relative to the base path/url?
  *                Use false if file is in $rsc_url/js/
@@ -498,9 +472,10 @@
 		'#jqueryUI_debug#' => 'jquery.ui.all.js',
 	);
 
-	// TODO: dh> I think dependencies should get handled where the files are included!
+	// @todo (0000): dh> I think dependencies should get handled where the files are included!
 	if( in_array( $js_file, array( '#jqueryUI#', '#jqueryUI_debug#' ) ) )
-	{	// Dependency : ensure jQuery is loaded
+	{
+		// Dependency : ensure jQuery is loaded
 		require_js( '#jquery#' );
 	}
 	elseif( $js_file == 'communication.js' )
@@ -515,9 +490,9 @@
 		$js_url = $js_file;
 		$absolute = TRUE;
 	}
-	elseif( !empty( $js_aliases[$js_file]) )
+	elseif( ! empty( $js_aliases[$js_file]) )
 	{ // It's an alias
-		if ( $js_file == '#jquery#' && $debug ) $js_file = '#jquery_debug#';
+		if( $js_file == '#jquery#' && $debug ) $js_file = '#jquery_debug#';
 		$js_file = $js_aliases[$js_file];
 	}
 
@@ -546,12 +521,11 @@
  * Accepts absolute urls, filenames relative to the qp_rsc/css directory.
  * Set $relative_to_base to TRUE to prevent this function from adding on the rsc_path
  *
- * @todo dh>merge with require_js()
  * @param string alias, url or filename (relative to qp_rsc/css) for CSS file
  * @param boolean|string Is the file's path relative to the base path/url?
- *                Use true to not add any prefix ("$rsc_url/css/").
- * @param string title.  The title for the link tag
- * @param string media.  ie, 'print'
+ * Use true to not add any prefix ("$rsc_url/css/").
+ * @param string The title for the link tag
+ * @param string Media (ie 'print')
  */
 function require_css( $css_file, $relative_to_base = false, $title = NULL, $media = NULL )
 {
@@ -572,7 +546,7 @@
 	}
 	else
 	{
-		$css_url = $rsc_url . 'css/' . $css_file;
+		$css_url = $rsc_url.'css/'.$css_file;
 	}
 
 	// Add to headlines, if not done already:
@@ -581,11 +555,11 @@
 		$required_css[] = strtolower($css_url);
 
 		$start_link_tag = '<link rel="stylesheet"';
-		if ( !empty( $title ) ) $start_link_tag .= ' title="' . $title . '"';
-		if ( !empty( $media ) ) $start_link_tag .= ' media="' . $media . '"';
+		if( ! empty( $title ) ) $start_link_tag .= ' title="'.$title.'"';
+		if( ! empty( $media ) ) $start_link_tag .= ' media="'.$media.'"';
 		$start_link_tag .= ' type="text/css" href="';
 		$end_link_tag = '" />';
-		add_headline( $start_link_tag . $css_url . $end_link_tag );
+		add_headline( $start_link_tag.$css_url.$end_link_tag );
 	}
 
 }
@@ -653,7 +627,7 @@
 	global $js_translations;
 	if( $string != $translation )
 	{ // it's translated
-		$js_translations[ $string ] = $translation;
+		$js_translations[$string] = $translation;
 	}
 }
 
@@ -702,11 +676,9 @@
 
 /**
  * T-Tag: Registers all the javascripts needed by the toolbar menu
- *
- * @todo (legacy): fp> include basic.css ? -- rename to add_headlines_for* -- potential
- * problem with inclusion order of CSS files!!
- * dh> would be nice to have the batch of CSS in a separate file. basic.css would
- * get included first always, then e.g. this toolbar.css.
+ * @todo (0000): fp> include basic.css ? -- rename to add_headlines_for* -- potential
+ * problem with inclusion order of CSS files!! dh> would be nice to have the batch of CSS in
+ * a separate file. basic.css would get included first always, then e.g. this toolbar.css.
  */
 function add_js_for_toolbar()
 {
@@ -716,8 +688,8 @@
 	}
 
 	require_js( '#jquery#' );
-	require_js( 'functions.js' );	// for rollovers AddEvent - TODO: change to jQuery
-	require_js( 'rollovers.js' );	// TODO: change to jQuery
+	require_js( 'functions.min.js' ); // for rollovers AddEvent - TODO: change to jQuery
+	require_js( 'rollovers.js' ); // @todo (0000): change to jQuery
 	// Superfish menus:
 	require_js( 'hoverintent.js' );
 	require_js( 'superfish.js' );
@@ -736,7 +708,6 @@
 
 /**
  * T-Tag: Outputs the collected HTML HEAD lines.
- *
  * @see add_headline()
  * @return string
  */
@@ -810,8 +781,8 @@
 
 /**
  * T-Tag: Display links to previous and next posts in single post mode
- *
  * @uses ItemList2::prevnext_item_links()
+ * @param array Associative array of parameters
  */
 function item_prevnext_links( $params = array() )
 {
@@ -830,13 +801,13 @@
  * <code>
  * $params = array_merge( array(
  * 	 'block_start' => '<div class="action_messages">',
- * 	 'block_end'   => '</div>',
+ * 	 'block_end' => '</div>',
  * ), $params );
  * </code>
- *
  * @todo Tblue: Default values taken from Log::disp() ... this seems redundant
  * @uses Log::disp()
  * @uses Log::display()
+ * @param array Associative array of parameters
  */
 function messages( $params = array() )
 {
@@ -844,7 +815,7 @@
 
 	$params = array_merge( array(
 			'block_start' => '<div class="action_messages">',
-			'block_end'   => '</div>',
+			'block_end' => '</div>',
 		), $params );
 
 	$Messages->disp( $params['block_start'], $params['block_end'] );
@@ -853,8 +824,8 @@
 
 /**
  * T-Tag: Display links to previous and next posts in multi-post (or list) mode
- *
  * @uses ItemListLight::page_links()
+ * @param array Associative array of parameters
  */
 function mainlist_page_links( $params = array() )
 {
@@ -869,7 +840,6 @@
 
 /**
  * T-Tag: Return an Item or NULL
- *
  * @uses ItemListLight::get_item()
  */
 function & mainlist_get_item()
@@ -881,7 +851,8 @@
 		$Item = & $MainList->get_item();
 
 		if( $Item && $Item->ID === $featured_displayed_item_ID )
-		{	// This post was already displayed as a Featured post, let's skip it and get the next one:
+		{
+			// This post was already displayed as a Featured post, let's skip it and get the next one:
 			$Item = & $MainList->get_item();
 		}
 	}
@@ -895,8 +866,8 @@
 
 /**
  * T-Tag: Display a message if MainList is empty
- *
  * @uses Results::display_if_empty()
+ * @param array Associative array of parameters
  */
 function display_if_empty( $params = array() )
 {
@@ -916,7 +887,7 @@
  */
 function star_rating( $stars, $class = 'middle' )
 {
-	if( is_null($stars) )
+	if( is_null( $stars ) )
 	{
 		return;
 	}
@@ -925,15 +896,15 @@
 	{
 		if( $i <= $stars )
 		{
-			echo get_icon( 'star_on', 'imgtag', array( 'class'=>$class ) );
+			echo get_icon( 'star_on', 'imgtag', array( 'class' => $class ) );
 		}
 		elseif( $i-.5 <= $stars )
 		{
-			echo get_icon( 'star_half', 'imgtag', array( 'class'=>$class ) );
+			echo get_icon( 'star_half', 'imgtag', array( 'class' => $class ) );
 		}
 		else
 		{
-			echo get_icon( 'star_off', 'imgtag', array( 'class'=>$class ) );
+			echo get_icon( 'star_off', 'imgtag', array( 'class' => $class ) );
 		}
 	}
 }

=== modified file 'qp_inc/_core/model/__core.install.php'
--- qp_inc/_core/model/__core.install.php	2013-02-28 16:40:18 +0000
+++ qp_inc/_core/model/__core.install.php	2013-03-05 23:36:23 +0000
@@ -64,86 +64,23 @@
 			UNIQUE KEY blog_urlname (blog_urlname)
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_groups' => array( 'Creating table for Groups',
-		"CREATE TABLE T_groups (
-			grp_ID INT(11) NOT NULL auto_increment,
-			grp_name VARCHAR(50) NOT NULL default '',
-			grp_perm_admin enum('none','hidden','visible') NOT NULL default 'visible',
-			grp_perm_blogs enum('user','viewall','editall') NOT NULL default 'user',
-			grp_perm_bypass_antispam TINYINT(1) NOT NULL DEFAULT 0,
-			grp_perm_xhtmlvalidation VARCHAR(10) NOT NULL default 'always',
-			grp_perm_xhtmlvalidation_xmlrpc VARCHAR(10) NOT NULL default 'always',
-			grp_perm_xhtml_css_tweaks TINYINT(1) NOT NULL DEFAULT 0,
-			grp_perm_xhtml_iframes TINYINT(1) NOT NULL DEFAULT 0,
-			grp_perm_xhtml_javascript TINYINT(1) NOT NULL DEFAULT 0,
-			grp_perm_xhtml_objects TINYINT(1) NOT NULL DEFAULT 0,
-			grp_perm_stats enum('none','user','view','edit') NOT NULL default 'none',
-			grp_perm_spamblacklist enum('none','view','edit') NOT NULL default 'none',
-			grp_perm_options enum('none','view','edit') NOT NULL default 'none',
-			grp_perm_users enum('none','view','edit') NOT NULL default 'none',
-			grp_perm_templates TINYINT NOT NULL DEFAULT 0,
-			grp_perm_files enum('none','view','add','edit','all') NOT NULL default 'none',
-			PRIMARY KEY grp_ID (grp_ID)
-		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
-
-	'T_settings' => array( 'Creating table for Settings',
-		"CREATE TABLE T_settings (
-			set_name VARCHAR( 30 ) NOT NULL ,
-			set_value VARCHAR( 255 ) NULL ,
-			PRIMARY KEY ( set_name )
-		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
-
-	'T_global__cache' => array( 'Creating table for Caches',
-		"CREATE TABLE T_global__cache (
-			cach_name VARCHAR( 30 ) NOT NULL ,
-			cach_cache MEDIUMBLOB NULL ,
-			PRIMARY KEY ( cach_name )
-		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
-
-	'T_users' => array( 'Creating table for Users',
-		"CREATE TABLE T_users (
-			user_ID INT(11) unsigned NOT NULL auto_increment,
-			user_login VARCHAR(20) NOT NULL,
-			user_pass CHAR(40) NOT NULL,
-			user_firstname VARCHAR(50) NULL,
-			user_lastname VARCHAR(50) NULL,
-			user_nickname VARCHAR(50) NULL,
-			user_email VARCHAR(255) NOT NULL,
-			user_url VARCHAR(255) NULL,
-			user_ip VARCHAR(15) NULL,
-			user_domain VARCHAR(200) NULL,
-			user_browser VARCHAR(200) NULL,
-			dateYMDhour datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
-			user_level int unsigned DEFAULT 0 NOT NULL,
-			user_locale VARCHAR(20) DEFAULT 'en-EU' NOT NULL,
-			user_idmode VARCHAR(20) NOT NULL DEFAULT 'login',
-			user_allow_msgform TINYINT NOT NULL DEFAULT '1',
-			user_notify tinyint(1) NOT NULL default 1,
-			user_showonline tinyint(1) NOT NULL default 1,
-			user_grp_ID INT(4) NOT NULL default 1,
-			user_validated tinyint(1) NOT NULL DEFAULT 0,
-			PRIMARY KEY user_ID (user_ID),
-			UNIQUE user_login (user_login),
-			KEY user_grp_ID (user_grp_ID)
-		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
-
-	'T_templates__template' => array( 'Creating table for installed templates',
-		"CREATE TABLE T_templates__template (
-				template_ID INT(10) unsigned NOT NULL auto_increment,
-				template_name VARCHAR(32) NOT NULL,
-				template_type enum('xhtml','feed','other') NOT NULL default 'xhtml',
-				template_folder VARCHAR(32) NOT NULL,
-				PRIMARY KEY template_ID (template_ID),
-				UNIQUE template_folder( template_folder ),
-				KEY template_name( template_name )
-			) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
-
-	'T_templates__container' => array( 'Creating table for template containers',
-		"CREATE TABLE T_templates__container (
-				sco_template_ID INT(10) unsigned NOT NULL,
-				sco_name VARCHAR(40) NOT NULL,
-				PRIMARY KEY (sco_template_ID, sco_name)
-			) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+	'T_coll_group_perms' => array( 'Creating table for blog-group permissions',
+		"CREATE TABLE T_coll_group_perms (
+			bloggroup_blog_ID INT(11) unsigned NOT NULL default 0,
+			bloggroup_group_ID INT(11) unsigned NOT NULL default 0,
+			bloggroup_ismember TINYINT NOT NULL default 0,
+			bloggroup_perm_poststatuses set('published','deprecated','protected','private','draft','redirected') NOT NULL default '',
+			bloggroup_perm_edit ENUM('no','own','lt','le','all','redirected') NOT NULL default 'no',
+			bloggroup_perm_delpost TINYINT NOT NULL default 0,
+			bloggroup_perm_comments TINYINT NOT NULL default 0,
+			bloggroup_perm_cats TINYINT NOT NULL default 0,
+			bloggroup_perm_properties TINYINT NOT NULL default 0,
+			bloggroup_perm_admin TINYINT NOT NULL default 0,
+			bloggroup_perm_media_upload TINYINT NOT NULL default 0,
+			bloggroup_perm_media_browse TINYINT NOT NULL default 0,
+			bloggroup_perm_media_change TINYINT NOT NULL default 0,
+			PRIMARY KEY bloggroup_pk (bloggroup_blog_ID,bloggroup_group_ID)
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
 	'T_coll_settings' => array( 'Creating collection settings table',
 		"CREATE TABLE T_coll_settings (
@@ -153,18 +90,22 @@
 			PRIMARY KEY ( cset_coll_ID, cset_name )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_widget' => array( 'Creating components table',
-		"CREATE TABLE T_widget (
-			wi_ID INT(10) UNSIGNED auto_increment,
-			wi_coll_ID INT(11) UNSIGNED NOT NULL,
-			wi_sco_name VARCHAR( 40 ) NOT NULL,
-			wi_order INT(10) NOT NULL,
-			wi_enabled TINYINT(1) NOT NULL DEFAULT 1,
-			wi_type ENUM( 'widget', 'plugin' ) NOT NULL DEFAULT 'widget',
-			wi_code VARCHAR(32) NOT NULL,
-			wi_params TEXT NULL,
-			PRIMARY KEY ( wi_ID ),
-			UNIQUE wi_order( wi_coll_ID, wi_sco_name, wi_order )
+	'T_coll_user_perms' => array( 'Creating table for Blog-User permissions',
+		"CREATE TABLE T_coll_user_perms (
+			bloguser_blog_ID INT(11) unsigned NOT NULL default 0,
+			bloguser_user_ID INT(11) unsigned NOT NULL default 0,
+			bloguser_ismember TINYINT NOT NULL default 0,
+			bloguser_perm_poststatuses set('published','deprecated','protected','private','draft','redirected') NOT NULL default '',
+			bloguser_perm_edit ENUM('no','own','lt','le','all','redirected') NOT NULL default 'no',
+			bloguser_perm_delpost TINYINT NOT NULL default 0,
+			bloguser_perm_comments TINYINT NOT NULL default 0,
+			bloguser_perm_cats TINYINT NOT NULL default 0,
+			bloguser_perm_properties TINYINT NOT NULL default 0,
+			bloguser_perm_admin TINYINT NOT NULL default 0,
+			bloguser_perm_media_upload TINYINT NOT NULL default 0,
+			bloguser_perm_media_browse TINYINT NOT NULL default 0,
+			bloguser_perm_media_change TINYINT NOT NULL default 0,
+			PRIMARY KEY bloguser_pk (bloguser_blog_ID,bloguser_user_ID)
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
 	'T_categories' => array( 'Creating table for Categories',
@@ -183,6 +124,99 @@
 			KEY cat_order (cat_order)
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
+	'T_comments' => array( 'Creating table for Comments',
+		"CREATE TABLE T_comments (
+			comment_ID INT(11) unsigned NOT NULL auto_increment,
+			comment_post_ID INT(11) unsigned NOT NULL default '0',
+			comment_type ENUM('comment','linkback','trackback') NOT NULL default 'comment',
+			comment_status ENUM('published','deprecated','protected','private','draft','redirected') DEFAULT 'published' NOT NULL,
+			comment_author_ID INT unsigned NULL default NULL,
+			comment_author VARCHAR(100) NULL,
+			comment_author_email VARCHAR(255) NULL,
+			comment_author_url VARCHAR(255) NULL,
+			comment_author_IP VARCHAR(23) NOT NULL default '',
+			comment_date DATETIME NOT NULL DEFAULT '2000-01-01 00:00:00',
+			comment_content text NOT NULL,
+			comment_rating TINYINT(1) NULL DEFAULT NULL,
+			comment_featured TINYINT(1) NOT NULL DEFAULT 0,
+			comment_nofollow TINYINT(1) NOT NULL DEFAULT 1,
+			comment_karma INT(11) NOT NULL DEFAULT 0,
+			comment_spam_karma TINYINT NULL,
+			comment_allow_msgform TINYINT NOT NULL DEFAULT 0,
+			PRIMARY KEY comment_ID (comment_ID),
+			KEY comment_post_ID (comment_post_ID),
+			KEY comment_date (comment_date),
+			KEY comment_type (comment_type)
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+
+	'T_cron__log' => array( 'Creating cron tasks table',
+		"CREATE TABLE T_cron__log(
+			clog_ctsk_ID INT(10) unsigned not null,
+			clog_realstart_datetime DATETIME not null DEFAULT '2000-01-01 00:00:00',
+			clog_realstop_datetime DATETIME,
+			clog_status ENUM('started','finished','error','timeout') not null default 'started',
+			clog_messages text,
+			PRIMARY KEY ( clog_ctsk_ID )
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+
+	'T_cron__task' => array( 'Creating cron tasks table',
+		"CREATE TABLE T_cron__task(
+			ctsk_ID INT(10) unsigned not null AUTO_INCREMENT,
+			ctsk_start_datetime DATETIME not null DEFAULT '2000-01-01 00:00:00',
+			ctsk_repeat_after INT(10) unsigned,
+			ctsk_name VARCHAR(50) not null,
+			ctsk_controller VARCHAR(50) not null,
+			ctsk_params text,
+			PRIMARY KEY ( ctsk_ID )
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+
+	'T_files' => array( 'Creating table for File Meta Data',
+		"CREATE TABLE T_files (
+			file_ID INT(11) unsigned not null AUTO_INCREMENT,
+			file_root_type ENUM('absolute','user','collection','shared','templates') not null default 'absolute',
+			file_root_ID INT(11) unsigned not null default 0,
+			file_path VARCHAR(255) not null default '',
+			file_title VARCHAR(255),
+			file_alt VARCHAR(255),
+			file_desc text,
+			PRIMARY KEY ( file_ID ),
+			unique file (file_root_type, file_root_ID, file_path)
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+
+	'T_filetypes' => array( 'Creating table for file types',
+		"CREATE TABLE T_filetypes (
+			ftyp_ID INT(11) unsigned NOT NULL auto_increment,
+			ftyp_extensions VARCHAR(30) NOT NULL,
+			ftyp_name VARCHAR(30) NOT NULL,
+			ftyp_mimetype VARCHAR(50) NOT NULL,
+			ftyp_icon VARCHAR(20) default NULL,
+			ftyp_viewtype VARCHAR(10) NOT NULL,
+			ftyp_allowed TINYINT(1) NOT NULL default 0,
+			PRIMARY KEY ( ftyp_ID )
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+
+	'T_groups' => array( 'Creating table for Groups',
+		"CREATE TABLE T_groups (
+			grp_ID INT(11) NOT NULL auto_increment,
+			grp_name VARCHAR(50) NOT NULL default '',
+			grp_perm_admin ENUM('none','hidden','visible') NOT NULL default 'visible',
+			grp_perm_blogs ENUM('user','viewall','editall') NOT NULL default 'user',
+			grp_perm_bypass_antispam TINYINT(1) NOT NULL DEFAULT 0,
+			grp_perm_xhtmlvalidation VARCHAR(10) NOT NULL default 'always',
+			grp_perm_xhtmlvalidation_xmlrpc VARCHAR(10) NOT NULL default 'always',
+			grp_perm_xhtml_css_tweaks TINYINT(1) NOT NULL DEFAULT 0,
+			grp_perm_xhtml_iframes TINYINT(1) NOT NULL DEFAULT 0,
+			grp_perm_xhtml_javascript TINYINT(1) NOT NULL DEFAULT 0,
+			grp_perm_xhtml_objects TINYINT(1) NOT NULL DEFAULT 0,
+			grp_perm_stats ENUM('none','user','view','edit') NOT NULL default 'none',
+			grp_perm_spamblacklist ENUM('none','view','edit') NOT NULL default 'none',
+			grp_perm_options ENUM('none','view','edit') NOT NULL default 'none',
+			grp_perm_users ENUM('none','view','edit') NOT NULL default 'none',
+			grp_perm_templates TINYINT NOT NULL DEFAULT 0,
+			grp_perm_files ENUM('none','view','add','edit','all') NOT NULL default 'none',
+			PRIMARY KEY grp_ID (grp_ID)
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+
 	'T_items__item' => array( 'Creating table for Posts',
 		"CREATE TABLE T_items__item (
 			post_ID INT(11) unsigned NOT NULL auto_increment,
@@ -191,15 +225,15 @@
 			post_lastedit_user_ID INT(11) unsigned NULL,
 			post_assigned_user_ID INT(11) unsigned NULL,
 			post_datestart DATETIME NOT NULL DEFAULT '2000-01-01 00:00:00',
-			post_datedeadline datetime NULL,
-			post_datecreated datetime NULL,
+			post_datedeadline DATETIME NULL,
+			post_datecreated DATETIME NULL,
 			post_datemodified DATETIME NOT NULL DEFAULT '2000-01-01 00:00:00',
-			post_status enum('published','deprecated','protected','private','draft','redirected') NOT NULL default 'published',
+			post_status ENUM('published','deprecated','protected','private','draft','redirected') NOT NULL default 'published',
 			post_pst_ID INT(11) unsigned NULL,
 			post_ptyp_ID INT(10) unsigned NOT NULL DEFAULT 1,
 			post_locale VARCHAR(20) NOT NULL DEFAULT 'en-EU',
 			post_content MEDIUMTEXT NULL,
-			post_excerpt text NULL,
+			post_excerpt TEXT NULL,
 			post_title text NOT NULL,
 			post_urltitle VARCHAR(210) NULL DEFAULT NULL,
 			post_titletag VARCHAR(255) NULL DEFAULT NULL,
@@ -215,7 +249,7 @@
 			post_commentsexpire DATETIME DEFAULT NULL,
 			post_renderers TEXT NOT NULL,
 			post_priority INT(11) unsigned null COMMENT 'Task priority in workflow',
-			post_featured tinyint(1) NOT NULL DEFAULT 0,
+			post_featured TINYINT(1) NOT NULL DEFAULT 0,
 			post_order DOUBLE NULL,
 			post_editor_code VARCHAR(32) NULL COMMENT 'Plugin code of the editor used to edit this post',
 			PRIMARY KEY post_ID( post_ID ),
@@ -239,54 +273,6 @@
 			UNIQUE catpost ( postcat_cat_ID, postcat_post_ID )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_comments' => array( 'Creating table for Comments',
-		"CREATE TABLE T_comments (
-			comment_ID INT(11) unsigned NOT NULL auto_increment,
-			comment_post_ID INT(11) unsigned NOT NULL default '0',
-			comment_type enum('comment','linkback','trackback') NOT NULL default 'comment',
-			comment_status ENUM('published','deprecated','protected','private','draft','redirected') DEFAULT 'published' NOT NULL,
-			comment_author_ID int unsigned NULL default NULL,
-			comment_author VARCHAR(100) NULL,
-			comment_author_email VARCHAR(255) NULL,
-			comment_author_url VARCHAR(255) NULL,
-			comment_author_IP VARCHAR(23) NOT NULL default '',
-			comment_date datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
-			comment_content text NOT NULL,
-			comment_rating TINYINT(1) NULL DEFAULT NULL,
-			comment_featured TINYINT(1) NOT NULL DEFAULT 0,
-			comment_nofollow TINYINT(1) NOT NULL DEFAULT 1,
-			comment_karma INT(11) NOT NULL DEFAULT 0,
-			comment_spam_karma TINYINT NULL,
-			comment_allow_msgform TINYINT NOT NULL DEFAULT 0,
-			PRIMARY KEY comment_ID (comment_ID),
-			KEY comment_post_ID (comment_post_ID),
-			KEY comment_date (comment_date),
-			KEY comment_type (comment_type)
-		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
-
-	'T_locales' => array( 'Creating table for Locales',
-		"CREATE TABLE T_locales (
-			loc_locale VARCHAR(20) NOT NULL default '',
-			loc_charset VARCHAR(15) NOT NULL default 'iso-8859-1',
-			loc_datefmt VARCHAR(20) NOT NULL default 'y-m-d',
-			loc_timefmt VARCHAR(20) NOT NULL default 'H:i:s',
-			loc_startofweek TINYINT UNSIGNED NOT NULL DEFAULT 1,
-			loc_name VARCHAR(40) NOT NULL default '',
-			loc_messages VARCHAR(20) NOT NULL default '',
-			loc_priority tinyint(4) UNSIGNED NOT NULL default '0',
-			loc_enabled tinyint(4) NOT NULL default '1',
-			PRIMARY KEY loc_locale( loc_locale )
-		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset COMMENT='saves available locales'
-		" ),
-
-	'T_usersettings' => array( 'Creating user settings table',
-		"CREATE TABLE T_usersettings (
-			uset_user_ID INT(11) UNSIGNED NOT NULL,
-			uset_name VARCHAR( 30 ) NOT NULL,
-			uset_value VARCHAR( 255 ) NULL,
-			PRIMARY KEY ( uset_user_ID, uset_name )
-		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
-
 	'T_items__prerendering' => array( 'Creating item prerendering cache table',
 		"CREATE TABLE T_items__prerendering(
 			itpr_itm_ID INT(11) UNSIGNED NOT NULL,
@@ -294,106 +280,40 @@
 			itpr_renderers TEXT NOT NULL,
 			itpr_content_prerendered MEDIUMTEXT NULL,
 			itpr_datemodified TIMESTAMP NOT NULL,
-			PRIMARY KEY (itpr_itm_ID, itpr_format)
+			PRIMARY KEY ( itpr_itm_ID, itpr_format )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_items__version' => array( 'Creating item versions table',
-		"CREATE TABLE T_items__version (
-			iver_itm_ID INT UNSIGNED NOT NULL ,
-			iver_edit_user_ID INT UNSIGNED NULL ,
-			iver_edit_datetime DATETIME NOT NULL ,
-			iver_status ENUM('published','deprecated','protected','private','draft','redirected') NULL ,
-			iver_title TEXT NULL ,
-			iver_content MEDIUMTEXT NULL ,
-			INDEX iver_itm_ID ( iver_itm_ID )
-		) ENGINE = innodb ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
-
 	'T_items__status' => array( 'Creating table for Post Statuses',
 		"CREATE TABLE T_items__status (
 			pst_ID INT(11) unsigned not null AUTO_INCREMENT,
 			pst_name VARCHAR(30) not null,
-			primary key ( pst_ID )
-		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
-
-	'T_items__type' => array( 'Creating table for Post Types',
-		"CREATE TABLE T_items__type (
-			ptyp_ID INT(11) unsigned not null AUTO_INCREMENT,
-			ptyp_name VARCHAR(30) not null,
-			primary key (ptyp_ID)
-		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
-
-	'T_items__tag' => array( 'Creating table for Tags',
-		"CREATE TABLE T_items__tag (
-			tag_ID INT(11) unsigned not null AUTO_INCREMENT,
-			tag_name VARCHAR(50) not null,
-			primary key (tag_ID),
-			UNIQUE tag_name( tag_name )
+			PRIMARY KEY ( pst_ID )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
 	'T_items__itemtag' => array( 'Creating table for Post-to-Tag relationships',
 		"CREATE TABLE T_items__itemtag (
 			itag_itm_ID INT(11) unsigned NOT NULL,
 			itag_tag_ID INT(11) unsigned NOT NULL,
-			PRIMARY KEY (itag_itm_ID, itag_tag_ID),
+			PRIMARY KEY ( itag_itm_ID, itag_tag_ID ),
 			UNIQUE tagitem ( itag_tag_ID, itag_itm_ID )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_files' => array( 'Creating table for File Meta Data',
-		"CREATE TABLE T_files (
-			file_ID INT(11) unsigned not null AUTO_INCREMENT,
-			file_root_type enum('absolute','user','collection','shared','templates') not null default 'absolute',
-			file_root_ID INT(11) unsigned not null default 0,
-			file_path VARCHAR(255) not null default '',
-			file_title VARCHAR(255),
-			file_alt VARCHAR(255),
-			file_desc text,
-			primary key (file_ID),
-			unique file (file_root_type, file_root_ID, file_path)
-		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
-
-	'T_subscriptions' => array( 'Creating table for subscriptions',
-		"CREATE TABLE T_subscriptions (
-			sub_coll_ID INT(11) unsigned not null,
-			sub_user_ID INT(11) unsigned not null,
-			sub_items tinyint(1) not null,
-			sub_comments tinyint(1) not null,
-			primary key (sub_coll_ID, sub_user_ID)
-		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
-
-	'T_coll_user_perms' => array( 'Creating table for Blog-User permissions',
-		"CREATE TABLE T_coll_user_perms (
-			bloguser_blog_ID INT(11) unsigned NOT NULL default 0,
-			bloguser_user_ID INT(11) unsigned NOT NULL default 0,
-			bloguser_ismember tinyint NOT NULL default 0,
-			bloguser_perm_poststatuses set('published','deprecated','protected','private','draft','redirected') NOT NULL default '',
-			bloguser_perm_edit ENUM('no','own','lt','le','all','redirected') NOT NULL default 'no',
-			bloguser_perm_delpost tinyint NOT NULL default 0,
-			bloguser_perm_comments tinyint NOT NULL default 0,
-			bloguser_perm_cats tinyint NOT NULL default 0,
-			bloguser_perm_properties tinyint NOT NULL default 0,
-			bloguser_perm_admin tinyint NOT NULL default 0,
-			bloguser_perm_media_upload tinyint NOT NULL default 0,
-			bloguser_perm_media_browse tinyint NOT NULL default 0,
-			bloguser_perm_media_change tinyint NOT NULL default 0,
-			PRIMARY KEY bloguser_pk (bloguser_blog_ID,bloguser_user_ID)
-		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
-
-	'T_coll_group_perms' => array( 'Creating table for blog-group permissions',
-		"CREATE TABLE T_coll_group_perms (
-			bloggroup_blog_ID INT(11) unsigned NOT NULL default 0,
-			bloggroup_group_ID INT(11) unsigned NOT NULL default 0,
-			bloggroup_ismember tinyint NOT NULL default 0,
-			bloggroup_perm_poststatuses set('published','deprecated','protected','private','draft','redirected') NOT NULL default '',
-			bloggroup_perm_edit ENUM('no','own','lt','le','all','redirected') NOT NULL default 'no',
-			bloggroup_perm_delpost tinyint NOT NULL default 0,
-			bloggroup_perm_comments tinyint NOT NULL default 0,
-			bloggroup_perm_cats tinyint NOT NULL default 0,
-			bloggroup_perm_properties tinyint NOT NULL default 0,
-			bloggroup_perm_admin tinyint NOT NULL default 0,
-			bloggroup_perm_media_upload tinyint NOT NULL default 0,
-			bloggroup_perm_media_browse tinyint NOT NULL default 0,
-			bloggroup_perm_media_change tinyint NOT NULL default 0,
-			PRIMARY KEY bloggroup_pk (bloggroup_blog_ID,bloggroup_group_ID)
+	'T_items__type' => array( 'Creating table for Post Types',
+		"CREATE TABLE T_items__type (
+			ptyp_ID INT(11) unsigned not null AUTO_INCREMENT,
+			ptyp_name VARCHAR(30) not null,
+			PRIMARY KEY ( ptyp_ID )
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+
+	'T_items__version' => array( 'Creating item versions table',
+		"CREATE TABLE T_items__version (
+			iver_itm_ID INT UNSIGNED NOT NULL,
+			iver_edit_user_ID INT UNSIGNED NULL,
+			iver_edit_datetime DATETIME NOT NULL,
+			iver_status ENUM('published','deprecated','protected','private','draft','redirected') NULL,
+			iver_title TEXT NULL,
+			iver_content MEDIUMTEXT NULL,
+			INDEX iver_itm_ID ( iver_itm_ID )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
 	'T_links' => array( 'Creating table for Post Links',
@@ -409,23 +329,26 @@
 			link_ltype_ID INT(11) unsigned NOT NULL default 1,
 			link_external_url VARCHAR(255) NULL,
 			link_title TEXT NULL,
-			PRIMARY KEY (link_ID),
+			PRIMARY KEY ( link_ID ),
 			INDEX link_itm_ID( link_itm_ID ),
 			INDEX link_dest_itm_ID (link_dest_itm_ID),
 			INDEX link_file_ID (link_file_ID)
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_filetypes' => array( 'Creating table for file types',
-		"CREATE TABLE T_filetypes (
-			ftyp_ID INT(11) unsigned NOT NULL auto_increment,
-			ftyp_extensions VARCHAR(30) NOT NULL,
-			ftyp_name VARCHAR(30) NOT NULL,
-			ftyp_mimetype VARCHAR(50) NOT NULL,
-			ftyp_icon VARCHAR(20) default NULL,
-			ftyp_viewtype VARCHAR(10) NOT NULL,
-			ftyp_allowed tinyint(1) NOT NULL default 0,
-			PRIMARY KEY (ftyp_ID)
-		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+	'T_locales' => array( 'Creating table for Locales',
+		"CREATE TABLE T_locales (
+			loc_locale VARCHAR(20) NOT NULL default '',
+			loc_charset VARCHAR(15) NOT NULL default 'iso-8859-1',
+			loc_datefmt VARCHAR(20) NOT NULL default 'y-m-d',
+			loc_timefmt VARCHAR(20) NOT NULL default 'H:i:s',
+			loc_startofweek TINYINT UNSIGNED NOT NULL DEFAULT 1,
+			loc_name VARCHAR(40) NOT NULL default '',
+			loc_messages VARCHAR(20) NOT NULL default '',
+			loc_priority TINYINT(4) UNSIGNED NOT NULL default '0',
+			loc_enabled TINYINT(4) NOT NULL default '1',
+			PRIMARY KEY loc_locale( loc_locale )
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset COMMENT='saves available locales'
+		" ),
 
 	'T_plugins' => array( 'Creating plugins table',
 		"CREATE TABLE T_plugins (
@@ -449,7 +372,7 @@
 			pevt_plug_ID INT(11) UNSIGNED NOT NULL,
 			pevt_event VARCHAR(40) NOT NULL,
 			pevt_enabled TINYINT NOT NULL DEFAULT 1,
-			PRIMARY KEY( pevt_plug_ID, pevt_event )
+			PRIMARY KEY ( pevt_plug_ID, pevt_event )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
 	'T_pluginsettings' => array( 'Creating plugin settings table',
@@ -460,6 +383,115 @@
 			PRIMARY KEY ( pset_plug_ID, pset_name )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
+	'T_pluginusersettings' => array( 'Creating plugin user settings table',
+		"CREATE TABLE T_pluginusersettings (
+			puset_plug_ID INT(11) UNSIGNED NOT NULL,
+			puset_user_ID INT(11) UNSIGNED NOT NULL,
+			puset_name VARCHAR( 30 ) NOT NULL,
+			puset_value TEXT NULL,
+			PRIMARY KEY ( puset_plug_ID, puset_user_ID, puset_name )
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+
+	'T_settings' => array( 'Creating table for Settings',
+		"CREATE TABLE T_settings (
+			set_name VARCHAR( 30 ) NOT NULL,
+			set_value VARCHAR( 255 ) NULL,
+			PRIMARY KEY ( set_name )
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+
+	'T_subscriptions' => array( 'Creating table for subscriptions',
+		"CREATE TABLE T_subscriptions (
+			sub_coll_ID INT(11) unsigned not null,
+			sub_user_ID INT(11) unsigned not null,
+			sub_items TINYINT(1) not null,
+			sub_comments TINYINT(1) not null,
+			PRIMARY KEY ( sub_coll_ID, sub_user_ID )
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+
+	'T_items__tag' => array( 'Creating table for Tags',
+		"CREATE TABLE T_items__tag (
+			tag_ID INT(11) unsigned not null AUTO_INCREMENT,
+			tag_name VARCHAR(50) not null,
+			PRIMARY KEY ( tag_ID ),
+			UNIQUE tag_name( tag_name )
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+
+	'T_templates__template' => array( 'Creating table for installed templates',
+		"CREATE TABLE T_templates__template (
+			template_ID INT(10) unsigned NOT NULL auto_increment,
+			template_name VARCHAR(32) NOT NULL,
+			template_type ENUM('xhtml','feed','other') NOT NULL default 'xhtml',
+			template_folder VARCHAR(32) NOT NULL,
+			PRIMARY KEY template_ID (template_ID),
+			UNIQUE template_folder( template_folder ),
+			KEY template_name( template_name )
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+
+	'T_templates__container' => array( 'Creating table for template containers',
+		"CREATE TABLE T_templates__container (
+			sco_template_ID INT(10) unsigned NOT NULL,
+			sco_name VARCHAR(40) NOT NULL,
+			PRIMARY KEY ( sco_template_ID, sco_name )
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+
+	'T_users' => array( 'Creating users table',
+		"CREATE TABLE T_users (
+			user_ID INT(11) unsigned NOT NULL auto_increment,
+			user_login VARCHAR(20) NOT NULL,
+			user_pass CHAR(40) NOT NULL,
+			user_firstname VARCHAR(50) NULL,
+			user_lastname VARCHAR(50) NULL,
+			user_nickname VARCHAR(50) NULL,
+			user_email VARCHAR(255) NOT NULL,
+			user_url VARCHAR(255) NULL,
+			user_ip VARCHAR(15) NULL,
+			user_domain VARCHAR(200) NULL,
+			user_browser VARCHAR(200) NULL,
+			dateYMDhour DATETIME NOT NULL DEFAULT '2000-01-01 00:00:00',
+			user_level int unsigned DEFAULT 0 NOT NULL,
+			user_locale VARCHAR(20) DEFAULT 'en-EU' NOT NULL,
+			user_idmode VARCHAR(20) NOT NULL DEFAULT 'login',
+			user_allow_msgform TINYINT NOT NULL DEFAULT '1',
+			user_notify TINYINT(1) NOT NULL default 1,
+			user_showonline TINYINT(1) NOT NULL default 1,
+			user_grp_ID INT(4) NOT NULL default 1,
+			user_validated TINYINT(1) NOT NULL DEFAULT 0,
+			user_avatar_ID INT(10) NULL,
+			user_biography TEXT NULL DEFAULT NULL,
+			PRIMARY KEY user_ID (user_ID),
+			UNIQUE user_login (user_login),
+			KEY user_grp_ID (user_grp_ID)
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+
+	'T_global__cache' => array( 'Creating table for Caches',
+		"CREATE TABLE T_global__cache (
+			cach_name VARCHAR( 30 ) NOT NULL,
+			cach_cache MEDIUMBLOB NULL,
+			PRIMARY KEY ( cach_name )
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+
+	'T_widget' => array( 'Creating components table',
+		"CREATE TABLE T_widget (
+			wi_ID INT(10) UNSIGNED auto_increment,
+			wi_coll_ID INT(11) UNSIGNED NOT NULL,
+			wi_sco_name VARCHAR( 40 ) NOT NULL,
+			wi_order INT(10) NOT NULL,
+			wi_enabled TINYINT(1) NOT NULL DEFAULT 1,
+			wi_type ENUM( 'widget', 'plugin' ) NOT NULL DEFAULT 'widget',
+			wi_code VARCHAR(32) NOT NULL,
+			wi_params TEXT NULL,
+			PRIMARY KEY ( wi_ID ),
+			UNIQUE wi_order( wi_coll_ID, wi_sco_name, wi_order )
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+
+	'T_usersettings' => array( 'Creating user settings table',
+		"CREATE TABLE T_usersettings (
+			uset_user_ID INT(11) UNSIGNED NOT NULL,
+			uset_name VARCHAR( 30 ) NOT NULL,
+			uset_value VARCHAR( 255 ) NULL,
+			PRIMARY KEY ( uset_user_ID, uset_name )
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+
 	/**
 	 * This table holds info about fields a plugin might want to access and
 	 * use. The only time it gets called is on a plugin's settings page
@@ -472,7 +504,7 @@
 			psf_type VARCHAR(255) NOT NULL, -- probably only 'text', maybe 'checkbox', 'select' is crazy talk!
 			psf_note VARCHAR(255) NOT NULL,
 			psf_validate VARCHAR(255) NOT NULL, -- make sure a url is a url ... for example
-			PRIMARY KEY (psf_fieldname)
+			PRIMARY KEY ( psf_fieldname )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
 	/**
@@ -487,39 +519,9 @@
 			psv_user_ID INT(10) unsigned NOT NULL,
 			psv_psf_fieldname VARCHAR(32) NOT NULL,
 			psv_userfieldvalue VARCHAR(255) NOT NULL,
-			PRIMARY KEY (psv_ID)
-		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
-
-	'T_pluginusersettings' => array( 'Creating plugin user settings table',
-		"CREATE TABLE T_pluginusersettings (
-			puset_plug_ID INT(11) UNSIGNED NOT NULL,
-			puset_user_ID INT(11) UNSIGNED NOT NULL,
-			puset_name VARCHAR( 30 ) NOT NULL,
-			puset_value TEXT NULL,
-			PRIMARY KEY ( puset_plug_ID, puset_user_ID, puset_name )
-		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
-
-	'T_cron__task' => array( 'Creating cron tasks table',
-		"CREATE TABLE T_cron__task(
-			ctsk_ID INT(10) unsigned not null AUTO_INCREMENT,
-			ctsk_start_datetime datetime not null DEFAULT '2000-01-01 00:00:00',
-			ctsk_repeat_after INT(10) unsigned,
-			ctsk_name VARCHAR(50) not null,
-			ctsk_controller VARCHAR(50) not null,
-			ctsk_params text,
-			PRIMARY KEY (ctsk_ID)
-		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
-
-	'T_cron__log' => array( 'Creating cron tasks table',
-		"CREATE TABLE T_cron__log(
-			clog_ctsk_ID INT(10) unsigned not null,
-			clog_realstart_datetime datetime not null DEFAULT '2000-01-01 00:00:00',
-			clog_realstop_datetime datetime,
-			clog_status enum('started','finished','error','timeout') not null default 'started',
-			clog_messages text,
-			PRIMARY KEY (clog_ctsk_ID)
-		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+			PRIMARY KEY ( psv_ID )
+		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
+
 );
 
-
 ?>

=== modified file 'qp_inc/files/files.ctrl.php'
--- qp_inc/files/files.ctrl.php	2011-08-19 16:20:19 +0000
+++ qp_inc/files/files.ctrl.php	2013-03-05 23:36:23 +0000
@@ -1,63 +1,32 @@
 <?php
 /**
- * This file implements the UI controller for file management.
+ * $ctrl_mappings: 'files' || Files -> browse (not upload)
  *
- * NOTE: $fm_mode is used for modes. Modes stay visible when browsing to a different location.
- * Examples of modes: link item, copy file.
+ * NOTE: $fm_mode is used for modes. Modes stay visible when browsing to a different
+ * location.
+ * - Examples of modes: link item, copy file.
  * Actions disappear if you browse to a different location.
- * Examples of actions: file properties, file edit.
- *
- * fp>> Movr/copy should not be a mode (too geeky). All we need is a dir selection tree inside of upload and move.
- *
- * This file is part of Quam Plures - {@link http://quamplures.net/}
- * See also {@link https://launchpad.net/quam-plures}.
- *
- * @copyright (c) 2009 - 2011 by the Quam Plures developers - {@link http://quamplures.net/}
- * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
- * Parts of this file are copyright (c)2004-2006 by Daniel HAHLER - {@link http://thequod.de/contact}.
- * Parts of this file are copyright (c)2005-2006 by PROGIDISTRI - {@link http://progidistri.com/}.
- *
- * {@internal License choice
- * - If you have received this file as part of a package, please find the license.txt file in
- *   the same folder or the closest folder above for complete license terms.
- * - If you have received this file individually (e-g: from http://evocms.cvs.sourceforge.net/)
- *   then you must choose one of the following licenses before using the file:
- *   - GNU General Public License 2 (GPL) - http://www.opensource.org/licenses/gpl-license.php
- *   - Mozilla Public License 1.1 (MPL) - http://www.opensource.org/licenses/mozilla1.1.php
- * }}
- *
- * {@internal Open Source relicensing agreement:
- * Daniel HAHLER grants Francois PLANQUE the right to license
- * Daniel HAHLER's contributions to this file and the b2evolution project
- * under any OSI approved OSS license (http://www.opensource.org/licenses/).
- *
- * PROGIDISTRI S.A.S. grants Francois PLANQUE the right to license
- * PROGIDISTRI S.A.S.'s contributions to this file and the b2evolution project
- * under any OSI approved OSS license (http://www.opensource.org/licenses/).
- * }}
- *
- * {@internal Below is a list of authors who have contributed to design/coding of this file: }}
- * @author blueyed: Daniel HAHLER.
- * @author fplanque: Francois PLANQUE.
- *
+ * - Examples of actions: file properties, file edit.
+ *
+ * @todo (1111): why does upload have it's own controller?
+ * @uses Zip_Archive
+ * @author {@link http://wonderwinds.com/ Ed Bennett}
+ * @author {@link http://progidistri.com/ PROGIDISTRI}
+ * @author {@link http://daniel.hahler.de/ Daniel HAHLER}
+ * @author {@link http://fplanque.net/ Francois PLANQUE}
+ * @copyright (c) 2009 by {@link http://quamplures.net/ the Quam Plures project}
+ * @license http://www.gnu.org/licenses/gpl.txt GNU General Public License v3
  * @package files
  */
-if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
-
-/**
- * Filelist
- * fp>> TODO: When the user is viewing details for a file he should (by default) not be presented with the filelist in addition to the file properties
- * In cases like that, we should try to avoid instanciating a Filelist.
- */
-load_class('files/model/_filelist.class.php');
-
+if(!defined('QP_MAIN_INIT')) die('fail');
+
+global $dispatcher;
 global $current_User;
-global $dispatcher;
 
-// Check global access permissions:
+// Check global access permissions
 if( ! $Settings->get( 'fm_enabled' ) )
 {
-	// File Manager is disabled, so let's be kind and give them something to work with
+	// File Manager is disabled, so give them something to work with
 	$AdminUI->set_coll_list_params( 'blog_ismember', 'view', array(), T_('Global'), '?blog=0' );
 	$AdminUI->set_path( 'dashboard' );
 	$AdminUI->disp_html_head();
@@ -67,58 +36,73 @@
 	die();
 }
 
-// Check permission:
+// Check permission
 $current_User->check_perm( 'files', 'view', true );
 
 $AdminUI->set_path( 'files', 'browse' );
 
-// INIT params:
+// INIT params
 if( param( 'root_and_path', 'string', '', false ) /* not memorized (default) */ && strpos( $root_and_path, '::' ) )
-{ // root and path together: decode and override (used by "radio-click-dirtree")
+{
+	// root and path together: decode and override (used by "radio-click-dirtree")
 	list( $root, $path ) = explode( '::', $root_and_path, 2 );
-	// Memorize new root:
+	// Memorize new root
 	memorize_param( 'root', 'string', NULL );
 	memorize_param( 'path', 'string', NULL );
 }
 else
 {
-	param( 'root', 'string', NULL, true ); // the root directory from the dropdown box (user_X or blog_X; X is ID - 'user' for current user (default))
-	param( 'path', 'string', '/', true );  // the path relative to the root dir
-	if( param( 'new_root', 'string', '' )
-		&& $new_root != $root )
-	{ // We have changed root in the select list
+	// the root directory from the dropdown box (user_X or blog_X; X is ID - 'user' for current user (default))
+	param( 'root', 'string', NULL, true );
+
+	// the path relative to the root dir
+	param( 'path', 'string', '/', true );
+
+	if( param( 'new_root', 'string', '' ) && $new_root != $root )
+	{
+		// We have changed root in the select list
 		$root = $new_root;
 		$path = '';
 	}
 }
 
-// Load linkable objects:
+// Load linkable objects
 if( param( 'item_ID', 'integer', NULL, true, false, false ) )
-{ // Load Requested iem:
+{
+	// Load Requested iem
 	$ItemCache = & get_Cache( 'ItemCache' );
-	if( ($edited_Item = & $ItemCache->get_by_ID( $item_ID, false )) === false )
-	{	// We could not find the contact to link:
+
+	if( ( $edited_Item = & $ItemCache->get_by_ID( $item_ID, false ) ) === false )
+	{
+		// We could not find the contact to link
 		$Messages->add( T_('Requested item does not exist any longer.'), 'error' );
 		unset( $edited_Item );
 		forget_param( 'item_ID' );
 		unset( $item_ID );
 	}
+
 }
 
 if( param( 'user_ID', 'integer', NULL, true, false, false ) )
-{ // Load Requested user:
+{
+	// Load Requested user
 	$UserCache = & get_Cache( 'UserCache' );
-	if( ($edited_User = & $UserCache->get_by_ID( $user_ID, false )) === false )
-	{	// We could not find the contact to link:
+
+	if( ( $edited_User = & $UserCache->get_by_ID( $user_ID, false ) ) === false )
+	{
+		// We could not find the contact to link
 		$Messages->add( T_('Requested user does not exist any longer.'), 'error' );
 		unset( $edited_User );
 		forget_param( 'user_ID' );
 		unset( $user_ID );
 	}
 	else
-	{	// Found User, check perm:
+	{
+		// Found User, check perm
 		if( $edited_User->ID != $current_User->ID )
-		{	// if not editing himself, must have user edit permission:
+		{
+
+			// if not editing himself, must have user edit permission
 			if( ! $current_User->check_perm( 'users', 'edit' ) )
 			{
 				$Messages->add( T_('No permission to edit this user.'), 'error' );
@@ -126,97 +110,101 @@
 				forget_param( 'user_ID' );
 				unset( $user_ID );
 			}
+
 		}
 
 	}
+
 }
 
-/**
- * @global string The file manager mode we're in ('fm_upload', 'fm_move')
- */
 $fm_mode = param( 'fm_mode', 'string', NULL, true );
 
 $action = param_action();
 if( $action == 'group_action' )
-{ // Get the real action from the select:
+{
+	// Get the real action from the select
 	$action = param( 'group_action', 'string', '' );
 }
 
-if( !empty($action) && substr( $fm_mode, 0, 5 ) != 'link_' )
-{	// The only modes which can tolerate simultaneous actions at this time are link_* modes (item, user...)
+if( ! empty( $action ) && substr( $fm_mode, 0, 5 ) != 'link_' )
+{
+	// The only modes which can tolerate simultaneous actions at this time are link_* modes (item, user...)
 	// file_move & file_copy shouldn't actually be modes
 	$fm_mode = '';
 }
 
-// Name of the iframe we want some actions to come back to:
+// Name of the iframe we want some actions to come back to
 param( 'iframe_name', 'string', '', true );
 
-// Get root:
+// Get root
 $ads_list_path = false; // false by default, gets set if we have a valid root
-/**
- * @var FileRoot
- */
 $fm_FileRoot = NULL;
-
 $FileRootCache = & get_Cache( 'FileRootCache' );
-
 $available_Roots = $FileRootCache->get_available_FileRoots();
 
-if( ! empty($root) )
-{ // We have requested a root folder by string:
-	$fm_FileRoot = & $FileRootCache->get_by_ID($root, true);
+if( ! empty( $root ) )
+{
+	// We have requested a root folder by string
+	$fm_FileRoot = & $FileRootCache->get_by_ID( $root, true );
 
 	if( ! $fm_FileRoot || ! isset( $available_Roots[$fm_FileRoot->ID] ) )
-	{ // Root not found or not in list of available ones
+	{
+		// Root not found or not in list of available ones
 		$Messages->add( T_('You don\'t have access to the requested root directory.'), 'error' );
 		$fm_FileRoot = false;
 	}
 }
-elseif( !empty($edited_Item) )
-{	// We have a post, check if it already has a linked file in a particular root, in which case we want to use that root!
-	// This is useful when whlicking "attach files" from teh post edit screen: it takes you to the root where you have
-	// already attached files from. Otherwise the next block below will default to the Blog's fileroot.
-	// Get list of attached files:
+elseif( ! empty( $edited_Item ) )
+{
+	// We have a post, check if it already has a linked file in a particular root, in
+	// which case we want to use that root! This is useful when whlicking "attach files"
+	// from the post edit screen: it takes you to the root where you have already attached
+	// files from. Otherwise the next block below will default to the Blog's fileroot.
+
+	// Get list of attached files
 	$FileList = $edited_Item->get_attachment_FileList( 1 );
-	// Get first file:
-  /**
-	 * @var File
-	 */
+
+	// Get first file
 	$File = & $FileList->get_next();
-	if( !empty( $File ) )
-	{	// Obtain and use file root of first file:
+	if( ! empty( $File ) )
+	{
+		// Obtain and use file root of first file
 		$fm_FileRoot = & $File->get_FileRoot();
 		$path = dirname( $File->get_rdfs_rel_path() ).'/';
 	}
+
 }
 
-
-if( empty($fm_FileRoot) && !empty($edited_User) )
-{	// Still not set a root, try to get it for the edited User
+if( empty( $fm_FileRoot ) && ! empty( $edited_User ) )
+{
+	// Still not set a root, try to get it for the edited User
 	$fm_FileRoot = & $FileRootCache->get_by_type_and_ID( 'user', $edited_User->ID );
 	if( ! $fm_FileRoot || ! isset( $available_Roots[$fm_FileRoot->ID] ) )
-	{ // Root not found or not in list of available ones
+	{
+		// Root not found or not in list of available ones
 		$fm_FileRoot = false;
 	}
 }
 
-if( empty($fm_FileRoot) && !empty($Blog) )
-{	// Still not set a root, try to get it for the current Blog
+if( empty( $fm_FileRoot ) && ! empty( $Blog ) )
+{
+	// Still not set a root, try to get it for the current Blog
 	$fm_FileRoot = & $FileRootCache->get_by_type_and_ID( 'collection', $Blog->ID );
 	if( ! $fm_FileRoot || ! isset( $available_Roots[$fm_FileRoot->ID] ) )
-	{ // Root not found or not in list of available ones
+	{
+		// Root not found or not in list of available ones
 		$fm_FileRoot = false;
 	}
 }
 
-
 if( ! $fm_FileRoot )
-{ // No root requested (or the requested is invalid),
-	// get the first one available:
+{
+	// No root requested (or the requested is invalid), get the first one available
 	if( $available_Roots
-	    && ( $tmp_keys = array_keys( $available_Roots ) )
-	    && $first_Root = & $available_Roots[ $tmp_keys[0] ] )
-	{ // get the first one
+		&& ( $tmp_keys = array_keys( $available_Roots ) )
+		&& $first_Root = & $available_Roots[$tmp_keys[0]] )
+	{
+		// get the first one
 		$fm_FileRoot = & $first_Root;
 	}
 	else
@@ -226,44 +214,50 @@
 }
 
 if( $fm_FileRoot )
-{ // We have access to a file root:
-	if( empty($fm_FileRoot->ads_path) )
-	{	// Not sure it's possible to get this far, but just in case...
+{
+	// We have access to a file root
+	if( empty( $fm_FileRoot->ads_path ) )
+	{
+		// Not sure it's possible to get this far, but just in case...
 		$Messages->add( sprintf( T_('The root directory &laquo;%s&raquo; does not exist.'), $fm_FileRoot->ads_path ), 'error' );
 	}
 	else
-	{ // Root exists
-
-		// Make sure $root is set:
+	{
+		// Root exists
+		// Make sure $root is set
 		$root = $fm_FileRoot->ID;
 
 		// Let's get into requested list dir...
 		$non_canonical_list_path = $fm_FileRoot->ads_path.$path;
 
-		// Dereference any /../ just to make sure, and CHECK if directory exists:
+		// Dereference any /../ just to make sure, and CHECK if directory exists
 		$ads_list_path = get_canonical_path( $non_canonical_list_path );
 
-		if( !is_dir( $ads_list_path ) )
-		{ // This should never happen, but just in case the diretory does not exist:
+		if( ! is_dir( $ads_list_path ) )
+		{
+			// This should never happen, but just in case the diretory does not exist
 			$Messages->add( sprintf( T_('The directory &laquo;%s&raquo; does not exist.'), $path ), 'error' );
-			$path = '';		// fp> added
+			$path = ''; // fp> added
 			$ads_list_path = NULL;
 		}
-		elseif( ! preg_match( '#^'.preg_quote($fm_FileRoot->ads_path, '#').'#', $ads_list_path ) )
-		{ // cwd is OUTSIDE OF root!
+		elseif( ! preg_match( '#^'.preg_quote( $fm_FileRoot->ads_path, '#' ).'#', $ads_list_path ) )
+		{
+			// cwd is OUTSIDE OF root!
 			$Messages->add( T_( 'You are not allowed to go outside your root directory!' ), 'error' );
-			$path = '';		// fp> added
+			$path = ''; // fp> added
 			$ads_list_path = $fm_FileRoot->ads_path;
 		}
 		elseif( $ads_list_path != $non_canonical_list_path )
-		{	// We have reduced the absolute path, we should also reduce the relative $path (used in urls params)
+		{
+			// We have reduced the absolute path, we should also reduce the relative $path (used in urls params)
 			$path = get_canonical_path( $path );
 		}
 	}
 }
 
-if( empty($ads_list_path) )
-{ // We have no Root / list path, there was an error. Unset any action or mode.
+if( empty( $ads_list_path ) )
+{
+	// We have no Root / list path, there was an error. Unset any action or mode
 	$action = 'nil';
 	$fm_mode = NULL;
 
@@ -274,39 +268,25 @@
 	exit(0);
 }
 
-$Debuglog->add( 'root: '.var_export( $root, true ), 'files' );
-$Debuglog->add( 'FM root: '.var_export( $fm_FileRoot, true ), 'files' );
-$Debuglog->add( 'FM _ads_list_path: '.var_export( $ads_list_path, true ), 'files' );
-$Debuglog->add( 'path: '.var_export( $path, true ), 'files' );
-
-
-/**
- * A list of filepaths which are selected in the FM list.
- *
- * @todo fp> This could probably be further simpplified by using "fm_sources" for selections.
- * Note: fm_sources is better because it also handles sources/selections on a different fileroot
- *
- * @global array
- */
+// A list of filepaths which are selected in the FM list.
+// @todo fp> This could probably be further simpplified by using "fm_sources" for selections.
+// Note: fm_sources is better because it also handles sources/selections on a different fileroot
 $fm_selected = param( 'fm_selected', 'array', array(), true );
-$Debuglog->add( count($fm_selected).' selected files/directories', 'files' );
-/**
- * The selected files (must be within current fileroot)
- *
- * @global Filelist
- */
+
+// The selected files (must be within current fileroot)
 $selected_Filelist = new Filelist( $fm_FileRoot, false );
 foreach( $fm_selected as $l_source_path )
 {
-	$selected_Filelist->add_by_subpath( urldecode($l_source_path), true );
+	$selected_Filelist->add_by_subpath( urldecode( $l_source_path ), true );
 }
 
-// Load editable objects:
+// Load editable objects
 if( param( 'link_ID', 'integer', NULL, false, false, false ) )
 {
 	$LinkCache = & get_Cache( 'LinkCache' );
-	if( ($edited_Link = & $LinkCache->get_by_ID( $link_ID, false )) === false )
-	{	// We could not find the link to edit:
+	if( ( $edited_Link = & $LinkCache->get_by_ID( $link_ID, false ) ) === false )
+	{
+		// We could not find the link to edit
 		$Messages->add( T_('Requested link does not exist any longer.'), 'error' );
 		unset( $edited_Link );
 		forget_param( 'link_ID' );
@@ -317,188 +297,185 @@
 // Check actions that need early processing:
 if( $action == 'createnew' )
 {
-	// Check permission:
+	// Check permission
 	$current_User->check_perm( 'files', 'add', true );
 
 	// create new file/dir
 	param( 'create_type', 'string', true ); // 'file', 'dir'
 
-	$action = ( $create_type == 'file' ? 'createnew_file' : 'createnew_dir'  );
+	$action = ( $create_type == 'file' ? 'createnew_file' : 'createnew_dir' );
 }
 
 switch( $action )
 {
 	case 'filter':
-		$action = 'list';
-		break;
+	$action = 'list';
+	break;
 
 	case 'filter_unset':
-		// Clear filters!
-		$fm_filter = '';
-		$action = 'list';
-		break;
+	// Clear filters!
+	$fm_filter = '';
+	$action = 'list';
+	break;
 
 	case 'createnew_dir':
-		// We are probably comming from 'createnew' but there is no guarantee!
-		// Check permission:
-		$current_User->check_perm( 'files', 'add', true );
-
-		if( ! $Settings->get( 'fm_enable_create_dir' ) )
-		{ // Directory creation is gloablly disabled:
-			$Messages->add( T_('Directory creation is disabled.'), 'error' );
-			break;
-		}
-
-		if( !	param( 'create_name', 'string', '' ) )
-		{ // No name was supplied:
-			$Messages->add( T_('Cannot create a directory without name.'), 'error' );
-			break;
-		}
-
-		if( $error_dirname = validate_dirname( $create_name ) )
-		{ // Not valid dirname
-			$Messages->add( $error_dirname, 'error' );
-			break;
-		}
-
-		// Try to get File object:
-		/**
-		 * @var FileCache
-		 */
-		$FileCache = & get_Cache( 'FileCache' );
-		/**
-		 * @var File
-		 */
-		$newFile = & $FileCache->get_by_root_and_path( $fm_FileRoot->type, $fm_FileRoot->in_type_ID, $path.$create_name );
-
-		if( $newFile->exists() )
-		{
-			$Messages->add( sprintf( T_('The file &laquo;%s&raquo; already exists.'), $create_name ), 'error' );
-			break;
-		}
-
-		if( ! $newFile->create( $create_type ) )
-		{
-			$Messages->add( sprintf( T_('Could not create directory &laquo;%s&raquo; in &laquo;%s&raquo;.'), $create_name, $fm_Filelist->_rds_list_path ), 'error' );
-		}
-
-		$Messages->add( sprintf( T_('The directory &laquo;%s&raquo; has been created.'), $create_name ), 'success' );
-
-		header_redirect( regenerate_url( '', '', '', '&' ) );
-		// $action = 'list';
-		break;
-
+	// We are probably comming from 'createnew' but there is no guarantee!
+
+	// Check permission
+	$current_User->check_perm( 'files', 'add', true );
+
+	if( ! $Settings->get( 'fm_enable_create_dir' ) )
+	{
+		// Directory creation is gloablly disabled
+		$Messages->add( T_('Directory creation is disabled.'), 'error' );
+		break;
+	}
+
+	if( ! param( 'create_name', 'string', '' ) )
+	{
+		// No name was supplied
+		$Messages->add( T_('Cannot create a directory without name.'), 'error' );
+		break;
+	}
+
+	if( $error_dirname = validate_dirname( $create_name ) )
+	{
+		// Not valid dirname
+		$Messages->add( $error_dirname, 'error' );
+		break;
+	}
+
+	// Try to get File object
+	$FileCache = & get_Cache( 'FileCache' );
+	$newFile = & $FileCache->get_by_root_and_path( $fm_FileRoot->type, $fm_FileRoot->in_type_ID, $path.$create_name );
+
+	if( $newFile->exists() )
+	{
+		$Messages->add( sprintf( T_('The file &laquo;%s&raquo; already exists.'), $create_name ), 'error' );
+		break;
+	}
+
+	if( ! $newFile->create( $create_type ) )
+	{
+		$Messages->add( sprintf( T_('Could not create directory &laquo;%s&raquo; in &laquo;%s&raquo;.'), $create_name, $fm_Filelist->_rds_list_path ), 'error' );
+	}
+
+	$Messages->add( sprintf( T_('The directory &laquo;%s&raquo; has been created.'), $create_name ), 'success' );
+
+	header_redirect( regenerate_url( '', '', '', '&' ) );
+	// $action = 'list';
+	break;
 
 	case 'createnew_file':
-		// We are probably comming from 'createnew' but there is no guarantee!
-		// Check permission:
-		$current_User->check_perm( 'files', 'add', true );
-
-		if( ! $Settings->get( 'fm_enable_create_file' ) )
-		{ // File creation is gloablly disabled:
-			$Messages->add( T_('File creation is disabled.'), 'error' );
-			break;
-		}
-
-		if( !	param( 'create_name', 'string', '' ) )
-		{ // No name was supplied:
-			$Messages->add( T_('Cannot create a file without name.'), 'error' );
-			break;
-		}
-		if( $error_filename = validate_filename( $create_name, $current_User->check_perm( 'files', 'all' ) ) )
-		{ // Not valid filename or extension
-			$Messages->add( $error_filename, 'error' );
-			break;
-		}
-
-		// Try to get File object:
-		$FileCache = & get_Cache( 'FileCache' );
-		$newFile = & $FileCache->get_by_root_and_path( $fm_FileRoot->type, $fm_FileRoot->in_type_ID, $path.$create_name );
-
-		if( $newFile->exists() )
-		{
-			$Messages->add( sprintf( T_('The file &laquo;%s&raquo; already exists.'), $create_name ), 'error' );
-			break;
-		}
-
-		if( ! $newFile->create( $create_type ) )
-		{
-			$Messages->add( sprintf( T_('Could not create file &laquo;%s&raquo; in &laquo;%s&raquo;.'), $create_name, $fm_Filelist->_rds_list_path ), 'error' );
-		}
-
-		$Messages->add( sprintf( T_('The file &laquo;%s&raquo; has been created.'), $create_name ), 'success' );
-
-		header_redirect( regenerate_url( '', '', '', '&' ) );
-		// $action = 'list';
-		break;
-
-
-  case 'update_settings':
-		// Update settings NOW since they may affect the FileList
-		$UserSettings->set( 'fm_dirsnotattop',   1-param( 'option_dirsattop',        'integer', 0 ) );
-		$UserSettings->set( 'fm_permlikelsl',      param( 'option_permlikelsl',      'integer', 0 ) );
-		$UserSettings->set( 'fm_imglistpreview',   param( 'option_imglistpreview',   'integer', 0 ) );
-		$UserSettings->set( 'fm_getimagesizes',    param( 'option_getimagesizes',    'integer', 0 ) );
-
-		$UserSettings->set( 'fm_showtypes',        param( 'option_showtypes',        'integer', 0 ) );
-		$UserSettings->set( 'fm_showdate',         param( 'option_showdate',         'string', 'compact' ) );
-		$UserSettings->set( 'fm_showfsperms',      param( 'option_showfsperms',      'integer', 0 ) );
-		$UserSettings->set( 'fm_showfsowner',      param( 'option_showfsowner',      'integer', 0 ) );
-		$UserSettings->set( 'fm_showfsgroup',      param( 'option_showfsgroup',      'integer', 0 ) );
-
-		$UserSettings->set( 'fm_showhidden',       param( 'option_showhidden',       'integer', 0 ) );
-		$UserSettings->set( 'fm_recursivedirsize', param( 'option_recursivedirsize', 'integer', 0 ) );
-		$UserSettings->set( 'fm_allowfiltering',   param( 'option_allowfiltering', 'string', 'simple' ) );
-
-		if( $UserSettings->dbupdate() )
-		{
-			$Messages->add( T_('Your user settings have been updated.'), 'success' );
-		}
-
-		header_redirect( regenerate_url( '', '', '', '&' ) );
-		// $action = 'list';
-		break;
+	// We are probably comming from 'createnew' but there is no guarantee!
+	// Check permission
+	$current_User->check_perm( 'files', 'add', true );
+
+	if( ! $Settings->get( 'fm_enable_create_file' ) )
+	{
+		// File creation is gloablly disabled
+		$Messages->add( T_('File creation is disabled.'), 'error' );
+		break;
+	}
+
+	if( ! param( 'create_name', 'string', '' ) )
+	{
+		// No name was supplied
+		$Messages->add( T_('Cannot create a file without name.'), 'error' );
+		break;
+	}
+
+	if( $error_filename = validate_filename( $create_name, $current_User->check_perm( 'files', 'all' ) ) )
+	{
+		// Not valid filename or extension
+		$Messages->add( $error_filename, 'error' );
+		break;
+	}
+
+	// Try to get File object
+	$FileCache = & get_Cache( 'FileCache' );
+	$newFile = & $FileCache->get_by_root_and_path( $fm_FileRoot->type, $fm_FileRoot->in_type_ID, $path.$create_name );
+
+	if( $newFile->exists() )
+	{
+		$Messages->add( sprintf( T_('The file &laquo;%s&raquo; already exists.'), $create_name ), 'error' );
+		break;
+	}
+
+	if( ! $newFile->create( $create_type ) )
+	{
+		$Messages->add( sprintf( T_('Could not create file &laquo;%s&raquo; in &laquo;%s&raquo;.'), $create_name, $fm_Filelist->_rds_list_path ), 'error' );
+	}
+
+	$Messages->add( sprintf( T_('The file &laquo;%s&raquo; has been created.'), $create_name ), 'success' );
+
+	header_redirect( regenerate_url( '', '', '', '&' ) );
+	// $action = 'list';
+	break;
+
+	case 'update_settings':
+	// Update settings NOW since they may affect the FileList
+	$UserSettings->set( 'fm_dirsnotattop', 1-param( 'option_dirsattop', 'integer', 0 ) );
+	$UserSettings->set( 'fm_permlikelsl', param( 'option_permlikelsl', 'integer', 0 ) );
+	$UserSettings->set( 'fm_imglistpreview', param( 'option_imglistpreview', 'integer', 0 ) );
+	$UserSettings->set( 'fm_getimagesizes', param( 'option_getimagesizes', 'integer', 0 ) );
+	$UserSettings->set( 'fm_showtypes', param( 'option_showtypes', 'integer', 0 ) );
+	$UserSettings->set( 'fm_showdate', param( 'option_showdate', 'string', 'compact' ) );
+	$UserSettings->set( 'fm_showfsperms', param( 'option_showfsperms', 'integer', 0 ) );
+	$UserSettings->set( 'fm_showfsowner', param( 'option_showfsowner', 'integer', 0 ) );
+	$UserSettings->set( 'fm_showfsgroup', param( 'option_showfsgroup', 'integer', 0 ) );
+	$UserSettings->set( 'fm_showhidden', param( 'option_showhidden', 'integer', 0 ) );
+	$UserSettings->set( 'fm_recursivedirsize', param( 'option_recursivedirsize', 'integer', 0 ) );
+	$UserSettings->set( 'fm_allowfiltering', param( 'option_allowfiltering', 'string', 'simple' ) );
+
+	if( $UserSettings->dbupdate() )
+	{
+		$Messages->add( T_('Your user settings have been updated.'), 'success' );
+	}
+
+	header_redirect( regenerate_url( '', '', '', '&' ) );
+	// $action = 'list';
+	break;
 
 	case 'update_file':
-		// Update File:
-
-		if( $demo_mode )
-		{
-			$Messages->add( 'Sorry, you cannot update files in demo mode!', 'error' );
-			break;
-		}
-
-		// Check permission!
- 		$current_User->check_perm( 'files', 'edit', true );
-
- 		// Get the file we want to update:
-		$edited_File = & $selected_Filelist->get_by_idx(0);
-
-		// Check that the file is editable:
-		if( ! $edited_File->is_editable( $current_User->check_perm( 'files', 'all' ) ) )
-		{
-			$Messages->add( sprintf( T_( 'You are not allowed to edit &laquo;%s&raquo;.' ), $edited_File->dget('name') ), 'error' );
-			break;
-		}
-
-		param( 'file_content', 'html', '', false );
-
-
-    $full_path = $edited_File->get_full_path();
-		if( $rsc_handle = fopen( $full_path, 'w+') )
-		{
-			fwrite( $rsc_handle, $file_content );
-			fclose( $rsc_handle );
-			$Messages->add( sprintf( T_( 'The file &laquo;%s&raquo; has been updated.' ), $edited_File->dget('name') ), 'success' );
-		}
-		else
-		{
-			$Messages->add( sprintf( T_( 'The file &laquo;%s&raquo; could not be updated.' ), $edited_File->dget('name') ), 'error' );
-		}
-
-		header_redirect( regenerate_url( '', '', '', '&' ) );
-		// $action = 'list';
-		break;
+	// Update File
+
+	if( $demo_mode )
+	{
+		$Messages->add( 'Sorry, you cannot update files in demo mode!', 'error' );
+		break;
+	}
+
+	// Check permission!
+	$current_User->check_perm( 'files', 'edit', true );
+
+	// Get the file we want to update
+	$edited_File = & $selected_Filelist->get_by_idx(0);
+
+	// Check that the file is editable
+	if( ! $edited_File->is_editable( $current_User->check_perm( 'files', 'all' ) ) )
+	{
+		$Messages->add( sprintf( T_( 'You are not allowed to edit &laquo;%s&raquo;.' ), $edited_File->dget( 'name' ) ), 'error' );
+		break;
+	}
+
+	param( 'file_content', 'html', '', false );
+
+	$full_path = $edited_File->get_full_path();
+	if( $rsc_handle = fopen( $full_path, 'w+') )
+	{
+		fwrite( $rsc_handle, $file_content );
+		fclose( $rsc_handle );
+		$Messages->add( sprintf( T_( 'The file &laquo;%s&raquo; has been updated.' ), $edited_File->dget( 'name' ) ), 'success' );
+	}
+	else
+	{
+		$Messages->add( sprintf( T_( 'The file &laquo;%s&raquo; could not be updated.' ), $edited_File->dget( 'name' ) ), 'error' );
+	}
+
+	header_redirect( regenerate_url( '', '', '', '&' ) );
+	// $action = 'list';
+	break;
 }
 
 // Do we want to display the directory tree next to the files table
@@ -506,7 +483,6 @@
 
 // Filelist
 $fm_Filelist = new Filelist( $fm_FileRoot, $ads_list_path );
-$Debuglog->add( 'FM _rds_list_path: '.var_export( $fm_Filelist->_rds_list_path, true ), 'files' );
 
 param( 'fm_filter', '', NULL, true );
 param( 'fm_filter_regex', 'integer', 0, true );
@@ -517,7 +493,7 @@
 	$fm_Filelist->_dirs_not_at_top = true;
 }
 
-if( $UserSettings->param_Request( 'fm_recursivedirsize', 'fm_recursivedirsize', 'integer', 0 ) ) // TODO: check for permission? (Server load)
+if( $UserSettings->param_Request( 'fm_recursivedirsize', 'fm_recursivedirsize', 'integer', 0 ) ) // @todo (0000): check for permission? (Server load)
 {
 	$fm_Filelist->_use_recursive_dirsize = true;
 }
@@ -548,938 +524,936 @@
 switch( $action )
 {
 	case 'download':
-		// TODO: We don't need the Filelist, move UP!
-		// TODO: provide optional zip formats (tgz, ..) - the used lib provides more..
-		// TODO: use "inmemory"=>false, so that you can download bigger archives faster!
-
-		$action_title = T_('Download');
-
-		if( !$selected_Filelist->count() )
-		{
-			$Messages->add( T_('Nothing selected.'), 'error' );
-			$action = 'list';
-			break;
-		}
-
-		param( 'zipname', 'string', '' );
-		param( 'exclude_sd', 'integer', 0 );
-
-		if( empty($zipname) )
-		{
-			if( param( 'action_invoked', 'integer', 0 ) )
-			{ // Action was invoked, add "hint"
-				param_error( 'zipname', T_('Please provide the name of the archive.') );
-			}
-			if( $selected_Filelist->count() == 1 )
-			{
-				$only_File = $selected_Filelist->get_array();
-				$only_File = $only_File[0];
-
-				// TODO: once we support additional formats, use the default extension here:
-				$zipname = $only_File->get_name().'.zip';
-			}
-			break;
-		}
-
-		// Downloading
-		load_class('_ext/_zip_archives.php');
-
-		$arraylist = $selected_Filelist->get_array( 'get_rdfs_rel_path' );
-
-		$options = array (
-			'basedir' => $fm_Filelist->get_ads_list_path(),
-			'inmemory' => 1,
-			'recurse' => (1 - $exclude_sd),
-		);
-
-		$zipfile = new zip_file( $zipname );
-		$zipfile->set_options( $options );
-		$zipfile->add_files( $arraylist );
-		$zipfile->create_archive();
-
-		if( $zipfile->error )
-		{
-			foreach($zipfile->error as $v)
-			{
-				$Messages->add( $v, 'error' );
-			}
-			break;
-		}
-
-		$zipfile->download_file();
-		exit(0);
-		/* EXITED! */
+	// @todo (0000): provide optional zip formats (tgz, ..) - the used lib provides more
+	// @todo (0000): use "inmemory"=>false, so that you can download bigger archives faster!
+
+	$action_title = T_('Download');
+
+	if( !$selected_Filelist->count() )
+	{
+		$Messages->add( T_('Nothing selected.'), 'error' );
+		$action = 'list';
+		break;
+	}
+
+	param( 'zipname', 'string', '' );
+	param( 'exclude_sd', 'integer', 0 );
+
+	if( empty( $zipname ) )
+	{
+		if( param( 'action_invoked', 'integer', 0 ) )
+		{
+			// Action was invoked, add "hint"
+			param_error( 'zipname', T_('Please provide the name of the archive.') );
+		}
+		if( $selected_Filelist->count() == 1 )
+		{
+			$only_File = $selected_Filelist->get_array();
+			$only_File = $only_File[0];
+
+			// @todo (0000): once we support additional formats, use the default extension here
+			$zipname = $only_File->get_name().'.zip';
+		}
+		break;
+	}
+
+	// Downloading
+	$arraylist = $selected_Filelist->get_array( 'get_rdfs_rel_path' );
+
+	$options = array(
+		'basedir' => $fm_Filelist->get_ads_list_path(),
+		'inmemory' => 1,
+		'recurse' => (1 - $exclude_sd),
+	);
+
+	$zipfile = new zip_file( $zipname );
+	$zipfile->set_options( $options );
+	$zipfile->add_files( $arraylist );
+	$zipfile->create_archive();
+
+	if( $zipfile->error )
+	{
+		foreach( $zipfile->error as $v )
+		{
+			$Messages->add( $v, 'error' );
+		}
+		break;
+	}
+
+	$zipfile->download_file();
+	exit(0);
+	/* EXITED! */
 
 
 	case 'rename':
-		// TODO: We don't need the Filelist, move UP!
-		// Rename a file:
-
-		// This will not allow to overwrite existing files, the same way Windows and MacOS do not allow it. Adding an option will only clutter the interface and satisfy geeks only.
-		if( ! $current_User->check_perm( 'files', 'edit' ) )
-		{ // We do not have permission to edit files
-			$Messages->add( T_('You have no permission to edit/modify files.'), 'error' );
-			$action = 'list';
-			break;
-		}
-
-		$allow_locked_filetypes = $current_User->check_perm( 'files', 'all' );
-
-		if( ! $selected_Filelist->count() )
-		{ // There is nothing to rename
-			$Messages->add( T_('Nothing selected.'), 'error' );
-			$action = 'list';
-			break;
-		}
-
-		param( 'confirmed', 'integer', 0 );
-		param( 'new_names', 'array', array() );
-
-		// Check params for each file to rename:
+	// Rename a file
+
+	// This will not allow to overwrite existing files, the same way Windows and MacOS
+	// do not allow it. Adding an option will only clutter the interface and satisfy geeks only.
+	if( ! $current_User->check_perm( 'files', 'edit' ) )
+	{
+		// We do not have permission to edit files
+		$Messages->add( T_('You have no permission to edit/modify files.'), 'error' );
+		$action = 'list';
+		break;
+	}
+
+	$allow_locked_filetypes = $current_User->check_perm( 'files', 'all' );
+
+	if( ! $selected_Filelist->count() )
+	{
+		// There is nothing to rename
+		$Messages->add( T_('Nothing selected.'), 'error' );
+		$action = 'list';
+		break;
+	}
+
+	param( 'confirmed', 'integer', 0 );
+	param( 'new_names', 'array', array() );
+
+	// Check params for each file to rename
+	while( $loop_src_File = & $selected_Filelist->get_next() )
+	{
+		if( ! isset( $new_names[$loop_src_File->get_md5_ID()] ) )
+		{
+			// We have not yet provided a name to rename to...
+			$confirmed = 0;
+			$new_names[$loop_src_File->get_md5_ID()] = $loop_src_File->get_name();
+			continue;
+		}
+
+		// Check if provided name is okay
+		$new_names[$loop_src_File->get_md5_ID()] = trim( strip_tags( $new_names[$loop_src_File->get_md5_ID()] ) );
+
+		if( !$loop_src_File->is_dir() )
+		{
+			if( $error_filename = validate_filename( $new_names[$loop_src_File->get_md5_ID()], $allow_locked_filetypes ) )
+			{
+				// Not a file name or not an allowed extension
+				$confirmed = 0;
+				param_error( 'new_names['.$loop_src_File->get_md5_ID().']', $error_filename );
+				continue;
+			}
+		}
+		elseif( $error_dirname = validate_dirname( $new_names[$loop_src_File->get_md5_ID()] ) )
+		{
+			// directory name
+			$confirmed = 0;
+			param_error( 'new_names['.$loop_src_File->get_md5_ID().']', $error_dirname );
+			continue;
+		}
+	}
+
+	if( $confirmed )
+	{
+		// Rename is confirmed, let's proceed
+		$selected_Filelist->restart();
 		while( $loop_src_File = & $selected_Filelist->get_next() )
 		{
-			if( ! isset( $new_names[$loop_src_File->get_md5_ID()] ) )
-			{ // We have not yet provided a name to rename to...
-				$confirmed = 0;
-				$new_names[$loop_src_File->get_md5_ID()] = $loop_src_File->get_name();
-				continue;
-			}
-
-			// Check if provided name is okay:
-			$new_names[$loop_src_File->get_md5_ID()] = trim(strip_tags($new_names[$loop_src_File->get_md5_ID()]));
-
-			if( !$loop_src_File->is_dir() )
-			{
-				if( $error_filename = validate_filename( $new_names[$loop_src_File->get_md5_ID()], $allow_locked_filetypes ) )
-				{ // Not a file name or not an allowed extension
-					$confirmed = 0;
-					param_error( 'new_names['.$loop_src_File->get_md5_ID().']', $error_filename );
-					continue;
-				}
-			}
-			elseif( $error_dirname = validate_dirname( $new_names[$loop_src_File->get_md5_ID()] ) )
-			{ // directory name
-				$confirmed = 0;
-				param_error( 'new_names['.$loop_src_File->get_md5_ID().']', $error_dirname );
-				continue;
-			}
-		}
-
-		if( $confirmed )
-		{ // Rename is confirmed, let's proceed:
-			$selected_Filelist->restart();
-			while( $loop_src_File = & $selected_Filelist->get_next() )
-			{
-				$old_name = $loop_src_File->get_name();
-				$new_name = $new_names[$loop_src_File->get_md5_ID()];
-
-				if( $new_name == $old_name )
-				{ // Name has not changed...
-					$Messages->add( sprintf( T_('&laquo;%s&raquo; has not been renamed'), $old_name ), 'note' );
-					continue;
-				}
-				// Perform rename:
-				if( ! $loop_src_File->rename_to( $new_name ) )
-				{
-					$Messages->add( sprintf( T_('&laquo;%s&raquo; could not be renamed to &laquo;%s&raquo;'),
-						$old_name, $new_name ), 'error' );
-					continue;
-				}
-
-				// We have moved in same dir, update caches:
-				$fm_Filelist->update_caches();
-
-				if( $fm_Filelist->contains( $loop_src_File ) === false )
-				{ // File not in filelist (expected if not same dir)
-					$fm_Filelist->add( $File );
-				}
-
-
-				$Messages->add( sprintf( T_('&laquo;%s&raquo; has been successfully renamed to &laquo;%s&raquo;'),
-						$old_name, $new_name ), 'success' );
-			}
-
-			// REDIRECT / EXIT
- 			header_redirect( regenerate_url( '', '', '', '&' ) );
- 		  // $action = 'list';
-		}
-		break;
-
+			$old_name = $loop_src_File->get_name();
+			$new_name = $new_names[$loop_src_File->get_md5_ID()];
+
+			if( $new_name == $old_name )
+			{
+				// Name has not changed...
+				$Messages->add( sprintf( T_('&laquo;%s&raquo; has not been renamed'), $old_name ), 'note' );
+				continue;
+			}
+			// Perform rename
+			if( ! $loop_src_File->rename_to( $new_name ) )
+			{
+				$Messages->add( sprintf( T_('&laquo;%s&raquo; could not be renamed to &laquo;%s&raquo;'),
+					$old_name, $new_name ), 'error' );
+				continue;
+			}
+
+			// We have moved in same dir, update caches
+			$fm_Filelist->update_caches();
+
+			if( $fm_Filelist->contains( $loop_src_File ) === false )
+			{
+				// File not in filelist (expected if not same dir)
+				$fm_Filelist->add( $File );
+			}
+
+			$Messages->add( sprintf( T_('&laquo;%s&raquo; has been successfully renamed to &laquo;%s&raquo;'),
+					$old_name, $new_name ), 'success' );
+		}
+
+		// REDIRECT / EXIT
+		header_redirect( regenerate_url( '', '', '', '&' ) );
+		// $action = 'list';
+	}
+	break;
 
 	case 'delete':
-		// TODO: We don't need the Filelist, move UP!
-		// Delete a file or directory:
-
-		if( ! $current_User->check_perm( 'files', 'edit' ) )
-		{ // We do not have permission to edit files
-			$Messages->add( T_('You have no permission to edit/modify files.'), 'error' );
-			$action = 'list';
-			break;
+	// Delete a file or directory
+
+	if( ! $current_User->check_perm( 'files', 'edit' ) )
+	{
+		// We do not have permission to edit files
+		$Messages->add( T_('You have no permission to edit/modify files.'), 'error' );
+		$action = 'list';
+		break;
+	}
+
+	if( ! $selected_Filelist->count() )
+	{
+		$Messages->add( T_('Nothing selected.'), 'error' );
+		$action = 'list';
+		break;
+	}
+
+	param( 'confirmed', 'integer', 0 );
+	// fplanque>> We cannot actually offer to delete subdirs since we cannot pre-check DB
+
+	$selected_Filelist->restart();
+	if( $confirmed )
+	{
+		// Unlink files
+		while( $l_File = & $selected_Filelist->get_next() )
+		{
+			if( $l_File->unlink() )
+			{
+				$Messages->add( sprintf( ( $l_File->is_dir() ? T_('The directory &laquo;%s&raquo; has been deleted.')
+					: T_('The file &laquo;%s&raquo; has been deleted.') ), $l_File->dget( 'name' ) ), 'success' );
+				$fm_Filelist->remove( $l_File );
+			}
+			else
+			{
+				$Messages->add( sprintf( ( $l_File->is_dir() ? T_('Could not delete the directory &laquo;%s&raquo; (not empty?).')
+					: T_('Could not delete the file &laquo;%s&raquo;.') ), $l_File->dget( 'name' ) ), 'error' );
+			}
+		}
+		$action = 'list';
+	}
+	else
+	{
+		// make sure we have loaded metas for all files in selection!
+		$selected_Filelist->load_meta();
+
+		// Check if there are delete restrictions on the files
+		while( $l_File = & $selected_Filelist->get_next() )
+		{
+			// Check if there are delete restrictions on this file.
+			// We use a callback here to display the post titles.
+			$l_File->check_relations( 'delete_restrictions', array(),
+				array( 'link_file_ID' => array( 'cb' => array( $l_File, 'cb_delete_restrictions_detail' ), ),
+			) );
+
+			if( $Messages->count('restrict') )
+			{
+				// There are restrictions
+				$Messages->add( sprintf( T_('%s cannot be deleted because of the following relations:'),
+					$l_File->get_prefixed_name() ).
+					$Messages->display( NULL, NULL, false, 'restrict', '', 'ul', false ) );
+				$Messages->clear( 'restrict' );
+
+				// remove it from the list of selected files (that will be offered to delete)
+				$selected_Filelist->remove( $l_File );
+			}
 		}
 
 		if( ! $selected_Filelist->count() )
 		{
-			$Messages->add( T_('Nothing selected.'), 'error' );
-			$action = 'list';
-			break;
-		}
-
-		param( 'confirmed', 'integer', 0 );
-		// fplanque>> We cannot actually offer to delete subdirs since we cannot pre-check DB
-
-		$selected_Filelist->restart();
-		if( $confirmed )
-		{ // Unlink files:
-			while( $l_File = & $selected_Filelist->get_next() )
-			{
-				if( $l_File->unlink() )
-				{
-					$Messages->add( sprintf( ( $l_File->is_dir() ? T_('The directory &laquo;%s&raquo; has been deleted.')
-									: T_('The file &laquo;%s&raquo; has been deleted.') ), $l_File->dget('name') ), 'success' );
-					$fm_Filelist->remove( $l_File );
-				}
-				else
-				{
-					$Messages->add( sprintf( ( $l_File->is_dir() ? T_('Could not delete the directory &laquo;%s&raquo; (not empty?).')
-									: T_('Could not delete the file &laquo;%s&raquo;.') ), $l_File->dget('name') ), 'error' );
-				}
-			}
-			$action = 'list';
-		}
-		else
-		{
-			// make sure we have loaded metas for all files in selection!
-			$selected_Filelist->load_meta();
-
-			// Check if there are delete restrictions on the files:
-			while( $l_File = & $selected_Filelist->get_next() )
-			{
-				// Check if there are delete restrictions on this file.
-				// We use a callback here to display the post titles.
-				$l_File->check_relations( 'delete_restrictions', array(), array(
-					'link_file_ID' => array(
-						'cb' => array( $l_File, 'cb_delete_restrictions_detail' ),
-					),
-				) );
-
-				if( $Messages->count('restrict') )
-				{ // There are restrictions:
-					$Messages->add( sprintf( T_('%s cannot be deleted because of the following relations:'),
-							$l_File->get_prefixed_name() ).
-						$Messages->display( NULL, NULL, false, 'restrict', '', 'ul', false ) );
-					$Messages->clear( 'restrict' );
-
-					// remove it from the list of selected files (that will be offered to delete):
-					$selected_Filelist->remove( $l_File );
-				}
-			}
-
-			if( ! $selected_Filelist->count() )
-			{ // no files left in list, cancel action
-				$action = 'list';
-			}
-		}
-		break;
-
+			// no files left in list, cancel action
+			$action = 'list';
+		}
+	}
+	break;
 
 	case 'make_post':
 	case 'make_posts':
-		// TODO: We don't need the Filelist, move UP!
-		// Make posts with selected images:
-
-		if( ! $selected_Filelist->count() )
-		{
-			$Messages->add( T_('Nothing selected.'), 'error' );
-			$action = 'list';
-			break;
-		}
-
-		// fp> TODO: this block should move to a general level
-		// Try to go to the right blog:
-		if( $fm_Filelist->get_root_type() == 'collection' )
-		{
-			set_working_blog( $fm_Filelist->get_root_ID() );
-      // Load the blog we're in:
-			$Blog = & $BlogCache->get_by_ID( $blog );
-		}
-		// ---
-
-
-		if( empty( $Blog ) )
-		{
-			$Messages->add( T_('No destination blog is selected.'), 'error' );
-			break;
-		}
-		//$Blog->disp('name');
-
-		// Get default status (includes PERM CHECK):
-		$item_status = $Blog->get_allowed_item_status();
-		if( empty($item_status) )
-		{
-			$Messages->add( T_('Sorry, you have no permission to post into this blog.'), 'error' );
-			break;
-		}
-
-		// make sure we have loaded metas for all files in selection!
-		$selected_Filelist->load_meta();
-
-		// Ready to create post(s):
-		load_class('items/model/_item.class.php');
-
-		switch( $action )
-		{
-			case 'make_post':
-				// SINGLE POST:
-				// Create a post:
-				$edited_Item = new Item();
-				$edited_Item->set( 'status', $item_status );
-				$edited_Item->set( 'main_cat_ID', $Blog->get_default_cat_ID() );
-
-				$l_File = & $selected_Filelist->get_next();
-
-				$title = $l_File->get('title');
-				if( empty($title) )
-				{
-					$title = $l_File->get('name');
-				}
-				$edited_Item->set( 'title', $title );
-
-				$DB->begin();
-
-				// INSERT NEW POST INTO DB:
-				$edited_Item->dbinsert();
-
-				do
-				{	// LOOP Through images:
-					if( ! $l_File->is_image() )
-					{
-						$Messages->add( sprintf( T_('Cannot post &laquo;%s&raquo; because it is not an image.'), $l_File->dget('name') ), 'error' );
-						continue;
-					}
-
-					if(	$l_File->meta == 'notfound' )
-					{	// That file has no meta data yet, create it now!
-						$l_File->dbsave();
-					}
-
-					// Let's make the link!
-					$edited_Link = new Link();
-					$edited_Link->set( 'itm_ID', $edited_Item->ID );
-					$edited_Link->set( 'file_ID', $l_File->ID );
-					$edited_Link->dbinsert();
-
-					$Messages->add( sprintf( T_('&laquo;%s&raquo; has been attached.'), $l_File->dget('name') ), 'success' );
-
-				} while( $l_File = & $selected_Filelist->get_next() );
-
-				$DB->commit();
-
-				header_redirect( $dispatcher.'?ctrl=items&action=edit&p='.$edited_Item->ID );	// Will save $Messages
-				break;
-
-			case 'make_posts':
-				// MULTIPLE POST (1 per image):
-				while( $l_File = & $selected_Filelist->get_next() )
-				{
-					if( ! $l_File->is_image() )
-					{
-						$Messages->add( sprintf( T_('Cannot post &laquo;%s&raquo; because it is not an image.'), $l_File->dget('name') ), 'error' );
-						continue;
-					}
-
-					// Create a post:
-					$edited_Item = new Item();
-					$edited_Item->set( 'status', $item_status );
-					$edited_Item->set( 'main_cat_ID', $Blog->get_default_cat_ID() );
-
-					$title = $l_File->get('title');
-					if( empty($title) )
-					{
-						$title = $l_File->get('name');
-					}
-					$edited_Item->set( 'title', $title );
-
-					$DB->begin();
-
-					// INSERT NEW POST INTO DB:
-					$edited_Item->dbinsert();
-
-					if(	$l_File->meta == 'notfound' )
-					{	// That file has no meta data yet, create it now!
-						$l_File->dbsave();
-					}
-
-					// Let's make the link!
-					$edited_Link = new Link();
-					$edited_Link->set( 'itm_ID', $edited_Item->ID );
-					$edited_Link->set( 'file_ID', $l_File->ID );
-					$edited_Link->dbinsert();
-
-					$DB->commit();
-
-					$Messages->add( sprintf( T_('&laquo;%s&raquo; has been posted.'), $l_File->dget('name') ), 'success' );
-				}
-
-				// Note: we redirect without restoring filter. This should allow to see the new files.
-				// &filter=restore
-				header_redirect( $dispatcher.'?ctrl=items&blog='.$blog );	// Will save $Messages
-
-				break;
-		}
-
-		// Note: we should have EXITED here. In case we don't (error, or sth...)
-
-		// Reset stuff so it doesn't interfere with upcomming display
-		unset( $edited_Item );
-		unset( $edited_Link );
-		$selected_Filelist = new Filelist( $fm_Filelist->get_FileRoot(), false );
-		break;
-
-
+	// Make posts with selected images
+	if( ! $selected_Filelist->count() )
+	{
+		$Messages->add( T_('Nothing selected.'), 'error' );
+		$action = 'list';
+		break;
+	}
+
+	// fp> TODO: this block should move to a general level
+	// Try to go to the right blog:
+	if( $fm_Filelist->get_root_type() == 'collection' )
+	{
+		set_working_blog( $fm_Filelist->get_root_ID() );
+		// Load the blog we're in
+		$Blog = & $BlogCache->get_by_ID( $blog );
+	}
+
+	// ---
+	if( empty( $Blog ) )
+	{
+		$Messages->add( T_('No destination blog is selected.'), 'error' );
+		break;
+	}
+	// $Blog->disp('name');
+
+	// Get default status (includes PERM CHECK)
+	$item_status = $Blog->get_allowed_item_status();
+	if( empty( $item_status ) )
+	{
+		$Messages->add( T_('Sorry, you have no permission to post into this blog.'), 'error' );
+		break;
+	}
+
+	// make sure we have loaded metas for all files in selection!
+	$selected_Filelist->load_meta();
+
+	// Ready to create post(s)
+	switch( $action )
+	{
+		// SINGLE POST
+		case 'make_post':
+		// Create a post
+		$edited_Item = new Item();
+		$edited_Item->set( 'status', $item_status );
+		$edited_Item->set( 'main_cat_ID', $Blog->get_default_cat_ID() );
+
+		$l_File = & $selected_Filelist->get_next();
+
+		$title = $l_File->get( 'title' );
+		if( empty( $title ) )
+		{
+			$title = $l_File->get( 'name' );
+		}
+		$edited_Item->set( 'title', $title );
+
+		$DB->begin();
+
+		// INSERT NEW POST INTO DB
+		$edited_Item->dbinsert();
+
+		do
+		{
+			// LOOP Through images
+			if( ! $l_File->is_image() )
+			{
+				$Messages->add( sprintf( T_('Cannot post &laquo;%s&raquo; because it is not an image.'), $l_File->dget( 'name' ) ), 'error' );
+				continue;
+			}
+
+			if( $l_File->meta == 'notfound' )
+			{
+				// That file has no meta data yet, create it now!
+				$l_File->dbsave();
+			}
+
+			// Let's make the link!
+			$edited_Link = new Link();
+			$edited_Link->set( 'itm_ID', $edited_Item->ID );
+			$edited_Link->set( 'file_ID', $l_File->ID );
+			$edited_Link->dbinsert();
+
+			$Messages->add( sprintf( T_('&laquo;%s&raquo; has been attached.'), $l_File->dget( 'name' ) ), 'success' );
+
+		} while( $l_File = & $selected_Filelist->get_next() );
+
+		$DB->commit();
+
+		header_redirect( $dispatcher.'?ctrl=items&action=edit&p='.$edited_Item->ID ); // Will save $Messages
+		break;
+
+		case 'make_posts':
+		// MULTIPLE POST (1 per image)
+		while( $l_File = & $selected_Filelist->get_next() )
+		{
+			if( ! $l_File->is_image() )
+			{
+				$Messages->add( sprintf( T_('Cannot post &laquo;%s&raquo; because it is not an image.'), $l_File->dget( 'name' ) ), 'error' );
+				continue;
+			}
+
+			// Create a post
+			$edited_Item = new Item();
+			$edited_Item->set( 'status', $item_status );
+			$edited_Item->set( 'main_cat_ID', $Blog->get_default_cat_ID() );
+
+			$title = $l_File->get( 'title' );
+			if( empty( $title ) )
+			{
+				$title = $l_File->get( 'name' );
+			}
+			$edited_Item->set( 'title', $title );
+
+			$DB->begin();
+
+			// INSERT NEW POST INTO DB
+			$edited_Item->dbinsert();
+
+			if( $l_File->meta == 'notfound' )
+			{
+				// That file has no meta data yet, create it now!
+				$l_File->dbsave();
+			}
+
+			// Let's make the link!
+			$edited_Link = new Link();
+			$edited_Link->set( 'itm_ID', $edited_Item->ID );
+			$edited_Link->set( 'file_ID', $l_File->ID );
+			$edited_Link->dbinsert();
+
+			$DB->commit();
+
+			$Messages->add( sprintf( T_('&laquo;%s&raquo; has been posted.'), $l_File->dget( 'name' ) ), 'success' );
+		}
+
+		// Note: we redirect without restoring filter. This should allow to see the new files.
+		// &filter=restore
+		header_redirect( $dispatcher.'?ctrl=items&blog='.$blog ); // Will save $Messages
+
+		break;
+	}
+
+	// Note: we should have EXITED here. In case we don't (error, or sth...)
+	// Reset stuff so it doesn't interfere with upcomming display
+	unset( $edited_Item );
+	unset( $edited_Link );
+	$selected_Filelist = new Filelist( $fm_Filelist->get_FileRoot(), false );
+	break;
+
+	// Edit Text File
 	case 'edit_file':
-		// TODO: We don't need the Filelist, move UP!
-		// Edit Text File
-
-		// Check permission!
- 		$current_User->check_perm( 'files', 'edit', true );
-
- 		// Get the file we want to edit:
-		$edited_File = & $selected_Filelist->get_by_idx(0);
-
-		// Check that the file is editable:
-		if( ! $edited_File->is_editable( $current_User->check_perm( 'files', 'all' ) ) )
-		{
-			$Messages->add( sprintf( T_( 'You are not allowed to edit &laquo;%s&raquo;.' ), $edited_File->dget('name') ), 'error' );
-	 		// Leave special display mode:
-			$action = 'list';
-			break;
-		}
-
-		$full_path = $edited_File->get_full_path();
-		if( $size = filesize($full_path) )
-		{
-			$rsc_handle = fopen( $full_path, 'r');
-			$edited_File->content = fread( $rsc_handle, $size );
-			fclose( $rsc_handle );
-		}
-		else
-		{	// Empty file
-			$edited_File->content = '';
-		}
+
+	// Check permission!
+	$current_User->check_perm( 'files', 'edit', true );
+
+	// Get the file we want to edit
+	$edited_File = & $selected_Filelist->get_by_idx(0);
+
+	// Check that the file is editable
+	if( ! $edited_File->is_editable( $current_User->check_perm( 'files', 'all' ) ) )
+	{
+		$Messages->add( sprintf( T_( 'You are not allowed to edit &laquo;%s&raquo;.' ), $edited_File->dget( 'name' ) ), 'error' );
+		// Leave special display mode
+		$action = 'list';
 		break;
-
-
+	}
+
+	$full_path = $edited_File->get_full_path();
+	if( $size = filesize( $full_path ) )
+	{
+		$rsc_handle = fopen( $full_path, 'r');
+		$edited_File->content = fread( $rsc_handle, $size );
+		fclose( $rsc_handle );
+	}
+	else
+	{
+		// Empty file
+		$edited_File->content = '';
+	}
+	break;
+
+	// Edit File properties (Meta Data)
 	case 'edit_properties':
-		// TODO: We don't need the Filelist, move UP!
-		// Edit File properties (Meta Data)
-
-		// Check permission!
- 		$current_User->check_perm( 'files', 'edit', true );
-
-		$edited_File = & $selected_Filelist->get_by_idx(0);
-		$edited_File->load_meta();
-		break;
-
-
+	// Check permission!
+	$current_User->check_perm( 'files', 'edit', true );
+
+	$edited_File = & $selected_Filelist->get_by_idx(0);
+	$edited_File->load_meta();
+	break;
+
+	// Update File properties (Meta Data); on success this ends the file_properties mode
 	case 'update_properties':
-		// TODO: We don't need the Filelist, move UP!
-		// Update File properties (Meta Data); on success this ends the file_properties mode:
-
-		// Check permission!
- 		$current_User->check_perm( 'files', 'edit', true );
-
-		$edited_File = & $selected_Filelist->get_by_idx(0);
-		// Load meta data:
-		$edited_File->load_meta();
-
-		$edited_File->set( 'title', param( 'title', 'string', '' ) );
-		$edited_File->set( 'alt', param( 'alt', 'string', '' ) );
-		$edited_File->set( 'desc', param( 'desc', 'string', '' ) );
-
-		// Store File object into DB:
-		if( $edited_File->dbsave() )
-		{
-			$Messages->add( sprintf( T_( 'File properties for &laquo;%s&raquo; have been updated.' ), $edited_File->dget('name') ), 'success' );
-		}
-		else
-		{
-			$Messages->add( sprintf( T_( 'File properties for &laquo;%s&raquo; have not changed.' ), $edited_File->dget('name') ), 'note' );
-		}
-		break;
+	// Check permission!
+	$current_User->check_perm( 'files', 'edit', true );
+
+	$edited_File = & $selected_Filelist->get_by_idx(0);
+	// Load meta data
+	$edited_File->load_meta();
+
+	$edited_File->set( 'title', param( 'title', 'string', '' ) );
+	$edited_File->set( 'alt', param( 'alt', 'string', '' ) );
+	$edited_File->set( 'desc', param( 'desc', 'string', '' ) );
+
+	// Store File object into DB
+	if( $edited_File->dbsave() )
+	{
+		$Messages->add( sprintf( T_( 'File properties for &laquo;%s&raquo; have been updated.' ), $edited_File->dget( 'name' ) ), 'success' );
+	}
+	else
+	{
+		$Messages->add( sprintf( T_( 'File properties for &laquo;%s&raquo; have not changed.' ), $edited_File->dget( 'name' ) ), 'note' );
+	}
+	break;
 
 
 	case 'link_user':
-		// TODO: We don't need the Filelist, move UP!
-		// Link File to User:
-		if( ! isset($edited_User) )
- 		{	// No User to link to
-			$fm_mode = NULL;	// not really needed but just  n case...
-			break;
-		}
-
-		// Permission HAS been checked on top of controller!
-
- 		// Get the file we want to link:
-		if( !$selected_Filelist->count() )
-		{
-			$Messages->add( T_('Nothing selected.'), 'error' );
-			break;
-		}
-		$edited_File = & $selected_Filelist->get_by_idx(0);
-
-		// Load meta data AND MAKE SURE IT IS CREATED IN DB:
-		$edited_File->load_meta( true );
-
-		// REDIRECT / EXIT
-		header_redirect( $admin_url.'?ctrl=users&user_ID='.$edited_User->ID );
-		break;
-
+	// Link File (Avatar) to User
+	if( ! isset( $edited_User ) )
+	{
+		// No User to link to
+		$fm_mode = NULL; // not really needed but just in case...
+		break;
+	}
+
+	// Permission HAS been checked on top of controller!
+
+	// Get the file we want to link
+	if( ! $selected_Filelist->count() )
+	{
+		$Messages->add( T_('Nothing selected.'), 'error' );
+		break;
+	}
+	$edited_File = & $selected_Filelist->get_by_idx( 0 );
+
+	// Load meta data AND MAKE SURE IT IS CREATED IN DB
+	$edited_File->load_meta( true );
+
+	// "Extended Identity" section - (avatar selection)
+	$edited_User->set( 'avatar_ID', $edited_File->ID );
+ 	$edited_User->dbupdate();
+	$Messages->add( T_('User avatar modified.'), 'success' );
+
+	// REDIRECT / EXIT
+	header_redirect( $admin_url.'?ctrl=users&user_ID='.$edited_User->ID );
+	break;
 
 	case 'link':
-	case 'link_inpost':	// In the context of a post
-		// TODO: We don't need the Filelist, move UP!
-		// Link File to Item
-
-		// Note: we are not modifying any file here, we're just linking it
-		// we only need read perm on file, but we'll need write perm on destination object (to be checked below)
-
-		if( ! isset($edited_Item) )
- 		{	// No Item to link to - end link_item mode.
-			$fm_mode = NULL;
-			break;
-		}
-
-		// Check item EDIT permissions:
-		$current_User->check_perm( 'item_post!CURSTATUS', 'edit', true, $edited_Item );
-
- 		// Get the file we want to link:
-		if( !$selected_Filelist->count() )
-		{
-			$Messages->add( T_('Nothing selected.'), 'error' );
-			break;
-		}
-		$edited_File = & $selected_Filelist->get_by_idx(0);
-
-		$DB->begin();
-
-		// Load meta data AND MAKE SURE IT IS CREATED IN DB:
-		$edited_File->load_meta( true );
-
-		// Let's make the link!
-		$edited_Link = new Link();
-		$edited_Link->set( 'itm_ID', $edited_Item->ID );
-		$edited_Link->set( 'file_ID', $edited_File->ID );
-		$edited_Link->dbinsert();
-
-		$DB->commit();
-
-		$Messages->add( T_('Selected file has been linked to item.'), 'success' );
-
-		// In case the mode had been closed, reopen it:
-		$fm_mode = 'link_item';
-
-
-		// REDIRECT / EXIT
-		if( $action == 'link_inpost' )
-		{
- 			header_redirect( $admin_url.'?ctrl=items&action=edit_links&mode=iframe&item_ID='.$edited_Item->ID );
-		}
-		else
-		{
- 			header_redirect( regenerate_url( '', '', '', '&' ) );
-		}
-		break;
-
+	case 'link_inpost':
+	// In the context of a post
+	// Link File to Item
+
+	// Note: we are not modifying any file here, we're just linking it. we only need read
+	// perm on file, but we'll need write perm on destination object (to be checked below)
+	if( ! isset( $edited_Item ) )
+	{
+		// No Item to link to - end link_item mode.
+		$fm_mode = NULL;
+		break;
+	}
+
+	// Check item EDIT permissions
+	$current_User->check_perm( 'item_post!CURSTATUS', 'edit', true, $edited_Item );
+
+	// Get the file we want to link
+	if( !$selected_Filelist->count() )
+	{
+		$Messages->add( T_('Nothing selected.'), 'error' );
+		break;
+	}
+	$edited_File = & $selected_Filelist->get_by_idx(0);
+
+	$DB->begin();
+
+	// Load meta data AND MAKE SURE IT IS CREATED IN DB
+	$edited_File->load_meta( true );
+
+	// Let's make the link!
+	$edited_Link = new Link();
+	$edited_Link->set( 'itm_ID', $edited_Item->ID );
+	$edited_Link->set( 'file_ID', $edited_File->ID );
+	$edited_Link->dbinsert();
+
+	$DB->commit();
+
+	$Messages->add( T_('Selected file has been linked to item.'), 'success' );
+
+	// In case the mode had been closed, reopen it
+	$fm_mode = 'link_item';
+
+
+	// REDIRECT / EXIT
+	if( $action == 'link_inpost' )
+	{
+		header_redirect( $admin_url.'?ctrl=items&action=edit_links&mode=iframe&item_ID='.$edited_Item->ID );
+	}
+	else
+	{
+		header_redirect( regenerate_url( '', '', '', '&' ) );
+	}
+	break;
 
 	case 'unlink':
-		// TODO: We don't need the Filelist, move UP!
-		// Unlink File from Item (or other object if extended):
-
-		// Note: we are not modifying any file here, we're just linking it
-		// we only need read perm on file, but we'll need write perm on destination object (to be checked below)
-
-		if( !isset( $edited_Link ) )
-		{
-			$action = 'list';
-			break;
-		}
-
-		// get Item (or other object) from Link to check perm
-		$edited_Item = & $edited_Link->Item;
-
-		// Check that we have permission to edit item:
-		$current_User->check_perm( 'item_post!CURSTATUS', 'edit', true, $edited_Item );
-
-		// Delete from DB:
-		$msg = sprintf( T_('Link from &laquo;%s&raquo; deleted.'), $edited_Link->Item->dget('title') );
-		$edited_Link->dbdelete( true );
-		unset( $edited_Link );
-		forget_param( 'link_ID' );
-
-		$Messages->add( $msg, 'success' );
+	// Unlink File from Item (or other object if extended):
+	// Note: we are not modifying any file here, we're just linking it
+	// we only need read perm on file, but we'll need write perm on destination object (to be checked below)
+
+	if( ! isset( $edited_Link ) )
+	{
 		$action = 'list';
-		// REDIRECT / EXIT
- 		header_redirect( regenerate_url( '', '', '', '&' ) );
 		break;
-
+	}
+
+	// get Item (or other object) from Link to check perm
+	$edited_Item = & $edited_Link->Item;
+
+	// Check that we have permission to edit item:
+	$current_User->check_perm( 'item_post!CURSTATUS', 'edit', true, $edited_Item );
+
+	// Delete from DB
+	$msg = sprintf( T_('Link from &laquo;%s&raquo; deleted.'), $edited_Link->Item->dget( 'title' ) );
+	$edited_Link->dbdelete( true );
+	unset( $edited_Link );
+	forget_param( 'link_ID' );
+
+	$Messages->add( $msg, 'success' );
+	$action = 'list';
+	// REDIRECT / EXIT
+	header_redirect( regenerate_url( '', '', '', '&' ) );
+	break;
 
 	case 'edit_perms':
-		// TODO: We don't need the Filelist, move UP!
-		// Edit file or directory permissions:
-
-		if( ! $current_User->check_perm( 'files', 'edit' ) )
-		{ // We do not have permission to edit files
-			$Messages->add( T_('You have no permission to edit/modify files.'), 'error' );
-			$action = 'list';
-			break;
-		}
-
-		if( ! $selected_Filelist->count() )
-		{
-			$Messages->add( T_('Nothing selected.'), 'error' );
-			$action = 'list';
-			break;
-		}
-
-
-		param( 'perms', 'array', array() );
-		param( 'edit_perms_default' ); // default value when multiple files are selected
-		param( 'use_default_perms', 'array', array() ); // array of file IDs that should be set to default
-
-		if( count( $use_default_perms ) && $edit_perms_default === '' )
-		{
-			param_error( 'edit_perms_default', T_('You have to give a default permission!') );
-			break;
-		}
-
-		// form params
-		$perms_read_readonly = is_windows();
-		$field_options_read_readonly = array(
-				array( 'value' => 444, 'label' => T_('Read-only') ),
-				array( 'value' => 666, 'label' => T_('Read and write') ) );
-		$more_than_one_selected_file = ( $selected_Filelist->count() > 1 );
-
-		if( count( $perms ) || count( $use_default_perms ) )
-		{ // New permissions given, change them
-			$selected_Filelist->restart();
-			while( $l_File = & $selected_Filelist->get_next() )
-			{
-				if( in_array( $l_File->get_md5_ID(), $use_default_perms ) )
-				{ // use default
-					$chmod = $edit_perms_default;
-				}
-				elseif( !isset($perms[ $l_File->get_md5_ID() ]) )
-				{ // happens for an empty text input or when no radio option is selected
-					$Messages->add( sprintf( T_('Permissions for &laquo;%s&raquo; have not been changed.'), $l_File->dget('name') ), 'note' );
-					continue;
-				}
-				else
-				{ // provided for this file
-					$chmod = $perms[ $l_File->get_md5_ID() ];
-				}
-
-				$oldperms = $l_File->get_perms( 'raw' );
-				$newperms = $l_File->chmod( octdec( $chmod ) );
-
-				if( $newperms === false )
-				{
-					$Messages->add( sprintf( T_('Failed to set permissions on &laquo;%s&raquo; to &laquo;%s&raquo;.'), $l_File->dget('name'), $chmod ), 'error' );
-				}
-				else
-				{
-					// Success, remove the file from the list of selected files:
-					$selected_Filelist->remove( $l_File );
-
-					if( $newperms === $oldperms )
-					{
-						$Messages->add( sprintf( T_('Permissions for &laquo;%s&raquo; have not been changed.'), $l_File->dget('name') ), 'note' );
-					}
-					else
-					{
-						$Messages->add( sprintf( T_('Permissions for &laquo;%s&raquo; changed to &laquo;%s&raquo;.'), $l_File->dget('name'), $l_File->get_perms() ), 'success' );
-					}
-				}
-			}
-		}
-
-		if( !$selected_Filelist->count() )
-		{ // No file left selected... (everything worked fine)
-			$action = 'list';
-		}
-		break;
+	// Edit file or directory permissions:
+	if( ! $current_User->check_perm( 'files', 'edit' ) )
+	{
+		// We do not have permission to edit files
+		$Messages->add( T_('You have no permission to edit/modify files.'), 'error' );
+		$action = 'list';
+		break;
+	}
+
+	if( ! $selected_Filelist->count() )
+	{
+		$Messages->add( T_('Nothing selected.'), 'error' );
+		$action = 'list';
+		break;
+	}
+
+	param( 'perms', 'array', array() );
+	// default value when multiple files are selected
+	param( 'edit_perms_default' );
+	// array of file IDs that should be set to default
+	param( 'use_default_perms', 'array', array() );
+
+	if( count( $use_default_perms ) && $edit_perms_default === '' )
+	{
+		param_error( 'edit_perms_default', T_('You have to give a default permission!') );
+		break;
+	}
+
+	// form params
+	$perms_read_readonly = is_windows();
+	$field_options_read_readonly = array(
+		array( 'value' => 444, 'label' => T_('Read-only') ),
+		array( 'value' => 666, 'label' => T_('Read and write')
+	) );
+	$more_than_one_selected_file = ( $selected_Filelist->count() > 1 );
+
+	if( count( $perms ) || count( $use_default_perms ) )
+	{
+		// New permissions given, change them
+		$selected_Filelist->restart();
+		while( $l_File = & $selected_Filelist->get_next() )
+		{
+			if( in_array( $l_File->get_md5_ID(), $use_default_perms ) )
+			{
+				// use default
+				$chmod = $edit_perms_default;
+			}
+			elseif( ! isset( $perms[$l_File->get_md5_ID()] ) )
+			{
+				// happens for an empty text input or when no radio option is selected
+				$Messages->add( sprintf( T_('Permissions for &laquo;%s&raquo; have not been changed.'), $l_File->dget( 'name' ) ), 'note' );
+				continue;
+			}
+			else
+			{
+				// provided for this file
+				$chmod = $perms[$l_File->get_md5_ID()];
+			}
+
+			$oldperms = $l_File->get_perms( 'raw' );
+			$newperms = $l_File->chmod( octdec( $chmod ) );
+
+			if( $newperms === false )
+			{
+				$Messages->add( sprintf( T_('Failed to set permissions on &laquo;%s&raquo; to &laquo;%s&raquo;.'), $l_File->dget( 'name' ), $chmod ), 'error' );
+			}
+			else
+			{
+				// Success, remove the file from the list of selected files
+				$selected_Filelist->remove( $l_File );
+
+				if( $newperms === $oldperms )
+				{
+					$Messages->add( sprintf( T_('Permissions for &laquo;%s&raquo; have not been changed.'), $l_File->dget( 'name' ) ), 'note' );
+				}
+				else
+				{
+					$Messages->add( sprintf( T_('Permissions for &laquo;%s&raquo; changed to &laquo;%s&raquo;.'), $l_File->dget( 'name' ), $l_File->get_perms() ), 'success' );
+				}
+			}
+		}
+	}
+
+	if( !$selected_Filelist->count() )
+	{
+		// No file left selected ... (everything worked fine)
+		$action = 'list';
+	}
+	break;
 }
 
-// Prepare for modes:
+// Prepare for modes
 switch( $fm_mode )
 {
 	case 'file_copy':
 	case 'file_move':
-		// ------------------------
-		// copy/move a file:
-		// ------------------------
-		/*
-		 * fplanque>> This whole thing is flawed:
-		 * 1) only geeks can possibly like to use the same interface for renaming, moving and copying
-		 * 2) even the geeky unix commands won't pretend copying and moving are the same thing. They are not!
-		 *    Only moving and renaming are similar, and again FOR GEEKS ONLY.
-		 * 3) The way this works it breaks the File meta data (I'm working on it).
-		 * 4) For Move and Copy, this should use a "destination directory tree" on the right (same as for upload)
-		 * 5) Given all the reasons above copy, move and rename should be clearly separated into 3 different interfaces.
-		 *
-		 * blueyed>> it was never meant to only use a single interface. The original mode
-		 *   'file_cmr' was just a mode to handle it internally easier/more central.
-		 *   'copy' is just 'move and keep the source', while 'rename' is 'move in the same dir'
-		 *
-		 */
-
-		/*
-		TODO: On error notes use prefixed names, if the roots differ.
-		      Something like $fm_Filelist->get_names_realtive_to( $a_File, $b_File, $root_type, $root_ID, $rel_path )
-		      that returns an array containing the name of $a_File and $b_File relative to the Root path given as
-		      param 3, 4, 5.
-		      This would allow to say "Copied «users/admin/test_me.jpg» to «test_me.jpg»." rather than just
-		      "Copied «test_me.jpg» to «test_me.jpg».".
-			// fp>> I don't really understand this (probably missing a verb) but I do think that extending the Fileman object is not the right direction to go on the long term
-			// blueyed>> Tried to make it clearer. If it wasn't a Filemanager method, it has to be a function or
-			//   a method of the File class. IMHO it should be a method of the (to be killed) Filemanager object.
-			// fp>> Okay. It should *definitely* be a method of the File object and we should ask for ONE file at a time. Any question about 'where is the file?' (what/where/when/who, etc) should be asked to the File object itself.
-		*/
-
-		if( ! $current_User->check_perm( 'files', 'edit' ) )
-		{ // We do not have permission to edit files
-			$Messages->add( T_('You have no permission to edit/modify files.'), 'error' );
-			$fm_mode = NULL;
-			break;
-		}
-
-		// Get the source list
-		if( $fm_sources = param( 'fm_sources', 'array', array(), true ) )
-		{
-			$fm_sources_root = param( 'fm_sources_root', 'string', '', true );
-
-			$sources_Root = & $FileRootCache->get_by_ID( $fm_sources_root );
-
-			if( $sources_Root )
-			{ // instantiate the source list for the selected sources
-				$fm_source_Filelist = new Filelist( $sources_Root );
-			}
-			else
-			{ // Fallback: source files are considered to be in the current root
-				$fm_source_Filelist = new Filelist( $fm_Filelist->get_FileRoot() );
-				$Debuglog->add( 'SourceList without explicit root!', 'error' );
-			}
-
-			if( $fm_source_Filelist )
-			{
-				// TODO: should fail for non-existant sources, or sources where no read-perm
-				foreach( $fm_sources as $l_source_path )
-				{
-					$fm_source_Filelist->add_by_subpath( urldecode($l_source_path), true );
-				}
-			}
-			else
-			{ // Without SourceList there's no mode
-				$fm_mode = false;
-			}
-		}
-		else
-		{
-			$fm_source_Filelist = false;
-			$fm_sources = NULL;
-			$fm_sources_root = NULL;
-		}
-
-		if( ! $fm_source_Filelist || ! $fm_source_Filelist->count() )
-		{
-			$Messages->add( T_('No source files!'), 'error' );
-			$fm_mode = NULL;
-			break;
-		}
-
-		param( 'confirm', 'integer', 0 );
-		param( 'new_names', 'array', array() );
-		param( 'overwrite', 'array', array() );
-
-		// Check params for each file to rename:
+	// copy/move a file
+
+	/*
+	TODO: On error notes use prefixed names, if the roots differ.
+	Something like $fm_Filelist->get_names_realtive_to( $a_File, $b_File, $root_type, $root_ID, $rel_path )
+	that returns an array containing the name of $a_File and $b_File relative to the Root path given as
+	param 3, 4, 5.
+	This would allow to say "Copied «users/admin/test_me.jpg» to «test_me.jpg»." rather than just
+	"Copied «test_me.jpg» to «test_me.jpg».".
+		// fp>> I don't really understand this (probably missing a verb) but I do think that extending the Fileman object is not the right direction to go on the long term
+		// blueyed>> Tried to make it clearer. If it wasn't a Filemanager method, it has to be a function or
+		// a method of the File class. IMHO it should be a method of the (to be killed) Filemanager object.
+		// fp>> Okay. It should *definitely* be a method of the File object and we should ask for ONE file at a time. Any question about 'where is the file?' (what/where/when/who, etc) should be asked to the File object itself.
+	*/
+
+	if( ! $current_User->check_perm( 'files', 'edit' ) )
+	{
+		// We do not have permission to edit files
+		$Messages->add( T_('You have no permission to edit/modify files.'), 'error' );
+		$fm_mode = NULL;
+		break;
+	}
+
+	// Get the source list
+	if( $fm_sources = param( 'fm_sources', 'array', array(), true ) )
+	{
+		$fm_sources_root = param( 'fm_sources_root', 'string', '', true );
+		$sources_Root = & $FileRootCache->get_by_ID( $fm_sources_root );
+
+		if( $sources_Root )
+		{
+			// instantiate the source list for the selected sources
+			$fm_source_Filelist = new Filelist( $sources_Root );
+		}
+		else
+		{
+			// Fallback: source files are considered to be in the current root
+			$fm_source_Filelist = new Filelist( $fm_Filelist->get_FileRoot() );
+		}
+
+		if( $fm_source_Filelist )
+		{
+			foreach( $fm_sources as $l_source_path )
+			{
+				$fm_source_Filelist->add_by_subpath( urldecode( $l_source_path ), true );
+			}
+		}
+		else
+		{
+			// Without SourceList there's no mode
+			$fm_mode = false;
+		}
+	}
+	else
+	{
+		$fm_source_Filelist = false;
+		$fm_sources = NULL;
+		$fm_sources_root = NULL;
+	}
+
+	if( ! $fm_source_Filelist || ! $fm_source_Filelist->count() )
+	{
+		$Messages->add( T_('No source files!'), 'error' );
+		$fm_mode = NULL;
+		break;
+	}
+
+	param( 'confirm', 'integer', 0 );
+	param( 'new_names', 'array', array() );
+	param( 'overwrite', 'array', array() );
+
+	// Check params for each file to rename
+	while( $loop_src_File = & $fm_source_Filelist->get_next() )
+	{
+		if( ! $loop_src_File->exists() )
+		{
+			// this can happen on reloading the page
+			$fm_source_Filelist->remove( $loop_src_File );
+			continue;
+		}
+		if( ! isset( $new_names[$loop_src_File->get_md5_ID()] ) )
+		{
+			// We have not yet provided a name to rename to...
+			$confirm = 0;
+			$new_names[$loop_src_File->get_md5_ID()] = $loop_src_File->get( 'name' );
+			continue;
+		}
+
+		// Check if provided name is okay
+		$new_names[$loop_src_File->get_md5_ID()] = trim( strip_tags( $new_names[$loop_src_File->get_md5_ID()] ) );
+
+		if( !$loop_src_File->is_dir() )
+		{
+			if( $error_filename = validate_filename( $new_names[$loop_src_File->get_md5_ID()] ) )
+			{
+				// Not a file name or not an allowed extension
+				$confirm = 0;
+				$Messages->add( $error_filename, 'error' );
+				continue;
+			}
+		}
+		elseif( $error_dirname = validate_dirname( $new_names[$loop_src_File->get_md5_ID()] ) )
+		{
+			// Not a directory name
+			$confirm = 0;
+			$Messages->add( $error_dirname, 'error' );
+			continue;
+		}
+
+		// Check if destination file exists
+		$FileCache = & get_Cache( 'FileCache' );
+		if( ( $dest_File = & $FileCache->get_by_root_and_path( $fm_Filelist->get_root_type(), $fm_Filelist->get_root_ID(), $fm_Filelist->get_rds_list_path().$new_names[$loop_src_File->get_md5_ID()] ) )
+			&& $dest_File->exists() )
+		{
+			// Target exists
+			if( $dest_File === $loop_src_File )
+			{
+				param_error( 'new_names['.$loop_src_File->get_md5_ID().']', T_('Source and target files are the same. Please choose another name or directory.') );
+				$confirm = 0;
+				continue;
+			}
+
+			if( ! isset( $overwrite[$loop_src_File->get_md5_ID()] ) )
+			{
+				// We have not yet asked to overwrite
+				param_error( 'new_names['.$loop_src_File->get_md5_ID().']', sprintf( T_('The file &laquo;%s&raquo; already exists.'), $dest_File->get_rdfp_rel_path() ) );
+				$overwrite[$loop_src_File->get_md5_ID()] = 0;
+				$confirm = 0;
+				continue;
+			}
+
+			// We have asked to overwite...
+			if( $fm_mode == 'file_copy' )
+			{
+				// We are making a copy: no problem, we'll recycle the file ID anyway
+				continue;
+			}
+
+			// We are moving, we'll need to unlink the target file and drop it's meta data
+			// Check if there are delete restrictions on this file:
+			$dest_File->check_relations( 'delete_restrictions' );
+
+			if( $Messages->count('restrict') )
+			{
+				// There are restrictions
+				param_error( 'new_names['.$loop_src_File->get_md5_ID().']', sprintf( T_('Cannot overwrite the file &laquo;%s&raquo; because of the following relations'), $dest_File->get_rdfp_rel_path() ) );
+
+				$confirm = 0;
+				break; // stop whole file list processing
+			}
+		}
+	}
+
+	if( $confirm && $fm_source_Filelist->count() )
+	{
+		// Copy/move is confirmed (and we still have files to copy/move), let's proceed
+		// Loop through files:
+		$fm_source_Filelist->restart();
 		while( $loop_src_File = & $fm_source_Filelist->get_next() )
 		{
-			if( ! $loop_src_File->exists() )
-			{ // this can happen on reloading the page
-				$fm_source_Filelist->remove($loop_src_File);
-				continue;
-			}
-			if( ! isset( $new_names[$loop_src_File->get_md5_ID()] ) )
-			{ // We have not yet provided a name to rename to...
-				$confirm = 0;
-				$new_names[$loop_src_File->get_md5_ID()] = $loop_src_File->get('name');
-				continue;
-			}
-
-			// Check if provided name is okay:
-			$new_names[$loop_src_File->get_md5_ID()] = trim(strip_tags($new_names[$loop_src_File->get_md5_ID()]));
-
-			if( !$loop_src_File->is_dir() )
-			{
-				if( $error_filename = validate_filename( $new_names[$loop_src_File->get_md5_ID()] ) )
-				{ // Not a file name or not an allowed extension
-					$confirm = 0;
-					$Messages->add( $error_filename , 'error' );
-					continue;
-				}
-			}
-			elseif( $error_dirname = validate_dirname( $new_names[$loop_src_File->get_md5_ID()] ) )
-			{ // Not a directory name
-				$confirm = 0;
-				$Messages->add( $error_dirname, 'error' );
-				continue;
-			}
-
-			// Check if destination file exists:
+			// Get a pointer on dest file
 			$FileCache = & get_Cache( 'FileCache' );
-			if( ($dest_File = & $FileCache->get_by_root_and_path( $fm_Filelist->get_root_type(), $fm_Filelist->get_root_ID(), $fm_Filelist->get_rds_list_path().$new_names[$loop_src_File->get_md5_ID()] ))
-							&& $dest_File->exists() )
-			{ // Target exists
-				if( $dest_File === $loop_src_File )
-				{
-					param_error( 'new_names['.$loop_src_File->get_md5_ID().']', T_('Source and target files are the same. Please choose another name or directory.') );
-					$confirm = 0;
-					continue;
-				}
-
-				if( ! isset( $overwrite[$loop_src_File->get_md5_ID()] ) )
-				{ // We have not yet asked to overwrite:
-					param_error( 'new_names['.$loop_src_File->get_md5_ID().']', sprintf( T_('The file &laquo;%s&raquo; already exists.'), $dest_File->get_rdfp_rel_path() ) );
-					$overwrite[$loop_src_File->get_md5_ID()] = 0;
-					$confirm = 0;
-					continue;
-				}
-
-				// We have asked to overwite...
-				if( $fm_mode == 'file_copy' )
-				{ // We are making a copy: no problem, we'll recycle the file ID anyway.
-					continue;
-				}
-
-				// We are moving, we'll need to unlink the target file and drop it's meta data:
-				// Check if there are delete restrictions on this file:
-				$dest_File->check_relations( 'delete_restrictions' );
-
-				if( $Messages->count('restrict') )
-				{ // There are restrictions:
-					// TODO: work on a better output display here...
-					param_error( 'new_names['.$loop_src_File->get_md5_ID().']', sprintf( T_('Cannot overwrite the file &laquo;%s&raquo; because of the following relations'), $dest_File->get_rdfp_rel_path() ) );
-
-					$confirm = 0;
-					break;	// stop whole file list processing
-				}
-			}
-		}
-
-		if( $confirm && $fm_source_Filelist->count() )
-		{ // Copy/move is confirmed (and we still have files to copy/move), let's proceed:
-
-			// Loop through files:
-			$fm_source_Filelist->restart();
-			while( $loop_src_File = & $fm_source_Filelist->get_next() )
-			{
-				// Get a pointer on dest file
-				$FileCache = & get_Cache( 'FileCache' );
-				$dest_File = & $FileCache->get_by_root_and_path( $fm_Filelist->get_root_type(), $fm_Filelist->get_root_ID(), $fm_Filelist->get_rds_list_path().$new_names[$loop_src_File->get_md5_ID()] );
-
-				if( $fm_mode == 'file_copy' )
-				{ // COPY
-
-					// Do the copy
-					if( $loop_src_File->copy_to( $dest_File ) )
-					{ // Success:
-						$Messages->add( sprintf( T_('Copied &laquo;%s&raquo; to &laquo;%s&raquo;.'),
-																		$loop_src_File->get_rdfp_rel_path(), $dest_File->get_rdfp_rel_path() ), 'success' );
-
-						if( $fm_Filelist->contains( $dest_File ) === false )
-						{
-							$fm_Filelist->add( $dest_File );
-						}
-					}
-					else
-					{ // Failure:
-						param_error( 'new_names['.$loop_src_File->get_md5_ID().']', sprintf( T_('Could not copy &laquo;%s&raquo; to &laquo;%s&raquo;.'),
-																		$loop_src_File->get_rdfp_rel_path(), $dest_File->get_rdfp_rel_path() ) );
-					}
-				}
-				elseif( $fm_mode == 'file_move' )
-				{ // MOVE
-					// NOTE: DB integrity is handled by the File object itself
-					$DB->begin();
-
-					if( isset( $overwrite[$loop_src_File->get_md5_ID()] )
-							&& $overwrite[$loop_src_File->get_md5_ID()] )
-					{ // We want to overwrite, let's unlink the old file:
-						if( ! $dest_File->unlink() )
-						{ // Unlink failed:
-							$DB->rollback();
-
-							$Messages->add( sprintf( ( $dest_File->is_dir() ? T_('Could not delete the directory &laquo;%s&raquo; (not empty?).') : T_('Could not delete the file &laquo;%s&raquo;.') ), $dest_File->dget('name') ), 'error' );
-
-							// Move on to next file:
-							continue;
-						}
-					}
-
-					// Do the move:
-					$rdfp_oldpath = $loop_src_File->get_rdfp_rel_path();
-					$rdfp_newpath = $fm_Filelist->get_rds_list_path().$new_names[$loop_src_File->get_md5_ID()];
-
-					if( $loop_src_File->move_to( $fm_Filelist->get_root_type(), $fm_Filelist->get_root_ID(), $rdfp_newpath ) )
-					{ // successfully moved
-						$Messages->add( sprintf( T_('Moved &laquo;%s&raquo; to &laquo;%s&raquo;.'), $rdfp_oldpath, $rdfp_newpath ), 'success' );
-
-						// We may have moved in same dir, update caches:
-						$fm_Filelist->update_caches();
-						// We remove the file from the source list, after refreshing the cache
-						$fm_source_Filelist->update_caches();
-						$fm_source_Filelist->remove( $loop_src_File );
-
-						if( $fm_Filelist->contains( $loop_src_File ) === false )
-						{ // File not in filelist (expected if not same dir)
-							$fm_Filelist->add( $loop_src_File );
-						}
-					}
-					else
-					{ // move failed
-						param_error( 'new_names['.$loop_src_File->get_md5_ID().']', sprintf( T_('Could not move &laquo;%s&raquo; to &laquo;%s&raquo;.'), $rdfp_oldpath, $rdfp_newpath ) );
-						// Note: we do not rollback, since unlinking is already done on disk :'(
-					}
-
-					$DB->commit();
-				}
-				else debug_die( 'Unhandled file copy/move mode' );
-			}
-
-			// EXIT MODE:
-			$fm_mode = NULL;
-		}
-		break;
+			$dest_File = & $FileCache->get_by_root_and_path( $fm_Filelist->get_root_type(), $fm_Filelist->get_root_ID(), $fm_Filelist->get_rds_list_path().$new_names[$loop_src_File->get_md5_ID()] );
+
+			if( $fm_mode == 'file_copy' )
+			{
+				// COPY
+
+				// Do the copy
+				if( $loop_src_File->copy_to( $dest_File ) )
+				{
+					// Success
+					$Messages->add( sprintf( T_('Copied &laquo;%s&raquo; to &laquo;%s&raquo;.'),
+						$loop_src_File->get_rdfp_rel_path(), $dest_File->get_rdfp_rel_path() ), 'success' );
+
+					if( $fm_Filelist->contains( $dest_File ) === false )
+					{
+						$fm_Filelist->add( $dest_File );
+					}
+				}
+				else
+				{
+					// Failure
+					param_error( 'new_names['.$loop_src_File->get_md5_ID().']', sprintf( T_('Could not copy &laquo;%s&raquo; to &laquo;%s&raquo;.'),
+						$loop_src_File->get_rdfp_rel_path(), $dest_File->get_rdfp_rel_path() ) );
+				}
+			}
+			elseif( $fm_mode == 'file_move' )
+			{
+				// MOVE
+				// NOTE: DB integrity is handled by the File object itself
+				$DB->begin();
+
+				if( isset( $overwrite[$loop_src_File->get_md5_ID()] )
+					&& $overwrite[$loop_src_File->get_md5_ID()] )
+				{
+					// We want to overwrite, let's unlink the old file
+					if( ! $dest_File->unlink() )
+					{
+						// Unlink failed
+						$DB->rollback();
+
+						$Messages->add( sprintf( ( $dest_File->is_dir() ? T_('Could not delete the directory &laquo;%s&raquo; (not empty?).') : T_('Could not delete the file &laquo;%s&raquo;.') ), $dest_File->dget( 'name' ) ), 'error' );
+
+						// Move on to next file
+						continue;
+					}
+				}
+
+				// Do the move
+				$rdfp_oldpath = $loop_src_File->get_rdfp_rel_path();
+				$rdfp_newpath = $fm_Filelist->get_rds_list_path().$new_names[$loop_src_File->get_md5_ID()];
+
+				if( $loop_src_File->move_to( $fm_Filelist->get_root_type(), $fm_Filelist->get_root_ID(), $rdfp_newpath ) )
+				{
+					// successfully moved
+					$Messages->add( sprintf( T_('Moved &laquo;%s&raquo; to &laquo;%s&raquo;.'), $rdfp_oldpath, $rdfp_newpath ), 'success' );
+
+					// We may have moved in same dir, update caches
+					$fm_Filelist->update_caches();
+					// We remove the file from the source list, after refreshing the cache
+					$fm_source_Filelist->update_caches();
+					$fm_source_Filelist->remove( $loop_src_File );
+
+					if( $fm_Filelist->contains( $loop_src_File ) === false )
+					{
+						// File not in filelist (expected if not same dir)
+						$fm_Filelist->add( $loop_src_File );
+					}
+				}
+				else
+				{
+					// move failed
+					param_error( 'new_names['.$loop_src_File->get_md5_ID().']', sprintf( T_('Could not move &laquo;%s&raquo; to &laquo;%s&raquo;.'), $rdfp_oldpath, $rdfp_newpath ) );
+					// Note: we do not rollback, since unlinking is already done on disk :'(
+				}
+
+				$DB->commit();
+			}
+			else debug_die( 'Unhandled file copy/move mode' );
+		}
+
+		// EXIT MODE
+		$fm_mode = NULL;
+	}
+	break;
 
 	case 'link_item':
-		// We want to link file(s) to an item:
-		// TODO: maybe this should not be a mode and maybe we should handle linking as soon as we have an $edited_Item ...
-		if( !isset($edited_Item) )
-		{ // No Item to link to...
-			$fm_mode = NULL;
-			break;
-		}
-
-		// TODO: check EDIT permissions!
+	// We want to link file(s) to an item
+	if( ! isset( $edited_Item ) )
+	{
+		// No Item to link to...
+		$fm_mode = NULL;
 		break;
+	}
+	break;
 
 }
 
-// Update sub-menu:
+// Update sub-menu
 if( $current_User->check_perm( 'files', 'add' ) )
-{ // Permission to upload and we are not in a popup window (no subtabs needed otherwise)
-	$AdminUI->add_menu_entries(
-		'files',
-		array(
+{
+	// Permission to upload and we are not in a popup window (no subtabs needed otherwise)
+	$AdminUI->add_menu_entries( 'files', array(
 			'browse' => array(
 				'text' => T_('Browse'),
 				'href' => regenerate_url( 'ctrl', 'ctrl=files' ) ),
@@ -1490,10 +1464,9 @@
 	);
 }
 
-// Display <html><head>...</head> section! (Note: should be done early if actions do not redirect)
+// Display <html><head>...</head> section (should be done early if actions do not redirect)
 $AdminUI->disp_html_head();
-
-// Display title, menu, messages, etc. (Note: messages MUST be displayed AFTER the actions)
+// Display title, menu, messages, etc... (messages MUST be displayed AFTER the actions)
 $AdminUI->disp_body_top();
 
 // Display reload-icon in the opener window if we're a popup in the same CWD and the
@@ -1505,7 +1478,7 @@
 			&& opener.document.FilesForm
 			&& typeof(opener.document.FilesForm.md5_filelist.value) != 'undefined'
 			&& typeof(opener.document.FilesForm.md5_cwd.value) != 'undefined'
-			&& opener.document.FilesForm.md5_cwd.value == '<?php echo md5($fm_Filelist->get_ads_list_path()); ?>'
+			&& opener.document.FilesForm.md5_cwd.value == '<?php echo md5( $fm_Filelist->get_ads_list_path() ); ?>'
 		)
 	{
 		opener.document.getElementById( 'fm_reloadhint' ).style.display =
@@ -1516,104 +1489,97 @@
 	// -->
 </script>
 <?php
-
+// Begin payload block
 $AdminUI->disp_payload_begin();
 
-// Display payload:
-if( !empty($action ) && $action != 'list' && $action != 'nil' )
+// Display payload
+if( ! empty( $action ) && $action != 'list' && $action != 'nil' )
 {
 
 	// Action displays:
 	switch( $action )
 	{
 		case 'rename':
-			// Rename files dialog:
-			$AdminUI->disp_view( 'files/views/_file_rename.form.php' );
-			break;
+		// Rename files dialog:
+		$AdminUI->disp_view( 'files/views/_file_rename.form.php' );
+		break;
 
 		case 'delete':
-			// Delete file(s). We arrive here either if not confirmed or in case of error(s).
-			$AdminUI->disp_view( 'files/views/_file_delete.form.php' );
-			break;
+		// Delete file(s). We arrive here either if not confirmed or in case of error(s).
+		$AdminUI->disp_view( 'files/views/_file_delete.form.php' );
+		break;
 
 		case 'download':
-			$AdminUI->disp_view( 'files/views/_file_download.form.php' );
-			break;
+		$AdminUI->disp_view( 'files/views/_file_download.form.php' );
+		break;
 
 		case 'edit_perms':
-			// Filesystem permissions for specific files
-			$AdminUI->disp_view( 'files/views/_file_permissions.form.php' );
-			break;
+		// Filesystem permissions for specific files
+		$AdminUI->disp_view( 'files/views/_file_permissions.form.php' );
+		break;
 
 		case 'edit_file':
-			// File Edit dialog:
-			$AdminUI->disp_view( 'files/views/_file_edit.form.php' );
-			break;
+		// File Edit dialog:
+		$AdminUI->disp_view( 'files/views/_file_edit.form.php' );
+		break;
 
 		case 'edit_properties':
-			// File properties (Meta data) dialog:
-			$AdminUI->disp_view( 'files/views/_file_properties.form.php' );
-			break;
+		// File properties (Meta data) dialog:
+		$AdminUI->disp_view( 'files/views/_file_properties.form.php' );
+		break;
 
 		case 'edit_settings':
-			// Display settings dialog:
-			$AdminUI->disp_view( 'files/views/_file_browse_set.form.php' );
-			break;
+		// Display settings dialog:
+		$AdminUI->disp_view( 'files/views/_file_browse_set.form.php' );
+		break;
 
 		case 'download':
-			// Deferred action message:
-			if( isset($action_title) )
-			{
-				echo "\n<h2>$action_title</h2>\n";
-			}
-
-			if( isset($action_msg) )
-			{
-				echo $action_msg;
-
-				if( isset( $js_focus ) )
-				{ // we want to auto-focus a field
-					echo '
-					<script type="text/javascript">
-						<!--
-						'.$js_focus.'.focus();
-						// -->
-					</script>';
-				}
-			}
+		// Deferred action message:
+		if( isset( $action_title ) )
+		{
+			echo "\n<h2>$action_title</h2>\n";
+		}
+
+		if( isset( $action_msg ) )
+		{
+			echo $action_msg;
+
+			if( isset( $js_focus ) )
+			{
+				// we want to auto-focus a field
+				echo '
+				<script type="text/javascript">
+					<!--
+					'.$js_focus.'.focus();
+					// -->
+				</script>';
+			}
+		}
 	}
 }
 
-
-/*
- * Diplay mode payload:
- */
+// Diplay mode payload
 switch( $fm_mode )
 {
 	case 'file_copy':
 	case 'file_move':
-		// CMR dialog:
-		$AdminUI->disp_view( 'files/views/_file_copy_move.form.php' );
-		break;
+	// CMR dialog:
+	$AdminUI->disp_view( 'files/views/_file_copy_move.form.php' );
+	break;
 
 	case 'link_item':
-		// Links dialog:
-		$AdminUI->disp_view( 'files/views/_file_links.view.php' );
-		break;
+	// Links dialog:
+	$AdminUI->disp_view( 'files/views/_file_links.view.php' );
+	break;
 }
 
-
-// -------------------
-// Browsing interface:
-// -------------------
-// Display VIEW:
+// Browsing interface
+// Display VIEW
 $AdminUI->disp_view( 'files/views/_file_browse.view.php' );
 
-
-// End payload block:
+// End payload block
 $AdminUI->disp_payload_end();
-
-// Display body bottom, debug info and close </html>:
+// Display body bottom, debug info, close </html>
 $AdminUI->disp_global_footer();
 
 ?>

=== modified file 'qp_inc/plugins/_plugin.class.php'
--- qp_inc/plugins/_plugin.class.php	2011-11-21 17:17:22 +0000
+++ qp_inc/plugins/_plugin.class.php	2013-03-05 23:36:23 +0000
@@ -1,59 +1,38 @@
 <?php
 /**
- * This file implements the abstract {@link Plugin} class.
- *
- * This file is part of Quam Plures - {@link http://quamplures.net/}
- * See also {@link https://launchpad.net/quam-plures}.
- *
- * @copyright Copyright (c) 2011 by {@link http://1912webworks.com/ Ed Bennett}
- * @copyright (c) 2009 - 2011 by the Quam Plures developers - {@link http://quamplures.net/}
- * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
- * Parts of this file are copyright (c)2004-2006 by Daniel HAHLER - {@link http://thequod.de/contact}.
- *
- * {@internal License choice
- * - If you have received this file as part of a package, please find the license.txt file in
- *   the same folder or the closest folder above for complete license terms.
- * - If you have received this file individually (e-g: from http://evocms.cvs.sourceforge.net/)
- *   then you must choose one of the following licenses before using the file:
- *   - GNU General Public License 2 (GPL) - http://www.opensource.org/licenses/gpl-license.php
- *   - Mozilla Public License 1.1 (MPL) - http://www.opensource.org/licenses/mozilla1.1.php
- * }}
- *
- * {@internal Open Source relicensing agreement:
- * Daniel HAHLER grants Francois PLANQUE the right to license
- * Daniel HAHLER's contributions to this file and the b2evolution project
- * under any OSI approved OSS license (http://www.opensource.org/licenses/).
- * }}
- *
- * @todo Add links to pages in the manual, once they are "clean"/tiny
- *
- * {@internal Below is a list of authors who have contributed to design/coding of this file: }}
+ * This file implements the Plugin class
+ *
+ * Real plugins should be derived from this class.
+ *
+ * @todo (1111): var $code needs to be checked for duplicity upon installation and a note thrown
+ * to the installing user indicating a potential conflict ... if it isn't already checked ;)
+ * @todo (1111): var $group needs to be an enum with "other" as the default. There is no need
+ * for a plugin author to jack up the plugins display page with their own group name!
+ * @todo (1111): var $priority needs to not apply to "install widget". Actually, it needs to not
+ * apply to everything except rendering ... and it needs a rename to $render_priority
  * @author {@link http://wonderwinds.com/ Ed Bennett}
- * @author fplanque: Francois PLANQUE - {@link http://fplanque.net/}
- * @author blueyed: Daniel HAHLER
- *
+ * @author {@link http://daniel.hahler.de/ Daniel HAHLER}
+ * @author {@link http://fplanque.net/ Francois PLANQUE}
+ * @copyright (c) 2009 by {@link http://quamplures.net/ the Quam Plures project}
+ * @license http://www.gnu.org/licenses/gpl.txt GNU General Public License v3
  * @package plugins
  */
-if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
-
+if(!defined('QP_MAIN_INIT')) die('fail');
 
 /**
- * Plugin Class
+ * Plugin class
  *
  * Real plugins should be derived from this class.
- *
- * @abstract
- *
  * @package plugins
  */
 class Plugin
 {
 	/**
-	 * If this is a rendering plugin, when should rendering apply? This is the
-	 * default value for the plugin and can be overriden in the Plugins
-	 * administration for plugins that provide rendering events.
+	 * If this is a rendering plugin, when should rendering apply?
 	 *
-	 * The actual value for the plugin gets stored in T_plugins.plug_apply_rendering.
+	 * This is the default value for the plugin and can be overriden in the Plugin's
+	 * administration for plugins that provide rendering events. The actual value for
+	 * the plugin gets stored in T_plugins=>plug_apply_rendering.
 	 *
 	 * Possible values:
 	 * - 'stealth': gets always used, but not displayed as option
@@ -62,241 +41,191 @@
 	 * - 'opt-in': disabled by default
 	 * - 'lazy': checkbox gets displayed, but is disabled
 	 * - 'never': cannot get used as a renderer
-	 *
-	 * @todo (legacy): blueyed>> IMHO we would need another value, which is the same as "lazy", but does not display a checkbox, which is useful for Plugins that add themselves as renderers on Item update
-	 *
-	 * @var string
+	 * @var string ENUM( 'stealth', 'always', 'opt-out', 'opt-in', 'lazy', 'never' ) DEFAULT 'never'
 	 */
 	var $apply_rendering = 'never';
-
 	/**
-	 * Plugin author.
-	 *
-	 * This is for user info only.
-	 *
-	 * @var string
+	 * Plugin author
+	 *
+	 * This is used on the plugin's "info" page, and on the application's "credits" page.
+	 * @var string The author's name
 	 */
 	var $author = 'Dracones Incompertus';
-
 	/**
-	 * Plugin author URL.
-	 *
-	 * This is for user info only, not to be confused with help_url.
-	 *
-	 * @var string
+	 * Plugin author URL
+	 *
+	 * This is used on the plugin's "info" page, and on the application's "credits" page,
+	 * @var string The author's URL (optional)
 	 */
 	var $author_url = '';
-
 	/**
-	 * Globally unique code for this plugin functionality. 32 chars.
-	 *
-	 * A common code MIGHT be shared between different plugins providing the same functionnality.
-	 * This allows to replace a given renderer with another one and keep the associations with posts.
-	 * Example: replacing a GIF smiley renderer with an SWF smiley renderer...
-	 *
-	 * MUST BE SET BY THE PLUGIN!!!
-	 *
-	 * @var string
+	 * Unique code for this plugin functionality
+	 *
+	 * THIS MUST BE SET BY YOUR PLUGIN!
+	 *
+	 * 32 characters max. Should be unique to each plugin, but a common code MIGHT be shared between
+	 * different plugins providing the same functionnality. This allows to replace a given renderer
+	 * with another one and keep the associations with posts. Example: replacing a GIF smiley renderer
+	 * with an SWF smiley renderer...
+	 *
+	 * For multiple instances of the same plugin, core will incrementally change this. Also,
+	 * the user can change this via the plugin's settings page (Plugin variables (Advanced)).
+	 * @var string A 32 character string identifying this plugin specific to this plugin
 	 */
 	var $code = '';
-
-	/**
-	 * Main group of the plugin.
-	 *
-	 * Accepts any value you want, but please pick from the following:
-	 * "toolbars, widgets, renderers, antispam, pingers, tools, comments, other"
-	 *
-	 * @var string
-	 */
-	var $group;
-
-	/**
-	 * Sub-Group of the plugin.
-	 *
-	 * OBSOLETE AND UN-USED! Left here only to not cause havoc with existing plugins
-	 *
-	 * @var string
-	 */
-	var $sub_group;
-
-	/**
-	 * URL for more info about the plugin, author and new versions.
-	 *
-	 * This is for user info only.  If empty, it defaults to 'something unknown right now',
-	 *
-	 * @var string
+	/**
+	 * Main group of the plugin
+	 *
+	 * Accepts any value you want, but please pick from: "antispam, comments, pingers, renderers,
+	 * toolbars, utilities, widgets, other". Eventually this will become a requirement so learn to
+	 * love it now :)
+	 * @var string 'antispam', 'comments', 'pingers', 'renderers', 'toolbars', 'utilities',
+	 * 'widgets', 'other'
+	 */
+	var $group = 'other';
+	/**
+	 * URL for plugin support
+	 *
+	 * This is used on the Global settings => Plugins page and should point to a URL that offers
+	 * support and update info about the plugin. If empty no icon is displayed.
+	 * @var string A URL for support and update info about this plugin (optional)
 	 */
 	var $help_url = '';
-
 	/**
-	 * Number of allowed installs.
+	 * Number of allowed installs
 	 *
-	 * When installing the plugin it gets checked if the plugin is already installed this
-	 * many times. If so, the installation gets aborted.
+	 * When the plugin is already installed this many times the option to install again is removed.
+	 * Use 0 for unlimited, and any other number you see fit. Default is 1.
+	 * @var integer How many times can this plugin be installed?
 	 */
-	var $number_of_installs;
-
+	var $number_of_installs = 1;
 	/**
-	 * Default priority.
-	 *
-	 * Priority determines in which order the plugins get called.
-	 * Range: 1 to 100 (the lower the number, the earlier it gets called)
-	 *
-	 * @var int
+	 * Priority
+	 *
+	 * Priority determines in which order the plugins get called. Range: 1 to 100 (the lower the
+	 * number, the earlier it gets called). Renderers use this to determine which renderer gets
+	 * called first. Also, adding plugins to the "Install widget" screen is by priority. Also,
+	 * renderer checkboxes are by priority. Possibly other places as well.
+	 *
+	 * The installing user can change this in "Plugin variables (Advanced)"
+	 * @var integer Rendering priority (lower number is first)
 	 */
 	var $priority = 50;
-
 	/**
-	 * Plugin version number (max 42 chars, so obscure CVS Revision keywords get handled).
-	 *
-	 * This must be compatible to PHP's {@link version_compare()},
-	 * e.g. '1', '2', '1.1', '2.1b' and '10-1-1a' are fine.
-	 *
-	 * This can be used by other plugins when requiring your plugin
-	 * through {@link Plugin::GetDependencies()}.
-	 *
+	 * Plugin version number
+	 *
+	 * Max 42 chars, so obscure CVS Revision keywords get handled. This must be compatible to PHP's
+	 * {@link version_compare()}, e.g. '1', '2', '1.1', '2.1b' and '10-1-1a' are fine. This can be
+	 * used by other plugins when requiring your plugin through {@link Plugin::GetDependencies()}.
 	 * By increasing it you can request a call of {@link GetDbLayout()} upon instantiating.
 	 * If there are DB layout changes to be made, the plugin gets changed to status "needs_config".
-	 *
-	 * @var string
+	 * @var string Incremental version number stored as a string
 	 */
 	var $version = '0';
-
 	/**
-	 * Plugin name as it will appear in lists.
-	 *
-	 * This should be no longer than 50 characters. To make it available for
-	 * translations set it in function PluginInit() by using (for example)
-	 * $this->name = $this->T_('Plugin Name');
-	 *
-	 * @var string
+	 * Plugin name
+	 *
+	 * Name as it will appear in lists, should be no longer than 50 characters so it fits nicely
+	 * on the (very crowded) Global settings => Plugins page. To make it available for translations
+	 * set it in function PluginInit() by using $this->name = $this->T_('A Great Plugin');
+	 * @var string Name of the plugin, used in lists
 	 */
 	var $name = 'foo';
-
-	/**
-	 * Plugin short description.
-	 *
-	 * This should be no longer than a line and is limited to 255 chars, but
-	 * "shorter is better"! To make it available for translations
-	 * set it in function PluginInit() by using (for example)
-	 * $this->short_desc = $this->T_('Makes blogging easier');
-	 *
-	 * @var string
-	 */
-	var $short_desc;
-
-	/**
-	 * Plugin long description.
-	 *
-	 * This should be no longer than a line or two.  If much more is needed you
-	 * should put it in your readme.html file instead. To make it available for
-	 * translations set it in function PluginInit() by using (for example)
-	 * $this->long_desc = $this->T_('Makes blogging easier by making a toolbar that does stuff that gets rendered into stuff');
-	 *
-	 * @var string
-	 */
-	var $long_desc;
-
-
-	/**
-	 * Name of the ping service (if this is a ping plugin, see {@link Plugin::ItemSendPing()})
-	 * @var string
+	/**
+	 * Plugin short description
+	 *
+	 * This is limited to 255 characters but should be no longer than a line because it gets used
+	 * on the (very crowded) Global settings => Plugins page. To make it available for translations
+	 * set it in function PluginInit() by using $this->short_desc = $this->T_('Makes blogging easier');
+	 * @var string Short (one line) description of the plugin
+	 */
+	var $short_desc = 'No desc available';
+	/**
+	 * Plugin long description
+	 *
+	 * This can be as long and informative as you like, but remember you also should provide a
+	 * readme.html file. To make it available for translations set it in function PluginInit()
+	 * by using $this->long_desc = $this->T_('Makes blogging easier by making a toolbar that does stuff that gets rendered into stuff');
+	 *
+	 * This is used on the plugin's "info" page, and on the application's "credits" page.
+	 * @var string Long description of the plugin, but not a replacement for a "readme" file
+	 */
+	var $long_desc = 'No long description available for this plugin';
+	/**
+	 * Name of the ping service
+	 * @var string Only if this is a ping plugin
 	 */
 	var $ping_service_name;
-
 	/**
-	 * Note about the ping service, used in the list of ping services in the blog settings
-	 * (if this is a ping plugin, see {@link Plugin::ItemSendPing()})
-	 * @var string
+	 * Note about the ping service
+	 * @var string If this is a ping plugin, used in the list of ping services in the blog settings
 	 */
 	var $ping_service_note;
-
-	/**#@+
-	 * Variables below MUST NOT be overriden or changed by you!
-	 * @access private
-	 */
-
 	/**
-	 * Name of the current class. (AUTOMATIC)
-	 *
-	 * Will be set automatically (from filename) when registering plugin.
-	 *
-	 * @var string
+	 * Name of the current class
+	 *
+	 * THIS MUST BE SET BY YOUR PLUGIN!
+	 *
+	 * Will be set automatically (from file name) when registering plugin, but folder name and
+	 * file name and the class declaration must match. "class thisismyplugin_plugin extends Plugin"
+	 * appears in file name "_thisismyplugin.plugin.php" in folder name "thisismyplugin_plugin".
+	 * @var string 40 characters max
 	 */
 	var $classname;
-
 	/**
-	 * Internal (DB) ID. (AUTOMATIC)
-	 *
-	 * ID < 1 means 'NOT installed'
-	 *
-	 * @var int
+	 * Internal (DB) ID
+	 *
+	 * You do not set this but you can access it with $this->ID inside your plugin.
+	 * ID < 1 means 'NOT installed'.
+	 * @var integer auto_incremented plugin ID 
 	 */
 	var $ID = 0;
-
 	/**
-	 * If the plugin provides settings, this will become the object to access them.
-	 *
-	 * This gets instantianted on Plugin registration for PHP4 and through
-	 * overloading in PHP5+, which means on first access.
-	 *
+	 * The object to access the (optional) plugin settings
 	 * @see GetDefaultSettings()
 	 * @var PluginSettings
 	 */
 	var $Settings;
-
 	/**
-	 * If the plugin provides user settings, this will become the object to access them.
-	 *
-	 * This gets instantianted on Plugin registration for PHP4 and through
-	 * overloading in PHP5+, which means on first access.
+	 * The object to access the (optional) user settings
 	 *
 	 * NOTE: its methods use {@link $current_User::$ID} by default, but you may call it
-	 *       if there's no {@link $current_User} instantiated (yet).
-	 *
+	 * if there is no {@link $current_User} instantiated (yet).
 	 * @see GetDefaultUserSettings()
 	 * @var PluginUserSettings
 	 */
 	var $UserSettings;
-
 	/**
-	 * The status of the plugin.
-	 *
-	 * Use {@link set_status()} to change it, if you need to.
-	 * Either 'enabled', 'disabled', 'needs_config' or 'broken'.
-	 *
-	 * @var string
+	 * The status of the plugin
+	 *
+	 * Use {@link set_status()} to change it, if you need to. Either 'enabled', 'disabled',
+	 * 'needs_config' or 'broken', installation of the plugin will set it appropriately.
+	 * @var string 'enabled', 'disabled', 'needs_config', 'broken'
 	 */
 	var $status;
-
 	/**
-	 * The "mother" object, where this Plugin got instantiated from.
-	 *
-	 * @deprecated since 2.0
+	 * The "mother" object, where this Plugin got instantiated from
+	 * @deprecated since before time began (which is something of a miracle eh?)
 	 * @var Plugins|Plugins_admin
 	 */
 	var $Plugins;
-
 	/**
-	 * The translations keyed by locale. They get loaded through include() of _global.php.
-	 * @see Plugin::T_()
-	 * @var array
+	 * The translations keyed by locale
+	 *
+	 * They get loaded through include() of _global.php.
+	 * @var array Array of string translations, English => Something else
 	 */
 	var $_trans = array();
-
 	/**
-	 * Has the global po/php/_global.php file (where translation for
-	 * all languages can be put into) been loaded?
+	 * Has _global.php been loaded?
 	 *
+	 * Has the global po/_global.xx.php file (translation for language xx) been loaded?
 	 * @var boolean
 	 */
 	var $_trans_loaded_global = false;
 
-	/**#@-*/
-
-
 	/**
-	 * Constructor.
+	 * Constructor
 	 *
 	 * You should not use a constructor with your plugin, but the
 	 * {@link Plugin::PluginInit()} method instead!
@@ -307,152 +236,229 @@
 
 
 	/**
-	 * Init the Plugin after it has been registered/instantiated.
-	 *
-	 * Should set name, short description, and long description in a localizable fashion.
-	 *
-	 * This gets called on every instantiated plugin, also if it's just for
-	 * discovering the list of available plugins in the backoffice.
-	 *
-	 * Use this to validate Settings/requirements and/or cache them into class properties.
-	 *
-	 * @param array Associative array of parameters.
-	 *  'is_installed': true, if the plugin is installed; false if not (probably it got discovered then)
-	 *  'db_row': an array with the columns of the plugin DB entry (in T_plugins).
-	 *  This is empty, if the plugin is not installed!
-	 *  E.g., 'plug_version' might be interesting to compare again "$this->version".
-	 *
-	 * @return boolean If this method returns false, the Plugin gets unregistered (for the current request only).
-	 */
-	function PluginInit( & $params )
-	{
-		// NOTE: the code below is just to handle stuff that has been deprecated since
-		//       b2evolution 1.9. You don't have to include this, if you override this method.
-
-		if( is_null($this->short_desc) )
-		{ // may have been set in plugin's constructor (which is deprecated since 1.9)
-			$this->short_desc = T_('No desc available');
-		}
-		if( is_null($this->long_desc) )
-		{ // may have been set in plugin's constructor (which is deprecated since 1.9)
-			$this->long_desc = T_('No long description available');
-		}
-
-		return true;
-	}
-
-
-	// Plugin information (settings, DB layout, ..): {{{
-
-	/**
-	 * Define default settings here.
-	 * Those can then be edited in the backoffice.
-	 *
-	 * You can access them in the plugin through the member object
-	 * {@link Plugin::$Settings}, e.g.:
-	 * <code>$this->Settings->get( 'my_param' );</code>
-	 *
-	 * fp> this is unclear: You probably don't need to set or change values (other than the
-	 * defaultvalues), but if you know what you're doing, see
-	 * {@link PluginSettings}, where {@link Plugin::$Settings} gets derived from.
-	 *
-	 * NOTE: this method gets called by b2evo when instantiating the plugin
-	 *       settings and when the settings get displayed for editing in the backoffice.
-	 *       In the second case, $params['for_editing'] will be true.
-	 *
-	 * @todo 3.0 fp> 1) This is not an event: RENAME to lowercase (in b2evo 3.0)
-	 *           dh> Not only events are CamelCase, but "interactions" with the Plugins(_admin) class, too!
-	 *               Maybe it should get prefixed with "Plugin"?!
-	 *               The intention is: all interfacing methods are camel-cased. That makes a lot of sense,
-	 *               given the provided helpers (get_plugin_url etc).
-	 *               This applies to the other todos below, too.
-	 * @todo 3.0 fp> 2) This defines more than Default values ::  confusing name
-	 * @todo name tentative get_general_param_definitions()
-	 *
-	 * @param array Associative array of parameters (since 1.9).
-	 *    'for_editing': true, if the settings get queried for editing;
-	 *                   false, if they get queried for instantiating {@link Plugin::$Settings}.
-	 * @return array
+	 * Internal Event: Called after the plugin has been installed
+	 */
+	function AfterInstall()
+	{
+	}
+
+
+	/**
+	 * Internal Event: Your plugin gets notified here just before it gets disabled
+	 *
+	 * You cannot prevent this, but only clean up stuff if you have to.
+	 */
+	function BeforeDisable()
+	{
+	}
+
+
+	/**
+	 * Internal Event: Called when a plugin is not enabled
+	 *
+	 * Event handler: Called when a plugin is not enabled and the admin tries to enable the
+	 * plugin, changes its configuration/settings, and after installation. Use this if your
+	 * plugin needs configuration before it can be used.
+	 * @return true|string True if the plugin can be enabled/activated, a string with an
+	 * error/note otherwise.
+	 */
+	function BeforeEnable()
+	{
+		return true;
+	}
+
+
+	/**
+	 * Internal Event: Called before the plugin is going to be installed
+	 *
+	 * This is the hook to create any DB tables or the like. If you just want
+	 * to add a note use {@link Plugin::msg()} (and return true).
+	 * @return true|string True if the plugin can be enabled/activated, a string with an
+	 * error/note otherwise.
+	 */
+	function BeforeInstall()
+	{
+		return true;
+	}
+
+
+	/**
+	 * Internal Event: Called before the plugin is going to be un-installed
+	 *
+	 * This is the hook to remove any files or the like - tables with canonical names (see
+	 * {@link Plugin::get_sql_table()}), are handled internally. See {@link BeforeUninstallPayload()}
+	 * for the corresponding payload handler, which you can request to invoke by returning
+	 * NULL here. Note: this method gets called again, if the uninstallation has to be
+	 * confirmed, either because you've requested a call to {@link BeforeUninstallPayload()}
+	 * or there are tables to be dropped (what the admin user has to confirm).
+	 *
+	 * This should cleanup everything without confirmation!
+	 * @param array Associative array of parameters. 'unattended': true if Uninstall is
+	 * unattended (e.g., the /install action "deletedb" uses it).
+	 * @return boolean|NULL true when it's ok to uninstall, false on failure (the plugin won't
+	 * get uninstalled then). You should add the reason for it through {@link Plugin::msg()}.
+	 * NULL requests to execute the {@link BeforeUninstallPayload()} method.
+	 */
+	function BeforeUninstall( & $params )
+	{
+		return true;
+	}
+
+
+	/**
+	 * Internal Event: Invoked to display the payload before uninstalling the plugin
+	 *
+	 * You have to request a call to this during the plugin uninstall procedure by returning
+	 * NULL in {@link BeforeUninstall()}. If your plugin uses canonical table names (see
+	 * {@link Plugin::get_sql_table()}), there will be already a list of those tables
+	 * included in it. Do not end the form, just add own inputs or hidden keys to it.
+	 * @param array Associative array of parameters. 'Form': The {@link Form} that
+	 * asks the user for confirmation (by reference).
+	 */
+	function BeforeUninstallPayload( & $params )
+	{
+	}
+
+
+	/**
+	 * Internal Event: Display a template
+	 *
+	 * Use {@link Plugin::GetProvidedTemplates()} to return a list of names that you register.
+	 * @param array Associative array of parameters. 'template': name of template to be
+	 * displayed (from the list of {@link Plugin::GetProvidedTemplates()}). If your Plugin
+	 * registers only one template you can ignore it.
+	 */
+	function DisplayTemplate( & $params )
+	{
+	}
+
+
+	/**
+	 * Internal Event: Execute/handle a cron job
+	 *
+	 * Internal Event: Execute/handle a cron job, which has been scheduled by the admin out
+	 * of the list that the Plugin provides (see {@link GetCronJobs()}).
+	 * @param array Associative array of parameters
+	 * - 'ctrl': The "ctrl" name as defined in {@link GetCronJobs()}
+	 * - 'params': The "params" value as defined in {@link GetCronJobs()}, plus "ctsk_ID" which holds the cron task ID.
+	 * @return array with keys "code" (integer, 1 is ok), "message" (gets logged)
+	 */
+	function ExecCronJob( & $params )
+	{
+	}
+
+
+	/**
+	 * Internal Event: Define default Plugin settings
+	 *
+	 * This defines settings that are available on the Global settings => Plugins => {{a plugin}}
+	 * page. You can access them in the plugin through the member object {@link Plugin::$Settings},
+	 * e.g.: <code>$this->Settings->get( 'my_param' );</code>
+	 *
+	 * NOTE: this method gets called by the application when instantiating the plugin settings
+	 * and when the settings get displayed for editing in the backoffice. In the second case,
+	 * $params['for_editing'] will be true.
+	 *
 	 * The array to be returned should define the names of the settings as keys (max length is 30 chars)
 	 * and assign an array with the following keys to them (only 'label' is required):
-	 *
-	 * 'label': Name/Title of the param, gets displayed as label for the input field, or
-	 *              as "legend" tag with types "array" and "fieldset".
-	 * 'defaultvalue': Default value for the setting, defaults to '' (empty string)
-	 * 'type', which can be:
-	 *     'info': not an input - just a label followed by information (text, link, image - whatever)
-	 *         'info': if type is info then use info to supply the actual information
-	 *     'text' (default): a simple string
-	 *     'password': like text, but hidden during input
-	 *     'html_input' : like text, but allows html
-	 *     'checkbox': either 0 or 1
-	 *     'integer': a number (no float, can have leading "+" or "-") (like 'text' for input, but gets validated when submitting)
-	 *     'float': a floating number (can have leading "+" or "-", e.g. "+1", "-0.05") (like 'text' for input, but gets validated when submitting)
-	 *     'textarea': several lines of input. The following can be set for this type:
-	 *         'rows': number of rows
-	 *         'cols': number of columns
-	 *     'html_textarea': like textarea, but allows html
-	 *     'select': a drop down field; you must set 'options' for it:
-	 *         'options': an array of options ('value' => 'description'), see {@link Form::select_input_array()}.
-	 *     'select_blog': a drop down field, providing all existing blogs (Blog ID is the value or "" if "allow_none" is true) (WARNING: does not scale - not recommended)
-	 *     'select_group': a drop down field, providing all existing groups (Group ID is the value or "" if "allow_none" is true)
-	 *     'select_user': a drop down field, providing all existing groups (User ID is the value or "" if "allow_none" is true) (WARNING: does not scale - not recommended)
-	 *     'array': a subset of settings. The value gets automagically (un)serialized through get() and set().
-	 *         The following keys apply to this type:
-	 *        'entries': an array with meta information about sub-settings
-	 *             (which can be everything from the top-level, except: "valid_pattern", "valid_range").
-	 *             Note: currently there's no type forcing or checking
-	 *                 for sub-entries involved (e.g., if you have an entry of type "integer", you could get
-	 *                 a non-numeric string there).
-	 *         fp> TODO: !!!! very unsafe
-	 *        'key': defines the key to use for each entry. This may be a text input for example
-	 *              (with label, note etc). (optional, default is numeric keys, which are not editable)
-	 *       'max_count': maximum count of sets (optional, default is no restriction)
-	 *       'min_count': minimum count of sets (optional, default is no restriction)
-	 * 'note' (gets displayed as a note to the param field),
-	 * 'size': Size of the HTML input field (applies to types 'text', 'password' and 'integer'; defaults to 15)
-	 * 'maxlength': maxlength attribute for the input field (See 'size' above; defaults to no limit)
-	 * 'disabled': if true, it adds a 'disabled="disabled"' html attribute to the element and the value cannot be changed
-	 * 'no_edit': if true, the setting is not editable. This is useful for internal settings.
-	 * 'allow_none': set this to true to have "None" in the options list for types 'select_group' and 'select_user'.
-	 * 'valid_pattern': A regular expression pattern that the value must match.
-	 *                      This is either just a regexp pattern as string or an array
-	 *                      with the keys 'pattern' and 'error' to define a custom error message.
-	 * 'valid_range': An array with keys 'min', 'max' and (optionally) 'error' to define
-	 *                    a custom error message. At least "min" or "max" must be given.
-	 * 'help': can be:
-	 *          '#anchor': anchor that gets appended to {@link $help_url}
-	 *          true: the settings name/key gets transformed to an html ID and gets used as anchor to {@link $help_url}.
-	 *          'http://example.com/uri': a full URL (starting with http:// or https://)
-	 * 'layout': Use this to visually group your settings.
-	 *               Either 'begin_fieldset', 'end_fieldset' or 'separator'. You can use 'label' for 'begin_fieldset'.
-	 * 'multiple': This allows to select multiple values in a SELECT (including select_*) (boolean)
-	 * 'id', 'onchange', 'onclick', 'onfocus', 'onkeyup', 'onkeydown', 'onreset', 'onselect', 'cols', 'rows', 'maxlength':
-	 *       get passed through as attributes to the form/input element.
-	 *
-	 * e.g.:
+
+	 * <ul>
+	 * <li>'label': Name/Title of the param, gets displayed as label for the input field, or as
+	 * "legend" tag with types "array" and "fieldset".</li>
+	 * <li>'type', which can be:<ul>
+	 * <li>'info': not an input - just a label followed by information (text, link, image - whatever)</li>
+	 * <li>'text' (default): a simple string</li>
+	 * <li>'password': like text, but hidden during input</li>
+	 * <li>'html_input' : like text, but allows html</li>
+	 * <li>'checkbox': either 0 or 1</li>
+	 * <li>'integer': a number (no float, can have leading "+" or "-") (like 'text' for input,
+	 * but gets validated when submitting)</li>
+	 * <li>'float': a floating number (can have leading "+" or "-", e.g. "+1", "-0.05") (like
+	 * 'text' for input, but gets validated when submitting)</li>
+	 * <li>'textarea': several lines of input. The following can be set for this type:<ul>
+	 * <li>'rows': number of rows</li>
+	 * <li>'cols': number of columns</li>
+	 * </ul></li>
+	 * <li>'html_textarea': like textarea, but allows html</li>
+	 * <li>'select': a drop down field; you must set 'options' for it:<ul>
+	 * <li>'options': an array of options ('value' => 'description'), see {@link Form::select_input_array()}.</li>
+	 * </ul></li>
+	 * <li>'select_blog': a drop down field, providing all existing blogs (Blog ID is the value or
+	 * "" if "allow_none" is true) (WARNING: does not scale - not recommended)</li>
+	 * <li>'select_group': a drop down field, providing all existing groups (Group ID is the value
+	 * or "" if "allow_none" is true)</li>
+	 * <li>'select_user': a drop down field, providing all existing groups (User ID is the value or
+	 * "" if "allow_none" is true) (WARNING: does not scale - not recommended)</li>
+	 * </ul></li>
+	 * <li>'array': a subset of settings. The value gets automagically (un)serialized through get()
+	 * and set(). The following keys apply to this type:<ul>
+	 * <li>'entries': an array with meta information about sub-settings (which can be everything from
+	 * the top-level, except: "valid_pattern", "valid_range"). Note: currently there's no type
+	 * forcing or checking for sub-entries involved (e.g., if you have an entry of type "integer",
+	 * you could get a non-numeric string there). fp> TODO: !!!! very unsafe</li>
+	 * <li>'key': defines the key to use for each entry. This may be a text input for example
+	 * (with label, note etc). (optional, default is numeric keys, which are not editable)</li>
+	 * <li>'max_count': maximum count of sets (optional, default is no restriction)</li>
+	 * <li>'min_count': minimum count of sets (optional, default is no restriction)</li>
+	 * </ul></li>
+	 * <li>'size': Size of the HTML input field (applies to types 'text', 'password' and 'integer';
+	 * defaults to 15)</li>
+	 * <li>'maxlength': maxlength attribute for the input field (See 'size' above; defaults to
+	 * no limit)</li>
+	 * <li>'disabled': if true, it adds a 'disabled="disabled"' html attribute to the element and
+	 * the value cannot be changed</li>
+	 * <li>'no_edit': if true, the setting is not editable. This is useful for internal settings.</li>
+	 * <li>'allow_none': set this to true to have "None" in the options list for types 'select_group'
+	 * and 'select_user'.</li>
+	 * <li>'multiple': This allows to select multiple values in a SELECT (including select_*) (boolean)</li>
+	 * <li>'valid_pattern': A regular expression pattern that the value must match. This is either
+	 * just a regexp pattern as string or an array with the keys 'pattern' and 'error' to define
+	 * a custom error message.</li>
+	 * <li>'valid_range': An array with keys 'min', 'max' and (optionally) 'error' to define a
+	 * custom error message. At least "min" or "max" must be given.</li>
+	 * <li>'help': can be:<ul>
+	 * <li>'#anchor': anchor that gets appended to {@link $help_url}</li>
+	 * <li>true: the settings name/key gets transformed to an html ID and gets used as anchor to {@link $help_url}.</li>
+	 * <li>'http://example.com/uri': a full URL (starting with http:// or https://)</li>
+	 * </ul></li>
+	 * <li>'defaultvalue': Default value for the setting, defaults to '' (empty string)</li>
+	 * <li>'note' (gets displayed as a note to the param field).</li>
+	 * <li>'layout': Use this to visually group your settings. Either 'begin_fieldset', 'end_fieldset'
+	 * or 'separator'. You can use 'label' for 'begin_fieldset'.</li>
+	 * <li>'id', 'onchange', 'onclick', 'onfocus', 'onkeyup', 'onkeydown', 'onreset', 'onselect', 'cols', 'rows', 'maxlength':
+	 * get passed through as attributes to the form/input element.</li>
+	 * </ul>
+	 *
+	 * Example:
 	 * <code>
 	 * return array(
 	 *   'my_param' => array(
 	 *     'label' => $this->T_('My Param'),
 	 *     'defaultvalue' => '10',
+	 *     'valid_pattern' => array( 'pattern' => '[1-9]\d+', $this->T_('The value must be >= 10.') ),
 	 *     'note' => $this->T_('Quite cool, eh?'),
-	 *     'valid_pattern' => array( 'pattern' => '[1-9]\d+', $this->T_('The value must be >= 10.') ),
 	 *   ),
 	 *   'another_param' => array( // this one has no 'note'
 	 *     'label' => $this->T_('My checkbox'),
+	 *     'type' => 'checkbox',
 	 *     'defaultvalue' => '1',
-	 *     'type' => 'checkbox',
 	 *   ),
 	 *   array( 'layout' => 'separator' ),
-	 *   'my_select' => array(
+	 *     'my_select' => array(
 	 *     'label' => $this->T_('Selector'),
+	 *     'type' => 'select',
+	 *     'options' => array(
+	 *       'sun' => $this->T_('Sunday')
+	 *       'mon' => $this->T_('Monday')
+	 *     ),
 	 *     'defaultvalue' => 'one',
-	 *     'type' => 'select',
-	 *     'options' => array( 'sun' => $this->T_('Sunday'), 'mon' => $this->T_('Monday') ),
-	 *   ) );
+	 *   )
+	 * );
 	 * </code>
-	 *
+	 * @param array Associative array of parameters
+	 * - 'for_editing': 'true' if the settings get queried for editing, 'false' if they get
+	 *   queried for instantiating {@link Plugin::$Settings}.
+	 * @return array Array of plugin's settings
 	 */
 	function GetDefaultSettings( & $params )
 	{
@@ -461,23 +467,34 @@
 
 
 	/**
-	 * Define here default user settings that are then available in the backoffice.
+	 * Internal Event: Define default Blog settings
+	 * @see Plugin::GetDefaultSettings()
+	 * @param array Associative array of parameters. 'for_editing': true if the settings get
+	 * queried for editing, false if they get queried for instantiating {@link Plugin::$UserSettings}.
+	 * @return array See {@link Plugin::GetDefaultSettings()}.
+	 */
+	function GetDefaultBlogSettings( & $params )
+	{
+		return array();
+	}
+
+
+	/**
+	 * Internal Event: Define default User settings
 	 *
-	 * You can access them in the plugin through the member object
-	 * {@link $UserSettings}, e.g.:
+	 * This method behaves exactly like {@link Plugin::GetDefaultSettings()}, except that it
+	 * defines user specific settings instead of global settings. You can access them in the
+	 * plugin through the member object {@link $UserSettings} e.g.:
 	 * <code>$this->UserSettings->get( 'my_param' );</code>
 	 *
-	 * This method behaves exactly like {@link Plugin::GetDefaultSettings()},
-	 * except that it defines user specific settings instead of global settings.
-	 *
-	 * @todo 3.0 fp> 1) This is not an event: RENAME to lowercase (in b2evo 3.0)
-	 * @todo 3.0 fp> 2) This defines more than Default values ::  confusing name
-	 * @todo name tentative get_user_param_definitions()
-	 *
+	 * This hook accepts special cases for a user's avatar and (brief) biography. These fields
+	 * are stored in the core table, but it is up to your plugin to use them. To activate them
+	 * in a user's profile add either of these to your user settings array:
+	 * <code>'use_avatar' => true,</code>
+	 * <code>'use_biography' => true,</code>
 	 * @see Plugin::GetDefaultSettings()
-	 * @param array Associative array of parameters.
-	 *    'for_editing': true, if the settings get queried for editing;
-	 *                   false, if they get queried for instantiating {@link Plugin::$UserSettings}.
+	 * @param array Associative array of parameters. 'for_editing': true if the settings get
+	 * queried for editing, false if they get queried for instantiating {@link Plugin::$UserSettings}.
 	 * @return array See {@link Plugin::GetDefaultSettings()}.
 	 */
 	function GetDefaultUserSettings( & $params )
@@ -487,23 +504,7 @@
 
 
 	/**
-	 * Define here default collection/blog settings that are to be made available in the backoffice.
-	 *
-	 * @see Plugin::GetDefaultSettings()
-	 * @param array Associative array of parameters.
-	 *    'for_editing': true, if the settings get queried for editing;
-	 *                   false, if they get queried for instantiating {@link Plugin::$UserSettings}.
-	 * @return array See {@link Plugin::GetDefaultSettings()}.
-	 */
-	function GetDefaultBlogSettings( & $params )
-	{
-		return array();
-	}
-
-
-  /**
-   * Get definitions for widget specific editable params
-   *
+	 * Internal Event: Define default Widget settings
 	 * @see Plugin::GetDefaultSettings()
 	 * @param local params like 'for_editing' => true
 	 */
@@ -514,71 +515,20 @@
 
 
 	/**
-	 * Get the list of dependencies that the plugin has.
-	 *
-	 * This gets checked on install or uninstall of a plugin.
-	 *
-	 * There are two <b>classes</b> of dependencies:
-	 *  - 'recommends': This is just a recommendation. If it cannot get fulfilled
-	 *                  there will just be a note added on install.
-	 *  - 'requires': A plugin cannot be installed if the dependencies cannot get
-	 *                fulfilled. Also, a plugin cannot get uninstalled, if another
-	 *                plugin depends on it.
-	 *
-	 * Each <b>class</b> of dependency can have the following types:
-	 *  - 'events_by_one': A list of eventlists that have to be provided by a single plugin,
-	 *                     e.g., <code>array( array('CaptchaPayload', 'CaptchaValidated') )</code>
-	 *                     to look for a plugin that provides both events.
-	 *  - 'plugins':
-	 *    A list of plugins, either just the plugin's classname or an array with
-	 *    classname and minimum version of the plugin (see {@link Plugin::$version}).
-	 *    E.g.: <code>array( 'test_plugin', '1' )</code> to require at least version "1"
-	 *          of the test plugin.
-	 *  - 'app_min': Minimum application (QP) version, e.g. "1.0".
-	 *               This way you can make sure that the hooks you need are implemented in the core.
-	 *
-	 * @see test_plugin::GetDependencies()
-	 * @return array
-	 */
-	function GetDependencies()
-	{
-		return array(); // no dependencies by default, of course
-	}
-
-
-	/**
-	 * This method should return your DB schema, consisting of a list of CREATE TABLE
-	 * queries.
-	 *
-	 * The DB gets changed accordingly on installing or enabling your Plugin.
-	 *
-	 * If you want to change your DB layout in a new version of your Plugin, simply
-	 * adjust the queries here and increase {@link Plugin::$version}, because this will
-	 * request to check the current DB layout against the one you require.
-	 *
-	 * For restrictions see {@link db_delta()}.
-	 */
-	function GetDbLayout()
-	{
-		return array();
-	}
-
-
-	/**
-	 * This method gets asked when plugins get installed and allows you to return a list
-	 * of extra events, which your plugin triggers itself (e.g. through
-	 * {@link $Plugins->trigger_event()}).
-	 *
-	 * NOTE: PLEASE use a distinct prefix for the event name, e.g. "$this->classname".