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

[EdB]

http://forums.quamplures.net/viewtopic.php?f=6&t=1896 ~200 files played with, almost all of which are "done" per the monster goal. works without issue :)

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

7662. By EdB on 2013-03-20

found and fixed 2 fatal flaws :(

=== modified file 'a_notemplate.php'
--- a_notemplate.php	2012-07-29 20:36:41 +0000
+++ a_notemplate.php	2013-03-20 18:13:29 +0000
@@ -51,7 +51,6 @@
 // --------------------- PAGE LEVEL CACHING SUPPORT ---------------------
 // This is totally optional. General caching must be enabled
 // in Global settings, otherwise this will do nothing.
-load_class( '_core/model/_pagecache.class.php' );
 $PageCache = new PageCache( NULL );
 
 // Check for cached content & Start caching if needed:

=== modified file 'admin.php'
--- admin.php	2011-01-09 17:19:59 +0000
+++ admin.php	2013-03-20 18:13:29 +0000
@@ -1,183 +1,131 @@
 <?php
 /**
- * This is the main dispatcher for the admin interface.
- *
- * 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 part of Quam Plures - {@link http://quamplures.net/}
- * See also {@link https://launchpad.net/quam-plures}.
- *
- * @copyright (c) 2009 - 2011 by the Quam Plures developers - {@link http://quamplures.net/}
- * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
- * Parts of this file are copyright (c)2004-2006 by Daniel HAHLER - {@link http://thequod.de/contact}.
- * Parts of this file are copyright (c)2005-2006 by PROGIDISTRI - {@link http://progidistri.com/}.
- *
- * {@internal License choice
- * - If you have received this file as part of a package, please find the license.txt file in
- *   the same folder or the closest folder above for complete license terms.
- * - If you have received this file individually (e-g: from http://evocms.cvs.sourceforge.net/)
- *   then you must choose one of the following licenses before using the file:
- *   - GNU General Public License 2 (GPL) - http://www.opensource.org/licenses/gpl-license.php
- *   - Mozilla Public License 1.1 (MPL) - http://www.opensource.org/licenses/mozilla1.1.php
- * }}
- *
- * {@internal Open Source relicensing agreement:
- * Daniel HAHLER grants Francois PLANQUE the right to license
- * Daniel HAHLER's contributions to this file and the b2evolution project
- * under any OSI approved OSS license (http://www.opensource.org/licenses/).
- *
- * PROGIDISTRI S.A.S. grants Francois PLANQUE the right to license
- * PROGIDISTRI S.A.S.'s contributions to this file and the b2evolution project
- * under any OSI approved OSS license (http://www.opensource.org/licenses/).
- * }}
- *
- * @package pond
+ * This is the main dispatcher for the admin interface
+ *
+ * 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.
+ *
+ * @todo (3048) EdB> this file is 1 of 2 that sets the default admin template (part of "Get the Admin template")
+ * @todo (1111) the "Redirect old-style URLs" check is probably obsolete
+ * @author {@link http://wonderwinds.com/ Ed Bennett}
+ * @author {@link http://progidistri.com/ PROGIDISTRI}
+ * @author {@link http://daniel.hahler.de/ Daniel HAHLER}
+ * @author {@link http://fplanque.net/ Francois PLANQUE}
+ * @copyright (c) 2009 by {@link http://quamplures.net/ the Quam Plures project}
+ * @license http://www.gnu.org/licenses/gpl.txt GNU General Public License v3
+ * @package admin
  */
 
-
 /**
- * Do the MAIN initializations:
+ * Load the configuration minimum
  */
 require_once dirname(__FILE__).'/qp_config/_config.php';
 
-
-/**
- * @global boolean Is this an admin page? Use {@link is_admin_page()} to query it, because it may change.
- */
+// Is this an admin page? Use is_admin_page() to query it because it may change
 $is_admin_page = true;
-
-
 $login_required = true;
+
+/**
+ * Main initialization, without a specific blog identified
+ */
 require_once $inc_path.'_main.inc.php';
 
-
-// Check global permission:
+// Check global permission
 if( ! $current_User->check_perm( 'admin', 'any' ) )
-{	// No permission to access admin...
+{
+	// No permission to access admin...
 	require $admintemplates_path.'_access_denied.main.php';
 }
 
-
-/*
+/**
  * Asynchronous processing options that may be required on any page
  */
 require_once $inc_path.'_async.inc.php';
 
-
-/*
- * Get the blog from param, defaulting to the last selected one for this user:
- * we need it for quite a few of the menu urls
- */
-$user_selected_blog = (int)$UserSettings->get('selected_blog');
+// Get the blog from param, defaulting to the last selected one for this user:
+// we need it for quite a few of the menu urls
+$user_selected_blog = (int)$UserSettings->get( 'selected_blog' );
 $BlogCache = & get_Cache( 'BlogCache' );
-if( param( 'blog', 'integer', NULL, true ) === NULL      // We got no explicit blog choice (not even '0' for 'no blog'):
-	|| ($blog > 0 && ! ($Blog = & $BlogCache->get_by_ID( $blog, false, false )) )) // or we requested a nonexistent blog
-{ // Try the memorized blog from the previous action:
+if( param( 'blog', 'integer', NULL, true ) === NULL // no explicit blog choice, not even '0' for 'no blog'
+	|| ( $blog > 0 && ! ( $Blog = & $BlogCache->get_by_ID( $blog, false, false ) ) ) ) // we requested a nonexistent blog
+{
+	// Try the memorized blog from the previous action
 	$blog = $user_selected_blog;
-	if( ! ($Blog = & $BlogCache->get_by_ID( $blog, false, false ) ) )
-	{	// That one doesn't exist either...
+	if( ! ( $Blog = & $BlogCache->get_by_ID( $blog, false, false ) ) )
+	{
+		// That one doesn't exist either...
 		$blog = 0;
 	}
 }
 elseif( $blog != $user_selected_blog )
-{ // We have selected a new & valid blog. Update UserSettings for selected blog:
+{
+	// We have selected a new & valid blog. Update UserSettings for selected blog
 	set_working_blog( $blog );
 }
 
-
-// bookmarklet, upload (upload actually means sth like: select img for post):
+// bookmarklet, upload (upload actually means sth like: select img for post)
 param( 'mode', 'string', '', true );
 
-
-/*
- * Get the Admin template
- * TODO: Allow setting through GET param (dropdown in backoffice), respecting a checkbox "Use different setting on each computer" (if cookie_state handling is ready)
- */
+// Get the Admin template
 $admin_template = $UserSettings->get( 'admin_template' );
 $admin_template_path = $admintemplates_path.'%s/_adminUI.class.php';
 
 if( ! $admin_template || ! file_exists( sprintf( $admin_template_path, $admin_template ) ) )
-{ // there's no template for the user
-	if( !$admin_template )
-	{
-		$Debuglog->add( 'The user has no admin template set.', 'template' );
-	}
-	else
-	{
-		$Debuglog->add( 'The admin template ['.$admin_template.'] set by the user does not exist.', 'template' );
-	}
-
+{
+	// there's no template for the user
 	$admin_template = $Settings->get( 'default_admin_template' );
 
-	if( !$admin_template || !file_exists( sprintf( $admin_template_path, $admin_template ) ) )
-	{ // even the default template does not exist!
-		if( !$admin_template )
-		{
-			$Debuglog->add( 'There is no default admin template set!', 'template' );
-		}
-		else
-		{
-			$Debuglog->add( 'The default admin template ['.$admin_template.'] does not exist!', array('template','error') );
-		}
-
-		if( file_exists(sprintf( $admin_template_path, 'wind' )) )
-		{ // 'wind' - the official starting template - exist
+	if( ! $admin_template || ! file_exists( sprintf( $admin_template_path, $admin_template ) ) )
+	{
+		// even the default template does not exist!
+		// set 'wind' as the admin template if it exists
+		if( file_exists( sprintf( $admin_template_path, 'wind' ) ) )
+		{
 			$admin_template = 'wind';
-
-			$Debuglog->add( 'Falling back to "wind" admin template.', 'template' );
 		}
 		else
-		{ // get the first one available one
+		{
+			// get the first one available one
 			$admin_template_dirs = get_admin_templates();
 
 			if( $admin_template_dirs === false )
 			{
-				$Debuglog->add( 'No admin template found! Check that the path '.$admintemplates_path.' exists.', array('template','error') );
+				// debuglog->add removed
 			}
-			elseif( empty($admin_template_dirs) )
-			{ // No admin template directories found
-				$Debuglog->add( 'No admin template found! Check that there are templates in '.$admintemplates_path.'.', array('template','error') );
+			elseif( empty( $admin_template_dirs ) )
+			{
+				// No admin template directories found
+				// debuglog->add removed
 			}
 			else
 			{
-				$admin_template = array_shift($admin_template_dirs);
-				$Debuglog->add( 'Falling back to first available template.', 'template' );
+				$admin_template = array_shift( $admin_template_dirs );
 			}
 		}
 	}
 }
+
+// we die without an admin template
 if( ! $admin_template )
 {
 	$Debuglog->display( 'No admin template available!', '', true, 'template' );
 	die(1);
 }
 
-$Debuglog->add( 'Using admin template &laquo;'.$admin_template.'&raquo;', 'template' );
-
 /**
- * Load the AdminUI class for the template.
+ * Load the AdminUI class for the template
  */
 require_once $admintemplates_path.$admin_template.'/_adminUI.class.php';
-/**
- * This is the Admin UI object which handles the UI for the backoffice.
- *
- * @global AdminUI
- */
+
+// This is the Admin UI object which handles the UI for the backoffice
 $AdminUI = new AdminUI();
 
-
-/*
- * Pass over to controller...
- */
-
-// Get requested controller and memorize it:
+// Pass over to controller ... get requested controller and memorize it
 param( 'ctrl', '/^[a-z0-9_]+$/', 'dashboard', true );
 
-
-// Redirect old-style URLs (e.g. /admin/plugins.php), if they come here because the webserver maps "/admin/" to "/admin.php"
-// NOTE: this is just meant as a transformation from pre-1.8 to 1.8!
+// Redirect old-style URLs (e.g. /admin/plugins.php), if they come here because the webserver
+// maps "/admin/" to "/admin.php" NOTE: this is just meant as a transformation from pre-1.8 to 1.8!
 if( ! empty( $_SERVER['PATH_INFO'] ) && $_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF'] ) // the "!= PHP_SELF" check seems needed by IIS..
 {
 	// Try to find the appropriate controller (ctrl) setting
@@ -196,7 +144,7 @@
 		$query_string = explode( '&', $_SERVER['QUERY_STRING'] );
 		foreach( $query_string as $k => $v )
 		{
-			$query_string[$k] = strip_tags($v);
+			$query_string[$k] = strip_tags( $v );
 		}
 		$query_string = '&'.implode( '&', $query_string );
 	}
@@ -209,14 +157,15 @@
 	exit(0);
 }
 
-
-// Check matching controller file:
-if( !isset($ctrl_mappings[$ctrl]) )
+// Check matching controller file
+if( ! isset( $ctrl_mappings[$ctrl] ) )
 {
 	debug_die( 'The requested controller ['.$ctrl.'] does not exist.' );
 }
 
-// Call the requested controller:
+/**
+ * Call the requested controller
+ */
 require $inc_path.$ctrl_mappings[$ctrl];
 
 ?>

=== modified file 'qp_config/_advanced.php'
--- qp_config/_advanced.php	2011-09-05 06:55:25 +0000
+++ qp_config/_advanced.php	2013-03-20 18:13:29 +0000
@@ -515,7 +515,7 @@
 /**
  * File extensions that the admin will not be able to enable in the Settings
  */
-$force_upload_forbiddenext = array( 'cgi', 'exe', 'htaccess', 'htpasswd', 'php', 'php3', 'php4', 'php5', 'php6', 'phtml', 'pl', 'vbs' );
+$forbidden_upload_exts = array( 'cgi', 'exe', 'htaccess', 'htpasswd', 'php', 'php3', 'php4', 'php5', 'php6', 'phtml', 'pl', 'vbs' );
 
 /**
  * Admin can configure max file upload size, but he won't be able to set it higher than this "max max" value.

=== modified file 'qp_config/_locales.php'
--- qp_config/_locales.php	2013-02-28 16:40:18 +0000
+++ qp_config/_locales.php	2013-03-20 18:13:29 +0000
@@ -88,7 +88,7 @@
  * - 'datefmt' : The date format for this language. See {@link date_i18n()}.
  * - 'timefmt' : The time format for this language. See {@link date_i18n()}.
  * - 'startofweek': Start of week for this locale. 0 means Sunday, 1 Monday etc.
- * - 'messages' : The locale's directory name (contains php/_global.php; ONLY USED HERE).
+ * - 'messages' : The locale's directory name (contains _global.php; ONLY USED HERE).
  * - 'enabled' : Is the locale visible to the user (ONLY USED HERE)?
  */
 $locales['en-US'] = array(

=== removed file 'qp_config/_upgrade.php'
--- qp_config/_upgrade.php	2010-12-31 12:12:03 +0000
+++ qp_config/_upgrade.php	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-<?php
-/**
- * This file includes upgrade settings for Quam Plures.
- *
- * 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/}
- *
- * @package pond
- */
-if( !defined('QP_CONFIG_LOADED') ) die( 'Please, do not access this page directly.' );
-
-
-/**#@+
- * Old b2 tables used exclusively by the cafelog upgrade mode of the install script.
- *
- * @global string
- */
-$oldtableposts      = 'b2posts';
-$oldtableusers      = 'b2users';
-$oldtablesettings   = 'b2settings';
-$oldtablecategories = 'b2categories';
-$oldtablecomments   = 'b2comments';
-/**#@-*/
-
-
-?>

=== modified file 'qp_inc/_application.php'
--- qp_inc/_application.php	2013-03-12 06:26:03 +0000
+++ qp_inc/_application.php	2013-03-20 18:13:29 +0000
@@ -30,7 +30,7 @@
 $app_date = '2013-03-21';
 
 // Displayed on the login screen
-$app_banner = '<a href="'.$app_homepage.'"><img src="'.$rsc_url.'img/qp-logo.jpg" width="337" height="76" alt="'.$app_name.'" /></a>';
+$app_banner = '<a href="'.$app_homepage.'"><img src="'.$rsc_url.'logo.jpg" width="337" height="76" alt="'.$app_name.'" /></a>';
 
 // Displayed on admin pages (footer)
 $app_footer_text = '<a href="'.$app_homepage.'" title="'.sprintf( T_('visit %s\' website'), $app_name ).'"><strong>'.$app_name.' v'.$app_version.'</strong></a>'

=== modified file 'qp_inc/_core/__core.init.php'
--- qp_inc/_core/__core.init.php	2013-03-13 02:35:35 +0000
+++ qp_inc/_core/__core.init.php	2013-03-20 18:13:29 +0000
@@ -30,33 +30,47 @@
 	'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_blog_groups' => $app_db_tableprefix.'bloggroups', // new
+	'T_coll_group_perms' => $app_db_tableprefix.'bloggroups', // old, going away
+	'T_blog_users' => $app_db_tableprefix.'blogusers', // new
+	'T_coll_user_perms' => $app_db_tableprefix.'blogusers', // old, going away
 	'T_comments' => $app_db_tableprefix.'comments',
-	'T_cron__log' => $app_db_tableprefix.'cron__log',
-	'T_cron__task' => $app_db_tableprefix.'cron__task',
+	'T_cron_log' => $app_db_tableprefix.'cron__log', // new
+	'T_cron__log' => $app_db_tableprefix.'cron__log', // old, going away
+	'T_cron_task' => $app_db_tableprefix.'cron__task', // new
+	'T_cron__task' => $app_db_tableprefix.'cron__task', // old, going away
 	'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_item_prerendering' => $app_db_tableprefix.'items__prerendering', // new
+	'T_items__prerendering' => $app_db_tableprefix.'items__prerendering', // old, going away
+	'T_item_status' => $app_db_tableprefix.'items__status', // new
+	'T_items__status' => $app_db_tableprefix.'items__status', // old, going away
+	'T_item_versions' => $app_db_tableprefix.'items__version', // new
+	'T_items__version' => $app_db_tableprefix.'items__version', // old, going away
 	'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_plugin_events' => $app_db_tableprefix.'pluginevents', // new
+	'T_pluginevents' => $app_db_tableprefix.'pluginevents', // old, going away
+	'T_plugin_settings' => $app_db_tableprefix.'pluginsettings', // new
+	'T_pluginsettings' => $app_db_tableprefix.'pluginsettings', // old, going away
+	'T_plugin_usersettings' => $app_db_tableprefix.'pluginusersettings', // new
+	'T_pluginusersettings' => $app_db_tableprefix.'pluginusersettings', // old, going away
 	'T_settings' => $app_db_tableprefix.'settings',
-	'T_templates__container' => $app_db_tableprefix.'templates__container',
-	'T_templates__template' => $app_db_tableprefix.'templates__template',
+	'T_template_containers' => $app_db_tableprefix.'templates__container', // new
+	'T_templates__container' => $app_db_tableprefix.'templates__container', // old, going away
+	'T_templates' => $app_db_tableprefix.'templates__template', // new
+	'T_templates__template' => $app_db_tableprefix.'templates__template', // old, going away
 	'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_user_settings' => $app_db_tableprefix.'usersettings', // new
+	'T_usersettings' => $app_db_tableprefix.'usersettings', // old, going away
+	'T_widgets' => $app_db_tableprefix.'widget', // new
+	'T_widget' => $app_db_tableprefix.'widget', // old, going away
 	// 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
@@ -100,10 +114,11 @@
 	'users' => 'users/users.ctrl.php',
 	'upload' => 'files/upload.ctrl.php',
 	'widgets' => 'widgets/widgets.ctrl.php',
-	);
+);
 
 /**
  * _core_Module class
+ *
  * @package core
  */
 class _core_Module
@@ -229,10 +244,6 @@
 					'text' => T_('Intros').'&hellip;',
 					'href' => $items_url.'tab=intros',
 				),
-				'item_podcasts' => array(
-					'text' => T_('Podcasts').'&hellip;',
-					'href' => $items_url.'tab=podcasts',
-				),
 				'item_links' => array(
 					'text' => T_('Sidebar links').'&hellip;',
 					'href' => $items_url.'tab=links',

=== modified file 'qp_inc/_core/_class.funcs.php'
--- qp_inc/_core/_class.funcs.php	2013-03-12 21:17:25 +0000
+++ qp_inc/_core/_class.funcs.php	2013-03-20 18:13:29 +0000
@@ -138,14 +138,4 @@
 	}
 }
 
-/**
- * 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;
-}
-
 ?>

=== modified file 'qp_inc/_core/_misc.funcs.php'
--- qp_inc/_core/_misc.funcs.php	2013-03-12 21:17:25 +0000
+++ qp_inc/_core/_misc.funcs.php	2013-03-20 18:13:29 +0000
@@ -83,7 +83,7 @@
 		return $FiletypeCache;
 
 		case 'GoalCache';
-		$GoalCache = new DataObjectCache( 'Goal', false, 'T_track__goal', 'goal_', 'goal_ID', 'goal_name', 'goal_name' ); // COPY (FUNC)
+		$GoalCache = new DataObjectCache( 'Goal', false, 'T_goals', 'goal_', 'goal_ID', 'goal_name', 'goal_name' ); // COPY (FUNC)
 		return $GoalCache;
 
 		case 'GroupCache':
@@ -111,7 +111,7 @@
 		return $ItemCatsCache;
 
 		case 'ItemStatusCache':
-		$Plugins->get_object_from_cacheplugin_or_create( 'ItemStatusCache', 'new GenericCache( \'GenericElement\', true, \'T_items__status\', \'pst_\', \'pst_ID\', NULL, \'\', T_(\'No status\') )' );
+		$Plugins->get_object_from_cacheplugin_or_create( 'ItemStatusCache', 'new GenericCache( \'GenericElement\', true, \'T_item_status\', \'pst_\', \'pst_ID\', NULL, \'\', T_(\'No status\') )' );
 		return $ItemStatusCache;
 
 		case 'ItemTypeCache':
@@ -1134,7 +1134,7 @@
  * @param string Format to use ('simple', 'rfc')
  * - 'simple': Single email address.
  * - 'rfc': Full email address, may include name (RFC2822) like [e-mail]
- * or Me <[e-mail]> or "Me" <[e-mail]>
+ *   or Me <[e-mail]> or "Me" <[e-mail]>
  *
  * @see Plugin::IsValidRawEmail()
  * @see Plugin::IsValidFilteredEmail()
@@ -3170,6 +3170,8 @@
 	global $app_shortname;
 	global $app_version;
 
+	return '';
+
 	if( $Settings->get( 'webhelp_enabled' ) )
 	{
 		$manual_url = 'http://codex.quamplures.net/onlinehelp.php/'.$topic.'?lang='.$current_locale.'&amp;app='.$app_shortname.'&amp;version='.$app_version;

=== modified file 'qp_inc/_core/_param.funcs.php'
--- qp_inc/_core/_param.funcs.php	2013-03-12 21:17:25 +0000
+++ qp_inc/_core/_param.funcs.php	2013-03-20 18:13:29 +0000
@@ -38,9 +38,10 @@
  * - '' (does nothing)
  * - '/^...$/' check regexp pattern match (string)
  * - boolean (will force type to boolean, but you can't use 'true' as a default
- * since it has special meaning. There is no real reason to pass booleans on a
- * URL though. Passing 0 and 1 as integers seems to be best practice).
- * Value type will be forced only if resulting value (probably from default then) is !== NULL
+ *   since it has special meaning. There is no real reason to pass booleans on a
+ *   URL though. Passing 0 and 1 as integers seems to be best practice).
+ *   Value type will be forced only if resulting value (probably from default then)
+ *   is !== NULL
  * @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?
  * @param boolean Override if variable already set
@@ -1622,7 +1623,7 @@
 /**
  * Checks for sanitized code
  *
- * WARNING: this does *NOT* (necessarilly) make the HTML code safe. It only checks
+ * WARNING: this does *NOT* (necessarily) 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
@@ -1743,8 +1744,9 @@
 		$allow_javascript = false;
 		$allow_iframes = false;
 		$allow_objects = false;
-		// fp> I don't know if it makes sense to bypass antispam in commenting context if the user
-		// has that kind of permissions. If so, then we also need to bypass in several other places.
+		// fp> I don't know if it makes sense to bypass antispam in commenting context
+		// if the user has that kind of permissions. If so, then we also need to bypass
+		// in several other places.
 		$bypass_antispam = false;
 		break;
 
@@ -1825,7 +1827,9 @@
 	{
 		// We want to validate XHTML
 
-		// figure out what we want to validate against
+		// figure out what we want to validate against. $skip lets us bypass checks
+		// when they don't matter, $flavor lets us validate against xhtml or html5
+		// (eventually!), and $source gives us info about where we are checking from
 		$skip = false;
 		$flavor = 'xhtml';
 		$source = array_merge( array(
@@ -1839,7 +1843,16 @@
 			$skip = true;
 		}
 
-		// if we come from param_check_html() we're almost done
+		// we can skip if we're just changing locales on a user. $flavor will be xhtml
+		// because we're in admin and admin doesn't do or need html5 stuff
+		if( array_key_exists( 'userupdate', $_POST['actionArray'] )
+			&& array_key_exists( 'ctrl', $_POST ) )
+		{
+			$flavor = 'xhtml';
+			$skip = true;
+		}
+
+		// if we come from param_check_html() (but not on a user update) we're almost done
 		if( ! $skip && $source['param_check_html'] )
 		{
 			global $Blog;

=== modified file 'qp_inc/_core/model/__core.install.php'
--- qp_inc/_core/model/__core.install.php	2013-03-13 02:35:35 +0000
+++ qp_inc/_core/model/__core.install.php	2013-03-20 18:13:29 +0000
@@ -2,8 +2,9 @@
 /**
  * This is the install file for the core modules
  *
- * This gets updated through {@link db_delta()} which generates the queries needed
- * to get to this scheme. Please see {@link db_delta()} for things to take care of.
+ * $schema_queries gets updated through {@link db_delta()} which generates the
+ * queries needed to get to this scheme. Please see {@link db_delta()} for things
+ * to take care of.
  *
  * @author {@link http://wonderwinds.com/ Ed Bennett}
  * @author {@link http://fplanque.net/ Francois PLANQUE}
@@ -15,9 +16,8 @@
 
 global $db_storage_charset;
 
-// This gets updated through db_delta() which generates the queries needed to get to this scheme
 $schema_queries = array(
-	'T_antispam' => array( 'Creating table for Antispam Blacklist',
+	'T_antispam' => array( 'Creating table for antispam',
 		"CREATE TABLE T_antispam (
 			aspm_ID bigint(11) NOT NULL auto_increment,
 			aspm_string VARCHAR(80) NOT NULL,
@@ -65,8 +65,8 @@
 			UNIQUE KEY blog_urlname (blog_urlname)
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_coll_group_perms' => array( 'Creating blog-group permissions table',
-		"CREATE TABLE T_coll_group_perms (
+	'T_blog_groups' => array( 'Creating blog-group permissions table',
+		"CREATE TABLE T_blog_groups (
 			bloggroup_blog_ID INT(11) unsigned NOT NULL default 0,
 			bloggroup_group_ID INT(11) unsigned NOT NULL default 0,
 			bloggroup_ismember TINYINT NOT NULL default 0,
@@ -91,8 +91,8 @@
 			PRIMARY KEY ( cset_blog_ID, cset_name )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_coll_user_perms' => array( 'Creating blog-user permissions table',
-		"CREATE TABLE T_coll_user_perms (
+	'T_blog_users' => array( 'Creating blog-user permissions table',
+		"CREATE TABLE T_blog_users (
 			bloguser_blog_ID INT(11) unsigned NOT NULL default 0,
 			bloguser_user_ID INT(11) unsigned NOT NULL default 0,
 			bloguser_ismember TINYINT NOT NULL default 0,
@@ -150,8 +150,8 @@
 			KEY comment_type (comment_type)
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_cron__log' => array( 'Creating cron log table',
-		"CREATE TABLE T_cron__log(
+	'T_cron_log' => array( 'Creating cron log table',
+		"CREATE TABLE T_cron_log(
 			clog_ctsk_ID INT(10) unsigned not null,
 			clog_realstart_datetime DATETIME not null DEFAULT '2000-01-01 00:00:00',
 			clog_realstop_datetime DATETIME,
@@ -160,8 +160,8 @@
 			PRIMARY KEY ( clog_ctsk_ID )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_cron__task' => array( 'Creating cron tasks table',
-		"CREATE TABLE T_cron__task(
+	'T_cron_task' => array( 'Creating cron tasks table',
+		"CREATE TABLE T_cron_task(
 			ctsk_ID INT(10) unsigned not null AUTO_INCREMENT,
 			ctsk_start_datetime DATETIME not null DEFAULT '2000-01-01 00:00:00',
 			ctsk_repeat_after INT(10) unsigned,
@@ -275,8 +275,8 @@
 			UNIQUE catpost ( postcat_cat_ID, postcat_post_ID )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_items__prerendering' => array( 'Creating item prerendering table',
-		"CREATE TABLE T_items__prerendering(
+	'T_item_prerendering' => array( 'Creating item prerendering table',
+		"CREATE TABLE T_item_prerendering(
 			itpr_itm_ID INT(11) UNSIGNED NOT NULL,
 			itpr_format ENUM('htmlbody','entityencoded','xml','text') NOT NULL,
 			itpr_renderers TEXT NOT NULL,
@@ -285,8 +285,8 @@
 			PRIMARY KEY ( itpr_itm_ID, itpr_format )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_items__status' => array( 'Creating item statuses table',
-		"CREATE TABLE T_items__status (
+	'T_item_status' => array( 'Creating item statuses table',
+		"CREATE TABLE T_item_status (
 			pst_ID INT(11) unsigned not null AUTO_INCREMENT,
 			pst_name VARCHAR(30) not null,
 			PRIMARY KEY ( pst_ID )
@@ -307,8 +307,8 @@
 			PRIMARY KEY ( ptyp_ID )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_items__version' => array( 'Creating item versions table',
-		"CREATE TABLE T_items__version (
+	'T_item_versions' => array( 'Creating item versions table',
+		"CREATE TABLE T_item_versions (
 			iver_itm_ID INT UNSIGNED NOT NULL,
 			iver_edit_user_ID INT UNSIGNED NULL,
 			iver_edit_datetime DATETIME NOT NULL,
@@ -369,24 +369,24 @@
 			INDEX plug_status( plug_status )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_pluginevents' => array( 'Creating plugin events table',
-		"CREATE TABLE T_pluginevents(
+	'T_plugin_events' => array( 'Creating plugin events table',
+		"CREATE TABLE T_plugin_events(
 			pevt_plug_ID INT(11) UNSIGNED NOT NULL,
 			pevt_event VARCHAR(40) NOT NULL,
 			pevt_enabled TINYINT NOT NULL DEFAULT 1,
 			PRIMARY KEY ( pevt_plug_ID, pevt_event )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_pluginsettings' => array( 'Creating plugin settings table',
-		"CREATE TABLE T_pluginsettings (
+	'T_plugin_settings' => array( 'Creating plugin settings table',
+		"CREATE TABLE T_plugin_settings (
 			pset_plug_ID INT(11) UNSIGNED NOT NULL,
 			pset_name VARCHAR(30) NOT NULL,
 			pset_value TEXT NULL,
 			PRIMARY KEY ( pset_plug_ID, pset_name )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_pluginusersettings' => array( 'Creating plugin user settings table',
-		"CREATE TABLE T_pluginusersettings (
+	'T_plugin_usersettings' => array( 'Creating plugin user settings table',
+		"CREATE TABLE T_plugin_usersettings (
 			puset_plug_ID INT(11) UNSIGNED NOT NULL,
 			puset_user_ID INT(11) UNSIGNED NOT NULL,
 			puset_name VARCHAR(30) NOT NULL,
@@ -418,8 +418,8 @@
 			UNIQUE tag_name( tag_name )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_templates__template' => array( 'Creating templates table',
-		"CREATE TABLE T_templates__template (
+	'T_templates' => array( 'Creating templates table',
+		"CREATE TABLE T_templates (
 			template_ID INT(10) unsigned NOT NULL auto_increment,
 			template_name VARCHAR(32) NOT NULL,
 			template_type ENUM('xhtml','html5','feed','other') NOT NULL default 'xhtml',
@@ -429,8 +429,8 @@
 			KEY template_name( template_name )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_templates__container' => array( 'Creating template containers table',
-		"CREATE TABLE T_templates__container (
+	'T_template_containers' => array( 'Creating template containers table',
+		"CREATE TABLE T_template_containers (
 			sco_template_ID INT(10) unsigned NOT NULL,
 			sco_name VARCHAR(40) NOT NULL,
 			sco_order TINYINT NOT NULL default 0,
@@ -473,16 +473,16 @@
 			PRIMARY KEY ( cach_name )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_usersettings' => array( 'Creating user settings table',
-		"CREATE TABLE T_usersettings (
+	'T_user_settings' => array( 'Creating user settings table',
+		"CREATE TABLE T_user_settings (
 			uset_user_ID INT(11) UNSIGNED NOT NULL,
 			uset_name VARCHAR(30) NOT NULL,
 			uset_value VARCHAR(255) NULL,
 			PRIMARY KEY ( uset_user_ID, uset_name )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	'T_widget' => array( 'Creating widgets table',
-		"CREATE TABLE T_widget (
+	'T_widgets' => array( 'Creating widgets table',
+		"CREATE TABLE T_widgets (
 			wi_ID INT(10) UNSIGNED auto_increment,
 			wi_widget_blog_ID INT(11) UNSIGNED NOT NULL,
 			wi_sco_name VARCHAR(40) NOT NULL,

=== modified file 'qp_inc/_core/model/_pagecache.class.php'
--- qp_inc/_core/model/_pagecache.class.php	2010-12-31 12:12:03 +0000
+++ qp_inc/_core/model/_pagecache.class.php	2013-03-20 18:13:29 +0000
@@ -1,72 +1,62 @@
 <?php
 /**
- * This file implements the PageCache class, which caches HTML pages genereated by the app.
- *
- * This file is part of Quam Plures - {@link http://quamplures.net/}
- * See also {@link https://launchpad.net/quam-plures}.
- *
- * @copyright (c) 2009 - 2011 by the Quam Plures developers - {@link http://quamplures.net/}
- * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
- * Parts of this file are copyright (c)2004-2006 by Daniel HAHLER - {@link http://thequod.de/contact}.
- *
- * {@internal License choice
- * - If you have received this file as part of a package, please find the license.txt file in
- *   the same folder or the closest folder above for complete license terms.
- * - If you have received this file individually (e-g: from http://evocms.cvs.sourceforge.net/)
- *   then you must choose one of the following licenses before using the file:
- *   - GNU General Public License 2 (GPL) - http://www.opensource.org/licenses/gpl-license.php
- *   - Mozilla Public License 1.1 (MPL) - http://www.opensource.org/licenses/mozilla1.1.php
- * }}
- *
- * {@internal Open Source relicensing agreement:
- * }}
- *
- * @package pond
+ * This file implements the PageCache class
+ *
+ * This caches HTML pages genereated by the app.
+ *
+ * @todo (1111) vars type 'foo' need useful/valid descriptions
+ * @author {@link http://wonderwinds.com/ Ed Bennett}
+ * @author {@link http://daniel.hahler.de/ Daniel HAHLER}
+ * @author {@link http://fplanque.net/ Francois PLANQUE}
+ * @copyright (c) 2009 by {@link http://quamplures.net/ the Quam Plures project}
+ * @license http://www.gnu.org/licenses/gpl.txt GNU General Public License v3
+ * @package core
  */
-if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
-
+if(!defined('QP_MAIN_INIT')) die('fail');
 
 /**
- * Page Cache.
+ * PageCache class
  *
- * @package pond
+ * @package core
  */
 class PageCache
 {
-  /**
+	/**
 	 * How old can a cached object get before we consider it outdated
+	 * @var foo
 	 */
-	var $max_age_seconds = 300;  // 5 minutes for now
-
-  /**
-	 * After how many bytes should we output sth live while collecting cache content:
+	var $max_age_seconds = 300;
+	/**
+	 * After how many bytes should we output sth live while collecting cache content
+	 * @var foo
 	 */
 	var $output_chunk_size = 2000;
-
 	/**
 	 * By default we consider caching not to be enabled
+	 * @var foo
 	 */
 	var $is_enabled = false;
-
 	/**
-	 *
+	 * FIX THIS
+	 * @var foo
 	 */
 	var $ads_collcache_path;
-
 	/**
 	 * Filename of cache for current page
+	 * @var foo
 	 */
 	var $cache_filepath;
 	/**
-	 * Progressively caching the content of the current page:
+	 * Progressively caching the content of the current page
+	 * @var foo
 	 */
 	var $cached_page_content = '';
 	/**
 	 * Are we currently recording cache contents for this page?
+	 * @var foo
 	 */
 	var $is_collecting = false;
 
-
 	/**
 	 * Constructor
 	 *
@@ -74,17 +64,18 @@
 	 */
 	function PageCache( $Blog = NULL )
 	{
-		global $Debuglog;
+		global $cache_path;
 		global $Settings;
-		global $cache_path;
 
-		if( is_null($Blog) )
-		{	// Cache for "other" "genereic" "special" pages:
+		if( is_null( $Blog ) )
+		{
+			// Cache for "other" "genereic" "special" pages
 			$this->ads_collcache_path = $cache_path.'general/';
 
-			if( ! $Settings->get('general_cache_enabled') )
-			{	// We do NOT want caching for this collection
-				$Debuglog->add( 'General cache not enabled.', 'cache' );
+			if( ! $Settings->get( 'general_cache_enabled' ) )
+			{
+				// We do NOT want caching for this collection
+				// debuglog-add removed
 			}
 			else
 			{
@@ -92,13 +83,15 @@
 			}
 		}
 		else
-		{	// Cache for a specific Blog/Collection:
-			// We need to set this even if cache is not enabled (yet) bc it's used for creating:
+		{
+			// Cache for a specific Blog/Collection
+			// We need to set this even if cache is not enabled (yet) bc it's used for creating
 			$this->ads_collcache_path = $cache_path.'c'.$Blog->ID.'/';
 
-			if( ! $Blog->get_setting('cache_enabled') )
-			{	// We do NOT want caching for this collection
-				$Debuglog->add( 'Cache not enabled for this blog.', 'cache' );
+			if( ! $Blog->get_setting( 'cache_enabled' ) )
+			{
+				// We do NOT want caching for this collection
+				// debuglog-add removed
 			}
 			else
 			{
@@ -111,37 +104,35 @@
 	/**
 	 * Get path to file for current URL
 	 *
-	 * @todo fp> We may need to add some keys like the locale or the charset, I'm not sure.
+	 * @todo (0000) fp> We may need to add some keys like the locale or the charset, I'm not sure.
 	 */
 	function get_af_filecache_path()
 	{
-		global $Debuglog;
-		global $ReqHost, $ReqURI;
+		global $ReqURI;
+		global $ReqHost;
 
 		// We want the cache for the current URL
 		if( empty( $this->cache_filepath ) )
 		{
 			$ReqAbsUrl = $ReqHost.$ReqURI;
- 			$Debuglog->add( 'URL being cached: '.$ReqAbsUrl, 'cache' );
-
- 			$this->cache_filepath = $this->gen_filecache_path( $ReqAbsUrl );
-
- 			$Debuglog->add( 'Cache file: '.$this->cache_filepath, 'cache' );
+
+			$this->cache_filepath = $this->gen_filecache_path( $ReqAbsUrl );
 		}
 
- 		return $this->cache_filepath;
+		return $this->cache_filepath;
 	}
 
 
 	/**
-	 * Generate path for caching $url.
+	 * Generate path for caching $url
+	 *
 	 * @param string URL
 	 * @return string
 	 */
 	function gen_filecache_path( $url )
 	{
-		$url_hash = md5($url);	// fp> is this teh fastest way to hash this into something not too obvious to guess?
-
+		// fp> is this the fastest way to hash this into something not too obvious to guess?
+		$url_hash = md5( $url );
 		return $this->ads_collcache_path.$url_hash.'.page';
 	}
 
@@ -153,29 +144,27 @@
 	 */
 	function invalidate( $url )
 	{
-		global $Debuglog;
-
-		$Debuglog->add( 'Invalidating:'.$url, 'cache' );
-
 		// What would be the cache file for the current URL?
 		$af_cache_file = $this->gen_filecache_path( $url );
-
 		@unlink( $af_cache_file );
 	}
 
 
 	/**
+	 * create cache
+	 *
 	 * @return boolean true if cache has been successfully created
 	 */
 	function cache_create()
 	{
-		// Create by using the filemanager's default chmod. TODO> we may not want to make these publicly readable
+		// Create by using the filemanager's default chmod.
+		// @todo (0000) we may not want to make these publicly readable
 		if( ! mkdir_r( $this->ads_collcache_path, NULL ) )
 		{
 			return false;
 		}
 
-		// Clear contents of folder, if any:
+		// Clear contents of folder, if any
 		cleardir_r( $this->ads_collcache_path );
 
 		return true;
@@ -198,66 +187,57 @@
 	 */
 	function check()
 	{
-		global $Debuglog;
 		global $disp;
-
 		global $Messages;
 
 		if( ! $this->is_enabled )
-		{	// We do NOT want caching for this page
-			$Debuglog->add( 'Cache not enabled. No lookup nor caching performed.', 'cache' );
+		{
+			// We do NOT want caching for this page
 			return false;
 		}
 
 		if( $disp == '404' )
-		{	// We do NOT want caching for 404 pages (illimited possibilities!)
-			$Debuglog->add( 'Never cache 404s!', 'cache' );
+		{
+			// We do NOT want caching for 404 pages (illimited possibilities!)
 			return false;
 		}
 
 		if( is_logged_in() )
-		{	// We do NOT want caching when a user is logged in (private data)
-			$Debuglog->add( 'Never cache pages for/from logged in members!', 'cache' );
+		{
+			// We do NOT want caching when a user is logged in (private data)
 			return false;
 		}
 
 		if( $Messages->count('all') )
-		{	// There are some messages do be displayed. That means the user has done some action.
+		{
+			// There are some messages do be displayed. That means the user has done some action.
 			// We do want to display those messages.
 			// There may also be more... like a "comment pending review" etc...
 			// DO NOT CACHE and do not present a cached page.
-			$Debuglog->add( 'Not caching because we have messages!', 'cache' );
 			return false;
 		}
 
-		// TODO: fp> If the user has submitted a comment, we might actually want to invalidate the cache...
-
-
 		if( $this->retrieve() )
-		{ // We could retrieve:
+		{
+			// We could retrieve
 			return true;
 		}
 
-
 		$this->is_collecting = true;
-
-		$Debuglog->add( 'Collecting started', 'cache' );
-
 		ob_start( array( & $this, 'output_handler'), $this->output_chunk_size );
-
 		return false;
 	}
 
 
 	/**
-	 * Retrieve and output cache for current URL.
+	 * Retrieve and output cache for current URL
 	 *
 	 * @return boolean true if we could retrieve
 	 */
 	function retrieve()
 	{
-		global $Debuglog;
-		global $ReqHost, $ReqURI;
+		global $ReqHost;
+		global $ReqURI;
 		global $servertimenow;
 
 		// What would be the cache file for the current URL?
@@ -275,48 +255,46 @@
 		*/
 
 		$lines = @file( $af_cache_file, false );
-		// fp> note we are using empty() so that we detect both the case where there is no file and the case wher ethe file
-		// might have ended up empty because PHP crashed while writing to it or sth like that...
-		if( ! empty($lines) )
-		{	// We have data in the cache!
-			$Debuglog->add( 'Retrieving from cache!', 'cache' );
-
-			// Check that the format of the file if OK.
-			$sep = trim($lines[2]);
-			unset($lines[2]);
+		// fp> note we are using empty() so that we detect both the case where there
+		// is no file and the case wher ethe file might have ended up empty because
+		// PHP crashed while writing to it or sth like that...
+		if( ! empty( $lines ) )
+		{
+			// We have data in the cache!
+			// Check that the format of the file if OK
+			$sep = trim( $lines[2] );
+			unset( $lines[2] );
 			if( $sep != '' )
 			{
-				$Debuglog->add( 'Cached file format not recognized, aborting retrieve.', 'cache' );
 				return false;
 			}
 
-			// Retrieved cached URL:
-			$retrieved_url = trim($lines[0]);
-			unset($lines[0]);
+			// Retrieved cached URL
+			$retrieved_url = trim( $lines[0] );
+			unset( $lines[0] );
 			if( $retrieved_url != $ReqHost.$ReqURI )
 			{
-				$Debuglog->add( 'Cached file URL ['.$retrieved_url.'] does not match current URL, aborting retrieve.', 'cache' );
 				return false;
 			}
 
-			// timestamp of cache generation:
-			$retrieved_ts = trim($lines[1]);
-			unset($lines[1]);
+			// timestamp of cache generation
+			$retrieved_ts = trim( $lines[1] );
+			unset( $lines[1] );
 			$cache_age = $servertimenow-$retrieved_ts;
-			$Debuglog->add( 'Cache age: '.floor($cache_age/60).' min '.($cache_age % 60).' sec', 'cache' );
 			if( $cache_age > $this->max_age_seconds )
-			{	// Cache has expired
+			{
+				// Cache has expired
 				return false;
 			}
 
 			// Go through headers
 			$i = 2;
-			while( $headerline = trim($lines[++$i]) )
+			while( $headerline = trim( $lines[++$i] ) )
 			{
 				header( $headerline );
-				unset($lines[$i]);
+				unset( $lines[$i] );
 			}
-			unset($lines[$i]);
+			unset( $lines[$i] );
 
 			// SEND CONTENT!
 			echo implode('',$lines);
@@ -326,7 +304,7 @@
 	}
 
 
-  /**
+	/**
 	 * This is called every x bytes to provide real time output
 	 */
 	function output_handler( $buffer )
@@ -337,21 +315,17 @@
 
 
 	/**
-	 * We are going to output personal data and we want to abort collecting the data for the cache.
+	 * We are going to output personal data and we want to abort collecting the data for the cache
 	 */
 	function abort_collect()
 	{
-		global $Debuglog;
-
 		if( ! $this->is_collecting )
-		{	// We are not collecting anyway
+		{
+			// We are not collecting anyway
 			return;
 		}
 
- 		$Debuglog->add( 'Aborting cache data collection...', 'cache' );
-
 		ob_end_flush();
-
 		// We are no longer collecting...
 		$this->is_collecting = false;
 	}
@@ -362,41 +336,42 @@
 	 */
 	function end_collect()
 	{
-		global $Debuglog;
-
 		if( ! $this->is_collecting )
-		{	// We are not collecting
+		{
+			// We are not collecting
 			return;
 		}
 
 		ob_end_flush();
-
 		// What would be the cache file for the current URL?
 		$af_cache_file = $this->get_af_filecache_path();
 
 		// fp> 'x' mode should either give an exclusive write lock or fail
-		// fp> TODO: this here should be ok, but it would be even better with locking the file when we start collecting cache
+		// @todo (0000) fp> this here should be ok, but it would be even better with
+		// locking the file when we start collecting cache
 		if( ! $fh = @fopen( $af_cache_file.'.tmp', 'x', false ) )
 		{
-			$Debuglog->add( 'Could not open cache file!', 'cache' );
+			// debuglog-add removed
 		}
 		else
 		{
-			// Put the URL of the page we are caching into the cache. You can never be to paranoid!
-			// People can change their domain names, folder structures, etc... AND you cannot trust the hash to give a
-			// different file name in 100.00% of the cases! Serving a page for a different URL would be REEEEEALLLY BAAAAAAD!
-			global $ReqHost, $ReqURI;
+			global $content_type_header;
+			global $ReqHost;
+			global $ReqURI;
+			global $servertimenow;
+
+			// Put the URL of the page we are caching into the cache. You can never be
+			// to paranoid! People can change their domain names, folder structures, etc...
+			// AND you cannot trust the hash to give a different file name in 100.00% of
+			// the cases! Serving a page for a different URL would be REEEEEALLLY BAAAAAAD!
 			$file_head = $ReqHost.$ReqURI."\n";
 
 			// Put the time of the page generation into the file (btw this is the time of when we started this script)
-			global $servertimenow;
 			$file_head .= $servertimenow."\n";
-
- 			$file_head .= "\n";
+			$file_head .= "\n";
 
 			// We need to write the content type!
-			global $content_type_header;
-			if( !empty($content_type_header) )
+			if( ! empty( $content_type_header ) )
 			{
 				$file_head .= $content_type_header."\n";
 			}
@@ -408,29 +383,23 @@
 
 			// Now atomically replace old cache with new cache (at least on Linux)
 			if( ! @rename( $af_cache_file.'.tmp', $af_cache_file ) )
-			{	// Rename failed, we are probably on windows PHP <= 5.2.5... http://bugs.php.net/bug.php?id=44805
+			{
+				// Rename failed, we are probably on windows PHP <= 5.2.5... http://bugs.php.net/bug.php?id=44805
 				// we have to split this:
-				$Debuglog->add( 'Renaming of cache file failed. (Windows?)', 'cache' );
-				// Kill cache:
+				// Kill cache
 				unlink( $af_cache_file );
-				// Now, some other process might start to try caching (and will likely give up since the .tmp file already exists)
+				// Now, some other process might start to try caching (and will likely give
+				// up since the .tmp file already exists)
 				if( ! @rename( $af_cache_file.'.tmp', $af_cache_file ) )
-				{ // Hide errors bc another PHP process could have beaten us to writing a new file there
-					// Anyways, we still could not rename, let's drop the .tmp file:
+				{
+					// Hide errors bc another PHP process could have beaten us to writing a new file there
+					// Anyways, we still could not rename, let's drop the .tmp file
 					unlink( $af_cache_file.'.tmp' );
 				}
-				else
-				{
-					$Debuglog->add( 'Cache updated... after unlink+rename!', 'cache' );
-				}
-			}
-			else
-			{
-				$Debuglog->add( 'Cache updated!', 'cache' );
 			}
 		}
 	}
 
 }
 
-?>
\ No newline at end of file
+?>

=== modified file 'qp_inc/_core/model/_timer.class.php'
--- qp_inc/_core/model/_timer.class.php	2010-12-31 12:12:03 +0000
+++ qp_inc/_core/model/_timer.class.php	2013-03-20 18:13:29 +0000
@@ -1,62 +1,43 @@
 <?php
 /**
- * This file implements the Timer class.
- *
- * This file is part of Quam Plures - {@link http://quamplures.net/}
- * See also {@link https://launchpad.net/quam-plures}.
- *
- * @copyright (c) 2009 - 2011 by the Quam Plures developers - {@link http://quamplures.net/}
- * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
- * Parts of this file are copyright (c)2004-2006 by Daniel HAHLER - {@link http://thequod.de/contact}.
- *
- * {@internal License choice
- * - If you have received this file as part of a package, please find the license.txt file in
- *   the same folder or the closest folder above for complete license terms.
- * - If you have received this file individually (e-g: from http://evocms.cvs.sourceforge.net/)
- *   then you must choose one of the following licenses before using the file:
- *   - GNU General Public License 2 (GPL) - http://www.opensource.org/licenses/gpl-license.php
- *   - Mozilla Public License 1.1 (MPL) - http://www.opensource.org/licenses/mozilla1.1.php
- * }}
- *
- * {@internal Open Source relicensing agreement:
- * Daniel HAHLER grants Francois PLANQUE the right to license
- * Daniel HAHLER's contributions to this file and the b2evolution project
- * under any OSI approved OSS license (http://www.opensource.org/licenses/).
- * }}
- *
- * {@internal Below is a list of authors who have contributed to design/coding of this file: }}
- * @author fplanque: Francois PLANQUE.
- * @author blueyed: Daniel HAHLER.
- *
- * @package pond
- */
-if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
-
-/**
+ * This file implements the Timer base class
+ *
  * This is a simple class to allow timing/profiling of code portions.
  *
- * @package pond
+ * @todo (1111) vars type 'foo' need useful/valid descriptions
+ * @author {@link http://wonderwinds.com/ Ed Bennett}
+ * @author {@link http://fplanque.net/ Francois PLANQUE}
+ * @author {@link http://daniel.hahler.de/ Daniel HAHLER}
+ * @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');
+
+/**
+ * Timer base class
+ *
+ * @package core
  */
 class Timer
 {
 	/**
-	 * Remember times.
+	 * Remember times
 	 *
 	 * We store for each category (primary key) the state, start/resume time and the total passed time.
 	 *
-	 * @access protected
+	 * @var foo
 	 */
 	var $_times = array();
 
-
 	/**
-	 * Constructor.
+	 * Constructor
 	 *
 	 * @param string|NULL If a category is given the timer starts right away.
 	 */
 	function Timer( $category = NULL )
 	{
-		if( is_string($category) )
+		if( is_string( $category ) )
 		{
 			$this->start( $category );
 		}
@@ -64,7 +45,7 @@
 
 
 	/**
-	 * Reset a timer category.
+	 * Reset a timer category
 	 */
 	function reset( $category )
 	{
@@ -73,49 +54,44 @@
 
 
 	/**
-	 * Start a timer.
+	 * Start a timer
 	 */
 	function start( $category, $log = true )
 	{
-		global $Debuglog;
-		if( $log && is_object( $Debuglog ) ) $Debuglog->add( 'Starting timer '.$category, 'timer' );
 		$this->reset( $category );
 		$this->resume( $category );
 	}
 
 
 	/**
-	 * Stops a timer category. It may me resumed later on, see {@link resume()}. This is an alias for {@link pause()}.
+	 * Stops a timer category
+	 *
+	 * The timer may me resumed later on, see {@link resume()}. This is an alias for {@link pause()}.
 	 *
 	 * @return boolean false, if the timer had not been started.
 	 */
 	function stop( $category )
 	{
-		global $Debuglog;
-
 		if( ! $this->pause( $category ) )
 			return false;
 
-		if( is_object( $Debuglog ) )
-		{
-			$Debuglog->add( 'Stopped timer '.$category.' at '.$this->get_duration( $category, 3 ), 'timer' );
-		}
-
 		return true;
 	}
 
 
 	/**
-	 * Pauses a timer category. It may me resumed later on, see {@link resume()}.
+	 * Pause a timer category
 	 *
-	 * NOTE: The timer needs to be started, either through the {@link Timer() Constructor} or the {@link start()} method.
+	 * It may me resumed later on, see {@link resume()}. NOTE: The timer needs to be started,
+	 * either through the {@link Timer() Constructor} or the {@link start()} method.
 	 *
 	 * @return boolean false, if the timer had not been started.
 	 */
 	function pause( $category )
 	{
-		if( !isset($this->_times[$category]['resumed']) )
-		{ // Timer has not been started!
+		if( ! isset( $this->_times[$category]['resumed'] ) )
+		{
+			// Timer has not been started!
 			return false;
 		}
 		$since_resume = $this->get_current_microtime() - $this->_times[$category]['resumed'];
@@ -127,26 +103,25 @@
 
 
 	/**
-	 * Resumes the timer on a category.
+	 * Resume the timer on a category
 	 */
 	function resume( $category )
 	{
-		if( !isset($this->_times[$category]['total']) )
+		if( ! isset( $this->_times[$category]['total'] ) )
 		{
-			$this->start($category);
+			$this->start( $category );
 		}
 		else
 		{
 			$this->_times[$category]['resumed'] = $this->get_current_microtime();
 			$this->_times[$category]['count']++;
-
 			$this->_times[$category]['state'] = 'running';
 		}
 	}
 
 
 	/**
-	 * Get the duration for a given category.
+	 * Get the duration for a given category
 	 *
 	 * @param string Category name
 	 * @param integer Number of decimals after dot.
@@ -154,12 +129,13 @@
 	 */
 	function get_duration( $category, $decimals = 3 )
 	{
-		return number_format( $this->get_microtime($category), $decimals ); // TODO: decimals/seperator by locale!
+		// @todo (0000) decimals/seperator by locale!
+		return number_format( $this->get_microtime( $category ), $decimals );
 	}
 
 
 	/**
-	 * Get number of timer resumes (includes start).
+	 * Get number of timer resumes (includes start)
 	 *
 	 * @return integer
 	 */
@@ -175,41 +151,40 @@
 
 
 	/**
-	 * Get the time in microseconds that was spent in the given category.
+	 * Get the time in microseconds that was spent in the given category
 	 *
 	 * @return float
 	 */
 	function get_microtime( $category )
 	{
-		switch( $this->get_state($category) )
+		switch( $this->get_state( $category ) )
 		{
 			case 'running':
-				// The timer is running, we need to return the additional time since the last resume.
-				return $this->_times[$category]['total']
-					+ $this->get_current_microtime() - $this->_times[$category]['resumed'];
+			// The timer is running, we need to return the additional time since the last resume
+			return $this->_times[$category]['total'] + $this->get_current_microtime() - $this->_times[$category]['resumed'];
 
 			case 'paused':
-				return $this->_times[$category]['total'];
+			return $this->_times[$category]['total'];
 
 			default:
-				return (float)0;
+			return (float)0;
 		}
 	}
 
 
 	/**
-	 * Get the state a category timer is in.
+	 * Get the state a category timer is in
 	 *
 	 * @return string 'unknown', 'not initialised', 'running', 'paused'
 	 */
 	function get_state( $category )
 	{
-		if( !isset($this->_times[$category]) )
+		if( ! isset( $this->_times[$category] ) )
 		{
 			return 'unknown';
 		}
 
-		if( !isset($this->_times[$category]['state']) )
+		if( ! isset( $this->_times[$category]['state'] ) )
 		{
 			return 'not initialised';
 		}
@@ -219,7 +194,7 @@
 
 
 	/**
-	 * Get a list of used categories.
+	 * Get a list of used categories
 	 *
 	 * @return array
 	 */
@@ -236,9 +211,10 @@
 	 */
 	function get_current_microtime()
 	{
-		list($usec, $sec) = explode(' ', microtime());
-		return ((float)$usec + (float)$sec);
+		list( $usec, $sec ) = explode( ' ', microtime() );
+		return ( (float)$usec + (float)$sec );
 	}
+
 }
 
-?>
\ No newline at end of file
+?>

=== modified file 'qp_inc/_core/model/dataobjects/_dataobject.class.php'
--- qp_inc/_core/model/dataobjects/_dataobject.class.php	2010-12-31 12:12:03 +0000
+++ qp_inc/_core/model/dataobjects/_dataobject.class.php	2013-03-20 18:13:29 +0000
@@ -1,89 +1,86 @@
 <?php
 /**
- * This file implements the abstract DataObject base class.
- *
- * This file is part of Quam Plures - {@link http://quamplures.net/}
- * See also {@link https://launchpad.net/quam-plures}.
- *
- * @copyright (c) 2009 - 2011 by the Quam Plures developers - {@link http://quamplures.net/}
- * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
- * Parts of this file are copyright (c)2004-2006 by Daniel HAHLER - {@link http://thequod.de/contact}.
- * Parts of this file are copyright (c)2005-2006 by PROGIDISTRI - {@link http://progidistri.com/}.
- *
- * {@internal License choice
- * - If you have received this file as part of a package, please find the license.txt file in
- *   the same folder or the closest folder above for complete license terms.
- * - If you have received this file individually (e-g: from http://evocms.cvs.sourceforge.net/)
- *   then you must choose one of the following licenses before using the file:
- *   - GNU General Public License 2 (GPL) - http://www.opensource.org/licenses/gpl-license.php
- *   - Mozilla Public License 1.1 (MPL) - http://www.opensource.org/licenses/mozilla1.1.php
- * }}
- *
- * {@internal Open Source relicensing agreement:
- * Daniel HAHLER grants Francois PLANQUE the right to license
- * Daniel HAHLER's contributions to this file and the b2evolution project
- * under any OSI approved OSS license (http://www.opensource.org/licenses/).
- *
- * PROGIDISTRI S.A.S. grants Francois PLANQUE the right to license
- * PROGIDISTRI S.A.S.'s contributions to this file and the b2evolution project
- * under any OSI approved OSS license (http://www.opensource.org/licenses/).
- * }}
- *
- * {@internal Below is a list of authors who have contributed to design/coding of this file: }}
- * @author fplanque: Francois PLANQUE
- * @author blueyed: Daniel HAHLER
- * @author mbruneau: Marc BRUNEAU / PROGIDISTRI
- *
- * @package pond
- */
-if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
-
-/**
- * Data Object Base Class
+ * This file implements the abstract DataObject base class
  *
  * This is typically an abstract class, useful only when derived.
  *
- * @version beta
- * @abstract
+ * @todo (1111) vars type 'foo' need useful/valid descriptions
+ * @author {@link http://wonderwinds.com/ Ed Bennett}
+ * @author {@link http://progidistri.com/ PROGIDISTRI}
+ * @author {@link http://daniel.hahler.de/ Daniel HAHLER}
+ * @author {@link http://fplanque.net/ Francois PLANQUE}
+ * @copyright (c) 2009 by {@link http://quamplures.net/ the Quam Plures project}
+ * @license http://www.gnu.org/licenses/gpl.txt GNU General Public License v3
+ * @package core
+ */
+if(!defined('QP_MAIN_INIT')) die('fail');
+
+/**
+ * DataObject base class
  *
- * @package pond
+ * @package core
  */
 class DataObject
 {
 	/**
 	 * Unique ID of object in database
 	 *
-	 * Please use get/set functions to read or write this param
+	 * This will be the ID in the DB. Please use get/set functions to read or write this param
 	 *
-	 * @var int
-	 * @access protected
+	 * @var integer
 	 */
-	var $ID = 0;  // This will be the ID in the DB
-
-	/**#@+
-	 * @access private
+	var $ID = 0;
+	/**
+	 * FIX THIS
+	 * @var foo
 	 */
 	var $dbtablename;
+	/**
+	 * FIX THIS
+	 * @var foo
+	 */
 	var $dbprefix;
+	/**
+	 * FIX THIS
+	 * @var foo
+	 */
 	var $dbIDname;
+	/**
+	 * FIX THIS
+	 * @var foo
+	 */
 	var $datecreated_field;
+	/**
+	 * FIX THIS
+	 * @var foo
+	 */
 	var $datemodified_field;
+	/**
+	 * FIX THIS
+	 * @var foo
+	 */
 	var $creator_field;
+	/**
+	 * FIX THIS
+	 * @var foo
+	 */
 	var $lasteditor_field;
+	/**
+	 * FIX THIS
+	 * @var foo
+	 */
 	var $dbchanges = array();
-	/**#@-*/
-
 	/**
 	 * Relations that may restrict deletion.
+	 * @var foo
 	 */
 	var $delete_restrictions = array();
-
 	/**
 	 * Relations that will cascade deletion.
+	 * @var foo
 	 */
 	var $delete_cascades = array();
 
-
 	/**
 	 * Constructor
 	 *
@@ -97,28 +94,29 @@
 	 */
 	function DataObject( $tablename, $prefix = '', $dbIDname = 'ID', $datecreated_field = '', $datemodified_field = '', $creator_field = '', $lasteditor_field = '' )
 	{
-		$this->dbtablename        = $tablename;
-		$this->dbprefix           = $prefix;
-		$this->dbIDname           = $dbIDname;
-		$this->datecreated_field  = $datecreated_field;
+		$this->dbtablename = $tablename;
+		$this->dbprefix = $prefix;
+		$this->dbIDname = $dbIDname;
+		$this->datecreated_field = $datecreated_field;
 		$this->datemodified_field = $datemodified_field;
-		$this->creator_field      = $creator_field;
-		$this->lasteditor_field   = $lasteditor_field;
+		$this->creator_field = $creator_field;
+		$this->lasteditor_field = $lasteditor_field;
 	}
 
 
 	/**
 	 * Records a change that will need to be updated in the db
 	 *
-	 * @access protected
 	 * @param string Name of parameter
 	 * @param string DB field type ('string', 'number', 'date' )
-	 * @param mixed Pointer to value of parameter - dh> pointer? So it should be a reference? Would make sense IMHO anyway.. fp> I just wonder why it's not already a reference... :@
+	 * @param mixed Pointer to value of parameter - dh> pointer? So it should be a
+	 * reference? Would make sense IMHO anyway.. fp> I just wonder why it's not already
+	 * a reference... :@
 	 */
-	function dbchange( $dbfieldname, $dbfieldtype, $valuepointer ) // TODO: dh> value by reference? see above..
+	function dbchange( $dbfieldname, $dbfieldtype, $valuepointer ) // @todo (0000) dh> value by reference? see above..
 	{
 		$this->dbchanges[$dbfieldname]['type'] = $dbfieldtype;
-		$this->dbchanges[$dbfieldname]['value'] = $valuepointer ;
+		$this->dbchanges[$dbfieldname]['value'] = $valuepointer;
 	}
 
 
@@ -130,24 +128,30 @@
 	 */
 	function dbupdate( $auto_track_modification = true )
 	{
-		global $DB, $localtimenow, $current_User;
+		global $current_User;
+		global $DB;
+		global $localtimenow;
 
 		if( $this->ID == 0 ) { debug_die( 'New object cannot be updated!' ); }
 
 		if( count( $this->dbchanges ) == 0 )
 		{
-			return NULL;	// No changes!
+			return NULL; // No changes!
 		}
 
 		if( $auto_track_modification )
-		{ // We wnat to track modification date and author automatically:
-			if( !empty($this->datemodified_field) )
-			{	// We want to track modification date:
-				$this->set_param( $this->datemodified_field, 'date', date('Y-m-d H:i:s',$localtimenow) );
+		{
+			// We want to track modification date and author automatically
+			if( ! empty( $this->datemodified_field ) )
+			{
+				// We want to track modification date
+				$this->set_param( $this->datemodified_field, 'date', date( 'Y-m-d H:i:s', $localtimenow ) );
 			}
-			if( !empty($this->lasteditor_field) && is_object($current_User) )
-			{	// We want to track last editor:
-				// TODO: the current_User is not necessarily the last editor. Item::dbupdate() gets called after incrementing the view for example!
+			if( ! empty( $this->lasteditor_field ) && is_object( $current_User ) )
+			{
+				// We want to track last editor
+				// @todo (0000) the current_User is not necessarily the last editor.
+				// Item::dbupdate() gets called after incrementing the view for example!
 				// fplanque: this should be handled by set() deciding wether the setting changes the last editor or not
 				$this->set_param( $this->lasteditor_field, 'number', $current_User->ID );
 			}
@@ -156,10 +160,11 @@
 		$sql_changes = array();
 		foreach( $this->dbchanges as $loop_dbfieldname => $loop_dbchange )
 		{
-			// Get changed value (we use eval() to allow constructs like $loop_dbchange['value'] = 'Group->get(\'ID\')'):
+			// Get changed value
+			// (we use eval() to allow constructs like $loop_dbchange['value'] = 'Group->get(\'ID\')'):
 			eval( '$loop_value = $this->'.$loop_dbchange['value'].';' );
-			// Prepare matching statement:
-			if( is_null($loop_value) )
+			// Prepare matching statement
+			if( is_null( $loop_value ) )
 			{
 				$sql_changes[] = $loop_dbfieldname.' = NULL ';
 			}
@@ -169,25 +174,24 @@
 				{
 					case 'date':
 					case 'string':
-						$sql_changes[] = $loop_dbfieldname." = '".$DB->escape( $loop_value )."' ";
-						break;
+					$sql_changes[] = $loop_dbfieldname." = '".$DB->escape( $loop_value )."' ";
+					break;
 
 					default:
-						$sql_changes[] = $loop_dbfieldname." = ".$DB->null($loop_value).' ';
+					$sql_changes[] = $loop_dbfieldname." = ".$DB->null( $loop_value ).' ';
 				}
 			}
 		}
 
-		// Prepare full statement:
-		$sql = "UPDATE $this->dbtablename SET ". implode( ', ', $sql_changes ). "
-						 WHERE $this->dbIDname = $this->ID";
+		// Prepare full statement
+		$sql = "UPDATE $this->dbtablename SET ". implode( ', ', $sql_changes ). " WHERE $this->dbIDname = $this->ID";
 
 		if( ! $DB->query( $sql, 'DataObject::dbupdate()' ) )
 		{
 			return false;
 		}
 
-		// Reset changes in object:
+		// Reset changes in object
 		$this->dbchanges = array();
 
 		return true;
@@ -195,35 +199,43 @@
 
 
 	/**
-	 * Insert object into DB based on previously recorded changes.
+	 * Insert object into DB based on previously recorded changes
 	 *
 	 * @return boolean true on success
 	 */
 	function dbinsert()
 	{
-		global $DB, $localtimenow, $current_User;
+		global $current_User;
+		global $DB;
+		global $localtimenow;
 
 		if( $this->ID != 0 ) debug_die( 'Existing object cannot be inserted!' );
 
-		if( !empty($this->datecreated_field) )
-		{	// We want to track creation date:
-			$this->set_param( $this->datecreated_field, 'date', date('Y-m-d H:i:s',$localtimenow) );
-		}
-		if( !empty($this->datemodified_field) )
-		{	// We want to track modification date:
-			$this->set_param( $this->datemodified_field, 'date', date('Y-m-d H:i:s',$localtimenow) );
-		}
-		if( !empty($this->creator_field) )
-		{	// We want to track creator:
-			if( empty($this->creator_user_ID) )
-			{	// No creator assigned yet, use current user:
+		if( ! empty( $this->datecreated_field ) )
+		{
+			// We want to track creation date
+			$this->set_param( $this->datecreated_field, 'date', date( 'Y-m-d H:i:s', $localtimenow ) );
+		}
+		if( ! empty( $this->datemodified_field ) )
+		{
+			// We want to track modification date
+			$this->set_param( $this->datemodified_field, 'date', date( 'Y-m-d H:i:s', $localtimenow ) );
+		}
+		if( ! empty( $this->creator_field ) )
+		{
+			// We want to track creator
+			if( empty( $this->creator_user_ID ) )
+			{
+				// No creator assigned yet, use current user
 				$this->set_param( $this->creator_field, 'number', $current_User->ID );
 			}
 		}
-		if( !empty($this->lasteditor_field) )
-		{	// We want to track last editor:
-			if( empty($this->lastedit_user_ID) )
-			{	// No editor assigned yet, use current user:
+		if( ! empty( $this->lasteditor_field ) )
+		{
+			// We want to track last editor
+			if( empty( $this->lastedit_user_ID ) )
+			{
+				// No editor assigned yet, use current user
 				$this->set_param( $this->lasteditor_field, 'number', $current_User->ID );
 			}
 		}
@@ -232,11 +244,12 @@
 		$sql_values = array();
 		foreach( $this->dbchanges as $loop_dbfieldname => $loop_dbchange )
 		{
-			// Get changed value (we use eval() to allow constructs like $loop_dbchange['value'] = 'Group->get(\'ID\')'):
+			// Get changed value
+			// (we use eval() to allow constructs like $loop_dbchange['value'] = 'Group->get(\'ID\')'):
 			eval( '$loop_value = $this->'. $loop_dbchange['value'].';' );
-			// Prepare matching statement:
+			// Prepare matching statement
 			$sql_fields[] = $loop_dbfieldname;
-			if( is_null($loop_value) )
+			if( is_null( $loop_value ) )
 			{
 				$sql_values[] = 'NULL';
 			}
@@ -246,16 +259,16 @@
 				{
 					case 'date':
 					case 'string':
-						$sql_values[] = $DB->quote( $loop_value );
-						break;
+					$sql_values[] = $DB->quote( $loop_value );
+					break;
 
 					default:
-						$sql_values[] = $DB->null( $loop_value );
+					$sql_values[] = $DB->null( $loop_value );
 				}
 			}
 		}
 
-		// Prepare full statement:
+		// Prepare full statement
 		$sql = "INSERT INTO {$this->dbtablename} (". implode( ', ', $sql_fields ). ") VALUES (". implode( ', ', $sql_values ). ")";
 
 		if( ! $DB->query( $sql, 'DataObject::dbinsert()' ) )
@@ -266,7 +279,7 @@
 		// store ID for newly created db record
 		$this->ID = $DB->insert_id;
 
-		// Reset changes in object:
+		// Reset changes in object
 		$this->dbchanges = array();
 
 		return true;
@@ -274,7 +287,7 @@
 
 
 	/**
-	 * Inserts or Updates depending on object state.
+	 * Inserts or Updates depending on object state
 	 *
 	 * @uses dbinsert()
 	 * @uses dbupdate()
@@ -283,55 +296,57 @@
 	function dbsave()
 	{
 		if( $this->ID == 0 )
-		{	// Object not serialized yet, let's insert!
+		{
+			// Object not serialized yet, let's insert!
 			return $this->dbinsert();
 		}
 		else
-		{	// Object already serialized, let's update!
+		{
+			// Object already serialized, let's update!
 			return $this->dbupdate();
 		}
 	}
 
 
 	/**
-	 * Delete object from DB.
+	 * Delete object from DB
 	 *
 	 * @return boolean true on success
 	 */
 	function dbdelete()
 	{
-		global $DB, $Messages, $app_db_config;
+		global $app_db_config;
+		global $DB;
+		global $Messages;
 
 		if( $this->ID == 0 ) { debug_die( 'Non persistant object cannot be deleted!' ); }
 
-		if( count($this->delete_cascades) )
-		{	// The are cascading deletes to be performed
-
-			// Start transaction:
+		if( count( $this->delete_cascades ) )
+		{
+			// The are cascading deletes to be performed; start transaction
 			$DB->begin();
 
 			foreach( $this->delete_cascades as $restriction )
 			{
-				if( !isset( $app_db_config['aliases'][$restriction['table']] ) )
-				{	// We have no declaration for this table, we consider we don't deal with this table in this app:
+				if( ! isset( $app_db_config['aliases'][$restriction['table']] ) )
+				{
+					// We have no declaration for this table, we consider we don't deal with this table in this app
 					continue;
 				}
 
-				$DB->query( '
-					DELETE FROM '.$restriction['table'].'
-					WHERE '.$restriction['fk'].' = '.$this->ID,
-					'Cascaded delete' );
+				$DB->query( 'DELETE FROM '.$restriction['table'].' WHERE '.$restriction['fk'].' = '.$this->ID, 'Cascaded delete' );
 			}
 		}
 
-		// Delete this (main/parent) object:
+		// Delete this (main/parent) object
 		$DB->query( "
 			DELETE FROM $this->dbtablename
 			WHERE $this->dbIDname = $this->ID",
 			'Main delete' );
 
-		if( count($this->delete_cascades) )
-		{	// There were cascading deletes
+		if( count( $this->delete_cascades ) )
+		{
+			// There were cascading deletes
 
 			// End transaction:
 			$DB->commit();
@@ -347,36 +362,42 @@
 	/**
 	 * Check relations for restrictions or cascades
 	 *
+	 * The $verbose_callbacks array is as follows:
+	 * <ul> <li>Array keys (string): Foreign key this callback should apply to.</li>
+	 * <li>Array values: Arrays with the following keys:
+	 * <ul><li>'cb' (callback): Callback to call. Should take one array argument, which
+	 * will contain the following keys:</li>
+	 * <li>'fk': The foreign key.</li>
+	 * <li>'table': The SQL table for this relation.</li>
+	 * <li>'msg': A format string -- a base message to be displayed.It normally shows
+	 * the number of results.</li>
+	 * <li>'id': The ID of this object.</li>
+	 * </li></ul></ul>
+	 *
 	 * @param string Which relation should be checked ('delete_restrictions' or 'delete_cascades')?
 	 * @param string An array of foreign key checks to skip.
-	 * @param array  An array of callbacks used to display more information about a relation.
-	 *               - Array keys (string): Foreign key this callback should apply to.
-	 *               - Array values: Arrays with the following keys:
-	 *                 - 'cb' (callback): Callback to call. Should take one array argument, which
-	 *                                    will contain the following keys:
-	 *                                      - 'fk': The foreign key.
-	 *                                      - 'table': The SQL table for this relation.
-	 *                                      - 'msg': A format string -- a base message to be displayed.
-	 *                                               It normally shows the number of results.
-	 *                                      - 'id':  The ID of this object.
+	 * @param array An array of callbacks used to display more information about a relation.
 	 */
 	function check_relations( $what, $ignore = array(), $verbose_callbacks = array() )
 	{
-		global $DB, $Messages;
+		global $DB;
+		global $Messages;
 
 		foreach( $this->$what as $restriction )
 		{
 			if( in_array( $restriction['fk'], $ignore ) )
-			{	// Skip this relation check.
+			{
+				// Skip this relation check
 				continue;
 			}
 
 			if( ! isset( $verbose_callbacks[$restriction['fk']] ) )
-			{	// We do not want to display detailed info, just the result count:
+			{
+				// We do not want to display detailed info, just the result count
 				$count = $DB->get_var(
 					'SELECT COUNT(*)
-					   FROM '.$restriction['table'].'
-					  WHERE '.$restriction['fk'].' = '.$this->ID,
+					FROM '.$restriction['table'].'
+					WHERE '.$restriction['fk'].' = '.$this->ID,
 					0, 0, 'restriction/cascade check' );
 				if( $count )
 				{
@@ -384,7 +405,8 @@
 				}
 			}
 			else
-			{	// We want verbose information.
+			{
+				// We want verbose information.
 				// We just will call the callback, providing some
 				// information about this object:
 				call_user_func( $verbose_callbacks[$restriction['fk']]['cb'],
@@ -411,16 +433,17 @@
 		$this->check_relations( 'delete_restrictions', $ignore );
 
 		if( $Messages->count('restrict') )
-		{	// There are restrictions:
+		{
+			// There are restrictions:
 			$Messages->head = array(
 					'container' => $restrict_title,
 					'restrict' => T_('The following relations prevent deletion:')
 				);
-			$Messages->foot =	T_('Please delete related objects before you proceed.');
-			return false;	// Can't delete
+			$Messages->foot = T_('Please delete related objects before you proceed.');
+			return false; // Can't delete
 		}
 
-		return true;	// can delete
+		return true; // can delete
 	}
 
 
@@ -444,7 +467,8 @@
 		$this->check_relations( 'delete_cascades' );
 
 		if( $Messages->count('restrict') )
-		{	// The will be cascading deletes, issue WARNING:
+		{
+			// The will be cascading deletes, issue WARNING
 			echo '<h3>'.T_('WARNING: Deleting this object will also delete:').'</h3>';
 			$Messages->display( '', '', true, 'restrict', NULL, NULL, NULL );
 		}
@@ -465,7 +489,7 @@
 
 		$Form->begin_form( 'inline' );
 			$Form->hiddens_by_key( $hiddens );
-			if( !empty( $cancel_action ) )
+			if( ! empty( $cancel_action ) )
 			{
 				$Form->hidden( 'action', $cancel_action );
 			}
@@ -500,7 +524,7 @@
 	function dget( $parname, $format = 'htmlbody' )
 	{
 		// Note: we call get again because of derived objects specific handlers !
-		return format_to_output( $this->get($parname), $format );
+		return format_to_output( $this->get( $parname ), $format );
 	}
 
 
@@ -513,7 +537,7 @@
 	function disp( $parname, $format = 'htmlbody' )
 	{
 		// Note: we call get again because of derived objects specific handlers !
-		echo format_to_output( $this->get($parname), $format );
+		echo format_to_output( $this->get( $parname ), $format );
 	}
 
 
@@ -534,90 +558,74 @@
 
 
 	/**
-	 * Set param value.
+	 * Set param value
 	 *
 	 * @param string Name of parameter
-	 * @param string DB field type ('string', 'number', 'date' )
+	 * @param string DB field type ('string', 'number', 'date')
 	 * @param mixed Value of parameter
 	 * @param boolean true to set to NULL if empty string value
 	 * @return boolean true, if value has been set/changed, false if not.
 	 */
 	function set_param( $parname, $fieldtype, $parvalue, $make_null = false )
 	{
-		global $Debuglog;
-
 		$dbfield = $this->dbprefix.$parname;
 
-		// Set value:
-		// fplanque: Note: I am changing the "make NULL" test to differentiate between 0 and NULL .
-		// There might be side effects. In this case it would be better to fix them before coming here.
-		// i-e: transform 0 to ''
-		$new_value = ($make_null && ($parvalue === '')) ? NULL : $parvalue;
+		// Set value. fplanque: Note: I am changing the "make NULL" test to differentiate
+		// between 0 and NULL. There might be side effects. In this case it would be
+		// better to fix them before coming here. i-e: transform 0 to ''
+		$new_value = ( $make_null && ( $parvalue === '' ) ) ? NULL : $parvalue;
 
-		/* Tblue> Problem: All class member variables originating from the
-		 *                 DB are strings (unless they were NULL in the DB,
-		 *                 then they are set to NULL by the PHP MySQL
-		 *                 extension).
-		 *                 If we pass an integer or a double to this function,
-		 *                 the corresponding member variable gets changed
-		 *                 on every call, because its type is 'string' and
-		 *                 we compare using the === operator. Using the
-		 *                 == operator would be a bad idea, though, because
-		 *                 somebody could pass a NULL value to this function.
-		 *                 If the member variable then is set to 0, then
-		 *                 0 equals NULL and the member variable does not
-		 *                 get updated at all!
-		 *                 Thus, using the === operator is correct.
-		 *       Solution: If $fieldtype is 'number' and the type of the
-		 *                 passed value is either integer or double, we
-		 *                 convert it to a string (no data loss). The
-		 *                 member variable and the passed value can then
-		 *                 be correctly compared using the === operator.
-		 *  fp> It would be nicer to convert numeric values to ints & floats at load time in class constructor  x=(int)$y->value  or sth.
-		 * THIS IS EXPERIMENTAL! Feel free to revert if something does not
-		 * work as expected.
-		 */
+		// Tblue> Problem: All class member variables originating from the DB are strings
+		// (unless they were NULL in the DB, then they are set to NULL by the PHP MySQL
+		// extension). If we pass an integer or a double to this function, the corresponding
+		// member variable gets changed on every call, because its type is 'string' and
+		// we compare using the === operator. Using the == operator would be a bad idea,
+		// though, because somebody could pass a NULL value to this function. If the member
+		// variable then is set to 0, then 0 equals NULL and the member variable does not
+		// get updated at all! Thus, using the === operator is correct.
+		// Solution: If $fieldtype is 'number' and the type of the passed value is either
+		// integer or double, we convert it to a string (no data loss). The member variable and
+		// the passed value can then be correctly compared using the === operator.
+		// fp> It would be nicer to convert numeric values to ints & floats at load time in
+		// class constructor x=(int)$y->value or sth.
+		// THIS IS EXPERIMENTAL! Feel free to revert if something does not
+		// work as expected.
 		if( $fieldtype == 'number' && ( is_int( $new_value ) || is_float( $new_value ) ) )
 		{
 			settype( $new_value, 'string' );
 		}
 
-/* >old
-		if( !isset($this->$parname) )
-		{	// This property has never been set before, set it to NULL now in order for tests to work:
+		/*
+		old way
+		if( ! isset( $this->$parname ) )
+		{
+			// This property has never been set before, set it to NULL now in order for tests to work:
 			$this->$parname = NULL;
 		}
 
-
-		/* blueyed>
-		TODO: there's a bug here: you cannot use set_param('foo', 'number', 0), if the $parname member
-		      has not been set before or is null!!
-		      What about just:
-		      ( isset($this->$parname) && $this->$parname === $new_value )
-		      This would also eliminate the isset() check from above.
-		      IIRC you've once said here that '===' would be too expensive and I would misuse the DataObjects,
-		      but IMHO what we have now is not much faster and buggy anyway..
-			fp> okay let's give it a try...
-		if( (!is_null($new_value) && $this->$parname == $new_value)
-			|| (is_null($this->$parname) && is_null($new_value)) )
-<old */
-		if( (isset($this->$parname) && $this->$parname === $new_value)
-			|| ( ! isset($this->$parname) && ! isset($new_value) ) )
-		{	// Value has not changed (we need 2 tests, for NULL and for NOT NULL value pairs)
-			$Debuglog->add( $this->dbtablename.' object, already set to same value: '.$parname.'/'.$dbfield.' = '.var_export( @$this->$parname, true ), 'dataobjects' );
-
+		@todo (0000) blueyed> there's a bug here: you cannot use set_param('foo',
+		'number', 0), if the $parname member has not been set before or is null!! What
+		about just:( isset( $this->$parname ) && $this->$parname === $new_value )
+		This would also eliminate the isset() check from above. IIRC you've once said
+		here that '===' would be too expensive and I would misuse the DataObjects, but
+		IMHO what we have now is not much faster and buggy anyway. fp> okay let's give
+		it a try...
+		if( ( ! is_null( $new_value ) && $this->$parname == $new_value )
+		 || ( is_null( $this->$parname ) && is_null( $new_value ) ) )
+		*/
+
+		if( ( isset( $this->$parname ) && $this->$parname === $new_value )
+			|| ( ! isset( $this->$parname ) && ! isset( $new_value ) ) )
+		{
+			// Value has not changed (we need 2 tests, for NULL and for NOT NULL value pairs)
 			return false;
 		}
 		else
 		{
-			// Set the value in the object:
-			$Debuglog->add( $this->dbtablename.' object, setting param '
-						   .$parname.'/'.$dbfield.' to '.var_export( $new_value, true )
-						   .' (old: '.( isset( $this->$parname ) ? var_export( $this->$parname, true ) : 'NULL' )
-						   .')', 'dataobjects' );
+			// Set the value in the object
 			$this->$parname = $new_value;
 
-			// Remember change for later db update:
+			// Remember change for later db update
 			$this->dbchange( $dbfield, $fieldtype, $parname );
 
 			return true;
@@ -626,7 +634,7 @@
 
 
 	/**
-	 * Set a parameter from a Request form value.
+	 * Set a parameter from a Request form value
 	 *
 	 * @param string Dataobject parameter name
 	 * @param string Request parameter name (NULL means to use Dataobject param name with its prefix)
@@ -635,17 +643,17 @@
 	 */
 	function set_from_Request( $parname, $var = NULL, $make_null = false )
 	{
-		if( empty($var) )
+		if( empty( $var ) )
 		{
 			$var = $this->dbprefix.$parname;
 		}
 
-		return $this->set( $parname, get_param($var), $make_null );
+		return $this->set( $parname, get_param( $var ), $make_null );
 	}
 
 
 	/**
-	 * Template function: Displays object ID.
+	 * Template function: Displays object ID
 	 */
 	function ID()
 	{
@@ -662,47 +670,56 @@
 		$UserCache = & get_Cache( 'UserCache' );
 
 		// HANDLE CREATOR STUFF
-		if( !empty($this->creator_field) && !empty($this->{$this->creator_field}) )
-		{	// We have a creator:
+		if( ! empty( $this->creator_field ) && ! empty( $this->{$this->creator_field} ) )
+		{
+			// We have a creator
 			$creator_User = & $UserCache->get_by_ID( $this->{$this->creator_field} );
 
-			if( !empty($this->datecreated_field) && !empty($this->{$this->datecreated_field}) )
-			{	// We also have a create date:
+			if( ! empty( $this->datecreated_field ) && ! empty( $this->{$this->datecreated_field} ) )
+			{
+				// We also have a create date
 				$history[0] = sprintf( T_('Created on %s by %s'), mysql2localedate( $this->{$this->datecreated_field} ),
-					$creator_User->dget('preferredname') );
+					$creator_User->dget( 'preferredname' ) );
 			}
 			else
-			{	// We only have a cretaor:
-				$history[0] = sprintf( T_('Created by %s'), $creator_User->dget('preferredname') );
+			{
+				// We only have a creator
+				$history[0] = sprintf( T_('Created by %s'), $creator_User->dget( 'preferredname' ) );
 			}
 		}
-		elseif( !empty($this->datecreated_field) && !empty($this->{$this->datecreated_field}) )
-		{	// We only have a create date:
+		elseif( ! empty( $this->datecreated_field ) && ! empty( $this->{$this->datecreated_field} ) )
+		{
+			// We only have a create date
 			$history[0] = sprintf( T_('Created on %s'), mysql2localedate( $this->{$this->datecreated_field} ) );
 		}
 
 		// HANDLE LAST UPDATE STUFF
-		if( !empty($this->lasteditor_field) && !empty($this->{$this->lasteditor_field}) )
-		{	// We have a creator:
+		if( ! empty( $this->lasteditor_field ) && ! empty( $this->{$this->lasteditor_field} ) )
+		{
+			// We have a creator
 			$creator_User = & $UserCache->get_by_ID( $this->{$this->lasteditor_field} );
 
-			if( !empty($this->datemodified_field) && !empty($this->{$this->datemodified_field}) )
-			{	// We also have a create date:
+			if( ! empty( $this->datemodified_field ) && ! empty( $this->{$this->datemodified_field} ) )
+			{
+				// We also have a create date
 				$history[1] = sprintf( T_('Last mod on %s by %s'), mysql2localedate( $this->{$this->datemodified_field} ),
-					$creator_User->dget('preferredname') );
+					$creator_User->dget( 'preferredname' ) );
 			}
 			else
-			{	// We only have a cretaor:
-				$history[1] = sprintf( T_('Last mod by %s'), $creator_User->dget('preferredname') );
+			{
+				// We only have a creator
+				$history[1] = sprintf( T_('Last mod by %s'), $creator_User->dget( 'preferredname' ) );
 			}
 		}
-		elseif( !empty($this->datemodified_field) && !empty($this->{$this->datemodified_field}) )
-		{	// We only have a create date:
+		elseif( ! empty( $this->datemodified_field ) && ! empty( $this->{$this->datemodified_field} ) )
+		{
+			// We only have a create date
 			$history[1] = sprintf( T_('Last mod on %s'), mysql2localedate( $this->{$this->datemodified_field} ) );
 		}
 
-		return get_icon( 'history', $what = 'imgtag', array( 'title'=>implode( ' - ', $history ) ), true );
+		return get_icon( 'history', $what = 'imgtag', array( 'title' => implode( ' - ', $history ) ), true );
 	}
+
 }
 
 ?>

=== modified file 'qp_inc/_core/model/dataobjects/_dataobjectcache.class.php'
--- qp_inc/_core/model/dataobjects/_dataobjectcache.class.php	2010-12-31 12:12:03 +0000
+++ qp_inc/_core/model/dataobjects/_dataobjectcache.class.php	2013-03-20 18:13:29 +0000
@@ -1,104 +1,95 @@
 <?php
 /**
- * This file implements the DataObjectCache class.
- *
- * This file is part of Quam Plures - {@link http://quamplures.net/}
- * See also {@link https://launchpad.net/quam-plures}.
- *
- * @copyright (c) 2009 - 2011 by the Quam Plures developers - {@link http://quamplures.net/}
- * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
- * Parts of this file are copyright (c)2004-2006 by Daniel HAHLER - {@link http://thequod.de/contact}.
- * Parts of this file are copyright (c)2005-2006 by PROGIDISTRI - {@link http://progidistri.com/}.
- *
- * {@internal License choice
- * - If you have received this file as part of a package, please find the license.txt file in
- *   the same folder or the closest folder above for complete license terms.
- * - If you have received this file individually (e-g: from http://evocms.cvs.sourceforge.net/)
- *   then you must choose one of the following licenses before using the file:
- *   - GNU General Public License 2 (GPL) - http://www.opensource.org/licenses/gpl-license.php
- *   - Mozilla Public License 1.1 (MPL) - http://www.opensource.org/licenses/mozilla1.1.php
- * }}
- *
- * {@internal Open Source relicensing agreement:
- * Daniel HAHLER grants Francois PLANQUE the right to license
- * Daniel HAHLER's contributions to this file and the b2evolution project
- * under any OSI approved OSS license (http://www.opensource.org/licenses/).
- *
- * PROGIDISTRI S.A.S. grants Francois PLANQUE the right to license
- * PROGIDISTRI S.A.S.'s contributions to this file and the b2evolution project
- * under any OSI approved OSS license (http://www.opensource.org/licenses/).
- * }}
- *
- * {@internal Below is a list of authors who have contributed to design/coding of this file: }}
- * @author blueyed: Daniel HAHLER.
- * @author fplanque: Francois PLANQUE
- *
- * @package pond
+ * This file implements the DataObjectCache base class
+ *
+ * @todo (1111) vars type 'foo' need useful/valid descriptions
+ * @author {@link http://wonderwinds.com/ Ed Bennett}
+ * @author {@link http://progidistri.com/ PROGIDISTRI}
+ * @author {@link http://daniel.hahler.de/ Daniel HAHLER}
+ * @author {@link http://fplanque.net/ Francois PLANQUE}
+ * @copyright (c) 2009 by {@link http://quamplures.net/ the Quam Plures project}
+ * @license http://www.gnu.org/licenses/gpl.txt GNU General Public License v3
+ * @package core
  */
-if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
+if(!defined('QP_MAIN_INIT')) die('fail');
 
 /**
- * Data Object Cache Class
- *
- * @todo dh> Provide iteration "interface"!
- *
- * @version beta
- *
- * @package pond
+ * DataObjectCache base class
+ *
+ * @package core
  */
 class DataObjectCache
 {
+	/**
+	 * FIX THIS
+	 * @var foo
+	 */
 	var $dbtablename;
+	/**
+	 * FIX THIS
+	 * @var foo
+	 */
 	var $dbprefix;
+	/**
+	 * FIX THIS
+	 * @var foo
+	 */
 	var $dbIDname;
-
 	/**
 	 * Class name of objects in this cache:
+	 * @var foo
 	 */
 	var $objtype;
-
 	/**
 	 * Object array by ID
+	 * @var foo
 	 */
 	var $cache = array();
-
 	/**
 	 * Copy of previous object array
 	 * @see DataObjectCache::clear()
 	 */
 	var $shadow_cache = NULL;
-
 	/**
 	 * NON indexed object array
 	 * @var array of DataObjects
 	 */
 	var $DataObject_array = array();
-
-  /**
+	/**
 	 * Index of current iteration
 	 * @see DataObjectCache::get_next()
 	 */
 	var $current_idx = NULL;
-
+	/**
+	 * FIX THIS
+	 * @var foo
+	 */
 	var $load_all = false;
+	/**
+	 * FIX THIS
+	 * @var foo
+	 */
 	var $all_loaded = false;
-
-
+	/**
+	 * FIX THIS
+	 * @var foo
+	 */
 	var $name_field;
+	/**
+	 * FIX THIS
+	 * @var foo
+	 */
 	var $order_by;
-
 	/**
-	 * The text that gets used for the "None" option in the objects options list.
+	 * The text that gets used for the "None" option in the objects options list
 	 *
 	 * This is especially useful for i18n, because there are several "None"s!
 	 *
 	 * @var string
 	 */
 	var $none_option_text;
-
 	/**
-	 * The value that gets used for the "None" option in the objects options list.
-	 *
+	 * The value that gets used for the "None" option in the objects options list
 	 * @var mixed
 	 */
 	var $none_option_value;
@@ -115,9 +106,18 @@
 	 * @param string Name of the name field (including prefix)
 	 * @param string field names or NULL to use name field
 	 * @param string The text that gets used for the "None" option in the objects options list (Default: T_('None')).
-	 * @param mixed  The value that gets used for the "None" option in the objects options list.
+	 * @param mixed The value that gets used for the "None" option in the objects options list.
 	 */
-	function DataObjectCache( $objtype, $load_all, $tablename, $prefix = '', $dbIDname, $name_field = NULL, $order_by = '', $allow_none_text = NULL, $allow_none_value = '' )
+	function DataObjectCache(
+		$objtype,
+		$load_all,
+		$tablename,
+		$prefix = '',
+		$dbIDname,
+		$name_field = NULL,
+		$order_by = '',
+		$allow_none_text = NULL,
+		$allow_none_value = '' )
 	{
 		$this->objtype = $objtype;
 		$this->load_all = $load_all;
@@ -143,7 +143,7 @@
 			$this->order_by = $order_by;
 		}
 
-		if( isset($allow_none_text) )
+		if( isset( $allow_none_text ) )
 		{
 			$this->none_option_text = $allow_none_text;
 		}
@@ -160,7 +160,6 @@
 	function & new_obj( $row = NULL )
 	{
 		$objtype = $this->objtype;
-
 		// Instantiate a custom object
 		$obj = new $objtype( $row ); // COPY !!
 
@@ -173,24 +172,16 @@
 	 */
 	function load_all()
 	{
-		/**
-		 * @var DB
-		 */
 		global $DB;
-		global $Debuglog;
 
 		if( $this->all_loaded )
-		{ // Already loaded
+		{
+			// Already loaded
 			return false;
 		}
 
 		$this->clear( true );
-
-		$Debuglog->add( get_class($this).' - Loading <strong>'.$this->objtype.'(ALL)</strong> into cache', 'dataobjects' );
-		$sql = 'SELECT *
-							FROM '.$this->dbtablename.'
-						 ORDER BY '.$this->order_by;
-
+		$sql = 'SELECT * FROM '.$this->dbtablename.' ORDER BY '.$this->order_by;
 		foreach( $DB->get_results( $sql, OBJECT, 'Loading '.$this->objtype.'(ALL) into cache' ) as $row )
 		{
 			// Instantiate a custom object
@@ -211,19 +202,14 @@
 	 */
 	function load_list( $req_list, $invert = false )
 	{
-		global $DB, $Debuglog;
-
-		$Debuglog->add( 'Loading <strong>'.$this->objtype.'('.( $invert ? 'ALL except ' : '' ).$req_list.')</strong> into cache', 'dataobjects' );
+		global $DB;
 
 		if( empty( $req_list ) )
 		{
 			return false;
 		}
 
-		$sql = "SELECT *
-		          FROM $this->dbtablename
-		         WHERE $this->dbIDname ".( $invert ? 'NOT ' : '' )."IN ($req_list)";
-
+		$sql = "SELECT * FROM $this->dbtablename WHERE $this->dbIDname ".( $invert ? 'NOT ' : '' )."IN ( $req_list )";
 		foreach( $DB->get_results( $sql ) as $row )
 		{
 			// Instantiate a custom object
@@ -233,19 +219,17 @@
 
 
 	/**
-	 * Get an array of all (loaded) IDs.
+	 * Get an array of all (loaded) IDs
 	 *
 	 * @return array
 	 */
 	function get_ID_array()
 	{
 		$IDs = array();
-
 		foreach( $this->cache as $obj )
 		{
 			$IDs[] = $obj->ID;
 		}
-
 		return $IDs;
 	}
 
@@ -255,26 +239,21 @@
 	 */
 	function add( & $Obj )
 	{
-		global $Debuglog;
-
-		if( is_null($Obj->ID) )	// value 0 is used by item preview
+		if( is_null( $Obj->ID ) ) // value 0 is used by item preview
 		{
-			$Debuglog->add( 'No object to add!', 'dataobjects' );
 			return false;
 		}
 
 		// fplanque: I don't want an extra (and expensive) comparison here. $this->cache[$Obj->ID] === $Obj.
 		// If you need this you're probably misusing the cache.
-		if( isset($this->cache[$Obj->ID]) )
+		if( isset( $this->cache[$Obj->ID] ) )
 		{
-			$Debuglog->add( $this->objtype.': Object with ID '.$Obj->ID.' is already cached', 'dataobjects' );
 			return false;
 		}
 
-		// If the object is valid and not already cached:
-		// Add object to cache:
+		// If the object is valid and not already cached, Add object to cache
 		$this->cache[$Obj->ID] = & $Obj;
-		// Add a reference in the object list:
+		// Add a reference in the object list
 		$this->DataObject_array[] = & $Obj;
 
 		return true;
@@ -282,36 +261,40 @@
 
 
 	/**
-	 * Instantiate a DataObject from a table row and then cache it.
+	 * Instantiate a DataObject from a table row and then cache it
 	 *
 	 * @param Object Database row
 	 * @return Object
 	 */
 	function & instantiate( & $db_row )
 	{
-		if( is_null($db_row) )
-		{	// we can't access NULL as an object
+		if( is_null( $db_row ) )
+		{
+			// we can't access NULL as an object
 			return $db_row;
 		}
 
 		// Get ID of the object we'ere preparing to instantiate...
 		$obj_ID = $db_row->{$this->dbIDname};
 
-		if( is_null($obj_ID) )	// value 0 is used for item preview
+		if( is_null( $obj_ID ) ) // value 0 is used for item preview
 		{
 			$Obj = NULL;
 			return $Obj;
 		}
 
 		if( isset( $this->cache[$obj_ID] ) )
-		{ // Already in cache, do nothing!
+		{
+			// Already in cache, do nothing!
 		}
 		elseif( isset( $this->shadow_cache[$obj_ID] ) )
-		{	// Already in shadow, recycle object:
+		{
+			// Already in shadow, recycle object
 			$this->add( $this->shadow_cache[$obj_ID] );
 		}
 		else
-		{ // Not already cached, add new object:
+		{
+			// Not already cached, add new object
 			$this->add( $this->new_obj( $db_row ) );
 		}
 
@@ -321,12 +304,12 @@
 
 	/**
 	 * Clear the cache **extensively**
-	 *
 	 */
 	function clear( $keep_shadow = false )
 	{
 		if( $keep_shadow )
-		{	// Keep copy of cache in case we try to re instantiate previous object:
+		{
+			// Keep copy of cache in case we try to re instantiate previous object
 			$this->shadow_cache = $this->cache;
 		}
 		else
@@ -341,33 +324,30 @@
 	}
 
 
-  /**
-	 * This provides a simple interface for looping over the contents of the Cache.
+	/**
+	 * This provides a simple interface for looping over the contents of the Cache
 	 *
-	 * This should only be used for basic enumeration.
-	 * If you need complex filtering of the cache contents, you should probablt use a DataObjectList instead.
+	 * This should only be used for basic enumeration. If you need complex filtering
+	 * of the cache contents, you should probablt use a DataObjectList instead.
 	 *
 	 * @see DataObject::get_next()
-	 *
 	 * @return DataObject
 	 */
 	function & get_first()
 	{
 		$this->load_all();
-
 		$this->current_idx = -1;
 		return $this->get_next();
 	}
 
 
-  /**
-	 * This provides a simple interface for looping over the contents of the Cache.
+	/**
+	 * This provides a simple interface for looping over the contents of the Cache
 	 *
-	 * This should only be used for basic enumeration.
-	 * If you need complex filtering of the cache contents, you should probablt use a DataObjectList instead.
+	 * This should only be used for basic enumeration. If you need complex filtering
+	 * of the cache contents, you should probably use a DataObjectList instead.
 	 *
 	 * @see DataObject::get_first()
-	 *
 	 * @return DataObject
 	 */
 	function & get_next()
@@ -397,11 +377,11 @@
 	 */
 	function & get_by_ID( $req_ID, $halt_on_error = true, $halt_on_empty = true )
 	{
-		global $DB, $Debuglog;
+		global $DB;
 
-		if( empty($req_ID) )
+		if( empty( $req_ID ) )
 		{
-			if($halt_on_empty)
+			if( $halt_on_empty )
 			{
 				debug_die( "Requested $this->objtype from $this->dbtablename without ID!" );
 			}
@@ -409,41 +389,37 @@
 			return $r;
 		}
 
-		if( !empty( $this->cache[ $req_ID ] ) )
-		{ // Already in cache
-			// $Debuglog->add( "Accessing $this->objtype($req_ID) from cache", 'dataobjects' );
-			return $this->cache[ $req_ID ];
+		if( ! empty( $this->cache[$req_ID] ) )
+		{
+			// Already in cache
+			return $this->cache[$req_ID];
 		}
-		elseif( !$this->all_loaded )
-		{ // Not in cache, but not everything is loaded yet
+		elseif( ! $this->all_loaded )
+		{
+			// Not in cache, but not everything is loaded yet
 			if( $this->load_all )
-			{ // It's ok to just load everything:
+			{
+				// It's ok to just load everything
 				$this->load_all();
 			}
 			else
-			{ // Load just the requested object:
-				$Debuglog->add( "Loading <strong>$this->objtype($req_ID)</strong> into cache", 'dataobjects' );
+			{
+				// Load just the requested object
 				// Note: $req_ID MUST be an unsigned integer. This is how DataObject works.
-				$sql = "SELECT *
-				          FROM $this->dbtablename
-				         WHERE $this->dbIDname = $req_ID";
+				$sql = "SELECT * FROM $this->dbtablename WHERE $this->dbIDname = $req_ID";
 				if( $row = $DB->get_row( $sql, OBJECT, 0, 'DataObjectCache::get_by_ID()' ) )
 				{
 					if( ! $this->instantiate( $row ) )
 					{
-						$Debuglog->add( 'Could not add() object to cache!', 'dataobjects' );
+						// debuglog-add removed
 					}
 				}
-				else
-				{
-					$Debuglog->add( 'Could not get DataObject by ID. Query: '.$sql, 'dataobjects' );
-				}
 			}
 		}
 
-		if( empty( $this->cache[ $req_ID ] ) )
-		{ // Requested object does not exist
-			// $Debuglog->add( 'failure', 'dataobjects' );
+		if( empty( $this->cache[$req_ID] ) )
+		{
+			// Requested object does not exist
 			if( $halt_on_error )
 			{
 				debug_die( "Requested $this->objtype does not exist!" );
@@ -452,7 +428,7 @@
 			return $r;
 		}
 
-		return $this->cache[ $req_ID ];
+		return $this->cache[$req_ID];
 	}
 
 
@@ -468,45 +444,30 @@
 	 */
 	function & get_by_name( $req_name, $halt_on_error = true, $halt_on_empty = true )
 	{
-		global $DB, $Debuglog;
+		global $DB;
 
 		if( empty( $this->name_field ) )
 		{
 			debug_die( 'DataObjectCache::get_by_name() : No name field to query on' );
 		}
 
-		if( empty($req_name) )
+		if( empty( $req_name ) )
 		{
-			if($halt_on_empty) { debug_die( "Requested $this->objtype from $this->dbtablename without name!" ); }
+			if( $halt_on_empty ) { debug_die( "Requested $this->objtype from $this->dbtablename without name!" ); }
 			$r = NULL;
 			return $r;
 		}
 
-		// Load just the requested object:
-		$Debuglog->add( "Loading <strong>$this->objtype($req_name)</strong>", 'dataobjects' );
-		$sql = "SELECT *
-						  FROM $this->dbtablename
-						 WHERE $this->name_field = ".$DB->quote($req_name);
+		// Load just the requested object
+		$sql = "SELECT * FROM $this->dbtablename WHERE $this->name_field = ".$DB->quote( $req_name );
 
 		if( $db_row = $DB->get_row( $sql, OBJECT, 0, 'DataObjectCache::get_by_name()' ) )
 		{
 			$resolved_ID = $db_row->{$this->dbIDname};
-			$Debuglog->add( 'success; ID = '.$resolved_ID, 'dataobjects' );
-			if( ! isset( $this->cache[$resolved_ID] ) )
-			{	// Object is not already in cache:
-				$Debuglog->add( 'Adding to cache...', 'dataobjects' );
-				//$Obj = new $this->objtype( $row ); // COPY !!
-				//if( ! $this->add( $this->new_obj( $db_row ) ) )
-				if( ! $this->add( $this->new_obj( $db_row ) ) )
-				{	// could not add
-					$Debuglog->add( 'Could not add() object to cache!', 'dataobjects' );
-				}
-			}
 			return $this->cache[$resolved_ID];
 		}
 		else
 		{
-			$Debuglog->add( 'Could not get DataObject by name.', 'dataobjects' );
 			if( $halt_on_error )
 			{
 				debug_die( "Requested $this->objtype does not exist!" );
@@ -529,7 +490,7 @@
 
 
 	/**
-	 * Delete an object from DB by ID.
+	 * Delete an object from DB by ID
 	 *
 	 * @param integer ID of object to delete
 	 * @return boolean
@@ -540,10 +501,8 @@
 		{
 			// Delete from db
 			$this->cache[$req_ID]->dbdelete();
-
 			// Remove from cache
 			$this->remove_by_ID( $req_ID );
-
 			return true;
 		}
 		else
@@ -572,13 +531,16 @@
 		}
 
 		if( ! $this->all_loaded && $this->load_all )
-		{ // We have not loaded all items so far, but we're allowed to.
-			if ( empty( $ignore_IDs ) )
-			{	// just load all items
+		{
+			// We have not loaded all items so far, but we're allowed to
+			if( empty( $ignore_IDs ) )
+			{
+				// just load all items
 				$this->load_all();
 			}
 			else
-			{	// only load those items not listed in $ignore_IDs
+			{
+				// only load those items not listed in $ignore_IDs
 				$this->load_list( implode( ',', $ignore_IDs ), true );
 			}
 		}
@@ -588,22 +550,23 @@
 		if( $allow_none )
 		{
 			$r .= '<option value="'.$this->none_option_value.'"';
-			if( empty($default) ) $r .= ' selected="selected"';
-			$r .= '>'.format_to_output($this->none_option_text).'</option>'."\n";
+			if( empty( $default ) ) $r .= ' selected="selected"';
+			$r .= '>'.format_to_output( $this->none_option_text ).'</option>'."\n";
 		}
 
 		foreach( $this->cache as $loop_Obj )
 		{
-			if ( in_array( $loop_Obj->ID, $ignore_IDs ) )
-			{	// Ignore this ID
+			if( in_array( $loop_Obj->ID, $ignore_IDs ) )
+			{
+				// Ignore this ID
 				continue;
 			}
 
-			$r .=  '<option value="'.$loop_Obj->ID.'"';
+			$r .= '<option value="'.$loop_Obj->ID.'"';
 			if( in_array( $loop_Obj->ID, $default ) ) $r .= ' selected="selected"';
 			$r .= '>';
 			$r .= format_to_output( $loop_Obj->$method(), 'htmlbody' );
-			$r .=  '</option>'."\n";
+			$r .= '</option>'."\n";
 		}
 
 		return $r;
@@ -622,13 +585,16 @@
 	function get_option_array( $method = 'get_name', $ignore_IDs = array() )
 	{
 		if( ! $this->all_loaded && $this->load_all )
-		{ // We have not loaded all items so far, but we're allowed to.
-			if ( empty( $ignore_IDs ) )
-			{	// just load all items
+		{
+			// We have not loaded all items so far, but we're allowed to
+			if( empty( $ignore_IDs ) )
+			{
+				// just load all items
 				$this->load_all();
 			}
 			else
-			{	// only load those items not listed in $ignore_IDs
+			{
+				// only load those items not listed in $ignore_IDs
 				$this->load_list( implode( ',', $ignore_IDs ), true );
 			}
 		}
@@ -638,7 +604,8 @@
 		foreach( $this->cache as $loop_Obj )
 		{
 			if( in_array( $loop_Obj->ID, $ignore_IDs ) )
-			{	// Ignore this ID
+			{
+				// Ignore this ID
 				continue;
 			}
 
@@ -650,5 +617,4 @@
 
 }
 
-
-?>
\ No newline at end of file
+?>

=== modified file 'qp_inc/_core/model/dataobjects/_dataobjectlist.class.php'
--- qp_inc/_core/model/dataobjects/_dataobjectlist.class.php	2010-12-31 12:12:03 +0000
+++ qp_inc/_core/model/dataobjects/_dataobjectlist.class.php	2013-03-20 18:13:29 +0000
@@ -1,66 +1,52 @@
 <?php
 /**
- * This file implements the abstract DataObjectList base class.
- *
- * 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
- * }}
- *
- * {@internal Open Source relicensing agreement:
- * }}
- *
- * {@internal Below is a list of authors who have contributed to design/coding of this file: }}
- * @author fplanque: Francois PLANQUE
- *
- * @package pond
+ * This file implements the DataObjectList class
+ *
+ * This is typically an abstract class, useful only when derived. Holds DataObjects
+ * in an array and allows walking through...
+ *
+ * @todo (1111) vars type 'foo' need useful/valid descriptions
+ * @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
  */
-if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
-
-load_class('_core/ui/results/_results.class.php');
+if(!defined('QP_MAIN_INIT')) die('fail');
 
 /**
- * Data Object List Base Class
- *
- * This is typically an abstract class, useful only when derived.
- * Holds DataObjects in an array and allows walking through...
- *
- * @version beta
- * @abstract
- *
- * @package pond
+ * DataObjectList class
+ *
+ * @package core
  */
 class DataObjectList extends Results
 {
-
 	/**
 	 * The following should probably be obsoleted by Results::Cache
-	 */
-	var	$dbtablename;
+	 * @var foo
+	 */
+	var $dbtablename;
+	/**
+	 * FIX THIS
+	 * @var foo
+	 */
 	var $dbprefix;
+	/**
+	 * FIX THIS
+	 * @var foo
+	 */
 	var $dbIDname;
-
 	/**
 	 * Class name of objects handled in this list
+	 * @var foo
 	 */
 	var $objType;
-
 	/**
 	 * Object array
+	 * @var foo
 	 */
 	var $Obj = array();
 
-
 	/**
 	 * Constructor
 	 *
@@ -75,8 +61,14 @@
 	 * @param string prefix to differentiate page/order params when multiple Results appear one same page
 	 * @param string default ordering of columns (special syntax)
 	 */
-	function DataObjectList( $tablename, $prefix = '', $dbIDname = 'ID', $objType = 'Item', $sql = NULL,
-														$limit = 20, $param_prefix = '', $default_order = NULL )
+	function DataObjectList(
+		$tablename, $prefix = '',
+		$dbIDname = 'ID',
+		$objType = 'Item',
+		$sql = NULL,
+		$limit = 20,
+		$param_prefix = '',
+		$default_order = NULL )
 	{
 		$this->dbtablename = $tablename;
 		$this->dbprefix = $prefix;
@@ -84,12 +76,14 @@
 		$this->objType = $objType;
 
 		if( !is_null( $sql ) )
-		{	// We have an SQL query to execute:
+		{
+			// We have an SQL query to execute
 			parent::Results( $sql, $param_prefix, $default_order, $limit );
 		}
 		else
-		{	// TODO: do we want to autogenerate a query here???
+		{
 			// Temporary...
+			// @todo (0000) do we want to autogenerate a query here???
 			parent::Results( $sql, $param_prefix, $default_order, $limit );
 		}
 	}
@@ -103,7 +97,8 @@
 	function & get_next()
 	{
 		if( $this->current_idx >= $this->result_num_rows )
-		{	// No more comment in list
+		{
+			// No more comment in list
 			$r = false;
 			return $r;
 		}
@@ -112,4 +107,4 @@
 
 }
 
-?>
\ No newline at end of file
+?>

=== modified file 'qp_inc/_core/model/dataobjects/_dataobjectlist2.class.php'
--- qp_inc/_core/model/dataobjects/_dataobjectlist2.class.php	2010-12-31 12:12:03 +0000
+++ qp_inc/_core/model/dataobjects/_dataobjectlist2.class.php	2013-03-20 18:13:29 +0000
@@ -1,53 +1,34 @@
 <?php
 /**
- * This file implements the abstract DataObjectList2 base class.
- *
- * 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
- * }}
- *
- * {@internal Open Source relicensing agreement:
- * }}
- *
- * {@internal Below is a list of authors who have contributed to design/coding of this file: }}
- * @author fplanque: Francois PLANQUE
- *
- * @package pond
+ * This file implements the abstract FilteredResults class
+ *
+ * @todo (1111) vars type 'foo' need useful/valid descriptions
+ * @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
  */
-if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
-
-load_class('_core/ui/results/_results.class.php');
-
+if(!defined('QP_MAIN_INIT')) die('fail');
 
 /**
- * FilteredResults > Results
+ * FilteredResults class
  *
- * @package pond
+ * @package core
  */
 class FilteredResults extends Results
 {
 	/**
 	 * Default filter set (used if no specific params are passed)
+	 * @var foo
 	 */
 	var $default_filters = array();
-
 	/**
 	 * Current filter set (depending on user input)
+	 * @var foo
 	 */
 	var $filters = array();
 
-
 	/**
 	 * Check if the Result set is filtered or not
 	 */
@@ -57,7 +38,6 @@
 		{
 			return false;
 		}
-
 		return ( $this->filters != $this->default_filters );
 	}
 
@@ -67,7 +47,7 @@
 	 */
 	function get_active_filter( $key )
 	{
-		if( isset($this->filters[$key]) )
+		if( isset( $this->filters[$key] ) )
 		{
 			return $this->filters[$key];
 		}
@@ -76,7 +56,7 @@
 	}
 
 
-  /**
+	/**
 	 * Get every active filter that is not the same as the defaults
 	 */
 	function get_active_filters()
@@ -85,10 +65,12 @@
 
 		foreach( $this->default_filters as $key => $value )
 		{
-			if( !isset( $this->filters[$key] ) )
-			{	// Some value has not been copied over from defaults to active or specifically set:
-				if( !is_null($value)) // Note: NULL value are not copied over. that's normal.
-				{	// A NON NULL value is missing
+			if( ! isset( $this->filters[$key] ) )
+			{
+				// Some value has not been copied over from defaults to active or specifically set:
+				if( ! is_null( $value ) ) // Note: NULL value are not copied over. that's normal.
+				{
+					// A NON NULL value is missing
 					$r[] = $key;
 				}
 			}
@@ -101,17 +83,19 @@
 	}
 
 
-  /**
+	/**
 	 * Show every active filter that is not the same as the defaults
 	 */
 	function dump_active_filters()
 	{
 		foreach( $this->default_filters as $key => $value )
 		{
-			if( !isset( $this->filters[$key] ) )
-			{	// SOme value has not been copied over from defaults to active or specifically set:
-				if( !is_null($value)) // Note: NULL value ar enot copied over. that's normal.
-				{	// A NON NULL value is missing
+			if( ! isset( $this->filters[$key] ) )
+			{
+				// Some value has not been copied over from defaults to active or specifically set
+				if( ! is_null( $value ) ) // Note: NULL value are not copied over. that's normal.
+				{
+					// A NON NULL value is missing
 					pre_dump( 'no active value for default '.$key );
 				}
 			}
@@ -125,60 +109,51 @@
 }
 
 
-
 /**
  * Data Object List Base Class 2
  *
- * This is typically an abstract class, useful only when derived.
- * Holds DataObjects in an array and allows walking through...
- *
- * This SECOND implementation will deprecate the first one when finished.
- *
- * @version beta
- * @abstract
- *
- * @package pond
+ * This is typically an abstract class, useful only when derived. Holds DataObjects
+ * in an array and allows walking through... This SECOND implementation will deprecate
+ * the first one when finished.
+ *
+ * @package core
  */
 class DataObjectList2 extends FilteredResults
 {
-
-
 	/**
 	 * Constructor
 	 *
 	 * If provided, executes SQL query via parent Results object
 	 *
 	 * @param DataObjectCache
-	 * @param integer number of lines displayed on one screen (null for default [20])
+	 * @param integer number of lines displayed on one screen (null for default [20] )
 	 * @param string prefix to differentiate page/order params when multiple Results appear one same page
 	 * @param string default ordering of columns (special syntax)
 	 */
 	function DataObjectList2( & $Cache, $limit = null, $param_prefix = '', $default_order = NULL )
 	{
 		// WARNING: we are not passing any SQL query to the Results object
-		// This will make the Results object behave a little bit differently than usual:
+		// This will make the Results object behave a little bit differently than usual
 		parent::Results( NULL, $param_prefix, $default_order, $limit, NULL, false );
-
 		// The list objects will also be cached in this cache.
-		// Tje Cache object may also be useful to get table information for the Items.
+		// The Cache object may also be useful to get table information for the Items
 		$this->Cache = & $Cache;
-
 		// Colum used for IDs
 		$this->ID_col = $Cache->dbIDname;
 	}
 
 
-/**
- * dummy docblock makes error-free autodocs
- */
+	/**
+	 * dummy docblock
+	 */
 	function & get_row_by_idx( $idx )
 	{
-		return $this->rows[ $idx ];
+		return $this->rows[$idx];
 	}
 
 
 	/**
-	 * Instantiate an object for requested row and cache it:
+	 * Instantiate an object for requested row and cache it
 	 */
 	function & get_by_idx( $idx )
 	{
@@ -192,13 +167,14 @@
 	function & get_next()
 	{
 		if( $this->current_idx >= $this->result_num_rows )
-		{	// No more object in list
+		{
+			// No more object in list
 			$this->current_Obj = NULL;
-			$r = false; // TODO: try with NULL
+			$r = false;
 			return $r;
 		}
 
-		// We also keep a local ref in case we want to use it for display:
+		// We also keep a local ref in case we want to use it for display
 		$this->current_Obj = & $this->get_by_idx( $this->current_idx );
 		$this->next_idx();
 
@@ -210,7 +186,6 @@
 	 * Display a global title matching filter params
 	 *
 	 * @todo implement $order
-	 *
 	 * @param string prefix to display if a title is generated
 	 * @param string suffix to display if a title is generated
 	 * @param string glue to use if multiple title elements are generated
@@ -221,12 +196,12 @@
 	{
 		$title_array = $this->get_filter_titles();
 
-  	if( empty( $title_array ) )
-  	{
+		if( empty( $title_array ) )
+		{
 			return '';
 		}
 
-		// We have something to display:
+		// We have something to display
 		$r = implode( $glue, $title_array );
 		$r = $prefix.format_to_output( $r, $format ).$suffix;
 		return $r;
@@ -245,7 +220,7 @@
 
 		$DB->begin();
 
-		if( ($obj = & $this->Cache->get_by_ID( $id )) === false )
+		if( ( $obj = & $this->Cache->get_by_ID( $id ) ) === false )
 		{
 			$Messages->head = T_('Cannot edit entry!');
 			$Messages->add( T_('Requested entry does not exist any longer.'), 'error' );
@@ -256,24 +231,21 @@
 
 		// Get the ID of the inferior element which his order is the nearest
 		$rows = $DB->get_results( 'SELECT '.$this->Cache->dbIDname
-														 	.' FROM '.$this->Cache->dbtablename
-														 .' WHERE '.$this->Cache->dbprefix.'order < '.$order
-													.' ORDER BY '.$this->Cache->dbprefix.'order DESC
-														 		LIMIT 0,1' );
+			.' FROM '.$this->Cache->dbtablename
+			.' WHERE '.$this->Cache->dbprefix.'order < '.$order
+			.' ORDER BY '.$this->Cache->dbprefix.'order DESC
+			LIMIT 0, 1' );
 
 		if( count( $rows ) )
 		{
 			// instantiate the inferior element
 			$obj_inf = & $this->Cache->get_by_ID( $rows[0]->{$this->Cache->dbIDname} );
-
-			//  Update element order
+			// Update element order
 			$obj->set( 'order', $obj_inf->order );
 			$obj->dbupdate();
-
 			// Update inferior element order
 			$obj_inf->set( 'order', $order );
 			$obj_inf->dbupdate();
-
 			// EXPERIMENTAL FOR FADEOUT RESULT
 			$result_fadeout[$this->Cache->dbIDname][] = $id;
 			$result_fadeout[$this->Cache->dbIDname][] = $obj_inf->ID;
@@ -294,11 +266,13 @@
 	 */
 	function move_down( $id )
 	{
-		global $DB, $Messages, $result_fadeout;
+		global $DB;
+		global $Messages;
+		global $result_fadeout;
 
 		$DB->begin();
 
-		if( ($obj = & $this->Cache->get_by_ID( $id )) === false )
+		if( ( $obj = & $this->Cache->get_by_ID( $id ) ) === false )
 		{
 			$Messages->head = T_('Cannot edit entry!');
 			$Messages->add( T_('Requested entry does not exist any longer.'), 'error' );
@@ -309,24 +283,21 @@
 
 		// Get the ID of the inferior element which his order is the nearest
 		$rows = $DB->get_results( 'SELECT '.$this->Cache->dbIDname
-														 	.' FROM '.$this->Cache->dbtablename
-														 .' WHERE '.$this->Cache->dbprefix.'order > '.$order
-													.' ORDER BY '.$this->Cache->dbprefix.'order ASC
-														 		LIMIT 0,1' );
+			.' FROM '.$this->Cache->dbtablename
+			.' WHERE '.$this->Cache->dbprefix.'order > '.$order
+			.' ORDER BY '.$this->Cache->dbprefix.'order ASC
+			LIMIT 0, 1' );
 
 		if( count( $rows ) )
 		{
 			// instantiate the inferior element
 			$obj_sup = & $this->Cache->get_by_ID( $rows[0]->{$this->Cache->dbIDname} );
-
-			//  Update element order
+			// Update element order
 			$obj->set( 'order', $obj_sup->order );
 			$obj->dbupdate();
-
 			// Update inferior element order
 			$obj_sup->set( 'order', $order );
 			$obj_sup->dbupdate();
-
 			// EXPERIMENTAL FOR FADEOUT RESULT
 			$result_fadeout[$this->Cache->dbIDname][] = $id;
 			$result_fadeout[$this->Cache->dbIDname][] = $obj_sup->ID;
@@ -339,4 +310,4 @@
 	}
 }
 
-?>
\ No newline at end of file
+?>

=== modified file 'qp_inc/_core/model/db/_db.class.php'
--- qp_inc/_core/model/db/_db.class.php	2010-12-31 12:12:03 +0000
+++ qp_inc/_core/model/db/_db.class.php	2013-03-20 18:13:29 +0000
@@ -1,80 +1,55 @@
 <?php
 /**
- * This file implements the DB class.
- *
- * Based on ezSQL - Class to make it very easy to deal with MySQL database connections.
- * b2evo Additions:
- * - nested transactions
- * - symbolic table names
- * - query log
- * - get_list
- * - dynamic extension loading
- * - Debug features (EXPLAIN...)
- * and more...
- *
- * 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 by Justin Vincent - {@link http://php.justinvincent.com}
- * Parts of this file are copyright (c)2004-2005 by Daniel HAHLER - {@link http://thequod.de/contact}.
- *
- * {@internal License choice
- * - If you have received this file as part of a package, please find the license.txt file in
- *   the same folder or the closest folder above for complete license terms.
- * - If you have received this file individually (e-g: from http://evocms.cvs.sourceforge.net/)
- *   then you must choose one of the following licenses before using the file:
- *   - GNU General Public License 2 (GPL) - http://www.opensource.org/licenses/gpl-license.php
- *   - Mozilla Public License 1.1 (MPL) - http://www.opensource.org/licenses/mozilla1.1.php
- * }}
- *
- * {@internal Origin:
+ * This file implements the DB base class
+ *
  * This file is based on the following package (excerpt from ezSQL's readme.txt):
  * =======================================================================
- * Author:  Justin Vincent ([e-mail])
- * Web: 	 http://php.justinvincent.com
- * Name: 	 ezSQL
- * Desc: 	 Class to make it very easy to deal with database connections.
+ * Author: Justin Vincent ([e-mail])
+ * Web: http://php.justinvincent.com
+ * Name: ezSQL
+ * Desc: Class to make it very easy to deal with database connections.
  * License: FREE / Donation (LGPL - You may do what you like with ezSQL - no exceptions.)
  * =======================================================================
  * A $10 donation has been made to Justin VINCENT on behalf of the b2evolution team.
  * The package has been relicensed as GPL based on
  * "You may do what you like with ezSQL - no exceptions."
  * 2004-10-14 (email): Justin VINCENT grants Francois PLANQUE the right to relicense
- * this modified class under other licenses. "Just include a link to where you got it from."
- * }}
- *
- * {@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
- * @author Justin VINCENT
- *
- * @todo transaction support
- *
- * @package pond
+ * this modified class under other licenses. "Just include a link to where you got
+ * it from."
+ *
+ * @todo (1111) vars type 'foo' need useful/valid descriptions
+ * @todo (0000) transaction support
+ * @author {@link http://wonderwinds.com/ Ed Bennett}
+ * @author {@link http://daniel.hahler.de/ Daniel HAHLER}
+ * @author {@link http://fplanque.net/ Francois PLANQUE}
+ * @author {@link http://php.justinvincent.com Justin VINCENT}
+ * @copyright (c) 2009 by {@link http://quamplures.net/ the Quam Plures project}
+ * @license http://www.gnu.org/licenses/gpl.txt GNU General Public License v3
+ * @package core
  */
-if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
+if(!defined('QP_MAIN_INIT')) die('fail');
 
 /**
  * ezSQL Constants
  */
 define( 'EZSQL_VERSION', '1.25' );
+/**
+ * ezSQL Constants
+ */
 define( 'OBJECT', 'OBJECT', true );
+/**
+ * ezSQL Constants
+ */
 define( 'ARRAY_A', 'ARRAY_A', true);
+/**
+ * ezSQL Constants
+ */
 define( 'ARRAY_N', 'ARRAY_N', true);
 
-
 /**
- * The Main Class
+ * DB base class
  *
- * @package pond
+ * @package core
  */
 class DB
 {
@@ -94,7 +69,7 @@
 	 */
 	var $error = false;
 	/**
-	 * Number of done queries.
+	 * Number of done queries
 	 * @var integer
 	 */
 	var $num_queries = 0;
@@ -108,168 +83,150 @@
 	 * @var string
 	 */
 	var $last_error = '';
-
 	/**
 	 * Last insert ID
 	 * @var integer
 	 */
 	var $insert_id = 0;
-
 	/**
 	 * Last query's resource
-	 * @access protected
 	 * @var resource
 	 */
 	var $result;
-
 	/**
 	 * Last result's rows
 	 * @var array
 	 */
 	var $last_result;
-
 	/**
 	 * Number of rows in result set (after a select)
+	 * @var foo
 	 */
 	var $num_rows = 0;
-
 	/**
 	 * Number of rows affected by insert, delete, update or replace
+	 * @var foo
 	 */
 	var $rows_affected = 0;
-
 	/**
-	 * Aliases that will be replaced in queries:
+	 * Aliases that will be replaced in queries
+	 * @var foo
 	 */
 	var $dbaliases = array();
 	/**
-	 * Strings that will replace the aliases in queries:
+	 * Strings that will replace the aliases in queries
+	 * @var foo
 	 */
 	var $dbreplaces = array();
-
 	/**
-	 * CREATE TABLE options.
-	 *
-	 * This gets appended to every "CREATE TABLE" query.
-	 *
-	 * Edit those if you have control over you MySQL server and want a more professional
-	 * database than what is commonly offered by popular hosting providers.
-	 *
-	 * @todo dh> If the query itself uses already e.g. "CHARACTER SET latin1" it should not get overridden..
+	 * CREATE TABLE options
+	 *
+	 * This gets appended to every "CREATE TABLE" query. Edit those if you have control over your MySQL
+	 * server and want a more professional database than what is commonly offered by popular hosting providers.
+	 *
 	 * @var string
 	 */
 	var $table_options = '';
-
 	/**
 	 * Use transactions in DB?
 	 *
-	 * You need to use InnoDB in order to enable this.  See the {@link $app_db_config "table_options" key}.
+	 * You need to use InnoDB in order to enable this. See the {@link $app_db_config
+	 * "table_options" key}.
+	 *
+	 * @var foo
 	 */
 	var $use_transactions = false;
-
 	/**
 	 * How many transactions are currently nested?
+	 * @var foo
 	 */
 	var $transaction_nesting_level = 0;
-
 	/**
 	 * Rememeber if we have to rollback at the end of a nested transaction construct
+	 * @var foo
 	 */
 	var $rollback_nested_transaction = false;
-
 	/**
 	 * MySQL Database handle
 	 * @var object
 	 */
 	var $dbhandle;
-
 	/**
 	 * Database username
 	 * @var string
 	 */
 	var $dbuser;
-
 	/**
 	 * Database username's password
 	 * @var string
 	 */
 	var $dbpassword;
-
 	/**
 	 * Database name
 	 * @var string
-	 * @see select()
 	 */
 	var $dbname;
-
 	/**
 	 * Database hostname
 	 * @var string
 	 */
 	var $dbhost = 'localhost';
-
 	/**
 	 * Current connection charset
 	 * @var string
 	 * @see DB::set_connection_charset()
 	 */
 	var $connection_charset;
-
-
-	// DEBUG:
-
 	/**
 	 * Do we want to log queries?
-	 * If null, it gets set according to {@link $debug}.
-	 * A subclass may set it by default (e.g. DbUnitTestCase_DB).
+	 *
+	 * If null, it gets set according to {@link $debug}. A subclass may set it by
+	 * default (e.g. DbUnitTestCase_DB).
+	 *
 	 * @var boolean
 	 */
 	var $log_queries;
-
 	/**
-	 * Log of queries:
+	 * Log of queries
 	 * @var array
 	 */
 	var $queries = array();
-
 	/**
 	 * Do we want to explain joins?
+	 *
 	 * This requires {@link DB::$log_queries} to be true.
 	 *
-	 * @todo fp> we'd probably want to group all the advanced debug vars under a single setting now. We might even auto enable it when $debug=2. (And we might actually want to include a $debug="cookie" mode for easy switching with bookmarks or a bookmarklet)
-	 *
+	 * @todo (0000) fp> we'd probably want to group all the advanced debug vars under a single setting now. We might even auto enable it when $debug=2. (And we might actually want to include a $debug="cookie" mode for easy switching with bookmarks or a bookmarklet)
 	 * @var boolean
 	 */
 	var $debug_explain_joins = false;
-
 	/**
 	 * Do we want to output a function backtrace for every query?
+	 *
 	 * Number of stack entries to show (from last to first) (Default: 0); true means 'all'.
-	 *
 	 * This requires {@link DB::$log_queries} to be true.
 	 *
 	 * @var integer
 	 */
 	var $debug_dump_function_trace_for_queries = 0;
-
 	/**
 	 * Number of rows we want to dump in debug output (0 disables it)
+	 *
 	 * This requires {@link DB::$log_queries} to be true.
+	 *
 	 * @var integer
 	 */
 	var $debug_dump_rows = 0;
-
 	/**
-	 * Time in seconds that is considered a fast query (green).
+	 * Time in seconds that is considered a fast query (green)
+	 * @see dump_queries()
 	 * @var float
-	 * @see dump_queries()
 	 */
 	var $query_duration_fast = 0.05;
-
 	/**
-	 * Time in seconds that is considered a slow query (red).
+	 * Time in seconds that is considered a slow query (red)
+	 * @see dump_queries()
 	 * @var float
-	 * @see dump_queries()
 	 */
 	var $query_duration_slow = 0.3;
 
@@ -279,32 +236,36 @@
 	 *
 	 * Connects to the server and selects a database.
 	 *
+	 * Mandatory parameters:
+	 * - 'user': username to connect with
+	 * - 'password': password to connect with OR
+	 * - 'handle': a MySQL Database handle (from a previous {@link mysql_connect()})
+	 *
+	 * Optional parameters:
+	 * - 'name': the name of the default database, see {@link DB::select()}
+	 * - 'host': host of the database; Default: 'localhost'
+	 * - 'show_errors': Display SQL errors? (true/false); Default: don't change member
+	 *   default ({@link $show_errors})
+	 * - 'halt_on_error': Halt on error? (true/false); Default: don't change member
+	 *   default ({@link $halt_on_error})
+	 * - 'table_options': sets {@link $table_options}
+	 * - 'use_transactions': sets {@link $use_transactions}
+	 * - 'aliases': Aliases for tables (array( alias => table name )); Default: no aliases.
+	 * - 'new_link': create a new link to the DB, even if there was a mysql_connect() with
+	 *   the same params before. (requires PHP 4.2)
+	 * - 'client_flags': optional settings like compression or SSL encryption. See
+	 *   {@link http://www.php.net/manual/en/ref.mysql.php#mysql.client-flags}.
+	 *
 	 * @param array An array of parameters.
-	 *   Manadatory:
-	 *    - 'user': username to connect with
-	 *    - 'password': password to connect with
-	 *    OR
-	 *    - 'handle': a MySQL Database handle (from a previous {@link mysql_connect()})
-	 *   Optional:
-	 *    - 'name': the name of the default database, see {@link DB::select()}
-	 *    - 'host': host of the database; Default: 'localhost'
-	 *    - 'show_errors': Display SQL errors? (true/false); Default: don't change member default ({@link $show_errors})
-	 *    - 'halt_on_error': Halt on error? (true/false); Default: don't change member default ({@link $halt_on_error})
-	 *    - 'table_options': sets {@link $table_options}
-	 *    - 'use_transactions': sets {@link $use_transactions}
-	 *    - 'aliases': Aliases for tables (array( alias => table name )); Default: no aliases.
-	 *    - 'new_link': create a new link to the DB, even if there was a mysql_connect() with
-	 *       the same params before. (requires PHP 4.2)
-	 *    - 'client_flags': optional settings like compression or SSL encryption. See {@link http://www.php.net/manual/en/ref.mysql.php#mysql.client-flags}.
-	 *       (requires PHP 4.3)
 	 */
 	function DB( $params )
 	{
 		global $debug;
 
-		// Mandatory parameters:
+		// Mandatory parameters
 		if( isset( $params['handle'] ) )
-		{ // DB-Link provided:
+		{
+			// DB-Link provided
 			$this->dbhandle = $params['handle'];
 		}
 		else
@@ -313,35 +274,73 @@
 			$this->dbpassword = $params['password'];
 		}
 
-		// Optional parameters (Allow overriding through $params):
-		if( isset($params['name']) ) $this->dbname = $params['name'];
-		if( isset($params['host']) ) $this->dbhost = $params['host'];
-		if( isset($params['show_errors']) ) $this->show_errors = $params['show_errors'];
-		if( isset($params['halt_on_error']) ) $this->halt_on_error = $params['halt_on_error'];
-		if( isset($params['table_options']) ) $this->table_options = $params['table_options'];
-		if( isset($params['use_transactions']) ) $this->use_transactions = $params['use_transactions'];
-		if( isset($params['debug_dump_rows']) ) $this->debug_dump_rows = $params['debug_dump_rows']; // Nb of rows to dump
-		if( isset($params['debug_explain_joins']) ) $this->debug_explain_joins = $params['debug_explain_joins'];
-		if( isset($params['debug_dump_function_trace_for_queries']) ) $this->debug_dump_function_trace_for_queries = $params['debug_dump_function_trace_for_queries'];
-
-		if( isset($debug) && ! isset($this->log_queries) )
-		{ // $log_queries follows $debug and respects subclasses, which may define it:
+		// Optional parameters (Allow overriding through $params)
+		if( isset( $params['name'] ) )
+		{
+			$this->dbname = $params['name'];
+		}
+
+		if( isset( $params['host'] ) )
+		{
+			$this->dbhost = $params['host'];
+		}
+
+		if( isset( $params['show_errors'] ) )
+		{
+			$this->show_errors = $params['show_errors'];
+		}
+
+		if( isset( $params['halt_on_error'] ) )
+		{
+			$this->halt_on_error = $params['halt_on_error'];
+		}
+
+		if( isset( $params['table_options'] ) )
+		{
+			$this->table_options = $params['table_options'];
+		}
+
+		if( isset( $params['use_transactions'] ) )
+		{
+			$this->use_transactions = $params['use_transactions'];
+		}
+
+		if( isset( $params['debug_dump_rows'] ) )
+		{
+			$this->debug_dump_rows = $params['debug_dump_rows']; // Nb of rows to dump
+		}
+
+		if( isset( $params['debug_explain_joins'] ) )
+		{
+			$this->debug_explain_joins = $params['debug_explain_joins'];
+		}
+
+		if( isset( $params['debug_dump_function_trace_for_queries'] ) )
+		{
+			$this->debug_dump_function_trace_for_queries = $params['debug_dump_function_trace_for_queries'];
+		}
+
+		if( isset( $debug ) && ! isset( $this->log_queries ) )
+		{
+			// $log_queries follows $debug and respects subclasses, which may define it
 			$this->log_queries = $debug;
 		}
 
-		if( ! extension_loaded('mysql') )
-		{ // The mysql extension is not loaded, try to dynamically load it:
+		if( ! extension_loaded( 'mysql' ) )
+		{
+			// The mysql extension is not loaded, try to dynamically load it
 			$mysql_ext_file = is_windows() ? 'php_mysql.dll' : 'mysql.so';
 			$php_errormsg = null;
-			$old_track_errors = ini_set('track_errors', 1);
-			$old_html_errors = ini_set('html_errors', 0);
+			$old_track_errors = ini_set( 'track_errors', 1 );
+			$old_html_errors = ini_set( 'html_errors', 0 );
 			@dl( $mysql_ext_file );
 			$error_msg = $php_errormsg;
-			if( $old_track_errors !== false ) ini_set('track_errors', $old_track_errors);
-			if( $old_html_errors !== false ) ini_set('html_errors', $old_html_errors);
+			if( $old_track_errors !== false ) ini_set( 'track_errors', $old_track_errors );
+			if( $old_html_errors !== false ) ini_set( 'html_errors', $old_html_errors );
 
-			if( ! extension_loaded('mysql') )
-			{ // Still not loaded:
+			if( ! extension_loaded( 'mysql' ) )
+			{
+				// Still not loaded
 				$this->print_error( 'The PHP MySQL module could not be loaded.', '
 					<p><strong>Error:</strong> '.$error_msg.'</p>
 					<p>You probably have to edit your php configuration (php.ini) and enable this module ('.$mysql_ext_file.').</p>
@@ -354,16 +353,17 @@
 		$client_flags = isset( $params['client_flags'] ) ? $params['client_flags'] : 0;
 
 		if( ! $this->dbhandle )
-		{ // Connect to the Database:
+		{
+			// Connect to the Database
 			// mysql_error() is tied to an established connection
 			// if the connection fails we need a different method to get the error message
 			$php_errormsg = null;
-			$old_track_errors = ini_set('track_errors', 1);
-			$old_html_errors = ini_set('html_errors', 0);
+			$old_track_errors = ini_set( 'track_errors', 1 );
+			$old_html_errors = ini_set( 'html_errors', 0 );
 			$this->dbhandle = @mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags );
 			$mysql_error = $php_errormsg;
-			if( $old_track_errors !== false ) ini_set('track_errors', $old_track_errors);
-			if( $old_html_errors !== false ) ini_set('html_errors', $old_html_errors);
+			if( $old_track_errors !== false ) ini_set( 'track_errors', $old_track_errors );
+			if( $old_html_errors !== false ) ini_set( 'html_errors', $old_html_errors );
 		}
 
 		if( ! $this->dbhandle )
@@ -371,18 +371,19 @@
 			$this->print_error( 'Error establishing a database connection!', '
 				<p>('.$mysql_error.')</p>
 				<ol>
-					<li>Are you sure you have typed the correct user/password?</li>
-					<li>Are you sure that you have typed the correct hostname?</li>
-					<li>Are you sure that the database server is running?</li>
+				<li>Are you sure you have typed the correct user/password?</li>
+				<li>Are you sure that you have typed the correct hostname?</li>
+				<li>Are you sure that the database server is running?</li>
 				</ol>', false );
 		}
-		elseif( isset($this->dbname) )
+		elseif( isset( $this->dbname ) )
 		{
-			$this->select($this->dbname);
+			$this->select( $this->dbname );
 		}
 
-		if( !empty($params['connection_charset']) )
-		{	// Specify which charset we are using on the client:
+		if( ! empty( $params['connection_charset'] ) )
+		{
+			// Specify which charset we are using on the client
 			$this->set_connection_charset( $params['connection_charset'] );
 		}
 
@@ -395,8 +396,9 @@
 		*/
 
 
-		if( isset($params['aliases']) )
-		{ // Prepare aliases for replacements:
+		if( isset( $params['aliases'] ) )
+		{
+			// Prepare aliases for replacements
 			foreach( $params['aliases'] as $dbalias => $dbreplace )
 			{
 				$this->dbaliases[] = '#\b'.$dbalias.'\b#'; // \b = word boundary
@@ -405,7 +407,8 @@
 		}
 
 		if( $debug )
-		{ // Force MySQL strict mode
+		{
+			// Force MySQL strict mode
 			// TRADITIONAL mode is only available to mysql > 5.0.2
 			$mysql_version = $this->get_version( 'we do this in DEBUG mode only' );
 			if( version_compare( $mysql_version, '5.0.2' ) > 0 )
@@ -419,15 +422,15 @@
 	/**
 	 * Select a DB (if another one needs to be selected)
 	 */
-	function select($db)
+	function select( $db )
 	{
-		if( !@mysql_select_db($db, $this->dbhandle) )
+		if( !@mysql_select_db( $db, $this->dbhandle ) )
 		{
 			$this->print_error( 'Error selecting database ['.$db.']!', '
 				<ol>
-					<li>Are you sure the database exists?</li>
-					<li>Are you sure the DB user is allowed to use that database?</li>
-					<li>Are you sure there is a valid database connection?</li>
+				<li>Are you sure the database exists?</li>
+				<li>Are you sure the DB user is allowed to use that database?</li>
+				<li>Are you sure there is a valid database connection?</li>
 				</ol>', false );
 		}
 	}
@@ -436,19 +439,19 @@
 	/**
 	 * Format a string correctly for safe insert under all PHP conditions
 	 */
-	function escape($str)
+	function escape( $str )
 	{
-		return mysql_real_escape_string($str, $this->dbhandle);
+		return mysql_real_escape_string( $str, $this->dbhandle );
 	}
 
 
 	/**
-	 * Quote a value, either in single quotes (and escaped) or if it's NULL as 'NULL'.
+	 * Quote a value, either in single quotes (and escaped) or if it's NULL as 'NULL'
 	 *
 	 * @param string|array|null
 	 * @return string Quoted (and escaped) value or 'NULL'.
 	 */
-	function quote($str)
+	function quote( $str )
 	{
 		if( is_null( $str ) )
 		{
@@ -459,26 +462,30 @@
 			$r = '';
 			foreach( $str as $elt )
 			{
-				$r .= $this->quote($elt).',';
+				$r .= $this->quote( $elt ).',';
 			}
 			return substr( $r, 0, -1 );
 		}
 		else
 		{
-			return "'".mysql_real_escape_string($str, $this->dbhandle)."'";
+			return "'".mysql_real_escape_string( $str, $this->dbhandle )."'";
 		}
 	}
 
 
 	/**
-	 * @return string Return the given value or 'NULL', if it's === NULL.
+	 * @return string Return the given value or 'NULL', if it's === NULL
 	 */
-	function null($val)
+	function null( $val )
 	{
 		if( $val === NULL )
+		{
 			return 'NULL';
+		}
 		else
+		{
 			return $val;
+		}
 	}
 
 
@@ -486,7 +493,6 @@
 	 * Returns the correct WEEK() function to get the week number for the given date.
 	 *
 	 * @link http://dev.mysql.com/doc/mysql/en/date-and-time-functions.html
-	 *
 	 * @todo disable when MySQL < 4
 	 * @param string will be used as is
 	 * @param integer 0 for sunday, 1 for monday
@@ -494,20 +500,18 @@
 	function week( $date, $startofweek )
 	{
 		if( $startofweek == 1 )
-		{ // Week starts on Monday, week 1 must have a monday in this year:
+		{
+			// Week starts on Monday, week 1 must have a monday in this year
 			return ' WEEK( '.$date.', 5 ) ';
 		}
 
-		// Week starts on Sunday, week 1 must have a sunday in this year:
+		// Week starts on Sunday, week 1 must have a sunday in this year
 		return ' WEEK( '.$date.', 0 ) ';
 	}
 
 
 	/**
-	 * Print SQL/DB error.
-	 *
-	 * TODO: fp> bloated: it probably doesn't make sense to display errors if we don't stop. Any use case?
-	 *       dh> Sure. Local testing (and test cases).
+	 * Print SQL/DB error
 	 *
 	 * @param string Short error (no HTML)
 	 * @param string Extended description/help for the error (for HTML)
@@ -515,17 +519,19 @@
 	 */
 	function print_error( $title = '', $html_str = '', $query_title = '' )
 	{
-		// All errors go to the global error array $EZSQL_ERROR..
-		global $EZSQL_ERROR, $is_cli;
+		// All errors go to the global error array $EZSQL_ERROR
+		global $EZSQL_ERROR;
+		global $is_cli;
 
 		$this->error = true;
 
-		// If no special error string then use mysql default..
-		if( ! strlen($title) )
+		// If no special error string then use mysql default
+		if( ! strlen( $title ) )
 		{
-			if( is_resource($this->dbhandle) )
-			{ // use mysql_error:
-				$this->last_error = mysql_error($this->dbhandle).'(Errno='.mysql_errno($this->dbhandle).')';
+			if( is_resource( $this->dbhandle ) )
+			{
+				// use mysql_error
+				$this->last_error = mysql_error( $this->dbhandle ).'(Errno='.mysql_errno( $this->dbhandle ).')';
 			}
 			else
 			{
@@ -540,23 +546,26 @@
 		// Log this error to the global array..
 		$EZSQL_ERROR[] = array(
 			'query' => $this->last_query,
-			'error_str'  => $this->last_error
+			'error_str' => $this->last_error
 		);
 
 		if( ! ( $this->halt_on_error || $this->show_errors ) )
-		{ // no reason to generate a nice message:
+		{
+			// no reason to generate a nice message
 			return;
 		}
 
 		if( $this->halt_on_error && ! $this->show_errors )
-		{ // do not show errors, just die:
+		{
+			// do not show errors, just die
 			die();
 		}
 
 		if( $is_cli )
-		{ // Clean error message for command line interface:
+		{
+			// Clean error message for command line interface
 			$err_msg = "MySQL error!\n{$this->last_error}\n";
-			if( ! empty($this->last_query) && $query_title !== false )
+			if( ! empty( $this->last_query ) && $query_title !== false )
 			{
 				$err_msg .= "Your query: $query_title\n";
 				$err_msg .= $this->format_query( $this->last_query, false );
@@ -567,7 +576,7 @@
 			$err_msg = '<p class="error">MySQL error!</p>'."\n";
 			$err_msg .= "<div><p><strong>{$this->last_error}</strong></p>\n";
 			$err_msg .= $html_str;
-			if( !empty($this->last_query) && $query_title !== false )
+			if( ! empty( $this->last_query ) && $query_title !== false )
 			{
 				$err_msg .= '<p class="error">Your query: '.$query_title.'</p>';
 				$err_msg .= '<pre>';
@@ -579,7 +588,7 @@
 
 		if( $this->halt_on_error )
 		{
-			if( function_exists('debug_die') )
+			if( function_exists( 'debug_die' ) )
 			{
 				debug_die( $err_msg );
 			}
@@ -589,7 +598,8 @@
 			}
 		}
 		elseif( $this->show_errors )
-		{ // If there is an error then take note of it
+		{
+			// If there is an error then take note of it
 			echo '<div class="error">';
 			echo $err_msg;
 			echo '</div>';
@@ -623,8 +633,9 @@
 		$this->show_errors = false;
 		$this->halt_on_error = false;
 
-		if( ($this->version_long = $this->get_var( 'SELECT VERSION()', 0, 0, $query_title ) ) === NULL )
-		{	// Very old version ( < 4.0 )
+		if( ( $this->version_long = $this->get_var( 'SELECT VERSION()', 0, 0, $query_title ) ) === NULL )
+		{
+			// Very old version ( < 4.0 )
 			$this->version = '';
 			$this->version_long = '';
 		}
@@ -646,10 +657,10 @@
 	function save_error_state()
 	{
 		$this->saved_error_states[] = array(
-			'show_errors'   => $this->show_errors,
+			'show_errors' => $this->show_errors,
 			'halt_on_error' => $this->halt_on_error,
-			'last_error'    => $this->last_error,
-			'error'         => $this->error,
+			'last_error' => $this->last_error,
+			'error' => $this->error,
 		);
 	}
 
@@ -661,17 +672,16 @@
 	 */
 	function restore_error_state()
 	{
-		if( empty($this->saved_error_states)
-			|| ! is_array($this->saved_error_states) )
+		if( empty( $this->saved_error_states ) || ! is_array( $this->saved_error_states ) )
 		{
 			return false;
 		}
-		$state = array_pop($this->saved_error_states);
+		$state = array_pop( $this->saved_error_states );
 
-		$this->show_errors   = $state['show_errors'];
+		$this->show_errors = $state['show_errors'];
 		$this->halt_on_error = $state['halt_on_error'];
-		$this->last_error    = $state['last_error'];
-		$this->error         = $state['error'];
+		$this->last_error = $state['last_error'];
+		$this->error = $state['error'];
 	}
 
 
@@ -690,54 +700,63 @@
 		// initialise return
 		$return_val = 0;
 
-		// Flush cached values..
+		// Flush cached values
 		$this->flush();
 
-		// Replace aliases:
-		if( ! empty($this->dbaliases) )
+		// Replace aliases
+		if( ! empty( $this->dbaliases ) )
 		{
-			// TODO: this should only replace the table name part(s), not the whole query!
-			// blueyed> I've changed it to replace in table name parts for UPDATE, INSERT and REPLACE, because
-			//          it corrupted serialized data..
-			//          IMHO, a cleaner solution would be to use {T_xxx} in the queries and replace it here. In object properties (e.g. DataObject::$dbtablename), only "T_xxx" would get used and surrounded by "{..}" in the queries it creates.
+			// @todo (0000) this should only replace the table name part(s), not the whole
+			// query! blueyed> I've changed it to replace in table name parts for UPDATE,
+			// INSERT and REPLACE, because it corrupted serialized data. IMHO, a cleaner
+			// solution would be to use {T_xxx} in the queries and replace it here. In
+			// object properties (e.g. DataObject::$dbtablename), only "T_xxx" would get
+			// used and surrounded by "{..}" in the queries it creates.
 
 			if( preg_match( '~^\s*(UPDATE\s+)(.*?)(\sSET\s.*)$~is', $query, $match ) )
-			{ // replace only between UPDATE and SET:
+			{
+				// replace only between UPDATE and SET
 				$query = $match[1].preg_replace( $this->dbaliases, $this->dbreplaces, $match[2] ).$match[3];
 			}
 			elseif( preg_match( '~^\s*(INSERT|REPLACE\s+)(.*?)(\s(VALUES|SET)\s.*)$~is', $query, $match ) )
-			{ // replace only between INSERT|REPLACE and VALUES|SET:
+			{
+				// replace only between INSERT|REPLACE and VALUES|SET
 				$query = $match[1].preg_replace( $this->dbaliases, $this->dbreplaces, $match[2] ).$match[3];
 			}
 			else
-			{ // replace in whole query:
+			{
+				// replace in whole query
 				$query = preg_replace( $this->dbaliases, $this->dbreplaces, $query );
 
-				if( ! empty($this->table_options) && preg_match( '#^ \s* create \s* table \s #ix', $query) )
-				{ // Query is a table creation, we add table options:
+				if( ! empty( $this->table_options ) && preg_match( '#^ \s* create \s* table \s #ix', $query ) )
+				{
+					// Query is a table creation, we add table options
 					$query = preg_replace( '~;\s*$~', '', $query ); // remove any ";" at the end
 					$query .= ' '.$this->table_options;
 				}
 			}
 		}
-		elseif( ! empty($this->table_options) )
-		{ // No aliases, but table_options:
+		elseif( ! empty( $this->table_options ) )
+		{
+			// No aliases, but table_options
 			if( preg_match( '#^ \s* create \s* table \s #ix', $query) )
-			{ // Query is a table creation, we add table options:
+			{
+				// Query is a table creation, we add table options
 				$query = preg_replace( '~;\s*$~', '', $query ); // remove any ";" at the end
 				$query .= $this->table_options;
 			}
 		}
 
-		// Keep track of the last query for debug..
+		// Keep track of the last query for debug
 		$this->last_query = $query;
 
-		// Perform the query via std mysql_query function..
+		// Perform the query via std mysql_query function
 		$this->num_queries++;
 
 		if( $this->log_queries )
-		{	// We want to log queries:
-			$this->queries[ $this->num_queries - 1 ] = array(
+		{
+			// We want to log queries
+			$this->queries[$this->num_queries-1] = array(
 				'title' => $title,
 				'sql' => $query,
 				'rows' => -1,
@@ -745,67 +764,73 @@
 				'results' => 'unknown' );
 		}
 
-		if( is_object($Timer) )
+		if( is_object( $Timer ) )
 		{
 			// Resume global query timer
 			$Timer->resume( 'sql_queries' );
-			// Start a timer for this particular query:
+			// Start a timer for this particular query
 			$Timer->start( 'sql_query', false );
 
-			// Run query:
+			// Run query
 			$this->result = @mysql_query( $query, $this->dbhandle );
 
 			if( $this->log_queries )
-			{	// We want to log queries:
-				// Get duration for last query:
-				$this->queries[ $this->num_queries - 1 ]['time'] = $Timer->get_duration( 'sql_query', 10 );
+			{
+				// We want to log queries
+				// Get duration for last query
+				$this->queries[$this->num_queries-1]['time'] = $Timer->get_duration( 'sql_query', 10 );
 			}
 
-			// Pause global query timer:
+			// Pause global query timer
 			$Timer->pause( 'sql_queries' );
 		}
 		else
 		{
-			// Run query:
+			// Run query
 			$this->result = @mysql_query( $query, $this->dbhandle );
 		}
 
-		// If there is an error then take note of it..
-		if( is_resource($this->dbhandle) && mysql_error($this->dbhandle) )
+		// If there is an error then take note of it
+		if( is_resource( $this->dbhandle ) && mysql_error( $this->dbhandle ) )
 		{
-			@mysql_free_result($this->result);
+			@mysql_free_result( $this->result );
 			$this->print_error( '', '', $title );
 			return false;
 		}
 
 		if( preg_match( '#^\s*(INSERT|DELETE|UPDATE|REPLACE)\s#i', $query, $match ) )
-		{ // Query was an insert, delete, update, replace:
+		{
+			// Query was an insert, delete, update, replace
 
-			$this->rows_affected = mysql_affected_rows($this->dbhandle);
+			$this->rows_affected = mysql_affected_rows( $this->dbhandle );
 			if( $this->log_queries )
-			{	// We want to log queries:
-				$this->queries[ $this->num_queries - 1 ]['rows'] = $this->rows_affected;
+			{
+				// We want to log queries
+				$this->queries[$this->num_queries-1]['rows'] = $this->rows_affected;
 			}
 
-			// Take note of the insert_id, for INSERT and REPLACE:
-			$match[1] = strtoupper($match[1]);
+			// Take note of the insert_id, for INSERT and REPLACE
+			$match[1] = strtoupper( $match[1] );
 			if( $match[1] == 'INSERT' || $match[1] == 'REPLACE' )
 			{
-				$this->insert_id = mysql_insert_id($this->dbhandle);
+				$this->insert_id = mysql_insert_id( $this->dbhandle );
 			}
 
 			// Return number of rows affected
 			$return_val = $this->rows_affected;
 		}
 		else
-		{ // Query was a select, alter, etc...:
+		{
+			// Query was a select, alter, etc...:
 			$this->num_rows = 0;
 
-			if( is_resource($this->result) )
-			{ // It's not a resource for CREATE or DROP for example and can even trigger a fatal error (see http://forums.b2evolution.net//viewtopic.php?t=9529)
+			if( is_resource( $this->result ) )
+			{
+				// It's not a resource for CREATE or DROP for example and can even trigger
+				// a fatal error (see http://forums.b2evolution.net//viewtopic.php?t=9529)
 
 				// Store Query Results
-				while( $row = mysql_fetch_object($this->result) )
+				while( $row = mysql_fetch_object( $this->result ) )
 				{
 					// Store relults as an objects within main array
 					$this->last_result[$this->num_rows] = $row;
@@ -814,8 +839,9 @@
 			}
 
 			if( $this->log_queries )
-			{	// We want to log queries:
-				$this->queries[ $this->num_queries - 1 ]['rows'] = $this->num_rows;
+			{
+				// We want to log queries
+				$this->queries[$this->num_queries-1]['rows'] = $this->num_rows;
 			}
 
 			// Return number of rows selected
@@ -823,26 +849,28 @@
 		}
 
 		if( $this->log_queries )
-		{	// We want to log queries:
+		{
+			// We want to log queries
 			if( $this->debug_dump_function_trace_for_queries )
 			{
-				$this->queries[ $this->num_queries - 1 ]['function_trace'] = debug_get_backtrace( $this->debug_dump_function_trace_for_queries, array( array( 'class' => 'DB' ) ), 1 ); // including first stack entry from class DB
+				$this->queries[$this->num_queries-1]['function_trace'] = debug_get_backtrace( $this->debug_dump_function_trace_for_queries, array( array( 'class' => 'DB' ) ), 1 ); // including first stack entry from class DB
 			}
 
 			if( $this->debug_dump_rows )
 			{
-				$this->queries[ $this->num_queries - 1 ]['results'] = $this->debug_get_rows_table( $this->debug_dump_rows );
+				$this->queries[$this->num_queries-1]['results'] = $this->debug_get_rows_table( $this->debug_dump_rows );
 			}
 		}
 
-		// Free original query's result:
-		@mysql_free_result($this->result);
+		// Free original query's result
+		@mysql_free_result( $this->result );
 
 		// EXPLAIN JOINS ??
 		if( $this->log_queries && $this->debug_explain_joins && preg_match( '#^ [\s(]* SELECT \s #ix', $query) )
-		{ // Query was a select, let's try to explain joins...
+		{
+			// Query was a select, let's try to explain joins...
 
-			// save values:
+			// save values
 			$saved_last_result = $this->last_result;
 			$saved_num_rows = $this->num_rows;
 
@@ -853,19 +881,19 @@
 
 			// Store Query Results
 			$this->num_rows = 0;
-			while( $row = @mysql_fetch_object($this->result) )
+			while( $row = @mysql_fetch_object( $this->result ) )
 			{
 				// Store results as an objects within main array
 				$this->last_result[$this->num_rows] = $row;
 				$this->num_rows++;
 			}
 
-			$this->queries[ $this->num_queries - 1 ]['explain'] = $this->debug_get_rows_table( 100, true );
-
-			// Free "EXPLAIN" result resource:
-			@mysql_free_result($this->result);
-
-			// Restore:
+			$this->queries[$this->num_queries-1]['explain'] = $this->debug_get_rows_table( 100, true );
+
+			// Free "EXPLAIN" result resource
+			@mysql_free_result( $this->result );
+
+			// Restore
 			$this->last_result = $saved_last_result;
 			$this->num_rows = $saved_num_rows;
 		}
@@ -875,28 +903,28 @@
 
 
 	/**
-	 * Get one variable from the DB - see docs for more detail
+	 * Get one variable from the DB
 	 *
 	 * Note: To be sure that you received NULL from the DB and not "no rows" check
-	 *       for {@link $num_rows}.
+	 * for {@link $num_rows}.
 	 *
 	 * @return mixed NULL if not found, the value otherwise (which may also be NULL).
 	 */
 	function get_var( $query = NULL, $x = 0, $y = 0, $title = '' )
 	{
-		// If there is a query then perform it if not then use cached results..
+		// If there is a query then perform it if not then use cached results
 		if( $query )
 		{
-			$this->query($query, $title);
+			$this->query( $query, $title );
 		}
 
 		// Extract var out of cached results based x,y vals
 		if( $this->last_result[$y] )
 		{
-			$values = array_values(get_object_vars($this->last_result[$y]));
+			$values = array_values( get_object_vars( $this->last_result[$y] ) );
 		}
 
-		if( isset($values[$x]) )
+		if( isset( $values[$x] ) )
 		{
 			return $values[$x];
 		}
@@ -906,40 +934,40 @@
 
 
 	/**
-	 * Get one row from the DB - see docs for more detail
+	 * Get one row from the DB
 	 *
 	 * @return mixed
 	 */
 	function get_row( $query = NULL, $output = OBJECT, $y = 0, $title = '' )
 	{
-		// If there is a query then perform it if not then use cached results..
+		// If there is a query then perform it if not then use cached results
 		if( $query )
 		{
-			$this->query($query, $title);
+			$this->query( $query, $title );
 		}
 
-		// If the output is an object then return object using the row offset..
+		// If the output is an object then return object using the row offset
 		if( $output == OBJECT )
 		{
 			return $this->last_result[$y]
 				? $this->last_result[$y]
 				: NULL;
 		}
-		// If the output is an associative array then return row as such..
+		// If the output is an associative array then return row as such
 		elseif( $output == ARRAY_A )
 		{
 			return $this->last_result[$y]
 				? get_object_vars( $this->last_result[$y] )
 				: array();
 		}
-		// If the output is an numerical array then return row as such..
+		// If the output is an numerical array then return row as such
 		elseif( $output == ARRAY_N )
 		{
 			return $this->last_result[$y]
-				? array_values( get_object_vars($this->last_result[$y]) )
+				? array_values( get_object_vars( $this->last_result[$y] ) )
 				: array();
 		}
-		// If invalid output type was specified..
+		// If invalid output type was specified
 		else
 		{
 			$this->print_error('DB::get_row(string query, output type, int offset) -- Output type must be one of: OBJECT, ARRAY_A, ARRAY_N', '', false);
@@ -949,13 +977,12 @@
 
 	/**
 	 * Function to get 1 column from the cached result set based on X index
-	 * see docs for usage and info
 	 *
 	 * @return array
 	 */
 	function get_col( $query = NULL, $x = 0, $title = '' )
 	{
-		// If there is a query then perform it if not then use cached results..
+		// If there is a query then perform it if not then use cached results
 		if( $query )
 		{
 			$this->query( $query, $title );
@@ -963,7 +990,7 @@
 
 		// Extract the column values
 		$new_array = array();
-		for( $i = 0, $count = count($this->last_result); $i < $count; $i++ )
+		for( $i = 0, $count = count( $this->last_result ); $i < $count; $i++ )
 		{
 			$new_array[$i] = $this->get_var( NULL, $x, $i );
 		}
@@ -979,7 +1006,7 @@
 	 */
 	function get_assoc( $query = NULL, $title = '' )
 	{
-		// If there is a query then perform it if not then use cached results..
+		// If there is a query then perform it if not then use cached results
 		if( $query )
 		{
 			$this->query( $query, $title );
@@ -987,7 +1014,7 @@
 
 		// Extract the column values
 		$new_array = array();
-		for( $i = 0, $count = count($this->last_result); $i < $count; $i++ )
+		for( $i = 0, $count = count( $this->last_result ); $i < $count; $i++ )
 		{
 			$key = $this->get_var( NULL, 0, $i );
 
@@ -999,16 +1026,16 @@
 
 
 	/**
-	 * Return the the query as a result set - see docs for more details
+	 * Return the the query as a result set
 	 *
 	 * @return mixed
 	 */
 	function get_results( $query = NULL, $output = OBJECT, $title = '' )
 	{
-		// If there is a query then perform it if not then use cached results..
+		// If there is a query then perform it if not then use cached results
 		if( $query )
 		{
-			$this->query($query, $title);
+			$this->query( $query, $title );
 		}
 
 		// Send back array of objects. Each row is an object
@@ -1026,11 +1053,11 @@
 
 				foreach( $this->last_result as $row )
 				{
-					$new_array[$i] = get_object_vars($row);
+					$new_array[$i] = get_object_vars( $row );
 
 					if( $output == ARRAY_N )
 					{
-						$new_array[$i] = array_values($new_array[$i]);
+						$new_array[$i] = array_values( $new_array[$i] );
 					}
 
 					$i++;
@@ -1047,7 +1074,7 @@
 
 
 	/**
-	 * Get a table (or "<p>No Results.</p>") for the SELECT query results.
+	 * Get a table (or "<p>No Results.</p>") for the SELECT query results
 	 *
 	 * @return string HTML table or "No Results" if the
 	 */
@@ -1055,36 +1082,34 @@
 	{
 		$r = '';
 
-		if( ! is_resource($this->result) )
+		if( ! is_resource( $this->result ) )
 		{
 			return '<p>No Results.</p>';
 		}
 
-		// Get column info:
+		// Get column info
 		$col_info = array();
-		$n = mysql_num_fields($this->result);
+		$n = mysql_num_fields( $this->result );
 		$i = 0;
 		while( $i < $n )
 		{
-			$col_info[$i] = mysql_fetch_field($this->result, $i);
+			$col_info[$i] = mysql_fetch_field( $this->result, $i );
 			$i++;
 		}
 
-		// =====================================================
 		// Results top rows
 		$r .= '<table cellspacing="0" summary="Results for query"><tr>';
-		for( $i = 0, $count = count($col_info); $i < $count; $i++ )
+		for( $i = 0, $count = count( $col_info ); $i < $count; $i++ )
 		{
 			$r .= '<th><span class="type">'.$col_info[$i]->type.' '.$col_info[$i]->max_length.'</span><br />'
 						.$col_info[$i]->name.'</th>';
 		}
 		$r .= '</tr>';
 
-		// ======================================================
 		// print main results
 		if( $this->last_result )
 		{
-			for( $i = 0, $n = min(count($this->last_result), $max_lines); $i < $n; $i++ )
+			for( $i = 0, $n = min( count( $this->last_result ), $max_lines ); $i < $n; $i++ )
 			{
 				$one_row = $this->get_row(NULL, ARRAY_N, $i);
 				$r .= '<tr>';
@@ -1111,7 +1136,7 @@
 						{
 							$item = substr( $item, 0, 50 ).'...';
 						}
-						$r .= htmlspecialchars($item);
+						$r .= htmlspecialchars( $item );
 					}
 					$r .= '</td>';
 				}
@@ -1119,14 +1144,14 @@
 				$r .= '</tr>';
 			}
 
-		} // if last result
+		}
 		else
 		{
-			$r .= '<tr><td colspan="'.(count($col_info)+1).'">No Results</td></tr>';
+			$r .= '<tr><td colspan="'.( count( $col_info )+1 ).'">No Results</td></tr>';
 		}
 		if( $i >= $max_lines )
 		{
-			$r .= '<tr><td colspan="'.(count($col_info)+1).'">Max number of dumped rows has been reached.</td></tr>';
+			$r .= '<tr><td colspan="'.( count( $col_info )+1 ).'">Max number of dumped rows has been reached.</td></tr>';
 		}
 
 		$r .= '</table>';
@@ -1137,8 +1162,7 @@
 
 	/**
 	 * Format a SQL query
-	 * @static
-	 * @todo dh> Steal the code from phpMyAdmin :)
+	 *
 	 * @param string SQL
 	 * @param boolean Format with/for HTML?
 	 */
@@ -1156,7 +1180,6 @@
 		}
 
 		// Split by FROM, WHERE, .. and AND, OR (if there's no comment sign before)
-		// TODO: dh> should not wrap in comments/string literals
 		$search = array(
 			'~(FROM|WHERE|GROUP BY|ORDER BY|LIMIT|VALUES)~',
 			'~(AND |OR )~',
@@ -1179,6 +1202,7 @@
 	function dump_queries( $html = true )
 	{
 		global $Timer;
+
 		if( is_object( $Timer ) )
 		{
 			$time_queries = $Timer->get_duration( 'sql_queries' );
@@ -1191,7 +1215,7 @@
 		$count_queries = 0;
 		$count_rows = 0;
 
-		if ( $html )
+		if( $html )
 		{
 			echo '<strong>DB queries:</strong> '.$this->num_queries."<br />\n";
 		}
@@ -1201,11 +1225,12 @@
 		}
 
 		if( ! $this->log_queries )
-		{ // nothing more to do here..
+		{
+			// nothing more to do here
 			return;
 		}
 
-		// Javascript function to toggle DIVs (EXPLAIN, results, backtraces).
+		// Javascript function to toggle DIVs (EXPLAIN, results, backtraces)
 		if( $html )
 		{
 			echo '<script type="text/javascript">
@@ -1232,11 +1257,13 @@
 				</script>';
 		}
 
+?><?php
+
 		foreach( $this->queries as $i => $query )
 		{
 			$count_queries++;
 
-			if ( $html )
+			if( $html )
 			{
 				echo '<h4>Query #'.$count_queries.': '.$query['title']."</h4>\n";
 				echo '<code>';
@@ -1270,7 +1297,7 @@
 			}
 
 			// Number of rows with time (percentage and graph, if total time available)
-			if ( $html )
+			if( $html )
 			{
 				echo '<div class="query_info">';
 				echo 'Rows: '.$query['rows'];
@@ -1289,7 +1316,8 @@
 			echo number_format( $query['time'], 4 ).'s';
 
 			if( $time_queries > 0 )
-			{ // We have a total time we can use to calculate percentage:
+			{
+				// We have a total time we can use to calculate percentage
 				echo ' ('.number_format( 100/$time_queries * $query['time'], 2 ).'%)';
 			}
 
@@ -1299,67 +1327,72 @@
 			}
 
 			if( $time_queries > 0 )
-			{ // We have a total time we can use to display a graph/bar:
+			{
+				// We have a total time we can use to display a graph/bar
 				$perc = round( 100/$time_queries * $query['time'] );
 
-				if ( $html )
+				if( $html )
 				{
 					echo '<div style="margin:0; padding:0; height:12px; width:'.$perc.'%;'.$style_time_graph.'"></div>';
 				}
 				else
-				{	// display an ASCII bar
+				{
+					// display an ASCII bar
 					printf( "\n".'[%-50s]', str_repeat( '=', $perc / 2 ) );
 				}
 			}
 			echo $html ? '</div>' : "\n\n";
 
-			// Explain:
-			if( isset($query['explain']) )
+			// Explain
+			if( isset( $query['explain'] ) )
 			{
 				if( $html )
 				{
-					$div_id = 'db_query_explain_'.$i.'_'.md5(serialize($query));
+					$div_id = 'db_query_explain_'.$i.'_'.md5( serialize( $query ) );
 					echo '<div id="'.$div_id.'">';
 					echo $query['explain'];
 					echo '</div>';
 					echo '<script type="text/javascript">debug_onclick_toggle_div("'.$div_id.'", "Show EXPLAIN", "Hide EXPLAIN");</script>';
 				}
 				else
-				{ // TODO: dh> contains html.
+				{
+					// @todo (0000) dh> contains html
 					echo $query['explain'];
 				}
 			}
 
-			// Results:
+			// Results
 			if( $query['results'] != 'unknown' )
 			{
 				if( $html )
 				{
-					$div_id = 'db_query_results_'.$i.'_'.md5(serialize($query));
+					$div_id = 'db_query_results_'.$i.'_'.md5( serialize( $query ) );
 					echo '<div id="'.$div_id.'">';
 					echo $query['results'];
 					echo '</div>';
 					echo '<script type="text/javascript">debug_onclick_toggle_div("'.$div_id.'", "Show results", "Hide results");</script>';
 				}
 				else
-				{ // TODO: dh> contains html.
+				{
+					// @todo (0000) dh> contains html.
 					echo $query['results'];
 				}
 			}
 
 			// Function trace:
-			if( isset($query['function_trace']) )
+			if( isset( $query['function_trace'] ) )
 			{
 				if( $html )
 				{
-					$div_id = 'db_query_backtrace_'.$i.'_'.md5(serialize($query));
+					$div_id = 'db_query_backtrace_'.$i.'_'.md5( serialize( $query ) );
 					echo '<div id="'.$div_id.'">';
 					echo $query['function_trace'];
 					echo '</div>';
 					echo '<script type="text/javascript">debug_onclick_toggle_div("'.$div_id.'", "Show function trace", "Hide function trace");</script>';
 				}
 				else
-				{ // TODO: dh> contains html.
+				{
+					// @todo (0000) dh> contains html.
 					echo $query['function_trace'];
 				}
 			}
@@ -1376,7 +1409,7 @@
 			$count_rows += $query['rows'];
 		}
 
-		if ( $html )
+		if( $html )
 		{
 			echo "\n<strong>Total rows:</strong> $count_rows<br />\n";
 		}
@@ -1390,14 +1423,13 @@
 	/**
 	 * BEGIN A TRANSCATION
 	 *
-	 * Note:  By default, MySQL runs with autocommit mode enabled.
-	 * This means that as soon as you execute a statement that updates (modifies)
-	 * a table, MySQL stores the update on disk.
-	 * Once you execute a BEGIN, the updates are "pending" until you execute a
-	 * {@link DB::commit() COMMIT} or a {@link DB:rollback() ROLLBACK}