Merge lp:~quam-plures-core/quam-plures/qp5_colls-blogs_chaps-cats into lp:quam-plures

[EdB]

http://forums.quamplures.net/viewtopic.php?f=6&t=1895
Tested as much as I can think of and haven't found any more problems, so yay progress :)

=== modified file 'index.php'
--- index.php	2010-12-31 12:12:03 +0000
+++ index.php	2013-03-14 18:35:26 +0000
@@ -1,79 +1,76 @@
 <?php
 /**
- * This is the main public interface file.
- *
- * IF YOU ARE READING THIS IN YOUR WEB BROWSER, IT MEANS THAT PHP IS NOT PROPERLY INSTALLED
- * ON YOUR WEB SERVER. IF YOU DON'T KNOW WHAT THIS MEANS, CONTACT YOUR SERVER ADMINISTRATOR
- * OR YOUR HOSTING COMPANY.
- *
- * This file is NOT mandatory. You can delete it if you want.
- * You can also replace the contents of this file with contents similar to the contents
- * of a_stub.php, a_notemplate.php, multiblogs.php, etc.
- *
- * Quam Plures - {@link http://quamplures.net/}
- * Released under GNU GPL License - {@link http://quamplures.net/license.html}
- * @copyright (c) 2009 - 2011 by the Quam Plures developers - {@link http://quamplures.net/}
- * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
- *
- * {@internal Note: we need at least one file in the main package}}
- *
- * @package pond
+ * This is the main public interface file
+ *
+ * IF YOU ARE READING THIS IN YOUR WEB BROWSER, IT MEANS THAT PHP IS
+ * NOT PROPERLY INSTALLED ON YOUR WEB SERVER. IF YOU DON'T KNOW WHAT
+ * THIS MEANS, CONTACT YOUR SERVER ADMINISTRATOR OR HOSTING COMPANY.
+ *
+ * This file is NOT mandatory. You can delete it if you want. You can also
+ * replace the contents of this file with a stub file or something like
+ * multiblogs.php or summary.php.
+ * @author {@link http://wonderwinds.com/ Ed Bennett}
+ * @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
  */
 
 /**
- * First thing: Do the minimal initializations required for QP:
+ * Load the configuration minimum
  */
 require_once dirname(__FILE__).'/qp_config/_config.php';
 
 /**
- * Check this: we are requiring _main.inc.php INSTEAD of _blog_main.inc.php
- * because we are not trying to initialize any particular blog
+ * Main initialization, without a specific blog identified
  */
 require_once $inc_path.'_main.inc.php';
 
-// Check if a specific blog has been requested in the URL:
+// Check if a specific blog has been requested in the URL
 param( 'blog', 'integer', '', true );
 
 if( empty($blog) )
-{ // No blog requested by URL param, let's try to match something in the URL
-	$Debuglog->add( 'No blog param received, checking extra path...', 'detectblog' );
-
+{
+	// No blog requested by URL param, let's try to match something in the URL
 	$BlogCache = & get_Cache( 'BlogCache' );
 
 	if( preg_match( '#^(.+?)index.php/([^/]+)#', $ReqHost.$ReqPath, $matches ) )
-	{ // We have an URL blog name:
-		$Debuglog->add( 'Found a potential URL blog name: '.$matches[2], 'detectblog' );
-		if( (($Blog = & $BlogCache->get_by_urlname( $matches[2], false )) !== false) )
-		{ // We found a matching blog:
+	{
+		// We have an URL blog name
+		if( ( ( $Blog = & $BlogCache->get_by_urlname( $matches[2], false ) ) !== false ) )
+		{
+			// We found a matching blog
 			$blog = $Blog->ID;
 		}
 	}
 
 	if( empty($blog) )
-	{ // No blog identified by URL name, let's try to match the absolute URL
+	{
+		// No blog identified by URL name, let's try to match the absolute URL
 		if( preg_match( '#^(.+?)index.php#', $ReqHost.$ReqPath, $matches ) )
-		{ // Remove what's not part of the absolute URL
+		{
+			// Remove what's not part of the absolute URL
 			$ReqAbsUrl = $matches[1];
 		}
 		else
 		{
 			$ReqAbsUrl = $ReqHost.$ReqPath;
 		}
-		$Debuglog->add( 'Looking up absolute url : '.$ReqAbsUrl, 'detectblog' );
-
-		if( (($Blog = & $BlogCache->get_by_url( $ReqAbsUrl, false )) !== false) )
-		{ // We found a matching blog:
+		if( ( ( $Blog = & $BlogCache->get_by_url( $ReqAbsUrl, false ) ) !== false ) )
+		{
+			// We found a matching blog
 			$blog = $Blog->ID;
-			$Debuglog->add( 'Found matching blog: '.$blog, 'detectblog' );
 		}
 	}
 
 	if( empty($blog) )
-	{ // Still no blog requested, use default
-		$blog = $Settings->get('default_blog_ID');
-		if( (($Blog = & $BlogCache->get_by_ID( $blog, false, false )) !== false) )
-		{ // We found a matching blog:
-			$Debuglog->add( 'Using default blog '.$blog, 'detectblog' );
+	{
+		// Still no blog requested, use default
+		$blog = $Settings->get( 'default_blog_ID' );
+		if( ( ($Blog = & $BlogCache->get_by_ID( $blog, false, false ) ) !== false ) )
+		{
+			// We found a matching blog
+			// debuglog-add removed
 		}
 		else
 		{
@@ -81,8 +78,9 @@
 		}
 	}
 
-	if( empty($blog) )
-	{ // No specific blog to be displayed, so make something nice then exit
+	if( empty( $blog ) )
+	{
+		// No specific blog to be displayed, so make something nice then exit
 		header_content_type( 'text/html' ); // sets charset
 		?>
 		<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -114,14 +112,15 @@
 		<?php
 		// messages generated from actions
 		messages( array() );
-		$BlogCache = & get_Cache('BlogCache');
+		$BlogCache = & get_Cache( 'BlogCache' );
 		$BlogCache->load_all();
 		if( count( $BlogCache->cache ) == 0 )
-		{	// There is no blog on this system!
+		{
+			// There is no blog on this system!
 			echo '<p><strong>';
 			printf( T_('%s is installed and ready but you haven\'t created any blog on this system yet.'), $app_name );
 			echo '</strong></p>';
-			echo '<p><a href="'.$admin_url.'?ctrl=collections&amp;action=new">'.T_( 'Create a first blog' ).' &raquo;</a></p>';
+			echo '<p><a href="'.$admin_url.'?ctrl=blogs&amp;action=new">'.T_( 'Create a first blog' ).' &raquo;</a></p>';
 		}
 		else
 		{
@@ -143,31 +142,33 @@
 		?>
 		</div></div></div></div></body></html>
 		<?php
-		exit();
+		exit(0);
 	}
 }
 
-// A blog has been requested... Let's set a few default params:
+// A blog has been requested ... Let's set a few default params.....
 
-# You could *force* a specific template here with this setting:
+// You could *force* a specific template here with this setting:
 # $template = 'basic';
 
-# This setting retricts posts to those published, thus hiding drafts.
-# You should not have to change this.
+// This setting retricts posts to those published, thus hiding drafts. You should
+// not have to change this.
 $show_statuses = array();
 
-# Here you can set a limit before which posts will be ignored
-# You can use a unix timestamp value or 'now' which will hide all posts in the past
+// Here you can set a limit before which posts will be ignored. You can use a
+// unix timestamp value or 'now' which will hide all posts in the past
 $timestamp_min = '';
 
-# Here you can set a limit after which posts will be ignored
-# You can use a unix timestamp value or 'now' which will hide all posts in the future
+// Here you can set a limit after which posts will be ignored. You can use a
+// unix timestamp value or 'now' which will hide all posts in the future
 $timestamp_max = 'now';
 
-# Additionnaly, you can set other values (see URL params in the manual)...
+// Additionnaly, you can set other values (see URL params in the manual)...
 # $order = 'ASC'; // This for example would display the blog in chronological order...
 
-// That's it, now let Quam Plures do the rest! :)
+/**
+ * Main initialization, with the identified $blog
+ */
 require $inc_path.'_blog_main.inc.php';
 
 ?>

=== modified file 'multiblogs.php'
--- multiblogs.php	2013-03-08 20:58:52 +0000
+++ multiblogs.php	2013-03-14 18:35:26 +0000
@@ -212,7 +212,7 @@
 			'unit' => $unit,
 		) );
 
-		// Run the query:
+		// Run the query
 		$BlogBList->query();
 		while( $Item = & $BlogBList->get_item() )
 		{
@@ -249,7 +249,7 @@
 			'unit' => $unit,
 		) );
 
-		// Run the query:
+		// Run the query
 		$LinkblogList->query();
 		while( $Item = & $LinkblogList->get_item() )
 		{
@@ -285,7 +285,7 @@
 	<h3><?php echo T_('Misc') ?></h3>
 	<ul>
 	<?php
-	// Administrative links:
+	// Administrative links
 	user_login_link( '<li>', '</li>' );
 	user_register_link( '<li>', '</li>' );
 	user_admin_link( '<li>', '</li>' );

=== modified file 'qp_inc/_application.php'
--- qp_inc/_application.php	2013-03-08 20:58:52 +0000
+++ qp_inc/_application.php	2013-03-14 18:35:26 +0000
@@ -19,10 +19,10 @@
 $app_homepage = 'http://quamplures.net/';
 
 // The fileset version: incremented in tenths, at whatever rate feels good :)
-$files_version = '1.10';
+$files_version = '1.20';
 
 // The database version, incrememented by 1 with each change in upgrade_dbase_tables()
-$app_db_version = 20;
+$app_db_version = 34;
 
 $app_version = $files_version.'.'.$app_db_version;
 

=== modified file 'qp_inc/_blog_main.inc.php'
--- qp_inc/_blog_main.inc.php	2011-06-28 05:46:28 +0000
+++ qp_inc/_blog_main.inc.php	2013-03-14 18:35:26 +0000
@@ -1,174 +1,126 @@
 <?php
 /**
- * This file loads and initializes the blog to be displayed.
- *
- * This file is part of the Quam Plures project - {@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-2005 by Daniel HAHLER - {@link http://thequod.de/contact}.
- *
- * @license http://quamplures.net/license.html GNU General Public License (GPL)
- *
- * {@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 loads and initializes the blog to be displayed
+ *
+ * @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_CONFIG_LOADED') ) die( 'Please, do not access this page directly.' );
+if(!defined('QP_CONFIG_LOADED')) die('fail');
 
 /**
- * Initialize everything:
+ * Initialize everything
  */
 require_once dirname(__FILE__).'/_main.inc.php';
 
-load_funcs('templates/_template.funcs.php');
-load_class('items/model/_itemlist.class.php');
+load_funcs( 'templates/_template.funcs.php' );
 
 $Timer->start( '_blog_main.inc' );
 
-
-/*
- * blog ID. This is a little bit special.
- *
- * In most cases $blog should be set by a stub file and the param() call below will just check that it's an integer.
- *
- * Note we do NOT memorize the param as we don't want it in regenerate_url() calls.
- * Whenever we do, index.php will already have called param() with memorize=true
- *
- * In some cases $blog will not have been set before and it will be set with the param() call below.
- * Currently, this only happens with the old /qp_srvc/ RSS stubs.
- */
+// blog ID. This is a little bit special. In most cases $blog should be set by a
+// stub file and the param() call below will just check that it's an integer. Note
+// we do NOT memorize the param as we don't want it in regenerate_url() calls. Whenever
+// we do, index.php will already have called param() with memorize=true In some cases
+// $blog will not have been set before and it will be set with the param() call below.
+// Currently, this only happens with the old /qp_srvc/ RSS stubs.
 param( 'blog', 'integer', '', false );
 
-// Getting current blog info:
+// Getting current blog info
 $BlogCache = & get_Cache( 'BlogCache' );
-/**
- * @var Blog
- */
 $Blog = & $BlogCache->get_by_ID( $blog, false, false );
 if( empty( $Blog ) )
 {
-	require $templates_path.'_404_blog_not_found.main.php'; // error & exit
-	// EXIT.
+	// error & exit
+	require $templates_path.'_404_blog_not_found.main.php';
 }
 
-
 // Init $disp
 param( 'disp', 'string', 'posts', true );
 $disp_detail = '';
 
-
-/*
- * _______________________________ Locale / Charset for the Blog _________________________________
- *
-	TODO: blueyed>> This should get moved as default to the locale detection in _main.inc.php,
-	        as we only want to activate the I/O charset, which is probably the user's..
-	        It prevents using a locale/charset in the front office, apart from the one given as default for the blog!!
-fp>there is no blog defined in _main and there should not be any
-blueyed> Sure, but that means we should either split it, or use the locale here only, if there's no-one given with higher priority.
-*/
-// Activate matching locale:
-$Debuglog->add( 'Activating blog locale: '.$Blog->get('locale'), 'locale' );
+// Locale / Charset for the Blog - activate matching locale
 locale_activate( $Blog->get('locale') );
 
-
-// Re-Init charset handling, in case current_charset has changed:
+// Re-Init charset handling, in case current_charset has changed
 if( init_charsets( $current_charset ) )
 {
-  // Reload Blog(s) (for encoding of name, tagline etc):
-  $BlogCache->clear();
-
-  $Blog = & $BlogCache->get_by_ID( $blog );
-}
-
-
-/*
- * _____________________________ Extra path info decoding ________________________________
- *
- * This will translate extra path into 'regular' params.
- *
- * Decoding should try to work like this:
- *
- * baseurl/blog-urlname/junk/.../junk/post-title    -> points to a single post (no ending slash)
- * baseurl/blog-urlname/junk/.../junk/p142          -> points to a single post
- * baseurl/blog-urlname/2006/                       -> points to a yearly archive because of ending slash + 4 digits
- * baseurl/blog-urlname/2006/12/                    -> points to a monthly archive
- * baseurl/blog-urlname/2006/12/31/                 -> points to a daily archive
- * baseurl/blog-urlname/2006/w53/                   -> points to a weekly archive
- * baseurl/blog-urlname/junk/.../junk/chap-urlname/ -> points to a single chapter/category (because of ending slash)
- * Note: category names cannot be named like this [a-z][0-9]+
- */
-if( ! isset( $resolve_extra_path ) ) { $resolve_extra_path = true; }
+	// Reload Blog(s) (for encoding of name, tagline etc)
+	$BlogCache->clear();
+	$Blog = & $BlogCache->get_by_ID( $blog );
+}
+
+// Extra path info decoding. This will translate extra path into 'regular' params.
+// Decoding should try to work like this:
+// - baseurl/blog-urlname/junk/.../junk/post-title -> points to a single post (no ending slash)
+// - baseurl/blog-urlname/junk/.../junk/p142 -> points to a single post
+// - baseurl/blog-urlname/2006/ -> points to a yearly archive because of ending slash + 4 digits
+// - baseurl/blog-urlname/2006/12/ -> points to a monthly archive
+// - baseurl/blog-urlname/2006/12/31/ -> points to a daily archive
+// - baseurl/blog-urlname/2006/w53/ -> points to a weekly archive
+// - baseurl/blog-urlname/junk/.../junk/cat-urlname/ -> points to a single category (because of ending slash)
+// Note: category names cannot be named like this [a-z][0-9]+
+if( ! isset( $resolve_extra_path ) )
+{
+	$resolve_extra_path = true;
+}
+
 if( $resolve_extra_path )
 {
-	// Check and Remove blog base URI from ReqPath:
+	// Check and Remove blog base URI from ReqPath
 	$blog_baseuri = substr( $Blog->gen_baseurl(), strlen( $Blog->get('baseurlroot') ) );
-	$Debuglog->add( 'blog_baseuri: "'.$blog_baseuri.'"', 'params' );
 
-	// Remove trailer:
+	// Remove trailer
 	$blog_baseuri_regexp = preg_replace( '¤(\.php[0-9]?)?/?$¤', '', $blog_baseuri );
-	// Readd possibilities in order to get a broad match:
+	// Read possibilities in order to get a broad match
 	$blog_baseuri_regexp = '¤^'.preg_quote( $blog_baseuri_regexp ).'(\.php[0-9]?)?/(.+)$¤';
 
 	if( preg_match( $blog_baseuri_regexp, $ReqPath, $matches ) )
-	{ // We have extra path info
+	{
+		// We have extra path info
 		$path_string = $matches[2];
-
-		$Debuglog->add( 'Extra path info found! path_string=' . $path_string , 'params' );
-
 		// Replace encoded ";" and ":" with regular chars (used for tags)
-		// TODO: dh> why not urldecode it altogether? fp> would prolly make sense but requires testing -- note: check with tags (move urldecode from tags up here)
-		// TODO: PHP5: use str_ireplace
 		$path_string = str_replace(
-			array('%3b', '%3B', '%3a', '%3A'),
-			array(';', ';', ':', ':'),
+			array( '%3b', '%3B', '%3a', '%3A' ),
+			array( ';', ';', ':', ':' ),
 			$path_string );
 
-		// Slice the path:
+		// Slice the path
 		$path_elements = preg_split( '~/~', $path_string, 20, PREG_SPLIT_NO_EMPTY );
 
 		if( isset( $path_elements[0] )
 			&& ( $path_elements[0] == $Blog->stub
 				|| $path_elements[0] == $Blog->urlname
 				|| $path_elements[0] == 'index.php' ) )
-		{ // Ignore stub files, blog url names, and index.php
+		{
+			// Ignore stub files, blog url names, and index.php
 			array_shift( $path_elements );
-			$Debuglog->add( 'Ignoring stub filename, blog urlname, or index.php in extra path info' , 'params' );
 		}
 
 		if( isset( $path_elements[0] )
 			&& ( substr_count( $path_elements[0], '.' ) != 0 )
 			&& is_file( $basepath.$path_elements[0] ) )
-		{ // Ignore filenames that exist in root
+		{
+			// Ignore filenames that exist in root
 			array_shift( $path_elements );
-			$Debuglog->add( 'Ignoring filenames that exist as installation root files in extra path info' , 'params' );
 		}
 
 		// Do we still have extra path info to decode?
 		if( count($path_elements) )
 		{
-			// TODO: dh> add plugin hook here, which would allow to handle path elements (name spaces in clean URLs), and to override internal functionality (e.g. handle tags in a different way).
 			// Is this a tag ("prefix-only" mode)?
-			if( $Blog->get_setting('tag_links') == 'prefix-only'
+			if( $Blog->get_setting( 'tag_links' ) == 'prefix-only'
 				&& count($path_elements) == 2
-				&& $path_elements[0] == $Blog->get_setting('tag_prefix')
+				&& $path_elements[0] == $Blog->get_setting( 'tag_prefix' )
 				&& isset($path_elements[1]) )
 			{
 				$tag = strip_tags(urldecode($path_elements[1]));
-
-				// # of posts per page for tag page:
+				// # of posts per page for tag page
 				if( ! $posts = $Blog->get_setting( 'tag_posts_per_page' ) )
-				{ // use blog default
+				{
+					// use blog default
 					$posts = $Blog->get_setting( 'posts_per_page' );
 				}
 			}
@@ -177,189 +129,201 @@
 				// Does the pathinfo end with a / or a ; ?
 				$last_char = substr( $path_string, -1 );
 				$last_part = $path_elements[count( $path_elements )-1];
-				$last_len  = strlen( $last_part );
+				$last_len = strlen( $last_part );
 				if( ( $last_char == '-' && ( ! $tags_dash_fix || $last_len != 40 ) ) || $last_char == ':'|| $last_char == ';' )
-				{	// - : or ; -> We'll consider this to be a tag page
+				{
+					// - : or ; -> We'll consider this to be a tag page
 					$tag = substr( $last_part, 0, -1 );
 					$tag = urldecode($tag);
-					$tag = strip_tags($tag);	// security
+					$tag = strip_tags($tag); // security
 
 					// # of posts per page:
 					if( ! $posts = $Blog->get_setting( 'tag_posts_per_page' ) )
-					{ // use blog default
+					{
+						// use blog default
 						$posts = $Blog->get_setting( 'posts_per_page' );
 					}
 				}
 				elseif( ( $tags_dash_fix && $last_char == '-' && $last_len == 40 ) || $last_char != '/' )
-				{	// NO ENDING SLASH or ends with a dash, is 40 chars long and $tags_dash_fix is true
-					// -> We'll consider this to be a ref to a post.
-					$Debuglog->add( 'We consider this o be a ref to a post - last char: '.$last_char, 'params' );
+				{
+					// NO ENDING SLASH or ends with a dash, is 40 chars long and $tags_dash_fix is true
+					// -> We'll consider this to be a reference to a post.
 
-					// Set a lot of defaults as if we had received a complex URL:
+					// Set a lot of defaults as if we had received a complex URL
 					$m = '';
 					$more = 1; // Display the extended entries' text
-					$c = 1;    // Display comments
-					$tb = 1;   // Display trackbacks
+					$c = 1; // Display comments
+					$tb = 1; // Display trackbacks
 
 					if( preg_match( '#^p([0-9]+)$#', $last_part, $req_post ) )
-					{ // The last param is of the form p000
-						$p = $req_post[1];		// Post to display
+					{
+						// The last param is of the form p000
+						$p = $req_post[1]; // Post to display
 					}
 					else
-					{ // Last param is a string, we'll consider this to be a post urltitle
+					{
+						// Last param is a string, we'll consider this to be a post urltitle
 						$title = $last_part;
 					}
 				}
 				else
-				{	// ENDING SLASH -> we are looking for a daterange OR a chapter:
-					$Debuglog->add( 'Last part: '.$last_part , 'params' );
+				{
+					// ENDING SLASH -> we are looking for a daterange OR a category
 					if( preg_match( '|^w?[0-9]+$|', $last_part ) )
-					{ // Last part is a number or a "week" number:
+					{
+						// Last part is a number or a "week" number
 						$i=0;
-						$Debuglog->add( 'Last part is a number or a "week" number: '.$path_elements[$i] , 'params' );
 						if( isset( $path_elements[$i] ) )
 						{
 							if( is_numeric( $path_elements[$i] ) )
-							{ // We'll consider this to be the year
+							{
+								// We'll consider this to be the year
 								$m = $path_elements[$i++];
-								$Debuglog->add( 'Setting year from extra path info. $m=' . $m , 'params' );
 
-								// Also use the prefered posts per page for archives (may be NULL, in which case the blog default will be used later on)
+								// Also use the prefered posts per page for archives (may be NULL,
+								// in which case the blog default will be used later on)
 								if( ! $posts = $Blog->get_setting( 'archive_posts_per_page' ) )
-								{ // use blog default
+								{
+									// use blog default
 									$posts = $Blog->get_setting( 'posts_per_page' );
 								}
 
 								if( isset( $path_elements[$i] ) && is_numeric( $path_elements[$i] ) )
-								{ // We'll consider this to be the month
+								{
+									// We'll consider this to be the month
 									$m .= $path_elements[$i++];
-									$Debuglog->add( 'Setting month from extra path info. $m=' . $m , 'params' );
 
 									if( isset( $path_elements[$i] ) && is_numeric( $path_elements[$i] ) )
-									{ // We'll consider this to be the day
+									{
+										// We'll consider this to be the day
 										$m .= $path_elements[$i++];
-										$Debuglog->add( 'Setting day from extra path info. $m=' . $m , 'params' );
 									}
 								}
 								elseif( isset( $path_elements[$i] ) && substr( $path_elements[$i], 0, 1 ) == 'w' )
-								{ // We consider this a week number
+								{
+									// We consider this a week number
 									$w = substr( $path_elements[$i], 1, 2 );
 								}
 							}
 							else
-							{	// We did not get a number/year...
+							{
+								// We did not get a number/year...
 								$disp = '404';
 								$disp_detail = '404-malformed_url-missing_year';
 							}
 						}
 					}
-					elseif( preg_match( '|^[A-Za-z0-9\-_]+$|', $last_part ) )	// UNDERSCORES for catching OLD URLS!!!
-					{	// We are pointing to a chapter/category:
-						$ChapterCache = & get_Cache( 'ChapterCache' );
-						/**
-						 * @var Chapter
-						 */
-						$Chapter = & $ChapterCache->get_by_urlname( $last_part, false );
-						if( empty( $Chapter ) )
-						{	// We could not match a chapter...
-							// We are going to consider this to be a post title with a misplaced trailing slash.
-							// That happens when upgrading from WP for example.
+					elseif( preg_match( '|^[A-Za-z0-9\-_]+$|', $last_part ) ) // UNDERSCORES for catching OLD URLS!!!
+					{
+						// We are pointing to a category
+						$CategoryCache = & get_Cache( 'CategoryCache' );
+						$Category = & $CategoryCache->get_by_urlname( $last_part, false );
+						if( empty( $Category ) )
+						{
+							// We could not match a category; consider this to be a post title with a
+							// misplaced trailing slash. That happens when upgrading from WP for example.
 							$title = $last_part; // Will be sought later
-							$already_looked_into_chapters = true;
+							$already_looked_into_cats = true;
 						}
 						else
-						{	// We could match a chapter from the extra path:
-							$cat = $Chapter->ID;
+						{
+							// We could match a category from the extra path
+							$cat = $Category->ID;
 							// Also use the prefered posts per page for a cat
-							if( ! $posts = $Blog->get_setting( 'chapter_posts_per_page' ) )
-							{ // use blog default
+							if( ! $posts = $Blog->get_setting( 'category_posts_per_page' ) )
+							{
+								// use blog default
 								$posts = $Blog->get_setting( 'posts_per_page' );
 							}
 						}
 					}
 					else
-					{	// We did not get anything we can decode...
+					{
+						// We did not get anything we can decode...
 						$disp = '404';
 						$disp_detail = '404-malformed_url-bad_char';
 					}
 				}
 			}
 		}
-
 	}
 }
 
-
-/*
- * ____________________________ Query params ____________________________
- *
- * Note: if the params have been set by the extra-path-info above, param() will not touch them.
- */
-param( 'p', 'integer', '', true );			// Specific post number to display
-param( 'title', 'string', '', true );		// urtitle of post to display
-param( 'redir', 'string', 'yes', false );	// Do we allow redirection to canonical URL? (allows to force a 'single post' URL for commenting)
-param( 'preview', 'integer', 0, true );		// Is this preview ?
-param( 'stats', 'integer', 0 );				// Deprecated but might still be used by spambots
-param( 'cat', 'integer', '', true );		// Chapter ID
-
-// In case these were not set by the stub:
-if( !isset($timestamp_min) ) $timestamp_min = '';
-if( !isset($timestamp_max) ) $timestamp_max = '';
-
-
-/*
- * ____________________________ Get specific Item if requested ____________________________
- */
-if( !empty($p) || !empty($title) )
-{ // We are going to display a single post
-	// Make sure the single post we're requesting (still) exists:
+// Query params ... Note: if the params have been set by the extra-path-info
+// above, param() will not touch them.
+
+// Specific post number to display
+param( 'p', 'integer', '', true );
+// urtitle of post to display
+param( 'title', 'string', '', true );
+// Do we allow redirection to canonical URL? (allows to force a 'single post' URL for commenting)
+param( 'redir', 'string', 'yes', false );
+// Is this preview ?
+param( 'preview', 'integer', 0, true );
+// Deprecated but might still be used by spambots
+param( 'stats', 'integer', 0 );
+// category ID
+param( 'cat', 'integer', '', true );
+
+// In case these were not set by the stub
+if( ! isset( $timestamp_min ) ) $timestamp_min = '';
+if( ! isset( $timestamp_max ) ) $timestamp_max = '';
+
+// Get specific Item if requested
+if( ! empty( $p ) || ! empty( $title ) )
+{
+	// We are going to display a single post
+	// Make sure the single post we're requesting (still) exists
 	$ItemCache = & get_Cache( 'ItemCache' );
-	if( !empty($p) )
-	{	// Get from post ID:
+	if( ! empty( $p ) )
+	{
+		// Get from post ID
 		$Item = & $ItemCache->get_by_ID( $p, false );
 	}
 	else
-	{	// Get from post title:
+	{
+		// Get from post title
 		$orig_title = $title;
 		$title = preg_replace( '/[^A-Za-z0-9_]/', '-', $title );
 		$Item = & $ItemCache->get_by_urltitle( $title, false );
 	}
 	if( empty( $Item ) )
-	{	// Post doesn't exist!
-
+	{
+		// Post doesn't exist!
 		// fp> TODO: ->viewing_allowed() for draft, private, protected and deprecated...
-
 		$title_fallback = false;
 		$tag_fallback = ( $tags_dash_fix && substr( $orig_title, -1 ) == '-' && strlen( $orig_title ) == 40 );
 
-		if( ! $tag_fallback && !empty($title) && empty($already_looked_into_chapters) )
-		{	// Let's try to fall back to a category/chapter...
-			$ChapterCache = & get_Cache( 'ChapterCache' );
-			/**
-			 * @var Chapter
-			 */
-			$Chapter = & $ChapterCache->get_by_urlname( $title, false );
-			if( !empty( $Chapter ) )
-			{	// We could match a chapter from the extra path:
-				$cat = $Chapter->ID;
+		if( ! $tag_fallback && ! empty( $title ) && empty( $already_looked_into_cats ) )
+		{
+			// Let's try to fall back to a category...
+			$CategoryCache = & get_Cache( 'CategoryCache' );
+			$Category = & $CategoryCache->get_by_urlname( $title, false );
+			if( ! empty( $Category ) )
+			{
+				// We could match a category from the extra path
+				$cat = $Category->ID;
 				$title_fallback = true;
 				$title = NULL;
 				// Also use the prefered posts per page for a cat
-				if( ! $posts = $Blog->get_setting( 'chapter_posts_per_page' ) )
-				{ // use blog default
+				if( ! $posts = $Blog->get_setting( 'category_posts_per_page' ) )
+				{
+					// use blog default
 					$posts = $Blog->get_setting( 'posts_per_page' );
 				}
 			}
 		}
 
-		if( !empty($title) )
-		{	// Let's try to fall back to a tag...
+		if( ! empty( $title ) )
+		{
+			// Let's try to fall back to a tag...
 			if( $tag_fallback )
 			{
 				$title = substr( $orig_title, 0, -1 );
 			}
 			if( $Blog->get_tag_post_count( $title ) )
-			{ // We could match a tag from the extra path:
+			{
+				// We could match a tag from the extra path
 				$tag = $title;
 				$title_fallback = true;
 				$title = NULL;
@@ -367,88 +331,79 @@
 		}
 
 		if( ! $title_fallback )
-		{	// We were not able to fallback to anythign meaningful:
+		{
+			// We were not able to fallback to anything meaningful
 			$disp = '404';
 			$disp_detail = '404-post_not_found';
 		}
 	}
 }
-else if( ! empty( $cat ) )
-{	// We are pointing to a chapter/category (by ID):
-	$ChapterCache = & get_Cache( 'ChapterCache' );
-	/**
-	 * @var Chapter
-	 */
-	$Chapter = & $ChapterCache->get_by_ID( $cat, false );
+elseif( ! empty( $cat ) )
+{
+	// We are pointing to a category (by ID)
+	$CategoryCache = & get_Cache( 'CategoryCache' );
+	$Category = & $CategoryCache->get_by_ID( $cat, false );
 
-	if( ! $Chapter )
-	{	// Category not found, bail out:
+	if( ! $Category )
+	{
+		// Category not found, bail out
 		$disp = '404';
 		$disp_detail = '404-category-not-found';
 	}
 }
 
-
-/*
- * ____________________________ "Clean up" the request ____________________________
- *
- * Make sure that:
- * 1) disp is set to "single" if single post requested
- * 2) URL is canonical if:
- *    - some content was requested in a weird/deprecated way
- *    - or if content identifiers have changed
- */
+// "Clean up" the request
+// Make sure that:
+// 1) disp is set to "single" if single post requested
+// 2) URL is canonical if:
+// - some content was requested in a weird/deprecated way
+// - or if content identifiers have changed
 if( $stats || $disp == 'stats' )
-{	// This used to be a spamfest...
-	require $templates_path.'_410_stats_gone.main.php'; // error & exit
-	// EXIT.
+{
+	// This used to be a spamfest, error & exit
+	require $templates_path.'_410_stats_gone.main.php';
 }
-elseif( !empty($preview) )
-{	// Preview
+elseif( ! empty( $preview ) )
+{
+	// Preview
 	$disp = 'single';
 	// Consider this as an admin hit!
 	$Hit->referer_type = 'admin';
 }
-elseif( $disp == 'posts' && !empty($Item) )
-{ // We are going to display a single post
-	// if( in_array( $Item->ptyp_ID, array( 1000, 1500, 1520, 1530, 1570 ) ) ) // pages and intros
+elseif( $disp == 'posts' && ! empty( $Item ) )
+{
+	// We are going to display a single post
 	if( $Item->ptyp_ID == 1000 )
 	{
+		// this is a page-type
 		$disp = 'page';
 	}
+	elseif( in_array( $Item->ptyp_ID, array( 1500, 1520, 1530, 1570 ) ) )
+	{
+		// these are intro-types
+		$disp = 'intro';
+	}
 	else
 	{
+		// must be good old permalink single post
 		$disp = 'single';
 	}
-
-	// fp> note: the redirecting code that was here moved to template_init() with the other redirecting code.
-	// That feels more consistent and may also allow some templates to handle redirects differently (framing?)
-	// I hope I didn't screw that up... but it felt like the historical reasons for this to be here no longer applied.
 }
 
-
-/*
- * ______________________ DETERMINE WHICH TEMPLATE TO USE FOR DISPLAY _______________________
- */
-
-/**
- * Check if a temporary template has been requested (used for RSS syndication
- * for example).
- *
- * This will be handled like any other template.
- * tempskin is also checked for b2evolution backward compatibility.
- *
- * @todo maybe restrict that to authorized users?
- */
+// DETERMINE WHICH TEMPLATE TO USE FOR DISPLAY
+// Check if a temporary template has been requested (used for RSS syndication for example).
+// This will be handled like any other template. tempskin is also checked for b2evolution
+// backward compatibility.
+
 if( param( 'viewmode', 'string', param( 'tempskin', 'string' ), true ) !== '' )
 {
 	$template = $viewmode;
 }
 
 if( isset( $template ) )
-{	// A template has been requested by folder_name (url or stub):
-
-	// Check validity of requested template name:
+{
+	// A template has been requested by folder_name (url or stub)
+	// Check validity of requested template name
 	if( preg_match( '~([^-A-Za-z0-9._]|\.\.)~', $template ) )
 	{
 		debug_die( 'The requested template name is invalid.' );
@@ -458,10 +413,13 @@
 	$Template = & $TemplateCache->new_obj( NULL, $template );
 
 	if( $Template->type == 'feed' )
-	{	// Check if we actually allow the display of the feed; last chance to revert to 404 displayed in default template.
-		// Note: Templates with the type "feed" can always be accessed, even when they're not installed.
-		if( $Blog->get_setting('feed_content') == 'none' )
-		{ // We don't want to provide feeds; revert to 404!
+	{
+		// Check if we actually allow the display of the feed; last chance to revert
+		// to 404 displayed in default template. Note: Templates with the type "feed"
+		// can always be accessed, even when they're not installed.
+		if( $Blog->get_setting( 'feed_content' ) == 'none' )
+		{
+			// We don't want to provide feeds; revert to 404!
 			unset( $template );
 			unset( $Template );
 			$disp = '404';
@@ -469,108 +427,115 @@
 		}
 	}
 	elseif( template_exists( $template ) && ! template_installed( $template ) )
-	{	// The requested template is not a feed template and exists in the file system, but isn't installed:
+	{
+		// The requested template is not a feed and exists, but isn't installed
 		debug_die( sprintf( T_( 'The template [%s] is not installed on this system.' ), htmlspecialchars( $template ) ) );
 	}
 	else if( ! empty( $viewmode ) )
-	{ // By definition, we want to see the temporary template (if we don't use feedburner... )
+	{
+		// By definition, we want to see the temporary template (if we don't use feedburner...)
 		$redir = 'no';
 	}
 }
 
-if( !isset( $template ) && !empty($Blog->template_ID) )	// Note: if $template is set to '', then we want to do a "no template" display
-{ // Use default template from the database
+// Note: if $template is set to '', then we want to do a "no template" display
+if( ! isset( $template ) && ! empty( $Blog->template_ID ) )
+{
+	// Use default template from the database
 	$TemplateCache = & get_cache( 'TemplateCache' );
 	$Template = & $TemplateCache->get_by_ID( $Blog->template_ID );
 	$template = $Template->folder;
 }
 
-// Because a lot of bloggers will delete templates, we have to make this fool proof with extra checking:
-if( !empty( $template ) && !template_exists( $template ) )
-{ // We want to use a template, but it doesn't exist!
+// we have to make this fool proof with extra checking ... if someone deletes a template
+if( ! empty( $template ) && ! template_exists( $template ) )
+{
+	// We want to use a template, but it doesn't exist!
 	$err_msg = sprintf( T_('The template [%s] set for blog [%s] does not exist. It must be properly set in the <a %s>blog properties</a> or properly overriden in a stub file.'),
-		htmlspecialchars($template),
-		$Blog->dget('shortname'),
-		'href="'.$admin_url.'?ctrl=coll_settings&amp;tab=template&amp;blog='.$Blog->ID.'"' );
+		htmlspecialchars( $template ),
+		$Blog->dget( 'shortname' ),
+		'href="'.$admin_url.'?ctrl=blog_settings&amp;tab=template&amp;blog='.$Blog->ID.'"' );
 	debug_die( $err_msg );
 }
 
-
 $Timer->pause( '_blog_main.inc');
 
-
-/*
- * _______________________________ READY TO DISPLAY _______________________________
- *
- * At this point $template holds the name of the template we want to use, or '' for no template!
- */
-
-
-// Trigger plugin event:
+// READY TO DISPLAY :)
+// At this point $template holds the name of the template we want to use, or ''
+// for no template ... which probably doesn't work at all so test it and fix it.
+
+// Trigger plugin event
 // fp> TODO: please doc with example of what this can be used for
-$Plugins->trigger_event( 'BeforeBlogDisplay', array('template'=>$template) );
-
-
-if( !empty( $template ) )
-{ // We want to display with a template now:
-
-	// Instanciate PageCache:
-	load_class( '_core/model/_pagecache.class.php' );
+$Plugins->trigger_event( 'BeforeBlogDisplay', array(
+	'template' => $template
+) );
+
+if( ! empty( $template ) )
+{
+	// We want to display with a template now
+
+	// Instanciate PageCache
 	$PageCache = new PageCache( $Blog );
-	// Check for cached content & Start caching if needed
-	// Note: there are some redirects inside the templates themselves for canonical URLs,
-	// If we have a cache hit, the redirect won't take place until the cache expires -- probably ok.
-	// If we start collecting and a redirect happens, the collecting will just be lost and that's what we want.
+	// Check for cached content & Start caching if needed Note: there are some redirects
+	// inside the templates themselves for canonical URLs, If we have a cache hit, the
+	// redirect won't take place until the cache expires -- probably ok. If we start
+	// collecting and a redirect happens, the collecting will just be lost and that's what we want.
 	if( ! $PageCache->check() )
-	{	// Cache miss, we have to generate:
-
-		if( $template_provided_by_plugin = template_provided_by_plugin($template) )
+	{
+		// Cache miss, we have to generate
+		if( $template_provided_by_plugin = template_provided_by_plugin( $template ) )
 		{
-			$Plugins->call_method( $template_provided_by_plugin, 'DisplayTemplate', $tmp_params = array('template'=>$template) );
+			$Plugins->call_method( $template_provided_by_plugin, 'DisplayTemplate', $tmp_params = array( 'template' => $template ) );
 		}
 		else
 		{
-			// Path for the current template:
+			// Path for the current template
 			$ads_current_template_path = $templates_path.$template.'/';
 
 			$disp_handlers = array(
-					'404'            => '404_not_found.main.php',
-					'arcdir'         => 'arcdir.main.php',
-					'catdir'         => 'catdir.main.php',
-					'comments'       => 'comments.main.php',
-					'credits'        => 'credits.main.php',
+					'404' => '404_not_found.main.php',
+					'arcdir' => 'arcdir.main.php',
+					'catdir' => 'catdir.main.php',
+					'comments' => 'comments.main.php',
+					'credits' => 'credits.main.php',
 					'feedback-popup' => 'feedback_popup.main.php',
-					'mediaidx'       => 'mediaidx.main.php',
-					'msgform'        => 'msgform.main.php',
-					'page'           => 'page.main.php',
-					'posts'          => 'posts.main.php',
-					'profile'        => 'profile.main.php',
-					'single'         => 'single.main.php',
-					'subs'           => 'subs.main.php',
+					'mediaidx' => 'mediaidx.main.php',
+					'msgform' => 'msgform.main.php',
+					'page' => 'page.main.php',
+					'posts' => 'posts.main.php',
+					'profile' => 'profile.main.php',
+					'single' => 'single.main.php',
+					'subs' => 'subs.main.php',
 					// All others will default to index.main.php
 				);
 
-			if( !empty($disp_handlers[$disp]) )
+			if( ! empty( $disp_handlers[$disp] ) )
 			{
 				if( file_exists( $disp_handler = $ads_current_template_path.$disp_handlers[$disp] ) )
-				{	// The template has a customized page handler for this display:
-					$Debuglog->add('blog_main: include '.rel_path_to_base($disp_handler).' (custom to this template)', 'template');
+				{
+					/**
+					 * The template has a customized page handler for this display
+					 */
 					require $disp_handler;
 				}
 				else
-				{	// Use the default handler from the templates dir:
-					$Debuglog->add('blog_main: include '.rel_path_to_base($ads_current_template_path.'index.main.php').' (default handler)', 'template');
+				{
+					/**
+					 * Use the default handler from the templates dir
+					 */
 					require $ads_current_template_path.'index.main.php';
 				}
 			}
 			else
-			{	// Use the default handler from the templates dir:
-				$Debuglog->add('blog_main: include '.rel_path_to_base($ads_current_template_path.'index.main.php').' (default index handler)', 'template');
+			{
+				/**
+				 * Use the default handler from the templates dir
+				 */
 				require $ads_current_template_path.'index.main.php';
 			}
 		}
 
-		// Save collected cached data if needed:
+		// Save collected cached data if needed
 		$PageCache->end_collect();
 	}
 
@@ -579,12 +544,13 @@
 	exit(0);
 }
 else
-{	// We don't use a template. Hopefully the caller will do some displaying.
+{
+	// We don't use a template. Hopefully the caller will do some displaying.
 	// Set a few vars with default values, just in case...
 	$ads_current_template_path = $srvc_path;
 
-	// We'll just return to the caller now... (if we have not used a template, the caller should do the display after this)
+	// We'll just return to the caller now... (if we have not used a template, the 
+	// caller should do the display after this)
 }
 
-
 ?>

=== modified file 'qp_inc/_core/__core.init.php'
--- qp_inc/_core/__core.init.php	2013-03-08 20:58:52 +0000
+++ qp_inc/_core/__core.init.php	2013-03-14 18:35:26 +0000
@@ -27,73 +27,79 @@
 
 // Aliases for table names
 $app_db_config['aliases'] = array(
-	'T_antispam'             => $app_db_tableprefix.'antispam',
-	'T_blogs'                => $app_db_tableprefix.'blogs',
-	'T_categories'           => $app_db_tableprefix.'categories',
-	'T_coll_group_perms'     => $app_db_tableprefix.'bloggroups',
-	'T_coll_user_perms'      => $app_db_tableprefix.'blogusers',
-	'T_coll_settings'        => $app_db_tableprefix.'coll_settings',
-	'T_comments'             => $app_db_tableprefix.'comments',
-	'T_cron__log'            => $app_db_tableprefix.'cron__log',
-	'T_cron__task'           => $app_db_tableprefix.'cron__task',
-	'T_files'                => $app_db_tableprefix.'files',
-	'T_filetypes'            => $app_db_tableprefix.'filetypes',
-	'T_groups'               => $app_db_tableprefix.'groups',
-	'T_global__cache'        => $app_db_tableprefix.'global__cache',
-	'T_items__item'          => $app_db_tableprefix.'items__item',
-	'T_items__itemtag'       => $app_db_tableprefix.'items__itemtag',
-	'T_items__prerendering'  => $app_db_tableprefix.'items__prerendering',
-	'T_items__status'        => $app_db_tableprefix.'items__status',
-	'T_items__tag'           => $app_db_tableprefix.'items__tag',
-	'T_items__type'          => $app_db_tableprefix.'items__type',
-	'T_items__version'       => $app_db_tableprefix.'items__version',
-	'T_links'                => $app_db_tableprefix.'links',
-	'T_locales'              => $app_db_tableprefix.'locales',
-	'T_plugins'              => $app_db_tableprefix.'plugins',
-	'T_pluginevents'         => $app_db_tableprefix.'pluginevents',
-	'T_pluginsettings'       => $app_db_tableprefix.'pluginsettings',
-	'T_pluginusersettings'   => $app_db_tableprefix.'pluginusersettings',
-	'T_postcats'             => $app_db_tableprefix.'postcats',
-	'T_settings'             => $app_db_tableprefix.'settings',
+	'T_antispam' => $app_db_tableprefix.'antispam',
+	'T_blogs' => $app_db_tableprefix.'blogs',
+	'T_categories' => $app_db_tableprefix.'categories',
+	'T_coll_group_perms' => $app_db_tableprefix.'bloggroups',
+	'T_coll_user_perms' => $app_db_tableprefix.'blogusers',
+	'T_comments' => $app_db_tableprefix.'comments',
+	'T_cron__log' => $app_db_tableprefix.'cron__log',
+	'T_cron__task' => $app_db_tableprefix.'cron__task',
+	'T_files' => $app_db_tableprefix.'files',
+	'T_filetypes' => $app_db_tableprefix.'filetypes',
+	'T_groups' => $app_db_tableprefix.'groups',
+	'T_global__cache' => $app_db_tableprefix.'global__cache',
+	'T_items__prerendering' => $app_db_tableprefix.'items__prerendering',
+	'T_items__status' => $app_db_tableprefix.'items__status',
+	'T_items__version' => $app_db_tableprefix.'items__version',
+	'T_links' => $app_db_tableprefix.'links',
+	'T_locales' => $app_db_tableprefix.'locales',
+	'T_plugins' => $app_db_tableprefix.'plugins',
+	'T_pluginevents' => $app_db_tableprefix.'pluginevents',
+	'T_pluginsettings' => $app_db_tableprefix.'pluginsettings',
+	'T_pluginusersettings' => $app_db_tableprefix.'pluginusersettings',
+	'T_settings' => $app_db_tableprefix.'settings',
 	'T_templates__container' => $app_db_tableprefix.'templates__container',
-	'T_templates__template'  => $app_db_tableprefix.'templates__template',
-	'T_subscriptions'        => $app_db_tableprefix.'subscriptions',
-	'T_users'                => $app_db_tableprefix.'users',
-	'T_plugin_sharedfields'  => $app_db_tableprefix.'plugin_sharedfields',
-	'T_plugin_sharedvalues'  => $app_db_tableprefix.'plugin_sharedvalues',
-	'T_usersettings'         => $app_db_tableprefix.'usersettings',
-	'T_widget'               => $app_db_tableprefix.'widget',
+	'T_templates__template' => $app_db_tableprefix.'templates__template',
+	'T_subscriptions' => $app_db_tableprefix.'subscriptions',
+	'T_users' => $app_db_tableprefix.'users',
+	'T_plugin_sharedfields' => $app_db_tableprefix.'plugin_sharedfields',
+	'T_plugin_sharedvalues' => $app_db_tableprefix.'plugin_sharedvalues',
+	'T_usersettings' => $app_db_tableprefix.'usersettings',
+	'T_widget' => $app_db_tableprefix.'widget',
+	// old ones that leave after monster branch is done
+	'T_blog_settings' => $app_db_tableprefix.'coll_settings',
+	'T_coll_settings' => $app_db_tableprefix.'coll_settings', // old
+	'T_items' => $app_db_tableprefix.'items__item',
+	'T_items__item' => $app_db_tableprefix.'items__item', // old
+	'T_item_cats' => $app_db_tableprefix.'postcats',
+	'T_postcats' => $app_db_tableprefix.'postcats', // old
+	'T_item_types' => $app_db_tableprefix.'items__type',
+	'T_items__type' => $app_db_tableprefix.'items__type', // old
+	'T_item_tags' => $app_db_tableprefix.'items__itemtag',
+	'T_items__itemtag' => $app_db_tableprefix.'items__itemtag', // old
+	'T_tags' => $app_db_tableprefix.'items__tag',
+	'T_items__tag' => $app_db_tableprefix.'items__tag', // old
 	);
 
 // Controller mappings
 $ctrl_mappings = array(
-	'antispam'      => 'antispam/list.ctrl.php',
-	'aspm_distro'   => 'antispam/distribute.ctrl.php',
+	'antispam' => 'antispam/list.ctrl.php',
+	'aspm_distro' => 'antispam/distribute.ctrl.php',
 	'aspm_settings' => 'antispam/settings.ctrl.php',
-	'chapters'      => 'chapters/chapters.ctrl.php',
-	'collections'   => 'collections/collections.ctrl.php',
-	'coll_settings' => 'collections/coll_settings.ctrl.php', // old
-	'blog_settings' => 'collections/coll_settings.ctrl.php', // new after monster
-	'comments'      => 'comments/_comments.ctrl.php',
-	'crontab'       => 'cron/cronjobs.ctrl.php',
-	'dashboard'     => 'dashboard/dashboard.ctrl.php',
-	'features'      => 'settings/features.ctrl.php',
-	'files'         => 'files/files.ctrl.php',
-	'fileset'       => 'files/file_settings.ctrl.php',
-	'filetypes'     => 'files/file_types.ctrl.php',
-	'items'         => 'items/items.ctrl.php',
-	'itemstatuses'  => 'items/item_statuses.ctrl.php',
-	'itemtypes'     => 'items/item_types.ctrl.php',
-	'locales'       => 'locales/locales.ctrl.php',
-	'plugins'       => 'plugins/plugins.ctrl.php',
-	'settings'      => 'settings/settings.ctrl.php',
-	'templates'     => 'templates/templates.ctrl.php',
-	'stats'         => 'sessions/stats.ctrl.php',
-	'system'        => 'tools/system.ctrl.php',
-	'tools'         => 'tools/tools.ctrl.php',
-	'users'         => 'users/users.ctrl.php',
-	'upload'        => 'files/upload.ctrl.php',
-	'widgets'       => 'widgets/widgets.ctrl.php',
+	'blogs' => 'blogs/blogs.ctrl.php',
+	'blog_settings' => 'blogs/blog_settings.ctrl.php',
+	'cats' => 'categories/categories.ctrl.php',
+	'comments' => 'comments/_comments.ctrl.php',
+	'crontab' => 'cron/cronjobs.ctrl.php',
+	'dashboard' => 'dashboard/dashboard.ctrl.php',
+	'features' => 'settings/features.ctrl.php',
+	'files' => 'files/files.ctrl.php',
+	'fileset' => 'files/file_settings.ctrl.php',
+	'filetypes' => 'files/file_types.ctrl.php',
+	'items' => 'items/items.ctrl.php',
+	'itemstatuses' => 'items/item_statuses.ctrl.php',
+	'itemtypes' => 'items/item_types.ctrl.php',
+	'locales' => 'locales/locales.ctrl.php',
+	'plugins' => 'plugins/plugins.ctrl.php',
+	'settings' => 'settings/settings.ctrl.php',
+	'templates' => 'templates/templates.ctrl.php',
+	'stats' => 'sessions/stats.ctrl.php',
+	'system' => 'tools/system.ctrl.php',
+	'tools' => 'tools/tools.ctrl.php',
+	'users' => 'users/users.ctrl.php',
+	'upload' => 'files/upload.ctrl.php',
+	'widgets' => 'widgets/widgets.ctrl.php',
 	);
 
 /**
@@ -253,15 +259,15 @@
 			if( $current_User->check_perm( 'blog_properties', 'edit', false, $Blog->ID ) )
 			{
 				// current user has blog settings permissions
-				$coll_chapters_perm = $current_User->check_perm( 'blog_cats', '', false, $blog );
-				$blogsets_url = $admin_url.'?ctrl=coll_settings&amp;blog='.$blog_id.'&amp;';
+				$blog_cats_perm = $current_User->check_perm( 'blog_cats', '', false, $blog );
+				$blogsets_url = $admin_url.'?ctrl=blog_settings&amp;blog='.$blog_id.'&amp;';
 
 				if( $blog_props_perm )
 				{
 					// current user has some perms in a blog
 					$entries['blog_settings']['text'] = T_('Blog settings').' &loz;';
 					$entries['blog_settings']['title'] = T_('Blog settings, lists blogs');
-					$entries['blog_settings']['href'] = $admin_url.'?ctrl=collections';
+					$entries['blog_settings']['href'] = $admin_url.'?ctrl=blogs';
 					$entries['blog_settings']['disabled'] = false;
 					$entries['blog_settings']['entries'] = array(
 						'bloglabel' => array(
@@ -290,13 +296,13 @@
 						),
 					);
 				}
-				if( $coll_chapters_perm )
+				if( $blog_cats_perm )
 				{
 					// current user has categories permissions in this blog
 					$entries['blog_settings']['entries'] += array(
 						'chapters' => array(
 							'text' => T_('Categories').'&hellip;',
-							'href' => $admin_url.'?ctrl=chapters&amp;blog='.$blog_id,
+							'href' => $admin_url.'?ctrl=cats&amp;blog='.$blog_id,
 						),
 					);
 				}
@@ -348,7 +354,7 @@
 				// current user can edit/create blogs
 				$entries['dashboard']['entries']['newblog'] = array(
 					'text' => T_('Create new blog').'&hellip;',
-					'href' => $admin_url.'?ctrl=collections&amp;action=new',
+					'href' => $admin_url.'?ctrl=blogs&amp;action=new',
 				);
 			}
 			$entries['dashboard']['entries']['templates'] = array(
@@ -639,7 +645,7 @@
 				$entries['tools']['entries']['newblog_sep'] = array( 'separator' => true );
 				$entries['tools']['entries']['newblog'] = array(
 					'text' => T_('Create new blog').'&hellip;',
-					'href' => $admin_url.'?ctrl=collections&amp;action=new',
+					'href' => $admin_url.'?ctrl=blogs&amp;action=new',
 				);
 			}
 		}
@@ -871,7 +877,7 @@
 		global $loc_transinfo;
 
 		// BLOG SETTINGS:
-		if( $ctrl == 'collections' )
+		if( $ctrl == 'blogs' )
 		{
 			// We are viewing the blog list, nothing fancy involved:
 			$AdminUI->add_menu_entries(
@@ -879,7 +885,7 @@
 				array(
 					'blogs' => array(
 						'text' => T_('Blog settings'),
-						'href' => $dispatcher.'?ctrl=collections',
+						'href' => $dispatcher.'?ctrl=blogs',
 					),
 				)
 			);
@@ -891,23 +897,23 @@
 
 			// What perms do we have?
 			$blog_props_perm = $current_User->check_perm( 'blog_properties', 'any', false, $blog );
-			$coll_chapters_perm = $current_User->check_perm( 'blog_cats', '', false, $blog );
+			$blog_cats_perm = $current_User->check_perm( 'blog_cats', '', false, $blog );
 
 			// Determine default page based on permissions:
 			if( $blog_props_perm )
 			{
 				// Default: show General Blog Settings
-				$default_page = $dispatcher.'?ctrl=coll_settings&amp;tab=general&amp;blog='.$blog;
+				$default_page = $dispatcher.'?ctrl=blog_settings&amp;tab=general&amp;blog='.$blog;
 			}
-			elseif( $coll_chapters_perm )
+			elseif( $blog_cats_perm )
 			{
 				// Default: show categories
-				$default_page = $dispatcher.'?ctrl=chapters&amp;blog='.$blog;
+				$default_page = $dispatcher.'?ctrl=cats&amp;blog='.$blog;
 			}
 			else
 			{
 				// Default: Show list of blogs
-				$default_page = $dispatcher.'?ctrl=collections';
+				$default_page = $dispatcher.'?ctrl=blogs';
 			}
 
 			$AdminUI->add_menu_entries(
@@ -926,30 +932,35 @@
 					array(
 						'general' => array(
 							'text' => T_('General'),
-							'href' => $dispatcher.'?ctrl=coll_settings&amp;tab=general&amp;blog='.$blog, ),
+							'href' => $dispatcher.'?ctrl=blog_settings&amp;tab=general&amp;blog='.$blog
+						),
 						'features' => array(
 							'text' => T_('Features'),
-							'href' => $dispatcher.'?ctrl=coll_settings&amp;tab=features&amp;blog='.$blog, ),
+							'href' => $dispatcher.'?ctrl=blog_settings&amp;tab=features&amp;blog='.$blog
+						),
 						'template' => array(
 							'text' => T_('Template'),
-							'href' => $dispatcher.'?ctrl=coll_settings&amp;tab=template&amp;blog='.$blog, ),
+							'href' => $dispatcher.'?ctrl=blog_settings&amp;tab=template&amp;blog='.$blog
+						),
 						'plugin_settings' => array(
 							'text' => T_('Plugin settings'),
-							'href' => $dispatcher.'?ctrl=coll_settings&amp;tab=plugin_settings&amp;blog='.$blog, ),
+							'href' => $dispatcher.'?ctrl=blog_settings&amp;tab=plugin_settings&amp;blog='.$blog
+						),
 						'widgets' => array(
 							'text' => T_('Widgets'),
-							'href' => $dispatcher.'?ctrl=widgets&amp;blog='.$blog, ),
+							'href' => $dispatcher.'?ctrl=widgets&amp;blog='.$blog
+						),
 					)
 				);
 			}
 
-			if( $coll_chapters_perm )
+			if( $blog_cats_perm )
 			{
 				$AdminUI->add_menu_entries( 'blogs',
 					array(
 						'chapters' => array(
 							'text' => T_('Categories'),
-							'href' => $dispatcher.'?ctrl=chapters&amp;blog='.$blog
+							'href' => $dispatcher.'?ctrl=cats&amp;blog='.$blog
 						),
 					)
 				);
@@ -961,7 +972,8 @@
 					array(
 						'urls' => array(
 							'text' => T_('URLs'),
-							'href' => $dispatcher.'?ctrl=coll_settings&amp;tab=urls&amp;blog='.$blog, ),
+							'href' => $dispatcher.'?ctrl=blog_settings&amp;tab=urls&amp;blog='.$blog
+						),
 					)
 				);
 
@@ -970,11 +982,13 @@
 					$AdminUI->add_menu_entries( 'blogs',
 						array(
 							'perm' => array(
-								'text' => T_('User perms'), // keep label short
-								'href' => $dispatcher.'?ctrl=coll_settings&amp;tab=perm&amp;blog='.$blog, ),
+								'text' => T_('User perms'),
+								'href' => $dispatcher.'?ctrl=blog_settings&amp;tab=perm&amp;blog='.$blog
+							),
 							'permgroup' => array(
-								'text' => T_('Group perms'), // keep label short
-								'href' => $dispatcher.'?ctrl=coll_settings&amp;tab=permgroup&amp;blog='.$blog, ),
+								'text' => T_('Group perms'),
+								'href' => $dispatcher.'?ctrl=blog_settings&amp;tab=permgroup&amp;blog='.$blog
+							),
 						)
 					);
 				}

=== added file 'qp_inc/_core/_class.funcs.php'
--- qp_inc/_core/_class.funcs.php	1970-01-01 00:00:00 +0000
+++ qp_inc/_core/_class.funcs.php	2013-03-14 18:35:26 +0000
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Function for handling Classes in PHP5
+ *
+ * @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('fail');
+
+/**
+ * Autoload the required .class.php file
+ *
+ * Autoload the required .class.php file when a class is accessed but not defined yet.
+ * This gets hooked into spl_autoload_register (preferred) or called through __autoload.
+ */
+function autoload_class( $classname )
+{
+	static $map_class_path;
+
+	if( ! isset( $map_class_path ) )
+	{
+		global $admintemplates_path;
+		global $inc_path;
+
+		$_map_class_path = array(
+			'abstractsettings' => $inc_path.'settings/model/_abstractsettings.class.php',
+			'adminui' => $admintemplates_path.'/wind/_adminUI.class.php',
+			'adminui_general' => $admintemplates_path.'/_adminUI_general.class.php',
+			'blog' => $inc_path.'blogs/model/_blog.class.php',
+			'blogcache' => $inc_path.'blogs/model/_blog_cache.class.php',
+			'blogsettings' => $inc_path.'blogs/model/_blog_settings.class.php',
+			'chapter' => $inc_path.'categories/model/_category.class.php',
+			'categorycache' => $inc_path.'categories/model/_categorycache.class.php',
+			'comment' => $inc_path.'comments/model/_comment.class.php',
+			'commentlist' => $inc_path.'comments/model/_commentlist.class.php',
+			'componentwidget' => $inc_path.'widgets/model/_widget.class.php',
+			'cronjob' => $inc_path.'cron/model/_cronjob.class.php',
+			'dataobject' => $inc_path.'_core/model/dataobjects/_dataobject.class.php',
+			'dataobjectcache' => $inc_path.'_core/model/dataobjects/_dataobjectcache.class.php',
+			'dataobjectlist' => $inc_path.'_core/model/dataobjects/_dataobjectlist.class.php',
+			'dataobjectlist2' => $inc_path.'_core/model/dataobjects/_dataobjectlist2.class.php',
+			'db' => $inc_path.'_core/model/db/_db.class.php',
+			'file' => $inc_path.'files/model/_file.class.php',
+			'filecache' => $inc_path.'files/model/_filecache.class.php',
+			'filelist' => $inc_path.'files/model/_filelist.class.php',
+			'fileroot' => $inc_path.'files/model/_fileroot.class.php',
+			'filerootcache' => $inc_path.'files/model/_filerootcache.class.php',
+			'filetype' => $inc_path.'files/model/_filetype.class.php',
+			'filetypecache' => $inc_path.'files/model/_filetypecache.class.php',
+			'form' => $inc_path.'_core/ui/forms/_form.class.php',
+			'generalsettings' => $inc_path.'settings/model/_generalsettings.class.php',
+			'genericcache' => $inc_path.'generic/model/_genericcache.class.php',
+			'genericcategory' => $inc_path.'generic/model/_genericcategory.class.php',
+			'genericcategorycache' => $inc_path.'generic/model/_genericcategorycache.class.php',
+			'genericelement' => $inc_path.'generic/model/_genericelement.class.php',
+			'genericordered' => $inc_path.'generic/model/_genericordered.class.php',
+			'genericorderedcache' => $inc_path.'generic/model/_genericorderedcache.class.php',
+			'goal' => $inc_path.'sessions/model/_goal.class.php',
+			'group' => $inc_path.'users/model/_group.class.php',
+			'hit' => $inc_path.'sessions/model/_hit.class.php',
+			'hitlist' => $inc_path.'sessions/model/_hitlist.class.php',
+			'iconlegend' => $inc_path.'_core/ui/_iconlegend.class.php',
+			'idna_convert' => $inc_path.'_ext/idna/_idna_convert.class.php',
+			'item' => $inc_path.'items/model/_item.class.php',
+			'itemcache' => $inc_path.'items/model/_itemcache.class.php',
+			'itemlight' => $inc_path.'items/model/_itemlight.class.php',
+			'itemlist2' => $inc_path.'items/model/_itemlist.class.php',
+			'itemlistlight' => $inc_path.'items/model/_itemlistlight.class.php',
+			'itemquery' => $inc_path.'items/model/_itemquery.class.php',
+			'itemtype' => $inc_path.'items/model/_itemtype.class.php',
+			'itemtypecache' => $inc_path.'items/model/_itemtypecache.class.php',
+			'link' => $inc_path.'items/model/_link.class.php',
+			'linkcache' => $inc_path.'items/model/_linkcache.class.php',
+			'log' => $inc_path.'_core/model/_log.class.php',
+			'log_noop' => $inc_path.'_core/model/_log.class.php',
+			'menu' => $inc_path.'_core/ui/_menu.class.php',
+			'mime_parser_class' => $inc_path.'_ext/mime_parser/mime_parser.php',
+			'pagecache' => $inc_path.'_core/model/_pagecache.class.php',
+			'plugin' => $inc_path.'plugins/_plugin.class.php',
+			'plugins' => $inc_path.'plugins/model/_plugins.class.php',
+			'plugins_admin' => $inc_path.'plugins/model/_plugins_admin.class.php',
+			'plugins_admin_no_db' => $inc_path.'plugins/model/_plugins_admin_no_db.class.php',
+			'pluginsettings' => $inc_path.'plugins/model/_pluginsettings.class.php',
+			'pluginusersettings' => $inc_path.'plugins/model/_pluginusersettings.class.php',
+			'pofile' => $inc_path.'locales/_pofile.class.php',
+			'potfile' => $inc_path.'locales/_pofile.class.php',
+			'results' => $inc_path.'_core/ui/results/_results.class.php',
+			'resultsel' => $inc_path.'_core/ui/results/_resultsel.class.php',
+			'rfc822_addresses_class' => $inc_path.'_ext/mime_parser/rfc822_addresses.php',
+			'session' => $inc_path.'sessions/model/_session.class.php',
+			'sql' => $inc_path.'_core/model/db/_sql.class.php',
+			'table' => $inc_path.'_core/ui/_uiwidget.class.php',
+			'template' => $inc_path.'templates/model/_template.class.php',
+			'templatecache' => $inc_path.'templates/model/_templatecache.class.php',
+			'timer' => $inc_path.'_core/model/_timer.class.php',
+			'user' => $inc_path.'users/model/_user.class.php',
+			'usercache' => $inc_path.'users/model/_usercache.class.php',
+			'usersettings' => $inc_path.'users/model/_usersettings.class.php',
+			'widget' => $inc_path.'_core/ui/_uiwidget.class.php',
+			'widgetcache' => $inc_path.'widgets/model/_widgetcache.class.php',
+			'xhtml_validator' => $inc_path.'xhtml_validator/_xhtml_validator.class.php',
+			'zip_file' => $inc_path.'_ext/_zip_archives.php',
+		);
+		$map_class_path = $_map_class_path;
+	}
+
+	$classname = strtolower( $classname );
+	if( isset( $map_class_path[$classname] ) )
+	{
+		require_once $map_class_path[$classname];
+	}
+}
+
+
+/**
+ * Use spl_autoload_register mechanism
+ *
+ * This way several autoload functions can be used (PHP>=5.1.2).
+ */
+if( function_exists( 'spl_autoload_register' ) )
+{
+	spl_autoload_register( 'autoload_class' );
+}
+else
+{
+	/**
+	 * PHP<5.1.2: Use the fallback method
+	 *
+	 * @deprecated - quam plures requires 5.2 or higher
+	 */
+	function __autoload( $classname )
+	{
+		return autoload_class( $classname );
+	}
+}
+
+/**
+ * Load class file. No-op for PHP5, uses __autoload().
+	 *
+	 * @deprecated - after "monster" all the load_class() calls will be removed
+ */
+function load_class( $class_path )
+{
+	return true;
+}
+
+?>

=== removed file 'qp_inc/_core/_class4.funcs.php'
--- qp_inc/_core/_class4.funcs.php	2010-12-31 12:12:03 +0000
+++ qp_inc/_core/_class4.funcs.php	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-<?php
-/**
- * Function for handling Classes in PHP 4.
- *
- * In PHP5, _class5.funcs.php should be used instead.
- *
- * 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/}
- *
- * {@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
- * }}
- *
- * @author fplanque: Francois PLANQUE
- *
- * @package pond
- */
-if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
-
-
-/**
- * Load class file
- */
-function load_class( $class_path )
-{
-	global $inc_path;
-	require_once $inc_path.$class_path;
-	return true;
-}
-
-
-?>
\ No newline at end of file

=== removed file 'qp_inc/_core/_class5.funcs.php'
--- qp_inc/_core/_class5.funcs.php	2011-01-09 02:10:50 +0000
+++ qp_inc/_core/_class5.funcs.php	1970-01-01 00:00:00 +0000
@@ -1,175 +0,0 @@
-<?php
-/**
- * Function for handling Classes in PHP 5.
- *
- * In PHP4, _class4.funcs.php should be used instead.
- *
- * 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)2009 by Francois PLANQUE - {@link http://fplanque.net/}
- * Parts of this file are copyright (c)2009 by Daniel HAHLER - {@link http://daniel.hahler.de/}.
- *
- * {@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/).
- * }}
- *
- * @author blueyed: Daniel HAHLER.
- *
- * @package pond
- */
-if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
-
-
-/**
- * Autoload the required .class.php file when a class is accessed but not defined yet.
- * This gets hooked into spl_autoload_register (preferred) or called through __autoload.
- * Requires PHP5.
- */
-function evocms_autoload_class( $classname )
-{
-	static $map_class_path;
-
-	/*
-	List generated with (executed in ./blogs):
-	for i in $(find . -name \*.class.php -o -name \*.widget.php); do echo "'$(basename $i .php | tr '[:upper:'] '[:lower:'] | sed 's/.widget$/_widget/; s/.class$//; s/^_//; s/^collsettings$/collectionsettings/; s/^itemlist$/itemlist2/; s/^widget$/componentwidget/; s/^uiwidget$/widget/')' => $(echo $i|sed "s~^./qp_inc/~\$inc_path.'~;s~^./qp_view_admin/~\$admintemplates_path.'/~")',"; done
-	*/
-	if( ! isset($map_class_path) )
-	{
-		global $inc_path, $admintemplates_path;
-		$_map_class_path = array(
-			/* SPECIAL: several classes in one file. */
-			'table' => $inc_path.'_core/ui/_uiwidget.class.php',
-			'log_noop' => $inc_path.'_core/model/_log.class.php',
-			'zip_file' => $inc_path.'_ext/_zip_archives.php',
-			'potfile' => $inc_path.'locales/_pofile.class.php',
-			/* SPECIAL END */
-
-			/* AUTOGENERATED LIST: */
-			'commentlist' => $inc_path.'comments/model/_commentlist.class.php',
-			'comment' => $inc_path.'comments/model/_comment.class.php',
-			'template' => $inc_path.'templates/model/_template.class.php',
-			'templatecache' => $inc_path.'templates/model/_templatecache.class.php',
-			'iconlegend' => $inc_path.'_core/ui/_iconlegend.class.php',
-			'form' => $inc_path.'_core/ui/forms/_form.class.php',
-			'resultsel' => $inc_path.'_core/ui/results/_resultsel.class.php',
-			'results' => $inc_path.'_core/ui/results/_results.class.php',
-			'widget' => $inc_path.'_core/ui/_uiwidget.class.php',
-			'pagecache' => $inc_path.'_core/model/_pagecache.class.php',
-			'dataobjectcache' => $inc_path.'_core/model/dataobjects/_dataobjectcache.class.php',
-			'dataobjectlist' => $inc_path.'_core/model/dataobjects/_dataobjectlist.class.php',
-			'dataobjectlist2' => $inc_path.'_core/model/dataobjects/_dataobjectlist2.class.php',
-			'dataobject' => $inc_path.'_core/model/dataobjects/_dataobject.class.php',
-			'timer' => $inc_path.'_core/model/_timer.class.php',
-			'log' => $inc_path.'_core/model/_log.class.php',
-			'sql' => $inc_path.'_core/model/db/_sql.class.php',
-			'db' => $inc_path.'_core/model/db/_db.class.php',
-			'filetype' => $inc_path.'files/model/_filetype.class.php',
-			'filetypecache' => $inc_path.'files/model/_filetypecache.class.php',
-			'filerootcache' => $inc_path.'files/model/_filerootcache.class.php',
-			'file' => $inc_path.'files/model/_file.class.php',
-			'filecache' => $inc_path.'files/model/_filecache.class.php',
-			'filelist' => $inc_path.'files/model/_filelist.class.php',
-			'fileroot' => $inc_path.'files/model/_fileroot.class.php',
-			'widgetcache' => $inc_path.'widgets/model/_widgetcache.class.php',
-			'componentwidget' => $inc_path.'widgets/model/_widget.class.php',
-			'session' => $inc_path.'sessions/model/_session.class.php',
-			'hitlist' => $inc_path.'sessions/model/_hitlist.class.php',
-			'hit' => $inc_path.'sessions/model/_hit.class.php',
-			'goal' => $inc_path.'sessions/model/_goal.class.php',
-			'idna_convert' => $inc_path.'_ext/idna/_idna_convert.class.php',
-			'item' => $inc_path.'items/model/_item.class.php',
-			'itemlistlight' => $inc_path.'items/model/_itemlistlight.class.php',
-			'itemlight' => $inc_path.'items/model/_itemlight.class.php',
-			'link' => $inc_path.'items/model/_link.class.php',
-			'itemlist2' => $inc_path.'items/model/_itemlist.class.php',
-			'itemtype' => $inc_path.'items/model/_itemtype.class.php',
-			'itemquery' => $inc_path.'items/model/_itemquery.class.php',
-			'linkcache' => $inc_path.'items/model/_linkcache.class.php',
-			'itemtypecache' => $inc_path.'items/model/_itemtypecache.class.php',
-			'itemcache' => $inc_path.'items/model/_itemcache.class.php',
-			'group' => $inc_path.'users/model/_group.class.php',
-			'usercache' => $inc_path.'users/model/_usercache.class.php',
-			'user' => $inc_path.'users/model/_user.class.php',
-			'usersettings' => $inc_path.'users/model/_usersettings.class.php',
-			'genericorderedcache' => $inc_path.'generic/model/_genericorderedcache.class.php',
-			'genericordered' => $inc_path.'generic/model/_genericordered.class.php',
-			'genericcategory' => $inc_path.'generic/model/_genericcategory.class.php',
-			'genericcategorycache' => $inc_path.'generic/model/_genericcategorycache.class.php',
-			'genericelement' => $inc_path.'generic/model/_genericelement.class.php',
-			'genericcache' => $inc_path.'generic/model/_genericcache.class.php',
-			'xhtml_validator' => $inc_path.'xhtml_validator/_xhtml_validator.class.php',
-			'pofile' => $inc_path.'locales/_pofile.class.php',
-			'plugins' => $inc_path.'plugins/model/_plugins.class.php',
-			'plugins_admin' => $inc_path.'plugins/model/_plugins_admin.class.php',
-			'pluginsettings' => $inc_path.'plugins/model/_pluginsettings.class.php',
-			'pluginusersettings' => $inc_path.'plugins/model/_pluginusersettings.class.php',
-			'plugins_admin_no_db' => $inc_path.'plugins/model/_plugins_admin_no_db.class.php',
-			'plugin' => $inc_path.'plugins/_plugin.class.php',
-			'cronjob' => $inc_path.'cron/model/_cronjob.class.php',
-			'generalsettings' => $inc_path.'settings/model/_generalsettings.class.php',
-			'abstractsettings' => $inc_path.'settings/model/_abstractsettings.class.php',
-			'blogcache' => $inc_path.'collections/model/_blogcache.class.php',
-			'collectionsettings' => $inc_path.'collections/model/_collsettings.class.php',
-			'blog' => $inc_path.'collections/model/_blog.class.php',
-			'chaptercache' => $inc_path.'chapters/model/_chaptercache.class.php',
-			'chapter' => $inc_path.'chapters/model/_chapter.class.php',
-			'adminui_general' => $admintemplates_path.'/_adminUI_general.class.php',
-			'adminui' => $admintemplates_path.'/wind/_adminUI.class.php',
-			'menu' => $inc_path.'_core/ui/_menu.class.php',
-			'rfc822_addresses_class' => $inc_path.'_ext/mime_parser/rfc822_addresses.php',
-			'mime_parser_class' => $inc_path.'_ext/mime_parser/mime_parser.php',
-			/* AUTOGENERATED LIST END */
-		);
-		$map_class_path = $_map_class_path;
-	}
-
-	$classname = strtolower($classname);
-	if( isset($map_class_path[$classname]) )
-	{
-		require_once $map_class_path[$classname];
-	}
-}
-
-
-/*
- * Use spl_autoload_register mechanism, if available (PHP>=5.1.2).
- * This way, several autoload functions can be used.
- */
-if( function_exists('spl_autoload_register') )
-{
-	// spl_autoload_register( 'var_dump' );
-	spl_autoload_register( 'evocms_autoload_class' );
-}
-else
-{
-	// PHP<5.1.2: Use the fallback method.
-	function __autoload( $classname )
-	{
-		return evocms_autoload_class($classname);
-	}
-}
-
-
-/**
- * Load class file. No-op for PHP5, uses __autoload().
- */
-function load_class( $class_path )
-{
-	return true;
-}
-
-
-?>

=== modified file 'qp_inc/_core/_misc.funcs.php'
--- qp_inc/_core/_misc.funcs.php	2013-02-28 16:40:18 +0000
+++ qp_inc/_core/_misc.funcs.php	2013-03-14 18:35:26 +0000
@@ -2,7 +2,7 @@
 /**
  * This file implements general purpose functions
  *
- * @todo (0000): dh> Refactor into smaller chunks/files. We should avoid using a
+ * @todo (0000) dh> Refactor into smaller chunks/files. We should avoid using a
  * "huge" misc early!
  * - _debug.funcs.php
  * - _formatting.funcs.php
@@ -10,6 +10,8 @@
  * - ?
  *
  * @author {@link http://wonderwinds.com/ Ed Bennett}
+ * @author {@link http://astonishme.co.uk/ Yabba (Paul Jones, rest in peace)}
+ * @author {@link http://ax86.net/ Tilman BLUMENBACH}
  * @author {@link http://progidistri.com/ PROGIDISTRI}
  * @author {@link http://daniel.hahler.de/ Daniel HAHLER}
  * @author {@link http://funky-m.com/ Vegar BERG GULDAL}
@@ -41,9 +43,9 @@
 }
 
 /**
- * Get a cache reference.
+ * Get a cache reference
  *
- * @todo fp> split into 1 function per case. (typed @return values)
+ * @todo (0000) fp> split into 1 function per case. (typed @return values)
  * @param string The cache to get (see source code for possible names).
  * @return mixed The requested cache (debug_die()s on invalid cache name).
  */
@@ -64,9 +66,9 @@
 		$BlogCache = new BlogCache(); // COPY (FUNC)
 		return $BlogCache;
 
-		case 'ChapterCache':
-		$ChapterCache = new ChapterCache(); // COPY (FUNC)
-		return $ChapterCache;
+		case 'CategoryCache':
+		$CategoryCache = new CategoryCache(); // COPY (FUNC)
+		return $CategoryCache;
 
 		case 'FileCache':
 		$FileCache = new FileCache(); // COPY (FUNC)
@@ -89,7 +91,7 @@
 		return $GroupCache;
 
 		case 'ItemCacheLight';
-		$ItemCacheLight = new DataObjectCache( 'ItemLight', false, 'T_items__item', 'post_', 'post_ID' ); // COPY (FUNC)
+		$ItemCacheLight = new DataObjectCache( 'ItemLight', false, 'T_items', 'post_', 'post_ID' ); // COPY (FUNC)
 		return $ItemCacheLight;
 
 		case 'ItemCache';
@@ -137,11 +139,10 @@
 		return $WidgetCache;
 
 		case 'EnabledWidgetCache':
-		// This simply instantiates a WidgetCache object, setting the
-		// $enabled_only parameter to true. Using a member variable
-		// instead of per-method parameters to load only the enabled
-		// widgets should be cleaner when there will be more methods
-		// in the WidgetCache class in the future.
+		// This simply instantiates a WidgetCache object, setting the $enabled_only
+		// parameter to true. Using a member variable instead of per-method parameters
+		// to load only the enabled widgets should be cleaner when there will be more
+		// methods in the WidgetCache class in the future.
 		$EnabledWidgetCache = new WidgetCache( true );
 		return $EnabledWidgetCache;
 
@@ -163,7 +164,7 @@
 
 
 /**
- * Shutdown function: update session!
+ * Shutdown function: update session
  *
  * This is registered in _main.inc.php with register_shutdown_function()
  * This is called by PHP at the end of the script.
@@ -173,7 +174,7 @@
 	global $Session;
 	global $Settings;
 
-	// fp> do we need special processing if we are in CLI mode?  probably earlier actually
+	// fp> do we need special processing if we are in CLI mode? probably earlier actually
 	// if( ! $is_cli )
 	// Note: it might be useful at some point to do special processing if the script has been aborted or has timed out
 	// connection_aborted()
@@ -182,7 +183,7 @@
 	// Update the SESSION:
 	$Session->dbsave();
 
-	// Auto pruning of old HITS, old SESSIONS and potentially MORE analytics data:
+	// Auto pruning of old HITS, old SESSIONS and potentially MORE analytics data
 	if( $Settings->get( 'auto_prune_stats_mode' ) == 'page' )
 	{
 		// Autopruning is requested
@@ -193,18 +194,16 @@
 	// Then again, it's for debug only, so it shouldn't matter that much.
 	debug_info();
 
-	// Update the SESSION again, at the very end:
+	// Update the SESSION again, at the very end
 	// (e.g. "Debugslogs" may have been removed in debug_info())
 	$Session->dbsave();
 }
 
 
-/***** Formatting functions *****/
-
 /**
  * Format a string/content for being output
  *
- * @todo (0000): htmlspecialchars() takes a charset argument, which we could provide ( $app_charset? )
+ * @todo (0000) htmlspecialchars() takes a charset argument, which we could provide ( $app_charset? )
  * @param string raw text
  * @param string format, can be one of the following
  * - raw: do nothing
@@ -260,7 +259,7 @@
 
 		// use as a form value: escapes &, quotes and < > but leaves code alone
 		case 'formvalue':
-		$content = htmlspecialchars( $content, ENT_QUOTES );  // Handles &, ", ', < and >
+		$content = htmlspecialchars( $content, ENT_QUOTES ); // Handles &, ", ', < and >
 		break;
 
 		// use in an XML file: strip HTML tags
@@ -298,11 +297,13 @@
 /*
  * autobrize(-)
  */
-function autobrize( $content ) {
+function autobrize( $content )
+{
 	$content = callback_on_non_matching_blocks( $content, '~<code>.+?</code>~is', 'autobrize_callback' );
 	return $content;
 }
 
+
 /**
  * Adds <br>'s to non code blocks
  * @param string $content
@@ -316,7 +317,8 @@
 	return( $content );
 }
 
-/*
+
+/**
  * unautobrize(-)
  */
 function unautobrize( $content )
@@ -325,20 +327,24 @@
 	return $content;
 }
 
+
 /**
  * Removes <br>'s from non code blocks
+ *
  * @param string $content
  * @return string content with <br>'s removed
  */
 function unautobrize_callback( $content )
 {
-	$content = preg_replace("/<br>\n/", "\n", $content);   //for PHP versions before 4.0.5
-	$content = preg_replace("/<br \/>\n/", "\n", $content);
+	$content = preg_replace( "/<br>\n/", "\n", $content) ; //for PHP versions before 4.0.5
+	$content = preg_replace( "/<br \/>\n/", "\n", $content );
 	return( $content );
 }
 
+
 /**
- * Add leading zeroes to a number when necessary.
+ * Add leading zeroes to a number when necessary
+ *
  * @param string The original number.
  * @param integer How many digits shall the number have?
  * @return string The padded number.
@@ -348,8 +354,10 @@
 	return str_pad( $number, $threshold, '0', STR_PAD_LEFT );
 }
 
+
 /**
- * Crop string to maxlen with &hellip; at the end if needed.
+ * Crop string to maxlen with &hellip; at the end if needed
+ *
  * @param string
  * @param int Maximum length
  * @return string
@@ -366,7 +374,8 @@
 
 
 /**
- * Crop string to maxwords preserving tags.
+ * Crop string to maxwords preserving tags
+ *
  * @param string
  * @param int Maximum number words
  * @param mixed array Optional parameters
@@ -375,9 +384,9 @@
 function strmaxwords( $str, $maxwords = 50, $params = array() )
 {
 	$params = array_merge( array(
-			'continued_link' => '',
-			'continued_text' => '&hellip;',
-			'always_continue' => false,
+		'continued_link' => '',
+		'continued_text' => '&hellip;',
+		'always_continue' => false,
 		), $params );
 	$open = false;
 	$have_seen_non_whitespace = false;
@@ -530,6 +539,7 @@
 
 /**
  * mbstring wrapper for strlen function
+ *
  * @param string
  * @return string
  */
@@ -548,6 +558,7 @@
 
 /**
  * mbstring wrapper for substr function
+ *
  * @param string
  * @param int start position
  * @param int string length
@@ -578,6 +589,7 @@
  * gets passed. This gets used to make links clickable or replace smilies. E.g., to replace
  * only in non-HTML tags, call it like:
  * <code>callback_on_non_matching_blocks( $text, '~<[^>]*>~s', 'your_callback' );</code>
+ *
  * @param string Text to handle
  * @param string Regular expression pattern that defines blocks to exclude.
  * @param callback Function name or object/method array to use as callback.
@@ -624,11 +636,11 @@
 
 
 /**
- * Make links clickable in a given text.
+ * Make links clickable in a given text
  *
  * It replaces only text which is not between <a> tags already.
  *
- * @todo (0000): dh> this should not replace links in tags! currently fails for
+ * @todo (0000) dh> this should not replace links in tags! currently fails for
  * something like '<img src=" http://example.com/" />' (not usual though!). fp> I
  * am trying to address this by not replacing anything inside tags. This should
  * be replaced by a clean state machine (one single variable for current state)
@@ -766,12 +778,11 @@
 /**
  * Callback function for {@link make_clickable()}.
  *
- * original function: phpBB, extended here for AIM & ICQ
- * fplanque restricted :// to http:// and mailto://
- * Fixed to not include trailing dot and comma.
+ * original function: phpBB, extended here for AIM & ICQ. fplanque restricted ://
+ * to http:// and mailto://. Fixed to not include trailing dot and comma.
  *
- * fp> I'm thinking of moving this into the autolinks plugin (only place where it's used)
- *     and break it up into something more systematic.
+ * fp> I'm thinking of moving this into the autolinks plugin (only place where it's
+ * used) and break it up into something more systematic.
  *
  * @return string The clickable text.
  */
@@ -779,9 +790,8 @@
 {
 	$pattern_domain = '([a-z0-9\-]+\.[a-z0-9\-.\~]+)'; // a domain name (not very strict)
 	$text = preg_replace(
-		/* Tblue> I removed the double quotes from the first RegExp because
-				  it made URLs in tag attributes clickable.
-				  See http://forums.b2evolution.net/viewtopic.php?p=92073 */
+		// Tblue> I removed the double quotes from the first RegExp because
+		// it made URLs in tag attributes clickable.
 		array( '#(^|[\s>])(https?|mailto)://([^<>{}\s]+[^.,<>{}\s])#i',
 			'#(^|[\s>])aim:([^,<\s]+)#i',
 			'#(^|[\s>])icq:(\d+)#i',
@@ -798,9 +808,9 @@
 }
 
 
-/***** // Formatting functions *****/
-
-
+/**
+ * dummy docblock
+ */
 function date2mysql( $ts )
 {
 	return date( 'Y-m-d H:i:s', $ts );
@@ -823,7 +833,8 @@
 }
 
 /**
- * Format a MYSQL date to current locale date format.
+ * Format a MYSQL date to current locale date format
+ *
  * @param string MYSQL date YYYY-MM-DD HH:MM:SS
  */
 function mysql2localedate( $mysqlstring )
@@ -831,16 +842,28 @@
 	return mysql2date( locale_datefmt(), $mysqlstring );
 }
 
+
+/**
+ * dummy docblock
+ */
 function mysql2localetime( $mysqlstring )
 {
 	return mysql2date( locale_timefmt(), $mysqlstring );
 }
 
+
+/**
+ * dummy docblock
+ */
 function mysql2localedatetime( $mysqlstring )
 {
 	return mysql2date( locale_datefmt().' '.locale_timefmt(), $mysqlstring );
 }
 
+
+/**
+ * dummy docblock
+ */
 function mysql2localedatetime_spans( $mysqlstring, $datefmt = NULL, $timefmt = NULL )
 {
 	if( is_null( $datefmt ) )
@@ -852,16 +875,14 @@
 		$timefmt = locale_timefmt();
 	}
 
-	return '<span class="date">'
-					.mysql2date( $datefmt, $mysqlstring )
-					.'</span> <span class="time">'
-					.mysql2date( $timefmt, $mysqlstring )
-					.'</span>';
+	return '<span class="date">'.mysql2date( $datefmt, $mysqlstring )
+		.'</span> <span class="time">'.mysql2date( $timefmt, $mysqlstring ).'</span>';
 }
 
 
 /**
  * Format a MYSQL date
+ *
  * @param string enhanced format string
  * @param string MYSQL date YYYY-MM-DD HH:MM:SS
  * @param boolean true to use GM time
@@ -881,14 +902,20 @@
 
 /**
  * Date internationalization: same as date() formatting but with i18n support
+ *
  * @param string enhanced format string
  * @param integer UNIX timestamp
  * @param boolean true to use GM time
  */
 function date_i18n( $dateformatstring, $unixtimestamp, $useGM = false )
 {
-	global $month, $month_abbrev, $weekday, $weekday_abbrev, $weekday_letter;
-	global $localtimenow, $time_difference;
+	global $localtimenow;
+	global $month;
+	global $month_abbrev;
+	global $time_difference;
+	global $weekday;
+	global $weekday_abbrev;
+	global $weekday_letter;
 
 	if( $dateformatstring == 'isoZ' )
 	{
@@ -907,21 +934,16 @@
 
 		/*
 		Special symbols:
-			'b': wether it's today (1) or not (0)
+			'b': whether it's today (1) or not (0)
 			'l': weekday
 			'D': weekday abbrev
 			'e': weekday letter
 			'F': month
 			'M': month abbrev
 		*/
-
-		#echo $dateformatstring, '<br />';
-
 		// protect special symbols, that date() would need proper locale set for
 		$protected_dateformatstring = preg_replace( '/(?<!\\\)([blDeFM])/', '@@@\\\$1@@@', $dateformatstring );
 
-		#echo $protected_dateformatstring, '<br />';
-
 		$r = date( $protected_dateformatstring, $unixtimestamp );
 
 		if( $protected_dateformatstring != $dateformatstring )
@@ -933,20 +955,21 @@
 
 			// replace special symbols
 			$r = str_replace( array(
-						'@@@b@@@',
-						'@@@l@@@',
-						'@@@D@@@',
-						'@@@e@@@',
-						'@@@F@@@',
-						'@@@M@@@',
-						),
-					array( $istoday,
-						trim( T_( $weekday[$dateweekday] ) ),
-						trim( T_( $weekday_abbrev[$dateweekday] ) ),
-						trim( T_( $weekday_letter[$dateweekday] ) ),
-						trim( T_( $month[$datemonth] ) ),
-						trim( T_( $month_abbrev[$datemonth] ) ) ),
-					$r );
+				'@@@b@@@',
+				'@@@l@@@',
+				'@@@D@@@',
+				'@@@e@@@',
+				'@@@F@@@',
+				'@@@M@@@',
+				),
+				array(
+				$istoday,
+				trim( T_( $weekday[$dateweekday] ) ),
+				trim( T_( $weekday_abbrev[$dateweekday] ) ),
+				trim( T_( $weekday_letter[$dateweekday] ) ),
+				trim( T_( $month[$datemonth] ) ),
+				trim( T_( $month_abbrev[$datemonth] ) ) ),
+				$r );
 		}
 	}
 
@@ -956,6 +979,7 @@
 
 /**
  * Add given # of days to a timestamp
+ *
  * @param integer timestamp
  * @param integer days
  * @return integer timestamp
@@ -966,17 +990,22 @@
 		date( 'm', $timestamp ), date( 'd', $timestamp )+$days, date( 'Y', $timestamp ) );
 }
 
+
 /**
  * Format dates into a string in a way similar to sprintf()
  */
 function date_sprintf( $string, $timestamp )
 {
 	global $date_sprintf_timestamp;
+
 	$date_sprintf_timestamp = $timestamp;
-
 	return preg_replace_callback( '/%\{(.*?)\}/', 'date_sprintf_callback', $string );
 }
 
+
+/**
+ * callback
+ */
 function date_sprintf_callback( $matches )
 {
 	global $date_sprintf_timestamp;
@@ -987,6 +1016,7 @@
 
 
 /**
+ * Get start date for week
  *
  * @param integer year
  * @param integer month (0-53)
@@ -997,8 +1027,8 @@
 	$new_years_date = mktime( 0, 0, 0, 1, 1, $year );
 	$weekday = date( 'w', $new_years_date );
 
-	// How many days until start of week:
-	$days_to_new_week = (7 - $weekday + $startofweek) % 7;
+	// How many days until start of week
+	$days_to_new_week = ( 7 - $weekday + $startofweek ) % 7;
 
 	// We now add the required number of days to find the 1st sunday/monday in the year:
 	//$first_week_start_date = $new_years_date + $days_to_new_week * 86400;
@@ -1027,7 +1057,7 @@
 		$date = mktime( 0, 0, 0, date( 'm', $date ), date( 'd', $date )-1, date( 'Y', $date ) );
 	}
 	$week['start'] = $date;
-	$week['end']   = $date + 604800; // 7 days
+	$week['end'] = $date + 604800; // 7 days
 
 	return( $week );
 }
@@ -1035,6 +1065,7 @@
 
 /**
  * Get difference between two MySQL timestamps
+ *
  * @link http://www.php.net/manual/en/function.time.php#85481
  * @param string MYSQL date (YYYY-MM-DD HH:MM:SS) 
  * @param string MYSQL date (YYYY-MM-DD HH:MM:SS), defaults to 0 for right now
@@ -1057,7 +1088,7 @@
 
 	if( $delta_minutes <= 1 )
 	{
-		return ($delta_minutes == 0) ? T_('less than a minute') : T_('1 minute');
+		return ( $delta_minutes == 0 ) ? T_('less than a minute') : T_('1 minute');
 	}
 
 	if( $delta_minutes < 45 )
@@ -1097,17 +1128,13 @@
 
 
 /**
- * Check that email address looks valid.
+ * Check that email address looks valid
  *
  * @param string email address to check
  * @param string Format to use ('simple', 'rfc')
- *    'simple':
- *      Single email address.
- *    'rfc':
- *      Full email address, may include name (RFC2822)
- *      - [e-mail]
- *      - Me <[e-mail]>
- *      - "Me" <[e-mail]>
+ * - 'simple': Single email address.
+ * - 'rfc': Full email address, may include name (RFC2822) like [e-mail]
+ * or Me <[e-mail]> or "Me" <[e-mail]>
  *
  * @see Plugin::IsValidRawEmail()
  * @see Plugin::IsValidFilteredEmail()
@@ -1136,12 +1163,12 @@
 		// The plugin thinks the email address is invalid. No further processing.
 		return false;
 	}
-	else if( $plug_choice == Plugin::EmailValid )
+	elseif( $plug_choice == Plugin::EmailValid )
 	{
 		// The plugin assures us that everything is perfectly fine.
 		return true;
 	}
-	else if( $plug_choice == Plugin::EmailNotSure )
+	elseif( $plug_choice == Plugin::EmailNotSure )
 	{
 		// No plugin could decide on the validity of the address.
 		// Apply our own checks.
@@ -1195,10 +1222,7 @@
 	// Now we have a syntactically valid email. Let's see if there are any other
 	// plugins that might decide that there's something else wrong with the address.
 	$plug_ret = $Plugins->trigger_event_first_false( 'IsValidFilteredEmail',
-		array(
-			'email' => $email,
-			'format' => $format,
-		) );
+		array( 'email' => $email, 'format' => $format, ) );
 
 	if( ! empty( $plug_ret ) )
 	{
@@ -1214,13 +1238,17 @@
  */
 function is_windows()
 {
-	return ( strtoupper(substr(PHP_OS,0,3)) == 'WIN' );
+	return ( strtoupper( substr( PHP_OS, 0, 3 ) ) == 'WIN' );
 }
 
 
-function xmlrpc_getposttitle($content)
+/**
+ * dummy docblock
+ */
+function xmlrpc_getposttitle( $content )
 {
 	global $post_default_title;
+
 	if( preg_match( '/<title>(.+?)<\/title>/is', $content, $matchtitle ) )
 	{
 		$post_title = $matchtitle[1];
@@ -1229,17 +1257,16 @@
 	{
 		$post_title = $post_default_title;
 	}
-	return($post_title);
+	return( $post_title );
 }
 
 
 /**
  * Also used by post by mail
  *
- * @deprecated by xmlrpc_getpostcategories()
- * @todo (1111): this is used only by qp_srvc/getmail.php in v0.0.0 (EdB)
+ * @deprecated by xmlrpc_getpostcategories() ... uh no: this is used only by qp_srvc/getmail.php in v0.0.0 (EdB)
  */
-function xmlrpc_getpostcategory($content)
+function xmlrpc_getpostcategory( $content )
 {
 	if( preg_match( '/<category>([0-9]+?)<\/category>/is', $content, $matchcat ) )
 	{
@@ -1251,14 +1278,14 @@
 
 
 /**
- * Extract categories out of "<category>" tag from $content.
+ * Extract categories out of "<category>" tag from $content
  *
- * NOTE: w.bloggar sends something like "<category>00000013,00000001,00000004,</category>" to
- *       blogger.newPost.
+ * NOTE: w.bloggar sends something like "<category>00000013,00000001,00000004,</category>"
+ * to blogger.newPost.
  *
  * @return false|array
  */
-function xmlrpc_getpostcategories($content)
+function xmlrpc_getpostcategories( $content )
 {
 	$cats = array();
 
@@ -1275,20 +1302,21 @@
 }
 
 
-/*
+/**
  * xmlrpc_removepostdata(-)
  */
-function xmlrpc_removepostdata($content)
+function xmlrpc_removepostdata( $content )
 {
 	$content = preg_replace('/<title>(.*?)<\/title>/si', '', $content);
 	$content = preg_replace('/<category>(.*?)<\/category>/si', '', $content);
-	$content = trim($content);
-	return($content);
+	$content = trim( $content );
+	return( $content );
 }
 
 
 /**
  * Echo the XML-RPC call Result and optionally log into file
+ *
  * @param object XMLRPC response object
  * @param boolean true to echo
  * @param mixed File resource or == '' for no file logging.
@@ -1306,18 +1334,18 @@
 	{
 		// We got a remote error
 		if( $display ) echo T_('Remote error'), ': ', $result->faultString(), ' (', $result->faultCode(), ")<br />\n";
-		debug_fwrite($log, $result->faultCode().' -- '.$result->faultString());
+		debug_fwrite( $log, $result->faultCode().' -- '.$result->faultString() );
 		return false;
 	}
 
 	// We'll display the response
 	$val = $result->value();
-	$value = xmlrpc_decode_recurse($result->value());
+	$value = xmlrpc_decode_recurse( $result->value() );
 
-	if( is_array($value) )
+	if( is_array( $value ) )
 	{
 		$out = '';
-		foreach($value as $l_value)
+		foreach( $value as $l_value )
 		{
 			$out .= ' ['.$l_value.'] ';
 		}
@@ -1327,7 +1355,7 @@
 		$out = $value;
 	}
 
-	debug_fwrite($log, $out);
+	debug_fwrite( $log, $out );
 
 	if( $display ) echo T_('Response').': '.$out."<br />\n";
 
@@ -1337,6 +1365,7 @@
 
 /**
  * Log the XML-RPC call Result into LOG object
+ *
  * @param object XMLRPC response object
  * @param Log object to add messages to
  * @return boolean true = success, false = error
@@ -1359,12 +1388,12 @@
 
 	// We got a response
 	$val = $result->value();
-	$value = xmlrpc_decode_recurse($result->value());
+	$value = xmlrpc_decode_recurse( $result->value() );
 
-	if( is_array($value) )
+	if( is_array( $value ) )
 	{
 		$out = '';
-		foreach($value as $l_value)
+		foreach( $value as $l_value )
 		{
 			$out .= ' ['.$l_value.'] ';
 		}
@@ -1383,33 +1412,49 @@
 }
 
 
-
-function debug_fopen($filename, $mode) {
+/**
+ * dummy docblock
+ */
+function debug_fopen( $filename, $mode )
+{
 	global $debug;
+
 	if( $debug == 1 && ( ! empty( $filename ) ) )
 	{
-		$fp = fopen($filename, $mode);
+		$fp = fopen( $filename, $mode );
 		return $fp;
-	} else {
+	}
+	else
+	{
 		return false;
 	}
 }
 
-function debug_fwrite($fp, $string)
+
+/**
+ * dummy docblock
+ */
+function debug_fwrite( $fp, $string )
 {
 	global $debug;
+
 	if( $debug && $fp )
 	{
-		fwrite($fp, $string);
+		fwrite( $fp, $string );
 	}
 }
 
-function debug_fclose($fp)
+
+/**
+ * dummy docblock
+ */
+function debug_fclose( $fp )
 {
 	global $debug;
+
 	if( $debug && $fp )
 	{
-		fclose($fp);
+		fclose( $fp );
 	}
 }
 
@@ -1417,6 +1462,7 @@
 
 /**
  * Wrap pre tag around {@link var_dump()} for better debugging
+ *
  * @param $var__var__var__var__,... mixed variable(s) to dump
  */
 function pre_dump( $var__var__var__var__ )
@@ -1428,13 +1474,13 @@
 	$func_num_args = func_num_args();
 	$count = 0;
 
-	if( ! empty($is_cli) )
+	if( ! empty( $is_cli ) )
 	{
 		// CLI, no encoding of special chars
 		$count = 0;
 		foreach( func_get_args() as $lvar )
 		{
-			var_dump($lvar);
+			var_dump( $lvar );
 
 			$count++;
 			if( $count < $func_num_args )
@@ -1456,7 +1502,7 @@
 		echo "\n<div style=\"padding:1ex;border:1px solid #00f;\">\n";
 		foreach( func_get_args() as $lvar )
 		{
-			xdebug_var_dump($lvar);
+			xdebug_var_dump( $lvar );
 
 			$count++;
 			if( $count < $func_num_args )
@@ -1502,11 +1548,14 @@
  * Get a function trace from {@link debug_backtrace()} as html table.
  *
  * Adopted from {@link http://us2.php.net/manual/de/function.debug-backtrace.php#47644}.
- * @param integer|NULL Get the last x entries from the stack (after $ignore_from is applied). Anything non-numeric means "all".
- * @param array After a key/value pair matches a stack entry, this and the rest is ignored.
- * For example, array( 'class' => 'DB' ) would exclude everything after the stack
- * "enters" class DB and everything that got called afterwards.
- * You can also give an array of arrays which means that every condition in one of the given array must match.
+ *
+ * @param integer|NULL Get the last x entries from the stack (after $ignore_from is applied).
+ * Anything non-numeric means "all".
+ * @param array After a key/value pair matches a stack entry, this and the rest
+ * is ignored. For example, array( 'class' => 'DB' ) would exclude everything after
+ * the stack "enters" class DB and everything that got called afterwards.
+ * You can also give an array of arrays which means that every condition in one
+ * of the given array must match.
  * @param integer Number of stack entries to include, after $ignore_from matches.
  * @return string HTML table
  */
@@ -1521,7 +1570,7 @@
 
 	$backtrace = debug_backtrace();
 	$count_ignored = 0; // remember how many have been ignored
-	$limited = false;   // remember if we have limited to $limit_to_last
+	$limited = false; // remember if we have limited to $limit_to_last
 
 	if( $ignore_from )
 	{
@@ -1529,7 +1578,7 @@
 		$trace_length = 0;
 		$break_because_of_offset = false;
 
-		for( $i = count($backtrace); $i > 0; $i-- )
+		for( $i = count( $backtrace ); $i > 0; $i-- )
 		{
 			// Search the backtrace from behind (first call)
 			$l_stack = & $backtrace[$i-1];
@@ -1543,13 +1592,13 @@
 			foreach( $ignore_from as $l_ignore_key => $l_ignore_value )
 			{
 				// Check if we want to ignore from here
-				if( is_array($l_ignore_value) )
+				if( is_array( $l_ignore_value ) )
 				{
 					// It's an array - all must match
 					foreach( $l_ignore_value as $l_ignore_mult_key => $l_ignore_mult_val )
 					{
 						if( ! isset( $l_stack[$l_ignore_mult_key] ) /* not set with this stack entry */
-							|| strcasecmp($l_stack[$l_ignore_mult_key], $l_ignore_mult_val) /* not this value (case-insensitive) */ )
+							|| strcasecmp( $l_stack[$l_ignore_mult_key], $l_ignore_mult_val ) /* not this value (case-insensitive) */ )
 						{
 							continue 2; // next ignore setting, because not all match.
 						}
@@ -1561,8 +1610,8 @@
 					}
 					break 2; // ignore from here
 				}
-				elseif( isset($l_stack[$l_ignore_key])
-					&& !strcasecmp($l_stack[$l_ignore_key], $l_ignore_value) /* is equal case-insensitive */ )
+				elseif( isset( $l_stack[$l_ignore_key] )
+					&& !strcasecmp( $l_stack[$l_ignore_key], $l_ignore_value ) /* is equal case-insensitive */ )
 				{
 					if( $offset_ignore_from-- > 0 )
 					{
@@ -1575,13 +1624,13 @@
 			$trace_length++;
 		}
 
-		$count_ignored = count($backtrace) - $trace_length;
+		$count_ignored = count( $backtrace ) - $trace_length;
 
 		$backtrace = array_slice( $backtrace, 0-$trace_length ); // cut off ignored ones
 	}
 
-	$count_backtrace = count($backtrace);
-	if( is_numeric($limit_to_last) && $limit_to_last < $count_backtrace )
+	$count_backtrace = count( $backtrace );
+	if( is_numeric( $limit_to_last ) && $limit_to_last < $count_backtrace )
 	{
 		// we want to limit to a maximum number
 		$limited = true;
@@ -1607,45 +1656,51 @@
 				$r .= '<li style="padding:0.5ex 0; border-bottom:1px solid #77d;">';
 			}
 			$args = array();
-			if( isset($l_trace['args']) && is_array( $l_trace['args'] ) )
+			if( isset( $l_trace['args'] ) && is_array( $l_trace['args'] ) )
 			{
 				// Prepare args
 				foreach( $l_trace['args'] as $l_arg )
 				{
-					$l_arg_type = gettype($l_arg);
+					$l_arg_type = gettype( $l_arg );
 					switch( $l_arg_type )
 					{
 						case 'integer':
 						case 'double':
-							$args[] = $l_arg;
-							break;
+						$args[] = $l_arg;
+						break;
+
 						case 'string':
-							$args[] = '"'.htmlspecialchars(str_replace("\n", '', substr($l_arg, 0, 64))).((strlen($l_arg) > 64) ? '...' : '').'"';
-							break;
+						$args[] = '"'.htmlspecialchars( str_replace( "\n", '', substr( $l_arg, 0, 64 ) ) ).( ( strlen( $l_arg ) > 64 ) ? '...' : '' ).'"';
+						break;
+
 						case 'array':
-							$args[] = 'Array('.count( $l_arg ).')';
-							break;
+						$args[] = 'Array('.count( $l_arg ).')';
+						break;
+
 						case 'object':
-							$args[] = 'Object('.get_class($l_arg).')';
-							break;
+						$args[] = 'Object('.get_class( $l_arg ).')';
+						break;
+
 						case 'resource':
-							$args[] = 'Resource('.strstr($l_arg, '#').')';
-							break;
+						$args[] = 'Resource('.strstr( $l_arg, '#' ).')';
+						break;
+
 						case 'boolean':
-							$args[] = $l_arg ? 'true' : 'false';
-							break;
+						$args[] = $l_arg ? 'true' : 'false';
+						break;
+
 						default:
-							$args[] = $l_arg_type;
+						$args[] = $l_arg_type;
 					}
 				}
 			}
 
 			$call = "<strong>\n";
-			if( isset($l_trace['class']) )
+			if( isset( $l_trace['class'] ) )
 			{
 				$call .= $l_trace['class'];
 			}
-			if( isset($l_trace['type']) )
+			if( isset( $l_trace['type'] ) )
 			{
 				$call .= $l_trace['type'];
 			}
@@ -1659,7 +1714,7 @@
 			$r .= $call."<br />\n";
 
 			$r .= '<strong>';
-			if( isset($l_trace['file']) )
+			if( isset( $l_trace['file'] ) )
 			{
 				$r .= "File: </strong> ".$l_trace['file'];
 			}
@@ -1667,7 +1722,7 @@
 			{
 				$r .= '[runtime created function]</strong>';
 			}
-			if( isset($l_trace['line']) )
+			if( isset( $l_trace['line'] ) )
 			{
 				$r .= ' on line '.$l_trace['line'];
 			}
@@ -1681,7 +1736,8 @@
 		$r .= '<p>No backtrace available.</p>';
 	}
 
-	// Extra notes, might be to much, but explains why we stopped at some point. Feel free to comment it out or remove it.
+	// Extra notes, might be to much, but explains why we stopped at some point.
+	// Feel free to comment it out or remove it.
 	$notes = array();
 	if( $count_ignored )
 	{
@@ -1705,19 +1761,22 @@
 /**
  * Outputs Unexpected Error message. When in debug mode it also prints a backtrace.
  *
- * This should be used instead of die() everywhere.
- * This should NOT be used instead of exit() anywhere.
- * Dying means the application has encontered and unexpected situation,
- * i-e: something that should never occur during normal operation.
- * Examples: database broken, user changed URL by hand...
+ * This should be used instead of die() everywhere. This should NOT be used instead
+ * of exit() anywhere. Dying means the application has encountered and unexpected
+ * situation, i-e: something that should never occur during normal operation. Examples:
+ * database broken, user changed URL by hand...
+ *
  * @param string Message to output
  * @param array Additional params
  * - "status" (Default: '500 Internal Server Error')
  */
 function debug_die( $additional_info = '', $params = array() )
 {
-	global $debug, $app_baseurl;
-	global $log_app_errors, $app_name, $is_cli;
+	global $app_baseurl;
+	global $app_name;
+	global $debug;
+	global $is_cli;
+	global $log_app_errors;
 
 	$params = array_merge( array( 'status' => '500 Internal Server Error', ), $params );
 
@@ -1731,14 +1790,14 @@
 	}
 	else
 	{
-		// Attempt to output an error header (will not work if the output buffer has already flushed once):
+		// Attempt to output an error header (will not work if the output buffer has already flushed once)
 		// This should help preventing indexing robots from indexing the error :P
 		if( ! headers_sent() )
 		{
 			load_funcs( '_core/_template.funcs.php' );
 			header_content_type( 'text/html' ); // it's ok, if a previous header would be replaced;
 			$status_header = $_SERVER['SERVER_PROTOCOL'].' '.$params['status'];
-			header($status_header);
+			header( $status_header );
 		}
 
 		echo '<div style="background-color: #fdd; padding: 1ex; margin-bottom: 1ex;">';
@@ -1770,9 +1829,9 @@
 
 	// Log error through PHP's logging facilities
 	$log_message = $app_name.' error: ';
-	if( ! empty($additional_info) )
+	if( ! empty( $additional_info ) )
 	{
-		$log_message .= trim( strip_tags($additional_info) );
+		$log_message .= trim( strip_tags( $additional_info ) );
 	}
 	else
 	{
@@ -1798,16 +1857,16 @@
 	{
 		// Append backtrace
 		// indent after newlines
-		$backtrace_cli = preg_replace( '~(\S)(\n)(\S)~', '$1  $2$3', $backtrace_cli );
+		$backtrace_cli = preg_replace( '~(\S)(\n)(\S)~', '$1 $2$3', $backtrace_cli );
 		$log_message .= "\nBacktrace:\n".$backtrace_cli;
 	}
 
-	$log_message .= "\nREQUEST_URI:  ".( isset( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : '-' );
+	$log_message .= "\nREQUEST_URI: ".( isset( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : '-' );
 	$log_message .= "\nHTTP_REFERER: ".( isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : '-' );
 
 	error_log( str_replace("\n", ' / ', $log_message), 0 /* PHP's system logger */ );
 
-	// DEBUG OUTPUT:
+	// DEBUG OUTPUT
 	if( $debug )
 	{
 		if( $is_cli )
@@ -1816,7 +1875,7 @@
 			echo $backtrace;
 	}
 
-	// EXIT:
+	// EXIT
 	if( ! $is_cli )
 	{
 		// Attempt to keep the html valid (but it doesn't really matter anyway)
@@ -1831,13 +1890,15 @@
  * Outputs Bad request Error message. When in debug mode it also prints a backtrace
  *
  * This should be used when a bad user input is detected?
+ *
  * @param string Message to output (HTML)
  */
 function bad_request_die( $additional_info = '' )
 {
-	global $debug, $app_baseurl;
+	global $app_baseurl;
+	global $debug;
 
-	// Attempt to output an error header (will not work if the output buffer has already flushed once):
+	// Attempt to output an error header (will not work if the output buffer has already flushed once)
 	// This should help preventing indexing robots from indexing the error :P
 	if( ! headers_sent() )
 	{
@@ -1875,6 +1936,7 @@
 
 /**
  * Outputs debug info according to {@link $debug} or $force param
+ *
  * @param boolean true to force output regardless of {@link $debug}
  * @param boolean true to force clean output (without HTML) regardless of {@link $is_cli}
  */
@@ -1920,7 +1982,7 @@
 		if( $debug < 2 && ( empty( $Hit ) || $Hit->get_agent_type() != 'browser' ) )
 		{
 			// Don't display if it's not a browser (very needed for proper RSS display btw)
-			// ($Hit is empty e.g. during install)
+			// $Hit is empty e.g. during install 
 			return;
 		}
 	}
@@ -1950,7 +2012,7 @@
 	{
 		// don't display changing items when we want to test obhandler
 
-		// Timer table:
+		// Timer table
 		$time_page = $Timer->get_duration( 'total' );
 		$timer_rows = array();
 		foreach( $Timer->get_categories() as $l_cat )
@@ -1967,7 +2029,7 @@
 
 		// Remove "total", it will get outputted as the last one
 		$total_time = $timer_rows['total'];
-		unset($timer_rows['total']);
+		unset( $timer_rows['total'] );
 
 		if( $clean )
 		{
@@ -2010,9 +2072,9 @@
 				echo $row."\n";
 			}
 		}
-		$count_collapse = count($table_rows_collapse);
+		$count_collapse = count( $table_rows_collapse );
 
-		// Collapse ignored rows, allowing to expand them with Javascript:
+		// Collapse ignored rows, allowing to expand them with Javascript
 		if( $count_collapse > 5 )
 		{
 			echo '<tr><td colspan="4" class="center"> <a href="" onclick="var e = document.getElementById(\'evo-debuglog-timer-long\'); e.style.display = (e.style.display == \'none\' ? \'\' : \'none\'); return false;">+ '.$count_collapse.' &lt; 0.005s</a> </td></tr>';
@@ -2050,7 +2112,7 @@
 			echo '</table>';
 		}
 
-		if( isset($DB) )
+		if( isset( $DB ) )
 		{
 			if( $clean )
 			{
@@ -2089,7 +2151,7 @@
 	// DEBUGLOG(s) FROM PREVIOUS SESSIONS, after REDIRECT(s) (with list of categories at top):
 	if( isset( $Session ) && ( $sess_Debuglogs = $Session->get( 'Debuglogs' ) ) && ! empty( $sess_Debuglogs ) )
 	{
-		$count_sess_Debuglogs = count($sess_Debuglogs);
+		$count_sess_Debuglogs = count( $sess_Debuglogs );
 		if( $count_sess_Debuglogs > 1 )
 		{
 			// Links to those Debuglogs
@@ -2126,22 +2188,22 @@
 			}
 			else
 			{
-				$log_container_head = '<h3 id="debug_sess_debuglog_'.($k+1).'" style="color:#f00;">Debug messages from redirected page (#'.($k+1).')</h3>'
+				$log_container_head = '<h3 id="debug_sess_debuglog_'.( $k + 1 ).'" style="color:#f00;">Debug messages from redirected page (#'.( $k + 1 ).')</h3>'
 					// link to real Debuglog:
 					.'<p><a href="'.$ReqHostPathQuery.'#debug_debuglog">See below for the Debuglog from the current request.</a></p>';
-				$log_cats = array_keys($sess_Debuglog->get_messages( $log_categories )); // the real list (with all replaced and only existing ones)
+				$log_cats = array_keys( $sess_Debuglog->get_messages( $log_categories ) ); // the real list (with all replaced and only existing ones)
 				$log_head_links = array();
 
 				foreach( $log_cats as $l_cat )
 				{
-					$log_head_links[] .= '<a href="'.$ReqHostPathQuery.'#debug_redir_'.($k+1).'_info_cat_'.str_replace( ' ', '_', $l_cat ).'">'.$l_cat.'</a>';
+					$log_head_links[] .= '<a href="'.$ReqHostPathQuery.'#debug_redir_'.( $k + 1 ).'_info_cat_'.str_replace( ' ', '_', $l_cat ).'">'.$l_cat.'</a>';
 				}
 				$log_container_head .= implode( ' | ', $log_head_links );
 
 				echo format_to_output(
 					$sess_Debuglog->display( array(
 							'container' => array( 'string' => $log_container_head, 'template' => false ),
-							'all' => array( 'string' => '<h4 id="debug_redir_'.($k+1).'_info_cat_%s">%s:</h4>', 'template' => false ) ),
+							'all' => array( 'string' => '<h4 id="debug_redir_'.( $k + 1 ).'_info_cat_%s">%s:</h4>', 'template' => false ) ),
 						'', false, $log_categories ),
 					'htmlbody' );
 			}
@@ -2149,10 +2211,10 @@
 		$Session->delete( 'Debuglogs' );
 	}
 
-	// CURRENT DEBUGLOG (with list of categories at top):
+	// CURRENT DEBUGLOG (with list of categories at top)
 	$log_categories = array( 'error', 'note', 'all' ); // Categories to output (in that order)
 	$log_container_head = $clean ? ( "\n".'== Debug messages =='."\n" ) : '<h3 id="debug_debuglog">Debug messages</h3>';
-	if( ! empty($sess_Debuglogs) )
+	if( ! empty( $sess_Debuglogs ) )
 	{
 		// link to first sess_Debuglog
 		if( $clean )
@@ -2167,7 +2229,7 @@
 
 	if( ! $clean )
 	{
-		$log_cats = array_keys($Debuglog->get_messages( $log_categories )); // the real list (with all replaced and only existing ones)
+		$log_cats = array_keys( $Debuglog->get_messages( $log_categories ) ); // the real list (with all replaced and only existing ones)
 		$log_head_links = array();
 		foreach( $log_cats as $l_cat )
 		{
@@ -2177,10 +2239,10 @@
 
 		echo format_to_output(
 			$Debuglog->display( array(
-					'container' => array( 'string' => $log_container_head, 'template' => false ),
-					'all' => array( 'string' => '<h4 id="debug_info_cat_%s">%s:</h4>', 'template' => false ) ),
+				'container' => array( 'string' => $log_container_head, 'template' => false ),
+				'all' => array( 'string' => '<h4 id="debug_info_cat_%s">%s:</h4>', 'template' => false ) ),
 				'', false, $log_categories ),
-			'htmlbody' );
+				'htmlbody' );
 
 		echo '<h3 id="app_debug_queries">DB</h3>';
 	}
@@ -2188,15 +2250,15 @@
 	{
 		echo format_to_output(
 			$Debuglog->display( array(
-					'container' => array( 'string' => $log_container_head, 'template' => false ),
-					'all' => array( 'string' => '= %s ='."\n\n", 'template' => false ) ),
+				'container' => array( 'string' => $log_container_head, 'template' => false ),
+				'all' => array( 'string' => '= %s ='."\n\n", 'template' => false ) ),
 				'', false, $log_categories, '', 'raw', false ),
-			'raw' );
+				'raw' );
 
 		echo "\n".'== DB =='."\n\n";
 	}
 
-	if($app_db_config)
+	if( $app_db_config )
 	{
 		if( ! $clean )
 		{
@@ -2204,15 +2266,15 @@
 		}
 
 		echo T_('DB Username').': '.$app_db_config['user']."\n".
-			 T_('DB Database').': '.$app_db_config['name']."\n".
-			 T_('DB Host').': '.$app_db_config['host']."\n".
-			 T_('DB tables prefix').': '.$app_db_tableprefix."\n".
-			 T_('DB connection charset').': '.$app_db_config['connection_charset']."\n";
+			T_('DB Database').': '.$app_db_config['name']."\n".
+			T_('DB Host').': '.$app_db_config['host']."\n".
+			T_('DB tables prefix').': '.$app_db_tableprefix."\n".
+			T_('DB connection charset').': '.$app_db_config['connection_charset']."\n";
 
 		echo $clean ? "\n" : '</pre>';
 	}
 
-	if( ! isset($DB) )
+	if( ! isset( $DB ) )
 	{
 		echo 'No DB object.'.( $clean ? "\n" : '' );
 	}
@@ -2229,12 +2291,12 @@
 
 
 /**
- * Prevent email header injection.
+ * Prevent email header injection
  */
 function mail_sanitize_header_string( $header_str, $close_brace = false )
 {
 	// Prevent injection! (remove everything after (and including) \n or \r)
-	$header_str = preg_replace( '~(\r|\n).*$~s', '', trim($header_str) );
+	$header_str = preg_replace( '~(\r|\n).*$~s', '', trim( $header_str ) );
 
 	if( $close_brace && strpos( $header_str, '<' ) !== false && strpos( $header_str, '>' ) === false )
 	{
@@ -2247,6 +2309,7 @@
 
 /**
  * Encode to RFC 1342 "Representation of Non-ASCII Text in Internet Message Headers"
+ *
  * @param string
  * @param string 'Q' for Quoted printable, 'B' for base64
  */
@@ -2254,14 +2317,14 @@
 {
 	global $app_charset;
 
-	/* mbstring way  (did not work for Alex RU)
+	/* mbstring way (did not work for Alex RU)
 	if( function_exists('mb_encode_mimeheader') )
 	{
 		// encode subject
 		$orig = mb_internal_encoding();
 		mb_internal_encoding('utf-8');
 		$r = mb_encode_mimeheader( $header_str, 'utf-8', $mode );
-		mb_internal_encoding($orig);
+		mb_internal_encoding( $orig );
 		return $r;
 	}
 	*/
@@ -2289,7 +2352,7 @@
 
 
 /**
- * Sends a mail, wrapping PHP's mail() function.
+ * Sends a mail, wrapping PHP's mail() function
  *
  * {@link $current_locale} will be used to set the charset.
  *
@@ -2297,9 +2360,8 @@
  * {@link http://www.faqs.org/rfcs/rfc2822 RFC2822}, but seems to be safer,
  * because some mail transfer agents replace \n by \r\n automatically.
  *
- * @todo Unit testing with "nice addresses" This gets broken over and over again.
- *
- * @param string Recipient email address. (Caould be multiple comma-separated addresses.)
+ * @todo (0000) Unit testing with "nice addresses" This gets broken over and over again.
+ * @param string Recipient email address. (Could be multiple comma-separated addresses.)
  * @param string Recipient name. (Only use if sending to a single address)
  * @param string Subject of the mail
  * @param string The message text
@@ -2308,7 +2370,8 @@
  * Defaults to {@link $notify_from} if NULL.
  * @param string From name.
  * @param array Additional headers ( headername => value ). Take care of injection!
- * @return boolean True if mail could be sent (not necessarily delivered!), false if not - (return value of {@link mail()})
+ * @return boolean True if mail could be sent (not necessarily delivered!), false
+ * if not - (return value of {@link mail()})
  */
 function send_mail( $to, $to_name, $subject, $message, $from = NULL, $from_name = NULL, $headers = array() )
 {
@@ -2340,11 +2403,11 @@
 		// fplanque: Windows XP, Apache 1.3, PHP 4.4, MS SMTP : will not accept "nice" addresses.
 		if( ! empty( $to_name ) )
 		{
-			$to = '"'.mail_encode_header_string($to_name).'" <'.$to.'>';
+			$to = '"'.mail_encode_header_string( $to_name ).'" <'.$to.'>';
 		}
 		if( ! empty( $from_name ) )
 		{
-			$from = '"'.mail_encode_header_string($from_name).'" <'.$from.'>';
+			$from = '"'.mail_encode_header_string( $from_name ).'" <'.$from.'>';
 		}
 	}
 
@@ -2352,7 +2415,7 @@
 	// From has to go into headers
 	$headers['From'] = $from;
 
-	$subject = mail_encode_header_string($subject);
+	$subject = mail_encode_header_string( $subject );
 
 	$message = str_replace( array( "\r\n", "\r" ), $NL, $message );
 
@@ -2414,7 +2477,7 @@
  */
 function disp_cond( $var, $disp_one, $disp_more = NULL, $disp_none = NULL )
 {
-	if( is_numeric($var) && $var > 1 )
+	if( is_numeric( $var ) && $var > 1 )
 	{
 		printf( ( $disp_more === NULL ? $disp_one : $disp_more ), $var );
 		return true;
@@ -2436,23 +2499,24 @@
 
 
 /**
- * Create IMG tag for an action icon.
- *
- * @todo (EdB) $icon_weight and $word_weight need serious overhaul.
- *
+ * Create IMG tag for an action icon
+ *
+ * @todo (EdB) $icon_weight and $word_weight need serious overhaul
  * @param string TITLE text (IMG and A link)
  * @param string icon code for {@link get_icon()}
  * @param string URL where the icon gets linked to (empty to not wrap the icon in a link)
- * @param string word to be displayed after icon (if no icon gets displayed, $title will be used instead!)
- * @param integer 1-5: weight of the icon. The icon will be displayed only if its weight is >= than the user setting threshold.
- *                     Use 5, if it's a required icon - all others could get disabled by the user. (Default: 4)
- * @param integer 1-5: weight of the word. The word will be displayed only if its weight is >= than the user setting threshold.
- *                     (Default: 1)
- * @param array Additional attributes to the A tag. The values must be properly encoded for html output (e.g. quotes).
- *        It may also contain these params:
- *         - 'use_js_popup': if true, the link gets opened as JS popup. You must also pass an "id" attribute for this!
- *         - 'use_js_size': use this to override the default popup size ("500, 400")
- *         - 'class': defaults to 'action_icon', if not set; use "" to not use it
+ * @param string word to be displayed after icon (if no icon gets displayed,
+ * $title will be used instead!)
+ * @param integer 1-5: weight of the icon. The icon will be displayed only if its
+ * weight is >= than the user setting threshold. Use 5 if it's a required icon;
+ * all others could get disabled by the user. (Default: 4)
+ * @param integer 1-5: weight of the word. The word will be displayed only if its
+ * weight is >= than the user setting threshold. (Default: 1)
+ * @param array Additional attributes to the A tag. The values must be properly
+ * encoded for html output (e.g. quotes). It may also contain these params:
+ * - 'use_js_popup': if true, the link gets opened as JS popup. You must also pass an "id" attribute for this!
+ * - 'use_js_size': use this to override the default popup size ("500, 400")
+ * - 'class': defaults to 'action_icon', if not set; use "" to not use it
  * @return string The generated action icon link.
  */
 function action_icon( $title, $icon, $url, $word = NULL, $icon_weight = NULL, $word_weight = NULL, $link_attribs = array() )
@@ -2462,23 +2526,23 @@
 	$link_attribs['href'] = $url;
 	$link_attribs['title'] = $title;
 
-	if( is_null($icon_weight) )
+	if( is_null( $icon_weight ) )
 	{
 		$icon_weight = 4;
 	}
-	if( is_null($word_weight) )
+	if( is_null( $word_weight ) )
 	{
 		$word_weight = 1;
 	}
 
-	if( ! isset($link_attribs['class']) )
+	if( ! isset( $link_attribs['class'] ) )
 	{
 		$link_attribs['class'] = 'action_icon';
 	}
 
 	if( get_icon( $icon, 'rollover' ) )
 	{
-		if( empty($link_attribs['class']) )
+		if( empty( $link_attribs['class'] ) )
 		{
 			$link_attribs['class'] = 'rollover';
 		}
@@ -2489,14 +2553,14 @@
 	}
 
 	// "use_js_popup": open link in a JS popup
-	// @todo (0000): this needs to be rewritten with jQuery instead
-	if( false && ! empty($link_attribs['use_js_popup']) )
+	// @todo (0000) this needs to be rewritten with jQuery instead
+	if( false && ! empty( $link_attribs['use_js_popup'] ) )
 	{
-		$popup_js = 'var win = new PopupWindow(); win.setUrl( \''.$link_attribs['href'].'\' ); win.setSize(  ); ';
+		$popup_js = 'var win = new PopupWindow(); win.setUrl( \''.$link_attribs['href'].'\' ); win.setSize(); ';
 
-		if( isset($link_attribs['use_js_size']) )
+		if( isset( $link_attribs['use_js_size'] ) )
 		{
-			if( ! empty($link_attribs['use_js_size']) )
+			if( ! empty( $link_attribs['use_js_size'] ) )
 			{
 				$popup_size = $link_attribs['use_js_size'];
 			}
@@ -2505,7 +2569,7 @@
 		{
 			$popup_size = '500, 400';
 		}
-		if( isset($popup_size) )
+		if( isset( $popup_size ) )
 		{
 			$popup_js .= 'win.setSize( '.$popup_size.' ); ';
 		}
@@ -2520,10 +2584,11 @@
 			$link_attribs['onclick'] .= $popup_js;
 		}
 	}
-	unset($link_attribs['use_js_popup']);
-	unset($link_attribs['use_js_size']);
+	unset( $link_attribs['use_js_popup'] );
+	unset( $link_attribs['use_js_size'] );
 
-	// NOTE: We do not use format_to_output with get_field_attribs_as_string() here, because it interferes with the Results class (eval() fails on entitied quotes..) (blueyed)
+	// NOTE: We do not use format_to_output with get_field_attribs_as_string() here
+	// because it interferes with the Results class (eval() fails on entitied quotes..) (blueyed)
 	$r = '<a '.get_field_attribs_as_string( $link_attribs, false ).'>';
 
 	$display_icon = ( $icon_weight >= 3 );
@@ -2568,18 +2633,20 @@
 
 
 /**
- * Get properties of an icon.
+ * Get properties of an icon
  *
  * Note: to get a file type icon, use {@link File::get_icon()} instead.
  *
  * @uses get_icon_info()
  * @param string icon for what? (key)
- * @param string what to return for that icon ('imgtag', 'alt', 'legend', 'file', 'url', 'size' {@link imgsize()})
+ * @param string what to return for that icon ('imgtag', 'alt', 'legend', 'file',
+ * 'url', 'size' {@link imgsize()})
  * @param array additional params (
- *              'class' => class name when getting 'imgtag',
- *              'size' => param for 'size',
- *              'title' => title attribute for 'imgtag')
- * @param boolean true to include this icon into the legend at the bottom of the page (works for 'imgtag' only)
+ * - 'class' => class name when getting 'imgtag',
+ * - 'size' => param for 'size',
+ * - 'title' => title attribute for 'imgtag')
+ * @param boolean true to include this icon into the legend at the bottom of the
+ * page (works for 'imgtag' only)
  */
 function get_icon( $iconKey, $what = 'imgtag', $params = NULL, $include_in_legend = false )
 {
@@ -2593,7 +2660,7 @@
 		require_once $conf_path.'_icons.php';
 	}
 
-	$icon = get_icon_info($iconKey);
+	$icon = get_icon_info( $iconKey );
 	if( ! $icon || ! isset( $icon['file'] ) )
 	{
 		return '[no image defined for '.var_export( $iconKey, true ).'!]';
@@ -2648,7 +2715,7 @@
 
 
 		case 'class':
-		if( isset($icon['class']) )
+		if( isset( $icon['class'] ) )
 		{
 			return $icon['class'];
 		}
@@ -2798,8 +2865,10 @@
 
 
 /**
- * Get list of client IP addresses from REMOTE_ADDR and HTTP_X_FORWARDED_FOR,
- * in this order. '' is used when no IP could be found.
+ * Get list of client IP addresses
+ *
+ * From REMOTE_ADDR and HTTP_X_FORWARDED_FOR, in that order.
+ * '' is used when no IP could be found.
  *
  * @param boolean True, to get only the first IP (probably REMOTE_ADDR)
  * @return array|string Depends on first param.
@@ -2812,8 +2881,8 @@
 	{
 		foreach( explode( ',', $_SERVER['REMOTE_ADDR'] ) as $l_ip )
 		{
-			$l_ip = trim($l_ip);
-			if( ! empty($l_ip) )
+			$l_ip = trim( $l_ip );
+			if( ! empty( $l_ip ) )
 			{
 				$r[] = $l_ip;
 			}
@@ -2847,6 +2916,7 @@
  * Get the base domain (without protocol and any subdomain) of an URL
  *
  * Gets a max of 3 domain parts (x.y.tld)
+ *
  * @param string URL
  * @return string the base domain (may become empty, if found invalid)
  */
@@ -2857,7 +2927,7 @@
 	// Chop away the http part and the path:
 	$domain = preg_replace( '~^([a-z]+://)?([^:/#]+)(.*)$~i', '\\2', $url );
 
-	if( empty($domain) || preg_match( '~^(\d+\.)+\d+$~', $domain ) )
+	if( empty( $domain ) || preg_match( '~^(\d+\.)+\d+$~', $domain ) )
 	{
 		// Empty or All numeric = IP address, don't try to cut it any further
 		return $domain;
@@ -2868,14 +2938,14 @@
 	// NOTE: \w includes "_"
 
 	// convert URL to IDN:
-	$domain = idna_encode($domain);
+	$domain = idna_encode( $domain );
 
-	$domain_pattern = '~ ( \w (\w|-|_)* \. ){0,2}   \w (\w|-|_)* $~ix';
+	$domain_pattern = '~ ( \w (\w|-|_)* \. ){0,2} \w (\w|-|_)* $~ix';
 	if( ! preg_match( $domain_pattern, $domain, $match ) )
 	{
 		return '';
 	}
-	$base_domain = convert_charset(idna_decode($match[0]), $app_charset, 'UTF-8');
+	$base_domain = convert_charset(idna_decode( $match[0] ), $app_charset, 'UTF-8');
 
 	// Remove any www*. prefix:
 	$base_domain = preg_replace( '~^www.*?\.~i', '', $base_domain );
@@ -2886,6 +2956,7 @@
 
 /**
  * Generate a valid key of size $length
+ *
  * @param integer length of key
  * @param string chars to use in generated key
  * @return string key
@@ -2893,11 +2964,11 @@
 function generate_random_key( $length = 32, $keychars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789' )
 {
 	$key = '';
-	$rnd_max = strlen($keychars) - 1;
+	$rnd_max = strlen( $keychars ) - 1;
 
 	for( $i = 0; $i < $length; $i++ )
 	{
-		$key .= $keychars{mt_rand(0, $rnd_max)}; // get a random character out of $keychars
+		$key .= $keychars{ mt_rand( 0, $rnd_max ) }; // get a random character out of $keychars
 	}
 
 	return $key;
@@ -2906,6 +2977,7 @@
 
 /**
  * Generate a random password with no ambiguous chars
+ *
  * @param integer length of password
  * @return string password
  */
@@ -2943,7 +3015,7 @@
 		return false;
 
 		default:
-		debug_die( 'Unhandled action in form: '.strip_tags($action_parts[0]) );
+		debug_die( 'Unhandled action in form: '.strip_tags( $action_parts[0] ) );
 	}
 }
 
@@ -2952,7 +3024,6 @@
  * Generate a link that toggles display of an element on clicking
  *
  * @todo Provide functionality to make those links accessible without JS (using GET parameter)
- *
  * @uses toggle_display_by_id() (JS)
  * @param string ID (html) of the link
  * @param string ID (html) of the target to toggle displaying
@@ -2971,13 +3042,14 @@
 
 /**
  * Escape a string to be used in Javascript
+ *
  * @param string
  * @return string
  */
 function jsspecialchars( $s )
 {
 	$r = str_replace(
-		array(  '\\', '"', "'" ),
+		array( '\\', '"', "'" ),
 		array( '\\\\', '\"', "\'" ),
 		$s );
 	return htmlspecialchars( $r, ENT_QUOTES );
@@ -2986,6 +3058,7 @@
 
 /**
  * Compact a date in a number keeping only integer value of the string
+ *
  * @param string date
  */
 function compact_date( $date )
@@ -2996,16 +3069,18 @@
 
 /**
  * Decompact a date in a date format ( Y-m-d h:m:s )
+ *
  * @param string date
  */
 function decompact_date( $date )
 {
 	$date0 = $date;
-	return  substr($date0,0,4).'-'.substr($date0,4,2).'-'.substr($date0,6,2).' '.substr($date0,8,2).':'.substr($date0,10,2).':'.substr($date0,12,2);
+	return substr( $date0, 0, 4 ).'-'.substr( $date0, 4, 2 ).'-'.substr( $date0, 6, 2 ).' '.substr( $date0, 8, 2 ).':'.substr( $date0, 10, 2 ).':'.substr( $date0, 12, 2 );
 }
 
 /**
  * Check the format of the phone number param and format it in a french number if it is
+ *
  * @param string phone number
  */
 function format_phone( $phone, $hide_country_dialing_code_if_same_as_locale = true )
@@ -3046,7 +3121,7 @@
 		}
 		else
 		{
-			// ( +dialing  xxxxxxxxxxx )
+			// ( +dialing xxxxxxxxxxx )
 			$phone_formated = '+'.$dialing_code.' '.substr( $phone, strlen( $dialing_code )+1 );
 		}
 	}
@@ -3054,7 +3129,7 @@
 	{
 		if( strlen( $phone ) == 10 )
 		{
-			//  We can format it like a french phone number ( xx.xx.xx.xx.xx )
+			// We can format it like a french phone number ( xx.xx.xx.xx.xx )
 			$phone_formated = format_french_phone( $phone );
 		}
 		else
@@ -3070,6 +3145,7 @@
 
 /**
  * Format a string in a french phone number
+ *
  * @param string phone number
  */
 function format_french_phone( $phone )
@@ -3079,13 +3155,11 @@
 
 
 /**
- * Generate a link to a online help resource.
- * testing the concept of online help (aka webhelp).
- * this function should be relocated somewhere better if it is taken onboard by the project
- *
- * @todo (legacy): replace [?] with icon,
- * @todo (legacy): write url suffix dynamically based on topic and language
- *
+ * Generate a link to a online help resource
+ *
+ * The idea is we can link a section in the admin to a help page.
+ *
+ * @deprecated by "monster" branch, though one day it might come back
  * @param string Topic
  * @return string
  */
@@ -3110,7 +3184,8 @@
 
 
 /**
- * Build a string out of $field_attribs, with each attribute prefixed by a space character.
+ * Build a string out of $field_attribs, with each attribute prefixed by a space character
+ *
  * @param array Array of field attributes.
  * @param boolean Use format_to_output() for the attributes?
  * @return string
@@ -3135,7 +3210,7 @@
 			}
 			else
 			{
-				// @todo (0000): this uses strip_tags et al! Shouldn't we just use "formvalue" always?
+				// @todo (0000) this uses strip_tags et al! Shouldn't we just use "formvalue" always?
 				// (E.g. it kills "for( var i=0; i<a; i++ )..." (in an onclick attr) from "<a" on.
 				// The workaround is to use spaces ("i < a"), but I was confused first)
 				$r .= ' '.$l_attr.'="'.format_to_output( $l_value, 'htmlattr' ).'"';
@@ -3172,9 +3247,9 @@
  * If there are at least two elements, the last one is concatenated using
  * $implode_last, while the ones before are imploded using $implode_by.
  *
- * @todo (0000): I don't think using entities/HTML as default for $implode_last is sane!
+ * @todo (0000) I don't think using entities/HTML as default for $implode_last is sane!
  * Use "&" instead and make sure that the output for HTML is HTML compliant..
- * @todo (0000): Support for locales that have a different kind of enumeration?!
+ * @todo (0000) Support for locales that have a different kind of enumeration?!
  * @return string
  */
 function implode_with_and( $arr, $implode_by = ', ', $implode_last = ' &amp; ' )
@@ -3182,16 +3257,15 @@
 	switch( count( $arr ) )
 	{
 		case 0:
-			return '';
+		return '';
 
 		case 1:
-			$r = array_shift( $arr );
-			return $r;
+		$r = array_shift( $arr );
+		return $r;
 
 		default:
-			$r = implode( $implode_by, array_slice( $arr, 0, -1 ) )
-			    .$implode_last.array_pop( $arr );
-			return $r;
+		$r = implode( $implode_by, array_slice( $arr, 0, -1 ) ).$implode_last.array_pop( $arr );
+		return $r;
 	}
 }
 
@@ -3210,8 +3284,9 @@
  */
 function send_javascript_message( $methods = array(), $send_as_html = false, $target = '' )
 {
+	global $Messages;
+
 	// lets spit out any messages
-	global $Messages;
 	ob_start();
 	$Messages->display();
 	$output = ob_get_clean();
@@ -3286,29 +3361,30 @@
 
 /**
  * Basic tidy up of strings
- * @author {@link http://astonishme.co.uk/ Yabba (Paul Jones, rest in peace)}
- * @author Tblue
+ *
  * @param string $unformatted raw data
  * @return string formatted data
  */
 function format_to_js( $unformatted )
 {
-	return str_replace( array(
-							'\'',
-							'\n',
-							'\r',
-							'\t',
-							"\n",
-							"\r",
-						),
-						array(
-							'\\\'',
-							'\\\\n',
-							'\\\\r',
-							'\\\\t',
-							'\n',
-							'\r',
-						), $unformatted );
+	return str_replace(
+		array(
+			'\'',
+			'\n',
+			'\r',
+			'\t',
+			"\n",
+			"\r",
+		),
+		array(
+			'\\\'',
+			'\\\\n',
+			'\\\\r',
+			'\\\\t',
+			'\n',
+			'\r',
+		),
+	$unformatted );
 }
 
 
@@ -3334,6 +3410,7 @@
 
 /**
  * Generate order by clause
+ *
  * @return string
  */
 function gen_order_clause( $order_by, $order_dir, $dbprefix, $dbIDname_disambiguation )
@@ -3341,15 +3418,15 @@
 	$orderby = str_replace( ' ', ',', $order_by );
 	$orderby_array = explode( ',', $orderby );
 
-	// Format each order param with default column names:
+	// Format each order param with default column names
 	$orderby_array = preg_replace( '#^(.+)$#', $dbprefix.'$1 '.$order_dir, $orderby_array );
 
 	$order_by = implode( ', ', $orderby_array );
 
-	// Special case for RAND:
+	// Special case for RAND
 	$order_by = str_replace( $dbprefix.'RAND ', 'RAND() ', $order_by );
 
-	// Add an ID parameter to make sure there is no ambiguity in ordering on similar items:
+	// Add an ID parameter to make sure there is no ambiguity in ordering on similar items
 	$order_by = $order_by.', '.$dbIDname_disambiguation.' '.$order_dir;
 
 	return $order_by;
@@ -3358,6 +3435,7 @@
 
 /**
  * Get the IconLegend instance
+ *
  * @return IconLegend or false, if the user has not set "display_icon_legend"
  */
 function & get_IconLegend()
@@ -3367,6 +3445,7 @@
 	if( ! isset( $IconLegend ) )
 	{
 		global $UserSettings;
+
 		if( $UserSettings->get( 'display_icon_legend' ) )
 		{
 			// Icon Legend
@@ -3383,6 +3462,7 @@
 
 /**
  * Check if two arrays contain the same elements
+ *
  * @param array The first array.
  * @param array The second array.
  * @return boolean True if both arrays contain the same elements, false otherwise.
@@ -3391,9 +3471,8 @@
 {
 	$one_count = count( $one );
 
-	/* We consider the arrays to be equal if they have the same number of
-	 * elements and all elements of $one are present in $two.
-	 */
+	// We consider the arrays to be equal if they have the same number of
+	// elements and all elements of $one are present in $two.
 	return $one_count == count( $two ) && count( array_intersect( $one, $two ) ) == $one_count;
 }
 
@@ -3401,11 +3480,10 @@
 /**
  * Get the Bazaar revision of this QP installation
  * 
- * Useful for snapshot users etc. -- they can include it in bug reports.
- * This function tries to find out the current revision from the .bzr control
- * directory or from the file .bzrrevision in the installation root (this is used
- * for snapshots).
- * 
+ * Useful for snapshot users etc. -- they can include it in bug reports. This function
+ * tries to find out the current revision from the .bzr control directory or from
+ * the file .bzrrevision in the installation root (this is used for snapshots).
+ *
  * @return boolean|int false on failure, the bzr revision otherwise.
  */
 function get_bzr_revision()

=== modified file 'qp_inc/_core/_param.funcs.php'
--- qp_inc/_core/_param.funcs.php	2013-03-08 20:58:52 +0000
+++ qp_inc/_core/_param.funcs.php	2013-03-14 18:35:26 +0000
@@ -59,8 +59,8 @@
 	$use_default = true,
 	$strict_typing = 'allow_empty' )
 {
+	global $app_charset;
 	global $debug;
-	global $app_charset;
 	global $io_charset;
 
 	// STEP 1 : Set the variable
@@ -281,12 +281,13 @@
 /**
  * Get the action from params
  *
- * If we got no "action" param, we'll check for an "actionArray" param
- * ( <input type="submit" name="actionArray[real_action]" ...> ).
- * And the real $action will be found in the first key...
- * When there are multiple submit buttons, this is smarter than checking the value
- * which is a translated string. When there is an image button, this allows to work
- * around IE not sending the value (it only sends X & Y coords of the click).
+ * If we got no "action" param, we'll check for an "actionArray" param (<input
+ * type="submit" name="actionArray[real_action]" ...>). And the real $action will
+ * be found in the first key... When there are multiple submit buttons, this is
+ * smarter than checking the value which is a translated string. When there is an
+ * image button, this allows to work around IE not sending the value (it only sends
+ * X & Y coords of the click).
+ *
  * @param mixed Default to use.
  * @return string
  */
@@ -312,6 +313,7 @@
  * This is just a wrapper around {@link param()} which unsets and restores GET and
  * POST. IMHO this is less hackish, at least performance wise then using a $sources
  * param for param()
+ *
  * @uses param()
  * @see param()
  */
@@ -339,9 +341,12 @@
 
 
 /**
+ * Check a param string to see if it is empty
+ *
+ * @uses param_check_not_empty()
  * @param string param name
  * @param string error message
- * @param string|NULL error message for form field ($err_msg gets used if === NULL).
+ * @param string|NULL error message for form field; $err_msg gets used if === NULL.
  * @return boolean true if OK
  */
 function param_string_not_empty( $var, $err_msg, $field_err_msg = NULL )
@@ -352,9 +357,12 @@
 
 
 /**
+ * Check a param to see if it is empty
+ *
+ * @uses param_error()
  * @param string param name
  * @param string error message
- * @param string|NULL error message for form field ($err_msg gets used if === NULL).
+ * @param string|NULL error message for form field; $err_msg gets used if === NULL.
  * @return boolean true if OK
  */
 function param_check_not_empty( $var, $err_msg, $field_err_msg = NULL )
@@ -369,8 +377,9 @@
 
 
 /**
- * Checks if the param is an integer (no float, e.g. 3.14).
+ * Checks if the param is an integer (no float, e.g. 3.14)
  *
+ * @uses param_error()
  * @param string param name
  * @param string error message
  * @return boolean true if OK
@@ -395,6 +404,7 @@
 /**
  * Checks if the param is a decimal number
  *
+ * @uses param_error()
  * @param string param name
  * @param string error message
  * @return boolean true if OK
@@ -417,7 +427,9 @@
 
 
 /**
- * Gets a param and makes sure it's a decimal number (no float, e.g. 3.14) in a given range.
+ * Gets a param and makes sure it's a decimal number (no float, e.g. 3.14) in a given range
+ *
+ * @uses param_check_range()
  * @param string param name
  * @param integer min value
  * @param integer max value
@@ -433,6 +445,8 @@
 
 /**
  * Checks if the param is a decimal number (no float, e.g. 3.14) in a given range
+ *
+ * @uses param_error()
  * @param string param name
  * @param integer min value
  * @param integer max value
@@ -458,6 +472,9 @@
 
 
 /**
+ * Check if an email address is valid or not
+ *
+ * @uses param_error()
  * @param string param name
  * @return boolean true if OK
  */
@@ -469,7 +486,7 @@
 		return true;
 	}
 
-	if( !is_email( $GLOBALS[$var] ) )
+	if( ! is_email( $GLOBALS[$var] ) )
 	{
 		param_error( $var, T_('The email address is invalid.') );
 		return false;
@@ -479,6 +496,10 @@
 
 
 /**
+ * Checks to see if a URL is a valid format
+ *
+ * @uses param_error()
+ * @uses validate_url()
  * @param string param name
  * @param string
  * @return boolean true if OK
@@ -500,6 +521,8 @@
 
 /**
  * Check if the value is a file name
+ *
+ * @uses param_error()
  * @param string param name
  * @param string error message
  * @return boolean true if OK
@@ -516,10 +539,12 @@
 
 
 /**
- * Check if the value of a param is a regular expression (syntax).
+ * Check if the value of a param is a regular expression (syntax)
+ *
+ * @uses param_error()
  * @param string param name
  * @param string error message
- * @param string|NULL error message for form field ($err_msg gets used if === NULL).
+ * @param string|NULL error message for form field; $err_msg gets used if === NULL.
  * @return boolean true if OK
  */
 function param_check_isregexp( $var, $err_msg, $field_err_msg = NULL )
@@ -535,7 +560,11 @@
 
 /**
  * Sets a date parameter by converting locale date (if valid) to ISO date
+ *
  * If the date is not valid, it is set to the param unchanged (unconverted).
+ *
+ * @uses param_check_date()
+ * @uses set_param()
  * @param string param name
  * @param string error message
  * @param boolean Is a non-empty date required?
@@ -567,6 +596,8 @@
  *
  * NOTE: for tokens like e.g. "D" (abbr. weekday), T_() gets used and it uses
  * the current locale!
+ *
+ * @uses param_error()
  * @param string param name
  * @param string error message
  * @param boolean Is a non-empty date required?
@@ -604,13 +635,13 @@
 			return "([1-3]?\\d)"; // day, 1-31
 
 			case "l":
-			return "(".str_replace("~", "\~", implode("|", array_map("trim", array_map("T_", $GLOBALS["weekday"])))).")";
+			return "(".str_replace( "~", "\~", implode( "|", array_map( "trim", array_map( "T_", $GLOBALS["weekday"] ) ) ) ).")";
 
 			case "D":
-			return "(".str_replace("~", "\~", implode("|", array_map("trim", array_map("T_", $GLOBALS["weekday_abbrev"])))).")";
+			return "(".str_replace( "~", "\~", implode( "|", array_map( "trim", array_map( "T_", $GLOBALS["weekday_abbrev"] ) ) ) ).")";
 
 			case "e": // QP extension!
-			return "(".str_replace("~", "\~", implode("|", array_map("trim", array_map("T_", $GLOBALS["weekday_letter"])))).")";
+			return "(".str_replace( "~", "\~", implode( "|", array_map( "trim", array_map( "T_", $GLOBALS["weekday_letter"] ) ) ) ).")";
 
 			case "S":
 			return "(st|nd|rd|th)"; // english suffix for day
@@ -622,10 +653,10 @@
 			return "(1?\\d)"; // month, 1-12
 
 			case "F":
-			return "(".str_replace("~", "\~", implode("|", array_map("trim", array_map("T_", $GLOBALS["month"])))).")"; //  A full textual representation of a month, such as January or March
+			return "(".str_replace("~", "\~", implode( "|", array_map( "trim", array_map( "T_", $GLOBALS["month"] ) ) ) ).")"; // A full textual representation of a month, such as January or March
 
 			case "M":
-			return "(".str_replace("~", "\~", implode("|", array_map("trim", array_map("T_", $GLOBALS["month_abbrev"])))).")";
+			return "(".str_replace("~", "\~", implode( "|", array_map( "trim", array_map( "T_", $GLOBALS["month_abbrev"] ) ) ) ).")";
 
 			case "y":
 			return "(\\d\\d)"; // year, 00-99
@@ -657,30 +688,30 @@
 			{
 				case 'd':
 				case 'j':
-				$day = $numbers[$position+1];
+				$day = $numbers[$position + 1];
 				break;
 
 				case 'm':
 				case 'n':
-				$month = $numbers[$position+1];
+				$month = $numbers[$position + 1];
 				break;
 
 				// full month name
 				case 'F':
 				$month = array_search(
-					strtolower( $numbers[$position+1] ), array_map( 'strtolower', array_map(
+					strtolower( $numbers[$position + 1] ), array_map( 'strtolower', array_map(
 					'trim', array_map( 'T_', $GLOBALS['month'] ) ) ) );
 				break;
 
 				case 'M':
 				$month = array_search(
-					strtolower( $numbers[$position+1] ), array_map( 'strtolower', array_map(
+					strtolower( $numbers[$position + 1] ), array_map( 'strtolower', array_map(
 					'trim', array_map( 'T_', $GLOBALS['month_abbrev'] ) ) ) );
 				break;
 
 				case 'y':
 				case 'Y':
-				$year = $numbers[$position+1];
+				$year = $numbers[$position + 1];
 				if( $year < 50 )
 				{
 					$year = 2000 + $year;
@@ -695,7 +726,7 @@
 
 		if( checkdate( $month, $day, $year ) )
 		{
-			// all clean! :)  We convert the value to ISO
+			// all clean! :) We convert the value to ISO
 			$iso_date = substr( '0'.$year, -4 ).'-'.substr( '0'.$month, -2 ).'-'.substr( '0'.$day, -2 );
 
 			return $iso_date;
@@ -710,8 +741,12 @@
 
 
 /**
- * Sets a date parameter with values from the request or to provided default,
- * And check we have a compact date (numbers only) ( used for URL filtering )
+ * Sets a date parameter with values from the request or to provided default
+ *
+ * Also check we have a compact date (numbers only) used for URL filtering.
+ *
+ * @uses param_check_date()
+ * @uses set_param()
  * @param string Variable to set
  * @param mixed Default value or TRUE if user input required
  * @param boolean memorize ( see {@link param()} )
@@ -749,8 +784,11 @@
  * Set a time parameter with the value from the request of the var argument
  *
  * Sets a time parameter with the value from the request of the var argument
- * or of the concat of the var argument_h: var argument_mn: var argument_s ,
+ * or of the concat of the var argument_h: var argument_mn: var argument_s,
  * except if param is already set!
+ *
+ * @uses param()
+ * @uses param_error()
  * @param string Variable to set
  * @param mixed Default value or TRUE if user input required
  * @param boolean Do we need to memorize this to regenerate the URL for this page?
@@ -803,14 +841,16 @@
 
 
 /**
- * Extend a LIST parameter with an ARRAY param.
+ * Extend a LIST parameter with an ARRAY param
  *
  * Will be used for author/authorsel[], etc. Note: cannot be used for catsel[]
  * because catsel is NON-recursive.
+ *
+ * @uses param()
  * @see param_compile_cat_array()
  * @param string Variable to extend
  * @param string Name of array Variable to use as an extension
- * @param boolean Save non numeric prefix?  ( 1 char -- can be used as a modifier, e-g: - + * )
+ * @param boolean Save non numeric prefix? ( 1 char -- can be used as a modifier, e-g: - + * )
  */
 function param_extend_list( $var, $var_ext_array, $save_prefix = true )
 {
@@ -866,16 +906,22 @@
 
 
 /**
+ * Compiles the cat array from $cat
+ *
  * Compiles the cat array from $cat (recursive + optional modifiers) and
  * $catsel[] (non recursive) and keeps those values available for future
  * reference (category widget)
+ *
+ * @uses param()
+ * @uses compile_cat_array()
  */
 function param_compile_cat_array( $restrict_to_blog = 0, $cat_default = NULL, $catsel_default = array() )
 {
 	// For now, we'll need those as globals!
 	// fp> this is used for the categories widget
 	// fp> we want might to use a $set_globals params to compile_cat_array()
-	global $cat_array, $cat_modifier;
+	global $cat_array;
+	global $cat_modifier;
 
 	$cat = param( 'cat', '/^[*\-]?([0-9]+(,[0-9]+)*)?$/', $cat_default, true ); // List of cats to restrict to
 	$catsel = param( 'catsel', 'array', $catsel_default, true ); // Array of cats to restrict to
@@ -888,9 +934,12 @@
 
 
 /**
+ * params check at least once
+ *
+ * @uses param_error_multiple()
  * @param array of param names
  * @param string error message
- * @param string|NULL error message for form field ($err_msg gets used if === NULL).
+ * @param string|NULL error message for form field; $err_msg gets used if === NULL.
  * @return boolean true if OK
  */
 function params_check_at_least_one( $vars, $err_msg, $field_err_msg = NULL )
@@ -911,10 +960,13 @@
 
 
 /**
- * Sets a combo parameter with values from the request,
- * => the value of the select option and the input text value if new is selected
- * Display an error if the new value is selected that the input text has a value
- *
+ * Sets a combo parameter with values from the request
+ *
+ * The value of the select option and the input text value if new is selected,
+ * Display an error if the new value is selected that the input text has a value.
+ *
+ * @uses param()
+ * @uses param_error()
  * @param string Variable to set
  * @param mixed Default value or TRUE if user input required
  * @param boolean true: allows to select new without entring a value in the input combo text
@@ -948,7 +1000,8 @@
 
 
 /**
- * set a parameter with the second part(X2) of the value from request ( X1-X2 )
+ * set a parameter with the second part(X2) of the value from request (X1-X2)
+ *
  * @param string Variable to set
  */
 function param_child_select_value( $var )
@@ -973,6 +1026,8 @@
 
 /**
  * @param string param name
+ *
+ * @uses param_error()
  * @return boolean true if OK
  */
 function param_check_phone( $var, $required = false )
@@ -1000,6 +1055,10 @@
 
 
 /**
+ * Check passwords (2 entered, they match)
+ *
+ * @uses param_error()
+ * @uses param_error_multiple()
  * @param string param name
  * @param string param name
  * @param boolean Is a password required? (non-empty)
@@ -1012,18 +1071,18 @@
 	$pass1 = $GLOBALS[$var1];
 	$pass2 = $GLOBALS[$var2];
 
-	if( empty($pass1) && empty($pass2) && ! $required )
+	if( empty( $pass1 ) && empty( $pass2 ) && ! $required )
 	{
 		// empty is OK
 		return true;
 	}
 
-	if( empty($pass1) )
+	if( empty( $pass1 ) )
 	{
 		param_error( $var1, T_('Please enter your password twice.') );
 		return false;
 	}
-	if( empty($pass2) )
+	if( empty( $pass2 ) )
 	{
 		param_error( $var2, T_('Please enter your password twice.') );
 		return false;
@@ -1032,13 +1091,13 @@
 	// checking the password has been typed twice the same
 	if( $pass1 != $pass2 )
 	{
-		param_error_multiple( array( $var1, $var2), T_('You typed two different passwords.') );
+		param_error_multiple( array( $var1, $var2 ), T_('You typed two different passwords.') );
 		return false;
 	}
 
 	if( strlen( $pass1 ) < $Settings->get( 'user_minpwdlen' ) )
 	{
-		param_error_multiple( array( $var1, $var2), sprintf( T_('The minimum password length is %d characters.'), $Settings->get( 'user_minpwdlen' ) ) );
+		param_error_multiple( array( $var1, $var2 ), sprintf( T_('The minimum password length is %d characters.'), $Settings->get( 'user_minpwdlen' ) ) );
 		return false;
 	}
 
@@ -1056,7 +1115,7 @@
 {
 	global $Messages;
 
-	return $Messages->count('error');
+	return $Messages->count( 'error' );
 }
 
 
@@ -1073,6 +1132,7 @@
 
 /**
  * Get error message for a param
+ *
  * @return string
  */
 function param_get_error_msg( $var )
@@ -1089,10 +1149,14 @@
 
 
 /**
- * Add an error for a variable, either to the Form's field and/or the global {@link $Messages} object
+ * Add an error for a variable
+ *
+ * Either to the Form's field and/or the global {@link $Messages} object
+ *
+ * @uses param_add_message_to_Log()
  * @param string param name
  * @param string|NULL error message (by using NULL you can only add an error to the field, but not the $Message object)
- * @param string|NULL error message for form field ($err_msg gets used if === NULL).
+ * @param string|NULL error message for form field - $err_msg gets used if === NULL.
  */
 function param_error( $var, $err_msg, $field_err_msg = NULL )
 {
@@ -1107,7 +1171,7 @@
 		}
 		$param_input_err_messages[$var] = $field_err_msg;
 
-		if( isset($err_msg) )
+		if( isset( $err_msg ) )
 		{
 			param_add_message_to_Log( $var, $err_msg, 'error' );
 		}
@@ -1116,11 +1180,14 @@
 
 
 /**
- * Add an error for multiple variables, either to the Form's field and/or the global {@link $Messages} object.
- *
+ * Add an error for multiple variables
+ *
+ * Either to the Form's field and/or the global {@link $Messages} object.
+ *
+ * @uses param_add_message_to_Log()
  * @param array of param names
  * @param string|NULL error message (by using NULL you can only add an error to the field, but not the $Message object)
- * @param string|NULL error message for form fields ($err_msg gets used if === NULL).
+ * @param string|NULL error message for form fields - $err_msg gets used if === NULL.
  */
 function param_error_multiple( $vars, $err_msg, $field_err_msg = NULL )
 {
@@ -1140,7 +1207,7 @@
 		}
 	}
 
-	if( isset($err_msg) )
+	if( isset( $err_msg ) )
 	{
 		param_add_message_to_Log( $var, $err_msg, 'error' );
 	}
@@ -1162,8 +1229,8 @@
 
 	if( ! empty( $link_param_err_messages_to_field_IDs ) )
 	{
-		$var_id = Form::get_valid_id($var);
-		$start_link = '<a href="#'.$var_id.'" onclick="var form_elem = document.getElementById(\''.$var_id.'\'); if( form_elem ) { if(form_elem.select) { form_elem.select(); } else if(form_elem.focus) { form_elem.focus(); } }">'; // "SELECT" does not have .select()
+		$var_id = Form::get_valid_id( $var );
+		$start_link = '<a href="#'.$var_id.'" onclick="var form_elem = document.getElementById(\''.$var_id.'\'); if( form_elem ) { if(form_elem.select) { form_elem.select(); } else if(form_elem.focus) { form_elem.focus(); } }">';
 
 		if( strpos( $err_msg, '<a' ) !== false )
 		{
@@ -1171,7 +1238,7 @@
 			$err_msg = preg_replace( '~(\s*)(<a\s+[^>]+>[^<]*</a>\s*)~i', '</a>$1&raquo;$2'.$start_link, $err_msg );
 		}
 
-		if( substr($err_msg, 0, 4) == '</a>' )
+		if( substr( $err_msg, 0, 4 ) == '</a>' )
 		{
 			// There was a link at the beginning of $err_msg: we do not prepend an emtpy link before it
 			$Messages->add( substr( $err_msg, 4 ).'</a>', $log_category );
@@ -1208,9 +1275,9 @@
 		$global_param_list = array();
 	}
 
-	$global_param_list[$var] = array( 'type' => $type, 'default' => (($default===true) ? NULL : $default) );
+	$global_param_list[$var] = array( 'type' => $type, 'default' => ( ( $default === true ) ? NULL : $default ) );
 
-	if( !is_null( $value ) )
+	if( ! is_null( $value ) )
 	{
 		// We want to set the variable too
 		set_param( $var, $value );
@@ -1219,7 +1286,8 @@
 
 
 /**
- * Forget a param so that is will not get included in subsequent {@link regenerate_url()} calls.
+ * Forget a param so that is will not get included in subsequent {@link regenerate_url()} calls
+ *
  * @param string Param name
  */
 function forget_param( $var )
@@ -1237,7 +1305,7 @@
 {
 	global $global_param_list;
 
-	return isset($global_param_list[$var]);
+	return isset( $global_param_list[$var] );
 }
 
 
@@ -1258,7 +1326,7 @@
 
 
 /**
- * Get the value of a param.
+ * Get the value of a param
  *
  * @return NULL|mixed The value of the param, if set. NULL otherwise.
  */
@@ -1302,6 +1370,7 @@
 			if( ! in_array( $var, $ignore ) )
 			{
 				global $$var;
+
 				$value = $$var;
 				$memo[$var] = $$var;
 			}
@@ -1313,8 +1382,9 @@
 
 /**
  * Regenerate current URL from parameters
- * This may clean it up
- * But it is also useful when generating static pages: you cannot rely on $_REQUEST[]
+ *
+ * This may clean it up, but it is also useful when generating static pages: you
+ * cannot rely on $_REQUEST[]
  *
  * @param mixed|string (delimited by commas) or array of params to ignore (can be regexps in /.../)
  * @param array|string Param(s) to set
@@ -1323,29 +1393,31 @@
  */
 function regenerate_url( $ignore = '', $set = '', $pagefileurl = '', $glue = '&amp;' )
 {
-	global $global_param_list, $ReqHost, $ReqPath;
 	global $base_tag_set;
+	global $global_param_list;
+	global $ReqHost;
+	global $ReqPath;
 
 	// Transform ignore param into an array:
-	if( empty($ignore) )
+	if( empty( $ignore ) )
 	{
 		$ignore = array();
 	}
-	elseif( !is_array($ignore) )
+	elseif( ! is_array( $ignore ) )
 	{
 		$ignore = explode( ',', $ignore );
 	}
 
-	// Construct array of all params that have been memorized:
+	// Construct array of all params that have been memorized
 	// (Note: we only include values if they differ from the default and they are not in the ignore list)
 	$params = array();
-	if( isset($global_param_list) ) foreach( $global_param_list as $var => $thisparam )
+	if( isset( $global_param_list ) ) foreach( $global_param_list as $var => $thisparam )
 	{
 		// For each saved param...
 		$type = $thisparam['type'];
 		$defval = $thisparam['default'];
 
-		// Check if the param should to be ignored:
+		// Check if the param should to be ignored
 		$skip = false;
 		foreach( $ignore as $ignore_pattern )
 		{
@@ -1386,13 +1458,13 @@
 				$url_array = array();
 				foreach( $value as $value )
 				{
-					$params[] = $var.'%5B%5D='.rawurlencode($value);
+					$params[] = $var.'%5B%5D='.rawurlencode( $value );
 				}
 			}
 			else
 			{
 				// not an array : normal formatting
-				$params[] = $var.'='.rawurlencode($value);
+				$params[] = $var.'='.rawurlencode( $value );
 			}
 		}
 	}
@@ -1402,7 +1474,7 @@
 	{
 		// We got some forced params
 		// Transform set param into an array:
-		if( !is_array($set) )
+		if( ! is_array( $set ) )
 		{
 			$set = array( $set );
 		}
@@ -1437,7 +1509,7 @@
 
 
 /**
- * Checks if a given regular expression is valid.
+ * Checks if a given regular expression is valid
  *
  * It changes the error_handler and restores it.
  *
@@ -1461,7 +1533,7 @@
 
 
 /**
- * Meant to replace error handler temporarily.
+ * Meant to replace error handler temporarily
  *
  * @return integer number of errors
  */
@@ -1494,12 +1566,12 @@
 		{
 			if( is_array( $mixed ) )
 			{
-				foreach($mixed as $k => $v)
+				foreach( $mixed as $k => $v )
 				{
 					$mixed[$k] = remove_magic_quotes( $v );
 				}
 			}
-			elseif( is_string($mixed) )
+			elseif( is_string( $mixed ) )
 			{
 				$mixed = str_replace( '\'\'', '\'', $mixed );
 			}
@@ -1509,7 +1581,8 @@
 	else
 	{
 		/**
-		 * Remove quotes from input.
+		 * Remove quotes from input
+		 *
 		 * This handles magic_quotes_gpc and magic_quotes_sybase PHP settings/variants.
 		 *
 		 * NOTE: you should not use it directly, but one of the param-functions!
@@ -1521,12 +1594,12 @@
 		{
 			if( is_array( $mixed ) )
 			{
-				foreach($mixed as $k => $v)
+				foreach( $mixed as $k => $v )
 				{
 					$mixed[$k] = remove_magic_quotes( $v );
 				}
 			}
-			elseif( is_string($mixed) )
+			elseif( is_string( $mixed ) )
 			{
 				$mixed = stripslashes( $mixed );
 			}
@@ -1547,11 +1620,10 @@
 
 
 /**
- * Checks for sanitized code.
+ * Checks for sanitized code
  *
- * WARNING: this does *NOT* (necessarilly) make the HTML code safe.
- * It only checks on it and produces error messages.
- * It is NOT (necessarily) safe to use the output.
+ * WARNING: this does *NOT* (necessarilly) make the HTML code safe. It only checks
+ * on it and produces error messages. It is NOT (necessarily) safe to use the output.
  *
  * @param string param name
  * @param string error message
@@ -1587,7 +1659,7 @@
 
 
 /**
- * DEPRECATED Stub for plugin compatibility:
+ * DEPRECATED Stub for plugin compatibility
  */
 function format_to_post( $content, $autobr = 0, $is_comment = 0, $encoding = NULL )
 {
@@ -1694,13 +1766,13 @@
 	{
 		if( $context == 'xmlrpc_posting' )
 		{
-			$errmsg = ($context == 'commenting')
+			$errmsg = ( $context == 'commenting' )
 				? T_('Illegal content found (spam?)')
 				: sprintf( T_('Illegal content found: blacklisted word "%s"'), $block );
 		}
 		else
 		{
-			$errmsg = ($context == 'commenting')
+			$errmsg = ( $context == 'commenting' )
 				? T_('Illegal content found (spam?)')
 				: sprintf( T_('Illegal content found: blacklisted word &laquo;%s&raquo;'), htmlspecialchars( $block ) );
 		}
@@ -1753,7 +1825,7 @@
 	{
 		// We want to validate XHTML
 
-		// figure out what we want to validate against ($flavor)
+		// figure out what we want to validate against
 		$skip = false;
 		$flavor = 'xhtml';
 		$source = array_merge( array(
@@ -1831,7 +1903,7 @@
 			// DEPRECATED but still...
 			$content = strip_tags( $content, $comment_allowed_tags );
 		}
-		else if( ! $escape_comments
+		elseif( ! $escape_comments
 				&& preg_match_all( '#(?:<!--|<!\[CDATA\[|<\?)#i', $content, $matches, PREG_OFFSET_CAPTURE ) )
 		{
 			// We are posting an item, try an el-cheapo check for unclosed comments,
@@ -1926,7 +1998,8 @@
 
 
 /**
- * Balances Tags of string using a modified stack.
+ * Balances Tags of string using a modified stack
+ *
  * @param string HTML to be balanced
  * @return string Balanced HTML
  */
@@ -1941,39 +2014,41 @@
 	{
 		$newtext = $newtext.$tagqueue;
 
-		$i = strpos($text,$regex[0]);
-		$l = strlen($tagqueue) + strlen($regex[0]);
+		$i = strpos( $text,$regex[0] );
+		$l = strlen( $tagqueue ) + strlen( $regex[0] );
 
 		// clear the shifter
 		$tagqueue = '';
 
 		// Pop or Push
-		if( substr($regex[1],0,1) == '/' )
+		if( substr( $regex[1], 0, 1 ) == '/' )
 		{
 			// End Tag
-			$tag = strtolower(substr($regex[1],1));
+			$tag = strtolower( substr( $regex[1], 1 ) );
 
 			// if too many closing tags
-			if($stacksize <= 0)
+			if( $stacksize <= 0 )
 			{
 				$tag = '';
 				// or close to be safe $tag = '/'.$tag;
 			}
 			// if stacktop value = tag close value then pop
-			else if( $tagstack[$stacksize - 1] == $tag )
+			elseif( $tagstack[$stacksize - 1] == $tag )
 			{
 				// found closing tag
 				$tag = '</'.$tag.'>'; // Close Tag
 				// Pop
-				array_pop ($tagstack);
+				array_pop ( $tagstack );
 				$stacksize--;
 			} else {
 				// closing tag not at top, search for it
-				for ($j=$stacksize-1;$j>=0;$j--) {
+				for( $j = $stacksize - 1; $j >= 0; $j-- )
+				{
 					if( $tagstack[$j] == $tag )
 					{
 					// add tag to tagqueue
-						for ($k=$stacksize-1;$k>=$j;$k--){
+						for( $k = $stacksize - 1; $k >= $j; $k-- )
+						{
 							$tagqueue .= '</'.array_pop( $tagstack ).'>';
 							$stacksize--;
 						}
@@ -1986,14 +2061,14 @@
 		else
 		{
 			// Begin Tag
-			$tag = strtolower($regex[1]);
+			$tag = strtolower( $regex[1] );
 
 			// Tag Cleaning
 
 			// Push if not img, br, hr, param or input
-			if($tag != 'br' && $tag != 'img' && $tag != 'hr' && $tag != 'param' && $tag != 'input')
+			if( $tag != 'br' && $tag != 'img' && $tag != 'hr' && $tag != 'param' && $tag != 'input' )
 			{
-				$stacksize = array_push ($tagstack, $tag);
+				$stacksize = array_push ( $tagstack, $tag );
 				$closing = '>';
 			}
 			else
@@ -2003,16 +2078,16 @@
 			// Attributes
 			// $attributes = $regex[2];
 			$attributes = $regex[2];
-			if($attributes)
+			if( $attributes )
 			{
-				$attributes = ' '.trim($attributes);
+				$attributes = ' '.trim( $attributes );
 			}
 
 			$tag = '<'.$tag.$attributes.$closing;
 		}
 
 		$newtext .= substr( $text, 0, $i ).$tag;
-		$text = substr($text,$i+$l);
+		$text = substr( $text, $i + $l );
 	}
 
 	// Clear Tag Queue
@@ -2022,12 +2097,11 @@
 	$newtext .= $text;
 
 	// Empty Stack
-	while($x = array_pop($tagstack)) {
+	while( $x = array_pop( $tagstack ) )
+	{
 		$newtext = $newtext.'</'.$x.'>'; // Add remaining tags to close
 	}
-
 	return $newtext;
 }
 
-
 ?>

=== modified file 'qp_inc/_core/_url.funcs.php'
--- qp_inc/_core/_url.funcs.php	2013-02-28 16:40:18 +0000
+++ qp_inc/_core/_url.funcs.php	2013-03-14 18:35:26 +0000
@@ -62,7 +62,7 @@
 				// Scheme not allowed
 				$scheme = 'mailto:';
 				return $verbose
-					? sprintf( T_('URI scheme "%s" not allowed.'), htmlspecialchars($scheme) )
+					? sprintf( T_('URI scheme "%s" not allowed.'), htmlspecialchars( $scheme ) )
 					: T_('URI scheme not allowed.');
 			}
 
@@ -73,14 +73,14 @@
 					? sprintf( T_('Invalid email link: %s.'), htmlspecialchars( $url ) )
 					: T_('Invalid email link.');
 			}
-      elseif( ! is_email( $match[2] ) )
+			elseif( ! is_email( $match[2] ) )
 			{
 				return $verbose
-					? sprintf( T_('Supplied email address (%s) is invalid.'), htmlspecialchars($match[2]) )
+					? sprintf( T_('Supplied email address (%s) is invalid.'), htmlspecialchars( $match[2] ) )
 					: T_('Invalid email address.');
 			}
 		}
-		elseif( substr($url, 0, 6) == 'clsid:' )
+		elseif( substr( $url, 0, 6 ) == 'clsid:' )
 		{
 			// clsid:link
 			if( ! in_array( 'clsid', $allowed_uri_schemes ) )
@@ -105,7 +105,7 @@
 				// Scheme not allowed
 				$scheme = 'javascript:';
 				return $verbose
-					? sprintf( T_('URI scheme "%s" not allowed.'), htmlspecialchars($scheme) )
+					? sprintf( T_('URI scheme "%s" not allowed.'), htmlspecialchars( $scheme ) )
 					: T_('URI scheme not allowed.');
 			}
 
@@ -116,18 +116,18 @@
 			// convert URL to IDN
 			$url = idna_encode( $url );
 
-			if( ! preg_match('~^           # start
-				([a-z][a-z0-9+.\-]*)             # scheme
-				://                              # authorize absolute URLs only ( // not present in clsid: -- problem? ; mailto: handled above)
-				(\w+(:\w+)?@)?                   # username or username and password (optional)
+			if( ! preg_match('~^               # start
+				([a-z][a-z0-9+.\-]*)           # scheme
+				://                            # authorize absolute URLs only ( // not present in clsid: -- problem? ; mailto: handled above)
+				(\w+(:\w+)?@)?                 # username or username and password (optional)
 				( localhost |
-						[a-z0-9]([a-z0-9\-])*            # Don t allow anything too funky like entities
-						\.                               # require at least 1 dot
-						[a-z0-9]([a-z0-9.\-])+           # Don t allow anything too funky like entities
+						[a-z0-9]([a-z0-9\-])*  # Don t allow anything too funky like entities
+						\.                     # require at least 1 dot
+						[a-z0-9]([a-z0-9.\-])+ # Don t allow anything too funky like entities
 				)
-				(:[0-9]+)?                       # optional port specification
-				.*                               # allow anything in the path (including spaces - used in FileManager - but no newlines).
-				$~ix', $url, $match) )
+				(:[0-9]+)?                     # optional port specification
+				.*                             # allow anything in the path (including spaces - used in FileManager - but no newlines).
+				$~ix', $url, $match ) )
 			{
 				// Cannot validate URL structure
 				return $verbose
@@ -151,10 +151,12 @@
 		if( $context == 'commenting' )
 		{
 			// We do not allow relative URLs in comments
-			return $verbose ? sprintf( T_('URL "%s" must be absolute.'), htmlspecialchars( $url ) ) : T_('URL must be absolute.');
+			return $verbose
+				? sprintf( T_('URL "%s" must be absolute.'), htmlspecialchars( $url ) )
+				: T_('URL must be absolute.');
 		}
 
-		$char = substr($url, 0, 1);
+		$char = substr( $url, 0, 1 );
 		if( $char != '/' && $char != '#' )
 		{
 			// must start with a slash or hash (for HTML anchors to the same page)
@@ -180,29 +182,27 @@
 
 
 /**
- * Get allowed URI schemes for a given context.
+ * Get allowed URI schemes for a given context
+ *
  * @param string Context ("posting", "commenting")
  * @return array
  */
 function get_allowed_uri_schemes( $context = 'posting' )
 {
-  /**
-	 * @var User
-	 */
 	global $current_User;
 
 	$schemes = array(
-			'http',
-			'https',
-			'ftp',
-			'gopher',
-			'nntp',
-			'news',
-			'mailto',
-			'irc',
-			'aim',
-			'icq'
-		);
+		'http',
+		'https',
+		'ftp',
+		'gopher',
+		'nntp',
+		'news',
+		'mailto',
+		'irc',
+		'aim',
+		'icq'
+	);
 
 	if( $context == 'commenting' )
 	{
@@ -223,9 +223,7 @@
 		{
 			$schemes[] = 'clsid';
 		}
-
 	}
-
 	return $schemes;
 }
 
@@ -234,7 +232,8 @@
  * Get the last HTTP status code received by the HTTP/HTTPS wrapper of PHP
  *
  * @param array The $http_response_header array (by reference).
- * @return integer|boolean False if no HTTP status header could be found, the HTTP status code otherwise.
+ * @return integer|boolean False if no HTTP status header could be found, the
+ * HTTP status code otherwise.
  */
 function _http_wrapper_last_status( & $headers )
 {
@@ -245,7 +244,6 @@
 			return $matches[1];
 		}
 	}
-
 	return false;
 }
 
@@ -253,14 +251,16 @@
 /**
  * Fetch remote page
  *
- * Attempt to retrieve a remote page using a HTTP GET request, first with cURL, then fsockopen, then fopen.
+ * Attempt to retrieve a remote page using a HTTP GET request, first with cURL,
+ * then fsockopen, then fopen.
+ *
  * @param string URL
  * @param array Info (by reference)
  * - 'error': holds error message, if any
  * - 'status': HTTP status (e.g. 200 or 404)
  * - 'used_method': Used method ("curl", "fopen", "fsockopen" or null if no methodis available)
- * @todo (0000): Should we try remaining methods, if the previous one(s) failed?
- * @todo (0000): Also allow HTTP POST.
+ * @todo (0000) Should we try remaining methods, if the previous one(s) failed?
+ * @todo (0000) Also allow HTTP POST.
  * @param integer Timeout
  * @return string|false The remote page as a string; false in case of error
  */
@@ -300,7 +300,7 @@
 		$info['used_method'] = 'fsockopen';
 
 		if( ( $url_parsed = @parse_url( $url ) ) === false
-			 || ! isset( $url_parsed['host'] ) )
+			|| ! isset( $url_parsed['host'] ) )
 		{
 			$info['error'] = 'Could not parse URL';
 			return false;
@@ -318,7 +318,7 @@
 		$out .= 'Host: '.$host;
 		if( ! empty( $url_parsed['port'] ) )
 		{
-			// we don't want to add :80 if not specified. remote end may not resolve it. (e-g b2evo multiblog does not)
+			// we don't want to add :80 if not specified. remote end may not resolve it
 			$out .= ':'.$port;
 		}
 		$out .= "\r\n".'Connection: Close'."\r\n\r\n";
@@ -330,10 +330,10 @@
 			return false;
 		}
 
-		// Send request:
+		// Send request
 		fwrite( $fp, $out );
 
-		// Set timeout for data:
+		// Set timeout for data
 		if( function_exists( 'stream_set_timeout' ) )
 		{
 			stream_set_timeout( $fp, $timeout ); // PHP 4.3.0
@@ -343,9 +343,9 @@
 			socket_set_timeout( $fp, $timeout ); // PHP 4
 		}
 
-		// Read response:
+		// Read response
 		$r = '';
-		// First line:
+		// First line
 		$s = fgets( $fp );
 		if( ! preg_match( '~^HTTP/\d+\.\d+ (\d+)~', $s, $match ) )
 		{
@@ -359,7 +359,7 @@
 		{
 			$r .= fgets( $fp );
 		}
-		fclose($fp);
+		fclose( $fp );
 
 		if( ( $pos = strpos( $r, "\r\n\r\n" ) ) === false )
 		{
@@ -378,7 +378,7 @@
 		if( ! $fp )
 		{
 			if( isset( $http_response_header )
-			    && ( $code = _http_wrapper_last_status( $http_response_header ) ) !== false )
+				&& ( $code = _http_wrapper_last_status( $http_response_header ) ) !== false )
 			{
 				// fopen() returned false because it got a bad HTTP code
 				$info['error'] = 'Invalid response';
@@ -389,9 +389,9 @@
 			$info['error'] = 'fopen() failed';
 			return false;
 		}
-		// Check just to be sure:
-		else if( ! isset( $http_response_header )
-		          || ( $code = _http_wrapper_last_status( $http_response_header ) ) === false )
+		// Check just to be sure
+		elseif( ! isset( $http_response_header )
+			|| ( $code = _http_wrapper_last_status( $http_response_header ) ) === false )
 		{
 			$info['error'] = 'Invalid response';
 			$r = false;
@@ -410,7 +410,7 @@
 		return $r;
 	}
 
-	// All failed:
+	// All failed
 	$info['error'] = 'No method available to access URL!';
 	return false;
 }
@@ -418,16 +418,17 @@
 
 /**
  * Get $url with the same protocol (http/https) as $other_url
+ *
  * @param string URL
  * @param string other URL (defaults to {@link $ReqHost})
  * @return string
  */
 function url_same_protocol( $url, $other_url = NULL )
 {
-	if( is_null($other_url) )
+	global $ReqHost;
+
+	if( is_null( $other_url ) )
 	{
-		global $ReqHost;
-
 		$other_url = $ReqHost;
 	}
 
@@ -452,23 +453,26 @@
 
 
 /**
- * Add param(s) at the end of an URL, using either "?" or "&amp;" depending on existing url
+ * Add param(s) at the end of an URL
+ *
+ * Using either "?" or "&amp;" depending on existing url
+ *
  * @param string existing url
  * @param string params to add
  * @param string delimiter to use for more params
  */
 function url_add_param( $url, $param, $glue = '&amp;' )
 {
-	if( empty($param) )
+	if( empty( $param ) )
 	{
 		return $url;
 	}
 
-	if( ($anchor_pos = strpos($url, '#')) !== false )
+	if( ( $anchor_pos = strpos( $url, '#' ) ) !== false )
 	{
 		// There's an "#anchor" in the URL
-		$anchor = substr($url, $anchor_pos);
-		$url = substr($url, 0, $anchor_pos);
+		$anchor = substr( $url, $anchor_pos );
+		$url = substr( $url, 0, $anchor_pos );
 	}
 	else
 	{
@@ -476,11 +480,11 @@
 		$anchor = '';
 	}
 
-	if( strpos($url, '?') !== false )
+	if( strpos( $url, '?' ) !== false )
 	{
 		// There are already params in the URL
 		$r = $url;
-		if( substr($url, -1) != '?' )
+		if( substr( $url, -1 ) != '?' )
 		{
 			// the "?" is not the last char
 			$r .= $glue;
@@ -494,18 +498,19 @@
 
 
 /**
- * Add a tail (starting with "/") at the end of an URL before any params (starting with "?")
+ * Add a tail (starting with "/") at the end of an URL before any params
+ *
  * @param string existing url
  * @param string tail to add
  */
 function url_add_tail( $url, $tail )
 {
 	$parts = explode( '?', $url );
-	if( substr($parts[0], -1) == '/' )
+	if( substr( $parts[0], -1 ) == '/' )
 	{
-		$parts[0] = substr($parts[0], 0, -1);
+		$parts[0] = substr( $parts[0], 0, -1 );
 	}
-	if( isset($parts[1]) )
+	if( isset( $parts[1] ) )
 	{
 		return $parts[0].$tail.'?'.$parts[1];
 	}
@@ -515,7 +520,7 @@
 
 
 /**
- * Try to make $url relative to $target_url, if scheme, host, user and pass matches.
+ * Try to make $url relative to $target_url, if scheme, host, user and pass matches
  *
  * This is useful for redirect_to params, to keep them short and avoid mod_security
  * rejecting the request as "Not Acceptable" (whole URL as param).
@@ -534,7 +539,7 @@
 		// invalid url
 		return $url;
 	}
-	if( empty($parsed_url['scheme']) || empty($parsed_url['host']) )
+	if( empty( $parsed_url['scheme'] ) || empty( $parsed_url['host'] ) )
 	{
 		// no protocol or host information
 		return $url;
@@ -546,58 +551,72 @@
 		// invalid url
 		return $url;
 	}
-	if( ! empty($target_url['scheme']) && $target_url['scheme'] != $parsed_url['scheme'] )
+	if( ! empty( $target_url['scheme'] ) && $target_url['scheme'] != $parsed_url['scheme'] )
 	{
 		// scheme/protocol is different
 		return $url;
 	}
-	if( ! empty($target_url['host']) )
+	if( ! empty( $target_url['host']) )
 	{
-		if( empty($target_url['scheme']) || $target_url['host'] != $parsed_url['host'] )
+		if( empty( $target_url['scheme'] ) || $target_url['host'] != $parsed_url['host'] )
 		{
 			// target has no scheme (but a host) or hosts differ
 			return $url;
 		}
 
 		if( @$target_url['port'] != @$parsed_url['port'] )
+		{
 			return $url;
+		}
 		if( @$target_url['user'] != @$parsed_url['user'] )
+		{
 			return $url;
+		}
 		if( @$target_url['pass'] != @$parsed_url['pass'] )
+		{
 			return $url;
+		}
 	}
 
-	// We can make the URL relative:
+	// We can make the URL relative
 	$r = '';
 	if( ! empty( $parsed_url['path'] ) )
+	{
 		$r .= $parsed_url['path'];
+	}
 	if( ! empty( $parsed_url['query'] ) )
+	{
 		$r .= '?'.$parsed_url['query'];
+	}
 	if( ! empty( $parsed_url['fragment'] ) )
+	{
 		$r .= '?'.$parsed_url['fragment'];
+	}
 
 	return $r;
 }