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

[EdB]

the last of the "monster" series. after this we're back to business as usual :)

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

7667. By EdB on 2013-04-18

more stuff ... not sure what but it fixes problems

7668. By EdB on 2013-04-18

updating release date to today

=== modified file 'admin.php'
--- admin.php	2013-03-18 19:20:42 +0000
+++ admin.php	2013-04-18 18:37:26 +0000
@@ -79,10 +79,10 @@
 	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' ) ) )
+		// set 'earth' as the admin template if it exists
+		if( file_exists( sprintf( $admin_template_path, 'earth' ) ) )
 		{
-			$admin_template = 'wind';
+			$admin_template = 'earth';
 		}
 		else
 		{
 
=== removed file 'blog2.php'
--- blog2.php	2013-03-08 20:58:52 +0000
+++ blog2.php	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-<?php
-/**
- * Stub File Template
- *
- * This file is used to create a new stub file when a blog is created. If the value of $blog
- * is not NNN then this file was created; only stubfile.template.php has that value of $blog.
- *
- * @author {@link http://wonderwinds.com/ Ed Bennett}
- * @copyright (c) 2010 by {@link http://quamplures.net/ the Quam Plures project}
- * @license http://www.gnu.org/licenses/gpl.txt GNU General Public License v3
- * @package templates
- */
-
-// select which blog
-$blog = 2;
-
-// retricts posts to published, hides drafts
-$show_statuses = array();
-
-// ignore before, unix timestamp or 'now'
-$timestamp_min = '';
-
-// ignore after, unix timestamp or 'now'
-$timestamp_max = 'now';
-
-// force a template?
-# $template = 'custom';
-
-// change order?
-# $order = 'ASC';
-
-/**
- * Load the configuration minimum
- */
-require_once dirname(__FILE__).'/qp_config/_config.php';
-
-/**
- * Main initialization, with the identified $blog
- */
-require $inc_path.'_blog_main.inc.php';
-
-?>
 
=== removed file 'blog3.php'
--- blog3.php	2013-03-08 20:58:52 +0000
+++ blog3.php	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-<?php
-/**
- * Stub File Template
- *
- * This file is used to create a new stub file when a blog is created. If the value of $blog
- * is not NNN then this file was created; only stubfile.template.php has that value of $blog.
- *
- * @author {@link http://wonderwinds.com/ Ed Bennett}
- * @copyright (c) 2010 by {@link http://quamplures.net/ the Quam Plures project}
- * @license http://www.gnu.org/licenses/gpl.txt GNU General Public License v3
- * @package templates
- */
-
-// select which blog
-$blog = 3;
-
-// retricts posts to published, hides drafts
-$show_statuses = array();
-
-// ignore before, unix timestamp or 'now'
-$timestamp_min = '';
-
-// ignore after, unix timestamp or 'now'
-$timestamp_max = 'now';
-
-// force a template?
-# $template = 'custom';
-
-// change order?
-# $order = 'ASC';
-
-/**
- * Load the configuration minimum
- */
-require_once dirname(__FILE__).'/qp_config/_config.php';
-
-/**
- * Main initialization, with the identified $blog
- */
-require $inc_path.'_blog_main.inc.php';
-
-?>
 
=== removed file 'blog4.php'
--- blog4.php	2013-03-08 20:58:52 +0000
+++ blog4.php	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-<?php
-/**
- * Stub File Template
- *
- * This file is used to create a new stub file when a blog is created. If the value of $blog
- * is not NNN then this file was created; only stubfile.template.php has that value of $blog.
- *
- * @author {@link http://wonderwinds.com/ Ed Bennett}
- * @copyright (c) 2010 by {@link http://quamplures.net/ the Quam Plures project}
- * @license http://www.gnu.org/licenses/gpl.txt GNU General Public License v3
- * @package templates
- */
-
-// select which blog
-$blog = 4;
-
-// retricts posts to published, hides drafts
-$show_statuses = array();
-
-// ignore before, unix timestamp or 'now'
-$timestamp_min = '';
-
-// ignore after, unix timestamp or 'now'
-$timestamp_max = 'now';
-
-// force a template?
-# $template = 'custom';
-
-// change order?
-# $order = 'ASC';
-
-/**
- * Load the configuration minimum
- */
-require_once dirname(__FILE__).'/qp_config/_config.php';
-
-/**
- * Main initialization, with the identified $blog
- */
-require $inc_path.'_blog_main.inc.php';
-
-?>
 
=== modified file 'qp_config/_admin.php'
--- qp_config/_admin.php	2013-03-22 21:28:25 +0000
+++ qp_config/_admin.php	2013-04-18 18:37:26 +0000
@@ -24,6 +24,8 @@
  * - 2 if you want to be able to cross-post among multiple blogs/categories
  * - 3 if you want to be able to change main cat among blogs
  * Note: #3 moves the posts from one blog to another, so use with caution.
+ *
+ * @global integer $allow_cross_posting
  */
 $allow_cross_posting = 1;
 
@@ -32,6 +34,8 @@
  *
  * Automatically balance unmatched tags in posts and comments. Choose
  * the formatting options for your posts: 0 to disable, 1 to enable
+ *
+ * @global bool $balance_tags
  */
 $balance_tags = 1;
 
@@ -40,30 +44,38 @@
  *
  * Default of 1 messages sent via the message form will be checked against
  * the antispam blacklist. Set it to 0 if you like spam I guess.
+ *
+ * @global bool $antispam_on_message_form
  */
 $antispam_on_message_form = 1;
 
 /**
+ * Cookie Expired
+ *
+ * Expired-time, used to erase comment meta data cookies. Default is 24 hours ago.
+ *
+ * @global integer $cookie_expired
+ */
+$cookie_expired = time() - 86400;
+
+/**
  * Cookies Expire
  *
  * Expiration for comment meta data cookies, in seconds. Set this to 0 if you wish
  * to use non-permanent cookies (erased when browser is closed). Default is one
  * year from now.
+ *
+ * @global integer $cookie_expires
  */
 $cookie_expires = time() + 31536000;
 
 /**
- * Cookie Expired
- *
- * Expired-time, used to erase comment meta data cookies. Default is 24 hours ago.
- */
-$cookie_expired = time() - 86400;
-
-/**
  * Cron Timeout Delay
  *
  * Seconds after which a scheduled task is considered to be timed out, default is
  * 30 minutes.
+ *
+ * @global integer $cron_timeout_delay
  */
 $cron_timeout_delay = 1800;
 
@@ -72,6 +84,8 @@
  *
  * This controls how many items by section (comments, drafts, recent edits)
  * are displayed on the dashboard page.
+ *
+ * @global integer $dash_disp_num
  */
 $dash_disp_num = 5;
 
@@ -83,6 +97,8 @@
  * - 1 = yes
  * - 2 = yes and potentially die() to display debug info (needed before redirects,
  *   e-g message_send.php)
+ *
+ * @global integer $debug
  */
 $debug = 0;
 
@@ -92,6 +108,8 @@
  * Display elements that are different on each request (Page processing time, ...)
  * Set this to true to prevent displaying minor changing elements (like time) in
  * order not to have artificial content changes.
+ *
+ * @global bool $debug_obhandler
  */
 $debug_obhandler = false;
 
@@ -101,6 +119,8 @@
  * $debug always applies to anyone logged in. Set this to 1 if you want debug info
  * displayed when you are not logged in (for troubleshooting what a visitor sees).
  * Default is 0. possible values: 0 = no, 1 = yes
+ *
+ * @global bool $debug_visitors
  */
 $debug_visitors = 0;
 
@@ -108,6 +128,8 @@
  * XMLRPC logging
  *
  * Set this to 1 to log XMLRPC calls received by this server (into /qp_srvc/xmlrpc.log).
+ *
+ * @global bool $debug_xmlrpc_logging
  */
 $debug_xmlrpc_logging = 0;
 
@@ -118,6 +140,8 @@
  * do not allow changes to the 'admin' or 'demouser' or 'demoblogger' or 'demospecial'
  * accounts/groups, blog media directories can only be configured to be inside of
  * {@link $media_path}.
+ *
+ * @global bool $demo_mode
  */
 $demo_mode = false;
 
@@ -126,6 +150,8 @@
  *
  * File extensions that the admin will not be able to enable via the admin interface
  * (Global settings => files).
+ *
+ * @global array $forbidden_upload_exts
  */
 $forbidden_upload_exts = array(
 	'cgi',
@@ -148,6 +174,8 @@
  * The admin can configure the regular expression for valid file names in the Settings
  * interface. However if this is set to non empty, the admin will not be able to
  * customize these values.
+ *
+ * @global string $force_regexp_filename
  */
 $force_regexp_filename = '';
 
@@ -157,6 +185,8 @@
  * The admin can configure the regular expression for valid dir names in the Settings
  * interface. However if this is set to non empty, the admin will not be able to
  * customize these values.
+ *
+ * @global string $force_regexp_dirname
  */
 $force_regexp_dirname = '';
 
@@ -166,6 +196,8 @@
  * The "home" button on the top right of the navbar is the only use of this. By
  * default this is the base url, and unless you do a complex installation there
  * is no need to change it.
+ *
+ * @global string $home_url
  */
 $home_url = $app_baseurl;
 
@@ -182,15 +214,32 @@
  *
  * @todo generate a random instance name at install and have it saved in the global
  * params in the DB
+ *
+ * @global string $instance_name
  */
 $instance_name = 'quamplures';
 
 /**
+ * Lock user's ID and nickname
+ *
+ * Setting this to 'true' will mean a user can not change their login ID or nickname.
+ * They will still be able to change their "known as" - just not their nickname
+ * or login :) Useful if you need continuity over time for all your users (for example
+ * when this app is the gateway to a forum or chatroom or other 3rd party with a
+ * login requirement).
+ *
+ * @global bool $lock_id_and_nick
+ */
+$lock_id_and_nick = false;
+
+/**
  * Minimum Comment Interval
  *
  * This is the minimum interval in seconds between consecutive comments from the
  * same IP. Increasing this can slow down spam attacks, and piss off real visitors
  * if too high.
+ *
+ * @global integer $minimum_comment_interval
  */
 $minimum_comment_interval = 30;
 
@@ -202,6 +251,8 @@
  *
  * This is legacy code that needs to be reverse-engineered, completely figured out,
  * and either fixed or killed. As-is this is crap - EdB.
+ *
+ * @global array $posttypes_locked_IDs
  */
 $posttypes_locked_IDs = array( 1000, 1500, 1520, 1530, 1570, 2000 );
 
@@ -214,6 +265,8 @@
  *
  * This is legacy code that needs to be reverse-engineered, completely figured out,
  * and either fixed or killed. As-is this is crap - EdB.
+ *
+ * @global array $posttypes_reserved_IDs
  */
 $posttypes_reserved_IDs = array( 3000, 4000, 5000 );
 
@@ -225,6 +278,8 @@
  * and getfile.php will check the User permisssion to view files. HOWEVER this will
  * not prevent users from hitting directly into the media folder with their web
  * browser. You still need to restrict access to the media folder from your webserver.
+ *
+ * @global bool $public_access_to_media
  */
 $public_access_to_media = true;
 
@@ -234,6 +289,8 @@
  * Default of 1 means a comment can not be left without the commenter providing
  * a name and email address. Set this to 0 to allow anonymous comments (without
  * name & email address).
+ *
+ * @global bool $require_name_email
  */
 $require_name_email = 1;
 
@@ -242,6 +299,8 @@
  *
  * Admins can configure max file upload size, but they won't be able to set it higher
  * than this "max max" value.
+ *
+ * @global integer $upload_maxmaxkb
  */
 $upload_maxmaxkb = 10000;
 
@@ -263,6 +322,8 @@
  * tag URL "marker", you won't be able to access either the post or the tag page,
  * depending on the value of this setting. And no, that doesn't make sense to me
  * either :/
+ *
+ * @global bool $tags_dash_fix
  */
 $tags_dash_fix = 0;
 
@@ -270,6 +331,8 @@
  * XHTML use Strict
  *
  * Set this to true if you want to enforce XHTML strict validation
+ *
+ * @global bool $xhtml_use_strict
  */
 $xhtml_use_strict = false;
 
@@ -277,6 +340,8 @@
  * XHTML validate comments
  *
  * Do we want to use XHTML validation for comments?
+ *
+ * @global bool $xhtml_validate_comments
  */
 $xhtml_validate_comments = true;
 
 
=== modified file 'qp_inc/_application.php'
--- qp_inc/_application.php	2013-03-22 21:28:25 +0000
+++ qp_inc/_application.php	2013-04-18 18:37:26 +0000
@@ -19,16 +19,16 @@
 $app_homepage = 'http://quamplures.net/';
 
 // The fileset version: incremented at whatever rate feels good :)
-$files_version = '1.20';
+$files_version = '1.50';
 
 // The database version, incrememented by 1 with each change in upgrade_dbase_tables()
-$app_db_version = 43;
+$app_db_version = 70;
 
 // This way the version tells us the files and the database :)
 $app_version = $files_version.'.'.$app_db_version;
 
 // The application's release date (ISO) for major (quarterly) releases
-$app_date = '2013-03-21';
+$app_date = '2013-04-18';
 
 // Displayed on the login screen
 $app_banner = '<a href="'.$app_homepage.'"><img src="'.$rsc_url.'logo.jpg" width="337" height="76" alt="'.$app_name.'" /></a>';
 
=== modified file 'qp_inc/_core/__core.init.php'
--- qp_inc/_core/__core.init.php	2013-03-22 21:28:25 +0000
+++ qp_inc/_core/__core.init.php	2013-04-18 18:37:26 +0000
@@ -29,64 +29,42 @@
 $app_db_config['aliases'] = array(
 	'T_antispam' => $app_db_tableprefix.'antispam',
 	'T_blogs' => $app_db_tableprefix.'blogs',
-	'T_blog_groups' => $app_db_tableprefix.'bloggroups',
-	'T_blog_settings' => $app_db_tableprefix.'coll_settings',
-	'T_blog_users' => $app_db_tableprefix.'blogusers',
+	'T_blog_groups' => $app_db_tableprefix.'blog_groups',
+	'T_blog_settings' => $app_db_tableprefix.'blog_settings',
+	'T_blog_users' => $app_db_tableprefix.'blog_users',
 	'T_categories' => $app_db_tableprefix.'categories',
 	'T_collections' => $app_db_tableprefix.'collections',
 	'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',
+	'T_cron_task' => $app_db_tableprefix.'cron_task',
 	'T_files' => $app_db_tableprefix.'files',
 	'T_filetypes' => $app_db_tableprefix.'filetypes',
 	'T_groups' => $app_db_tableprefix.'groups',
-	'T_items' => $app_db_tableprefix.'items__item',
-	'T_item_cats' => $app_db_tableprefix.'postcats',
+	'T_items' => $app_db_tableprefix.'items',
+	'T_item_cats' => $app_db_tableprefix.'item_cats',
 	'T_item_colls' => $app_db_tableprefix.'item_colls',
-	'T_item_prerendering' => $app_db_tableprefix.'items__prerendering',
-	'T_item_status' => $app_db_tableprefix.'items__status',
-	'T_item_tags' => $app_db_tableprefix.'items__itemtag',
-	'T_item_types' => $app_db_tableprefix.'items__type',
-	'T_item_versions' => $app_db_tableprefix.'items__version',
+	'T_item_prerendering' => $app_db_tableprefix.'item_prerendering',
+	'T_item_status' => $app_db_tableprefix.'item_status',
+	'T_item_tags' => $app_db_tableprefix.'item_tags',
+	'T_item_types' => $app_db_tableprefix.'item_types',
+	'T_item_versions' => $app_db_tableprefix.'item_versions',
 	'T_links' => $app_db_tableprefix.'links',
 	'T_locales' => $app_db_tableprefix.'locales',
 	'T_plugins' => $app_db_tableprefix.'plugins',
-	'T_plugin_events' => $app_db_tableprefix.'pluginevents',
-	'T_plugin_settings' => $app_db_tableprefix.'pluginsettings',
-	'T_plugin_usersettings' => $app_db_tableprefix.'pluginusersettings',
+	'T_plugin_events' => $app_db_tableprefix.'plugin_events',
+	'T_plugin_settings' => $app_db_tableprefix.'plugin_settings',
+	'T_plugin_usersettings' => $app_db_tableprefix.'plugin_usersettings',
 	'T_settings' => $app_db_tableprefix.'settings',
 	'T_subscriptions' => $app_db_tableprefix.'subscriptions',
-	'T_tags' => $app_db_tableprefix.'items__tag',
-	'T_templates' => $app_db_tableprefix.'templates__template',
-	'T_template_containers' => $app_db_tableprefix.'templates__container',
+	'T_tags' => $app_db_tableprefix.'tags',
+	'T_templates' => $app_db_tableprefix.'templates',
+	'T_template_containers' => $app_db_tableprefix.'template_containers',
 	'T_users' => $app_db_tableprefix.'users',
 	'T_user_cyberspace' => $app_db_tableprefix.'user_cyberspace',
 	'T_user_realworld' => $app_db_tableprefix.'user_realworld',
-	'T_plugin_sharedfields' => $app_db_tableprefix.'plugin_sharedfields',
-	'T_plugin_sharedvalues' => $app_db_tableprefix.'plugin_sharedvalues',
-	'T_user_settings' => $app_db_tableprefix.'usersettings',
-	'T_widgets' => $app_db_tableprefix.'widget',
-	'T_coll_group_perms' => $app_db_tableprefix.'bloggroups', // old, going away
-	'T_coll_settings' => $app_db_tableprefix.'coll_settings', // old, going away
-	'T_coll_user_perms' => $app_db_tableprefix.'blogusers', // old, going away
-	'T_cron__log' => $app_db_tableprefix.'cron__log', // old, going away
-	'T_cron__task' => $app_db_tableprefix.'cron__task', // old, going away
-	'T_items__item' => $app_db_tableprefix.'items__item', // old, going away
-	'T_postcats' => $app_db_tableprefix.'postcats', // old, going away
-	'T_items__prerendering' => $app_db_tableprefix.'items__prerendering', // old, going away
-	'T_items__status' => $app_db_tableprefix.'items__status', // old, going away
-	'T_items__itemtag' => $app_db_tableprefix.'items__itemtag', // old, going away
-	'T_items__type' => $app_db_tableprefix.'items__type', // old, going away
-	'T_items__version' => $app_db_tableprefix.'items__version', // old, going away
-	'T_pluginevents' => $app_db_tableprefix.'pluginevents', // old, going away
-	'T_pluginsettings' => $app_db_tableprefix.'pluginsettings', // old, going away
-	'T_pluginusersettings' => $app_db_tableprefix.'pluginusersettings', // old, going away
-	'T_items__tag' => $app_db_tableprefix.'items__tag', // old, going away
-	'T_templates__template' => $app_db_tableprefix.'templates__template', // old, going away
-	'T_templates__container' => $app_db_tableprefix.'templates__container', // old, going away
-	'T_usersettings' => $app_db_tableprefix.'usersettings', // old, going away
-	'T_widget' => $app_db_tableprefix.'widget', // old, going away
-	);
+	'T_user_settings' => $app_db_tableprefix.'user_settings',
+	'T_widgets' => $app_db_tableprefix.'widgets',
+);
 
 // Controller mappings
 $ctrl_mappings = array(
@@ -452,7 +430,7 @@
 					// we have blog files
 					$entries['file_manager']['entries']['fm_view_blog'] = array(
 						'text' => T_('View BLOG Files').'&hellip;',
-						'href' => $admin_url.'?ctrl=files&amp;root=collection_'.$blog_id,
+						'href' => $admin_url.'?ctrl=files&amp;root=blog_'.$blog_id,
 					);
 					if( empty( $Blog ) )
 					{
@@ -498,7 +476,7 @@
 					// we have blog files
 					$entries['file_manager']['entries']['fm_add_blog'] = array(
 						'text' => T_('Upload BLOG Files').'&hellip;',
-						'href' => $admin_url.'?ctrl=upload&amp;root=collection_'.$blog_id,
+						'href' => $admin_url.'?ctrl=upload&amp;root=blog_'.$blog_id,
 					);
 					if( empty( $Blog ) )
 					{
@@ -683,7 +661,7 @@
 		// current user's profile
 		$entries['userprefs']['entries']['userprof'] = array(
 			'text' => T_('Your Profile').'&hellip;',
-			'href' => get_user_profile_url(),
+			'href' => get_user_profile_url( $current_User->ID ),
 		);
 
 		if( $current_User->check_perm( 'users', 'edit' ) )
@@ -765,13 +743,12 @@
 			),
 		);
 
-
 		if( ! $current_User->check_perm( 'admin', 'visible' ) )
 		{
 			// user can not access admin, replace admin link with profile link
 			$entries['abswitch']['text'] = '<strong>'.$current_User->login.'</strong>';
 			$entries['abswitch']['title'] = T_('Edit your user profile');
-			$entries['abswitch']['href'] = get_user_profile_url();
+			$entries['abswitch']['href'] = get_user_profile_url( $current_User->ID );
 			$entries['abswitch']['class'] = '';
 
 			if( $subs_url = get_user_subs_url() )
 
=== modified file 'qp_inc/_core/_param.funcs.php'
--- qp_inc/_core/_param.funcs.php	2013-03-23 18:54:25 +0000
+++ qp_inc/_core/_param.funcs.php	2013-04-18 18:37:26 +0000
@@ -387,6 +387,10 @@
  */
 function param_check_number( $var, $err_msg, $required = false )
 {
+	// first get the param even as a string to avoid red-death errors
+	param( $var, 'string', $required ? true : '' );
+
+	// if it is empty and that's okay then we're done? wait it might be a string ... which might be okay anyway
 	if( empty( $GLOBALS[$var] ) && ! $required )
 	{
 		// empty is OK
@@ -395,6 +399,7 @@
 
 	if( ! preg_match( '#^[0-9]+$#', $GLOBALS[$var] ) )
 	{
+		// forget_param( 'link_ID' );
 		param_error( $var, $err_msg );
 		return false;
 	}
 
=== modified file 'qp_inc/_core/model/__core.install.php'
--- qp_inc/_core/model/__core.install.php	2013-03-22 21:28:25 +0000
+++ qp_inc/_core/model/__core.install.php	2013-04-18 18:37:26 +0000
@@ -55,7 +55,7 @@
 			blog_tagline VARCHAR(250) NULL default '',
 			blog_description VARCHAR(250) NULL default '',
 			blog_longdesc TEXT NULL DEFAULT NULL,
-			blog_locale VARCHAR(20) NOT NULL DEFAULT 'en-EU',
+			blog_locale VARCHAR(20) NOT NULL DEFAULT 'en-US',
 			blog_access_type VARCHAR(10) NOT NULL DEFAULT 'index.php',
 			blog_siteurl VARCHAR(120) NOT NULL default '',
 			blog_urlname VARCHAR(255) NOT NULL DEFAULT 'urlname',
@@ -202,7 +202,7 @@
 	'T_files' => array( 'Creating files table',
 		"CREATE TABLE T_files (
 			file_ID INT(11) unsigned not null AUTO_INCREMENT,
-			file_root_type ENUM('absolute','user','collection','shared','templates') not null default 'absolute',
+			file_root_type ENUM('absolute','user','blog','shared','templates') not null default 'absolute',
 			file_root_ID INT(11) unsigned not null default 0,
 			file_path VARCHAR(255) not null default '',
 			file_title VARCHAR(255),
@@ -565,36 +565,6 @@
 			UNIQUE wi_order( wi_widget_blog_ID, wi_sco_name, wi_order )
 		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
 
-	/**
-	 * This table holds info about fields a plugin might want to access and
-	 * use. The only time it gets called is on a plugin's settings page
-	 * for the various bits that make a plugin field be a plugin field
-	 */
-	'T_plugin_sharedfields' => array( 'Creating table for User field definitions',
-		"CREATE TABLE T_plugin_sharedfields (
-			psf_fieldname VARCHAR(16) NOT NULL,
-			psf_label VARCHAR(255) NOT NULL,
-			psf_type VARCHAR(255) NOT NULL, -- probably only 'text', maybe 'checkbox', 'select' is crazy talk!
-			psf_note VARCHAR(255) NOT NULL,
-			psf_validate VARCHAR(255) NOT NULL, -- make sure a url is a url ... for example
-			PRIMARY KEY ( psf_fieldname )
-		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
-
-	/**
-	 * This table holds user-specific info for any shared plugin field. When on a
-	 * plugin's settings page it gets accessed to find then store info about a
-	 * user. The plugin then stores the fact that some info about the user
-	 * is stored in this table for the rest of QP to do it's thing with.
-	 */
-	'T_plugin_sharedvalues' => array( 'Creating table for User fields',
-		"CREATE TABLE T_plugin_sharedvalues (
-			psv_ID INT(10) unsigned NOT NULL auto_increment,
-			psv_user_ID INT(10) unsigned NOT NULL,
-			psv_psf_fieldname VARCHAR(32) NOT NULL,
-			psv_userfieldvalue VARCHAR(255) NOT NULL,
-			PRIMARY KEY ( psv_ID )
-		) ENGINE = innodb DEFAULT CHARSET = $db_storage_charset" ),
-
 );
 
 ?>
 
=== modified file 'qp_inc/_core/ui/results/_results.class.php'
--- qp_inc/_core/ui/results/_results.class.php	2013-03-22 21:28:25 +0000
+++ qp_inc/_core/ui/results/_results.class.php	2013-04-18 18:37:26 +0000
@@ -92,9 +92,13 @@
 	 */
 	var $current_Obj;
 	/**
-	 * Definitions for each column:
+	 * Definitions for each column
+	 *
+	 * Possible definitions for each column are:
 	 * - th
+	 * - th_class
 	 * - td
+	 * - td_class
 	 * - order: SQL column name(s) to sort by (delimited by comma)
 	 * - order_objects_callback: a PHP callback function (can be array( $Object, $method )).
 	 *   This gets three params: $a, $b, $desc. $a and $b are instantiated objects
@@ -104,8 +108,7 @@
 	 *   This gets three params: $a, $b, $desc. $a and $b are DB row objects, $desc
 	 *   is either 'ASC' or 'DESC'. The function has to return -1, 0 or 1, according
 	 *   to if the $a < $b, $a == $b or $a > $b.
-	 * - td_class
-	 * @var foo
+	 * @var array something goes here
 	 */
 	var $cols;
 	/**
@@ -191,11 +194,14 @@
 	 * Constructor
 	 *
 	 * @param string SQL query
-	 * @param string prefix to differentiate page/order params when multiple Results appear one same page
-	 * @param string default ordering of columns (special syntax) if not specified in the URL params
+	 * @param string prefix to differentiate page/order params when multiple Results
+	 * appear one same page
+	 * @param string default ordering of columns (special syntax) if not specified
+	 * in the URL params
 	 * - example: -A-- will sort in ascending order on 2nd column
 	 * - example: ---D will sort in descending order on 4th column
-	 * @param integer number of lines displayed on one page (0 to disable paging; null to use $UserSettings/results_per_page)
+	 * @param integer number of lines displayed on one page (0 to disable paging;
+	 * null to use $UserSettings/results_per_page)
 	 * @param string SQL to get the total count of results
 	 * @param boolean
 	 * @param string|integer SQL query used to count the total # of rows
 
=== modified file 'qp_inc/blogs/blogs.ctrl.php'
--- qp_inc/blogs/blogs.ctrl.php	2013-03-12 06:26:03 +0000
+++ qp_inc/blogs/blogs.ctrl.php	2013-04-18 18:37:26 +0000
@@ -86,7 +86,7 @@
 		{
 			// okay good, continue
 			$file_imploded = implode( '', $file_loaded );
-			$stub_filename = 'blog'.$edited_Blog->urlname.'.php';
+			$stub_filename = $edited_Blog->urlname.'.php';
 			$new_file = $basepath.$stub_filename;
 			$f = @fopen( $new_file, 'w' );
 			if( $f == false )
 
=== modified file 'qp_inc/blogs/model/_blog.class.php'
--- qp_inc/blogs/model/_blog.class.php	2013-03-12 21:17:25 +0000
+++ qp_inc/blogs/model/_blog.class.php	2013-04-18 18:37:26 +0000
@@ -1089,7 +1089,7 @@
 	{
 		global $dispatcher;
 
-		return $dispatcher.'?ctrl=files&amp;root='.FileRoot::gen_ID( 'collection', $this->ID );
+		return $dispatcher.'?ctrl=files&amp;root='.FileRoot::gen_ID( 'blog', $this->ID );
 	}
 
 
@@ -1133,7 +1133,7 @@
 
 		if( ! $Settings->get( 'fm_enable_roots_blog' ) )
 		{
-			// User directories are disabled
+			// blog directories are disabled
 			return false;
 		}
 
@@ -1208,7 +1208,7 @@
 
 		if( ! $Settings->get( 'fm_enable_roots_blog' ) )
 		{
-			// User directories are disabled
+			// blog directories are disabled
 			return false;
 		}
 
 
=== modified file 'qp_inc/files/file_settings.ctrl.php'
--- qp_inc/files/file_settings.ctrl.php	2013-03-22 21:28:25 +0000
+++ qp_inc/files/file_settings.ctrl.php	2013-04-18 18:37:26 +0000
@@ -29,9 +29,17 @@
 	{
 		$Settings->delete_array( array(
 			'fm_enable_roots_blog',
+			'fm_blog_limit_files',
+			'fm_blog_limit_bytes',
 			'fm_enable_roots_user',
+			'fm_user_limit_files',
+			'fm_user_limit_bytes',
 			'fm_enable_roots_shared',
+			'fm_shared_limit_files',
+			'fm_shared_limit_bytes',
 			'fm_enable_roots_templates',
+			'fm_templates_limit_files',
+			'fm_templates_limit_bytes',
 			'fm_enable_create_dir',
 			'fm_default_chmod_dir',
 			'fm_enable_create_file',
@@ -51,18 +59,48 @@
 	}
 	else
 	{
-		// Filemanager settings
+		// "Accessible file roots" settings
+		// ... blog folders
 		param( 'fm_enable_roots_blog', 'integer', 0 );
 		$Settings->set( 'fm_enable_roots_blog', $fm_enable_roots_blog );
+		param_check_number( 'fm_blog_limit_files', sprintf( T_('"%s file limit" must be numbers only'), 'blog' ) );
+		$Settings->set( 'fm_blog_limit_files', $fm_blog_limit_files );
+		param_check_number( 'fm_blog_limit_bytes', sprintf( T_('"%s dir size" must be numbers only'), 'blog' ) );
+		$Settings->set( 'fm_blog_limit_bytes', $fm_blog_limit_bytes );
+		// ... user folders
 		param( 'fm_enable_roots_user', 'integer', 0 );
 		$Settings->set( 'fm_enable_roots_user', $fm_enable_roots_user );
+		param_check_number( 'fm_user_limit_files', sprintf( T_('"%s file limit" must be numbers only'), 'user' ) );
+		$Settings->set( 'fm_user_limit_files', $fm_user_limit_files );
+		param_check_number( 'fm_user_limit_bytes', sprintf( T_('"%s dir size" must be numbers only'), 'user' ) );
+		$Settings->set( 'fm_user_limit_bytes', $fm_user_limit_bytes );
+		// ... shared folders
 		param( 'fm_enable_roots_shared', 'integer', 0 );
 		$Settings->set( 'fm_enable_roots_shared', $fm_enable_roots_shared );
+		param_check_number( 'fm_shared_limit_files', sprintf( T_('"%s file limit" must be numbers only'), 'shared' ) );
+		$Settings->set( 'fm_shared_limit_files', $fm_shared_limit_files );
+		param_check_number( 'fm_shared_limit_bytes', sprintf( T_('"%s dir size" must be numbers only'), 'shared' ) );
+		$Settings->set( 'fm_shared_limit_bytes', $fm_shared_limit_bytes );
+		// ... template folders
 		param( 'fm_enable_roots_templates', 'integer', 0 );
 		$Settings->set( 'fm_enable_roots_templates', $fm_enable_roots_templates );
+		param_check_number( 'fm_templates_limit_files', sprintf( T_('"%s file limit" must be numbers only'), 'template' ) );
+		$Settings->set( 'fm_templates_limit_files', $fm_templates_limit_files );
+		param_check_number( 'fm_templates_limit_bytes', sprintf( T_('"%s dir size" must be numbers only'), 'template' ) );
+		$Settings->set( 'fm_templates_limit_bytes', $fm_templates_limit_bytes );
+
+		// "File creation options" settings
 		param( 'fm_enable_create_dir', 'integer', 0 );
 		$Settings->set( 'fm_enable_create_dir', $fm_enable_create_dir );
-		// Default dir CHMOD
+		param( 'fm_enable_create_file', 'integer', 0 );
+		$Settings->set( 'fm_enable_create_file', $fm_enable_create_file );
+		param( 'upload_enabled', 'integer', 0 );
+		$Settings->set( 'upload_enabled', $upload_enabled );
+		param_integer_range( 'upload_maxkb', 1, $upload_maxmaxkb, T_('Maximum allowed filesize must be between %d and %d KB.') );
+		$Settings->set( 'upload_maxkb', $upload_maxkb ); // upload limit
+
+		// "File creation options" settings
+		// ... default dir CHMOD
 		if( param( 'fm_default_chmod_dir', 'string', NULL ) !== NULL )
 		{
 			if( ! preg_match('~^[0-7]{3}$~', $fm_default_chmod_dir) )
@@ -71,9 +109,7 @@
 			}
 			$Settings->set( 'fm_default_chmod_dir', $fm_default_chmod_dir );
 		}
-		param( 'fm_enable_create_file', 'integer', 0 );
-		$Settings->set( 'fm_enable_create_file', $fm_enable_create_file );
-		// Default files CHMOD
+		// ... default files CHMOD
 		if( param( 'fm_default_chmod_file', 'string', NULL ) !== NULL )
 		{
 			if( ! preg_match('~^[0-7]{3}$~', $fm_default_chmod_file) )
@@ -82,23 +118,19 @@
 			}
 			$Settings->set( 'fm_default_chmod_file', $fm_default_chmod_file );
 		}
-		// Upload
-		param( 'upload_enabled', 'integer', 0 );
-		$Settings->set( 'upload_enabled', $upload_enabled );
-		param_integer_range( 'upload_maxkb', 1, $upload_maxmaxkb, T_('Maximum allowed filesize must be between %d and %d KB.') );
-		$Settings->set( 'upload_maxkb', $upload_maxkb );
-		// Advanced settings
+		// ... valid folder and file name
+		param( 'regexp_dirname', 'string', '' );
+		if( param_check_isregexp( 'regexp_dirname', T_('Valid dirname pattern is not a regular expression!') ) )
+		{
+			$Settings->set( 'regexp_dirname', $regexp_dirname );
+		}
 		param( 'regexp_filename', 'string', '' );
 		if( param_check_isregexp( 'regexp_filename', T_('Valid filename pattern is not a regular expression!') ) )
 		{
 			$Settings->set( 'regexp_filename', $regexp_filename );
 		}
-		param( 'regexp_dirname', 'string', '' );
-		if( param_check_isregexp( 'regexp_dirname', T_('Valid dirname pattern is not a regular expression!') ) )
-		{
-			$Settings->set( 'regexp_dirname', $regexp_dirname );
-		}
 
+		// wrap it up, ship it out
 		if( ! $Messages->count('error') )
 		{
 			if( $Settings->dbupdate() )
 
=== modified file 'qp_inc/files/files.ctrl.php'
--- qp_inc/files/files.ctrl.php	2013-03-22 21:28:25 +0000
+++ qp_inc/files/files.ctrl.php	2013-04-18 18:37:26 +0000
@@ -190,7 +190,7 @@
 if( empty( $fm_FileRoot ) && ! empty( $Blog ) )
 {
 	// Still not set a root, try to get it for the current Blog
-	$fm_FileRoot = & $FileRootCache->get_by_type_and_ID( 'collection', $Blog->ID );
+	$fm_FileRoot = & $FileRootCache->get_by_type_and_ID( 'blog', $Blog->ID );
 	if( ! $fm_FileRoot || ! isset( $available_Roots[$fm_FileRoot->ID] ) )
 	{
 		// Root not found or not in list of available ones
@@ -775,7 +775,7 @@
 
 	// fp> TODO: this block should move to a general level
 	// Try to go to the right blog:
-	if( $fm_Filelist->get_root_type() == 'collection' )
+	if( $fm_Filelist->get_root_type() == 'blog' )
 	{
 		set_working_blog( $fm_Filelist->get_root_ID() );
 		// Load the blog we're in
 
=== modified file 'qp_inc/files/model/_file.class.php'
--- qp_inc/files/model/_file.class.php	2013-03-22 21:28:25 +0000
+++ qp_inc/files/model/_file.class.php	2013-04-18 18:37:26 +0000
@@ -1646,6 +1646,9 @@
 
 	/**
 	 * Generate the IMG THUMBNAIL tag with all the alt & title if available
+	 *
+	 * @todo (3086) EdB> this needs to be params instead of ordered bits
+	 * @todo (3086) EdB> this really needs params/bits for setting alt and title
 	 */
 	function get_thumb_imgtag( $size_name = 'fit-80x80', $class = '', $align = '' )
 	{
 
=== modified file 'qp_inc/files/model/_file.funcs.php'
--- qp_inc/files/model/_file.funcs.php	2013-03-22 21:28:25 +0000
+++ qp_inc/files/model/_file.funcs.php	2013-04-18 18:37:26 +0000
@@ -151,6 +151,7 @@
  *
  * This checks if there's a _adminUI.class.php in there.
  *
+ * @todo (3086) EdB> this is ignoring the setting for default admin template :(
  * @return array List of directory names that hold admin templates or false, if
  * the admin templates directory does not exist.
  */
@@ -181,14 +182,14 @@
 	}
 	// lets alphabetize them
 	sort( $r );
-	// if we have "wind" put it first so we default to that
-	if( in_array( 'wind', $r ) )
+	// if we have "earth" put it first so we default to that
+	if( in_array( 'earth', $r ) )
 	{
 		$r_clone = array();
-		$r_clone[] = 'wind';
+		$r_clone[] = 'earth';
 		foreach( $r as $v )
 		{
-			if( $v != 'wind' )
+			if( $v != 'earth' )
 			{
 				$r_clone[] = $v;
 			}
 
=== modified file 'qp_inc/files/model/_filelist.class.php'
--- qp_inc/files/model/_filelist.class.php	2013-03-18 19:20:42 +0000
+++ qp_inc/files/model/_filelist.class.php	2013-04-18 18:37:26 +0000
@@ -1166,9 +1166,12 @@
 
 
 	/**
+	 * Get Current Working Directory
+	 *
 	 * Returns cwd, where the accessible directories (below root) are clickable
 	 *
-	 * @return string cwd as clickable html
+	 * @param boolean true hides most of the dir path, leaving only the "clickable" part
+	 * @return string current working directory (cwd) as clickable html
 	 */
 	function get_cwd_clickable( $clickableOnly = true )
 	{
@@ -1177,7 +1180,7 @@
 			return ' -- '.T_('No directory.').' -- ';
 		}
 
-		// Get the part of the path which is not clickable:
+		// Get the part of the path which is not clickable
 		$r = substr( $this->_FileRoot->ads_path, 0, strrpos( substr( $this->_FileRoot->ads_path, 0, -1 ), '/' ) + 1 );
 
 		// get the part that is clickable
 
=== modified file 'qp_inc/files/model/_fileroot.class.php'
--- qp_inc/files/model/_fileroot.class.php	2013-03-22 21:28:25 +0000
+++ qp_inc/files/model/_fileroot.class.php	2013-04-18 18:37:26 +0000
@@ -89,7 +89,7 @@
 			$this->ads_url = $User->get_media_url();
 			return;
 
-			case 'collection':
+			case 'blog':
 			$BlogCache = & get_Cache( 'BlogCache' );
 			$Blog = & $BlogCache->get_by_ID( $root_in_type_ID );
 			$this->name = $Blog->get( 'shortname' );
@@ -156,7 +156,7 @@
 			case 'user':
 			return NT_('User roots');
 
-			case 'collection':
+			case 'blog':
 			return NT_('Blog roots');
 
 			default:
@@ -172,8 +172,8 @@
 		switch( $root_type )
 		{
 			case 'user':
+			case 'blog':
 			case 'shared':
-			case 'collection':
 			case 'templates':
 			return $root_type.'_'.$root_in_type_ID;
 		}
 
=== modified file 'qp_inc/files/model/_filerootcache.class.php'
--- qp_inc/files/model/_filerootcache.class.php	2013-03-22 21:28:25 +0000
+++ qp_inc/files/model/_filerootcache.class.php	2013-04-18 18:37:26 +0000
@@ -53,7 +53,7 @@
 		$bloglist = $BlogCache->load_user_blogs( 'blog_media_browse', $current_User->ID );
 		foreach( $bloglist as $blog_ID )
 		{
-			if( $Root = & $this->get_by_type_and_ID( 'collection', $blog_ID, true ) )
+			if( $Root = & $this->get_by_type_and_ID( 'blog', $blog_ID, true ) )
 			{
 				$r[$Root->ID] = & $Root;
 			}
 
=== modified file 'qp_inc/files/upload.ctrl.php'
--- qp_inc/files/upload.ctrl.php	2013-03-12 21:17:25 +0000
+++ qp_inc/files/upload.ctrl.php	2013-04-18 18:37:26 +0000
@@ -210,6 +210,75 @@
 // Remember failed files (and the error messages)
 $failedFiles = array();
 
+// This next section will check if we have any file or byte restrictions,
+// and if so see if we will even bother trying to upload.
+if( isset( $_FILES ) && count( $_FILES ) )
+{
+	// Some files have been uploaded
+	global $upload_maxmaxkb;
+	$files_allowed = 99;
+	$bytes_allowed = $upload_maxmaxkb;
+	$uploading_denied = false;
+
+	// easiest first check is if we even have limits
+	$files_lim = $Settings->get( 'fm_'.$fm_FileRoot->type.'_limit_files' );
+	$bytes_lim = $Settings->get( 'fm_'.$fm_FileRoot->type.'_limit_bytes' );
+
+	if( $files_lim != '' || $bytes_lim != '' )
+	{
+		// we have a limit of some kind, so we deal with it
+		$fm_Filelist = new Filelist( $fm_FileRoot, $ads_list_path );
+		$fm_Filelist->load();
+		$files = $fm_Filelist->_total_files;
+		$bytes = $fm_Filelist->_total_bytes;
+
+		// have we reached or exceeded our file count limit?
+		if( $files_lim != '' )
+		{
+			if( $files >= $files_lim )
+			{
+				// yes: error message, get out
+				$Messages->add( sprintf( T_('This folder has reached the limit for number of files (%s) - uploading not allowed.'), $files_lim ), 'error' );
+				$uploading_denied = true;
+			}
+			else
+			{
+				$files_allowed = $files_lim - $files;
+			}
+		}
+
+		// have we reached or exceeded our byte count limit?
+		if( $bytes_lim != '' )
+		{
+			$bytes_lim = ( $bytes_lim * 1024 );
+			if( $bytes >= $bytes_lim )
+			{
+				// yes: error message, get out
+				$bytes_lim_kb = number_format( $bytes_lim );
+				$Messages->add( sprintf( T_('This folder has reached the limit for total bytes (%s) - uploading not allowed.'), $bytes_lim_kb ), 'error' );
+				$uploading_denied = true;
+			}
+			else
+			{
+				$bytes_allowed = $bytes_lim - $bytes;
+			}
+		}
+	}
+}
+
+// If we reached any limits we display the error message and call it a day
+if( $Messages->count('error') )
+{
+	$AdminUI->disp_html_head();
+	// Display title, menu, messages, etc. (Note: messages MUST be displayed AFTER the actions)
+	$AdminUI->disp_body_top();
+	$AdminUI->disp_global_footer();
+	exit(0);
+}
+
+// We have $files_allowed and $bytes_allowed. These are either real limits or
+// crazy-high high falsies. We will apply our limits after each upload ...
+
 // Process uploaded files
 if( isset( $_FILES ) && count( $_FILES ) )
 {
@@ -222,6 +291,22 @@
 
 	foreach( $_FILES['uploadfile']['name'] as $lKey => $lName )
 	{
+		// check if our limits have been broken, if so abort out
+		if( ! $files_allowed )
+		{
+			// yes: error message, get out
+			$Messages->add( sprintf( T_('This folder has reached the limit for number of files (%s) - uploading &laquo;%s&raquo; cancelled.'), $files_lim, $lName ), 'error' );
+			continue; // abort upload for this file
+		}
+		// have we reached or exceeded our byte count limit?
+		if( $bytes_allowed < 1 )
+		{
+			// yes: error message, get out
+			$bytes_lim_kb = number_format( $bytes_lim );
+			$Messages->add( sprintf( T_('This folder has reached the limit for total bytes (%s) - uploading &laquo;%s&raquo; cancelled.'), $bytes_lim_kb, $lName ), 'error' );
+			continue; // abort upload for this file
+		}
+
 		if( empty( $lName ) )
 		{
 			// No file name
@@ -231,73 +316,69 @@
 				 || ! empty( $uploadfile_desc[$lKey] )
 				 || ! empty( $uploadfile_name[$lKey] ) )
 			{
-				// User specified params but NO file!!!
-				// Remember the file as failed when additional info provided.
+				// User specified params but no file; remember the file as failed when additional info provided
 				$failedFiles[$lKey] = T_( 'Please select a local file to upload.' );
 			}
-			// Abort upload for this file
-			continue;
+			continue; // abort upload for this file
 		}
 
 		if( $Settings->get( 'upload_maxkb' )
-				&& $_FILES['uploadfile']['size'][$lKey] > $Settings->get( 'upload_maxkb' )*1024 )
+			&& $_FILES['uploadfile']['size'][$lKey] > $Settings->get( 'upload_maxkb' )*1024 )
 		{
 			// bigger than defined by blog
-			$failedFiles[$lKey] = sprintf(
-				T_('The file is too large: %s but the maximum allowed is %s.'),
+			$failedFiles[$lKey] = sprintf( T_('The file is too large: %s but the maximum allowed is %s.'),
 				bytesreadable( $_FILES['uploadfile']['size'][$lKey] ),
 				bytesreadable( $Settings->get( 'upload_maxkb' )*1024 ) );
-			// Abort upload for this file
-			continue;
+			continue; // abort upload for this file
 		}
 
 		if( $_FILES['uploadfile']['error'][$lKey] )
 		{
-			// PHP has detected an error!
+			// PHP has detected an error :: http://php.net/manual/en/features.file-upload.errors.php
 			switch( $_FILES['uploadfile']['error'][$lKey] )
 			{
+				case UPLOAD_ERR_INI_SIZE:
+				$failedFiles[$lKey] = T_('The file exceeds the upload_max_filesize directive in php.ini.');
+				continue; // abort upload for this file
+
 				case UPLOAD_ERR_FORM_SIZE:
-				// The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
-				// This can easily be changed, so we do not use it.. file size gets checked for real just above
+				// The uploaded file exceeds the MAX_FILE_SIZE directive that was specified
+				// in the html form. This can easily be changed, so we do not use it. File
+				// size gets checked for real just before this switch
 				break;
 
-				case UPLOAD_ERR_INI_SIZE: // bigger than allowed in php.ini
-				$failedFiles[$lKey] = T_('The file exceeds the upload_max_filesize directive in php.ini.');
-				// Abort upload for this file
-				continue;
-
 				case UPLOAD_ERR_PARTIAL:
 				$failedFiles[$lKey] = T_('The file was only partially uploaded.');
-				// Abort upload for this file
-				continue;
+				continue; // abort upload for this file
 
 				case UPLOAD_ERR_NO_FILE:
-				// Is probably the same as empty( $lName ) before
 				$failedFiles[$lKey] = T_('No file was uploaded.');
-				// Abort upload for this file
-				continue;
+				continue; // abort upload for this file
 
-				case 6: // numerical value of UPLOAD_ERR_NO_TMP_DIR
-				# (min_php: 4.3.10, 5.0.3) case UPLOAD_ERR_NO_TMP_DIR:
-				// Missing a temporary folder.
+				case UPLOAD_ERR_NO_TMP_DIR:
 				$failedFiles[$lKey] = T_('Missing a temporary folder (upload_tmp_dir in php.ini).');
-				// Abort upload for this file
-				continue;
+				continue; // abort upload for this file
+
+				case UPLOAD_ERR_CANT_WRITE:
+				$failedFiles[$lKey] = T_('Failed to write file to disk.');
+				continue; // abort upload for this file
+
+				case UPLOAD_ERR_EXTENSION:
+				$failedFiles[$lKey] = T_('A PHP extension stopped the file upload.');
+				continue; // abort upload for this file
 
 				default:
 				$failedFiles[$lKey] = T_('Unknown error.').' #'.$_FILES['uploadfile']['error'][$lKey];
-				// Abort upload for this file:
-				continue;
+				continue; // abort upload for this file
 			}
 		}
 
-		if( !is_uploaded_file( $_FILES['uploadfile']['tmp_name'][$lKey] ) )
+		if( ! is_uploaded_file( $_FILES['uploadfile']['tmp_name'][$lKey] ) )
 		{
-			// Ensure that a malicious user hasn't tried to trick the script into working
-			// on files upon which it should not be working
+			// Ensure that a malicious user hasn't tried to trick the script into
+			// working on files upon which it should not be working
 			$failedFiles[$lKey] = T_('The file does not seem to be a valid upload! It may exceed the upload_max_filesize directive in php.ini.');
-			// Abort upload for this file
-			continue;
+			continue; // abort upload for this file
 		}
 
 		// If new name on server is specified check the extension and use the new name
@@ -325,8 +406,7 @@
 		{
 			// Not a file name or not an allowed extension
 			$failedFiles[$lKey] = $error_filename;
-			// Abort upload for this file
-			continue;
+			continue; // abort upload for this file
 		}
 
 		// Get File object for requested target location
@@ -335,12 +415,11 @@
 
 		if( $newFile->exists() )
 		{
-			// The file already exists in the target location!
+			// The file already exists in the target location
 			// @todo (0000) Rename/Overwriting (save as filename_<numeric_extension> and
 			// provide interface to confirm, rename or overwrite)
 			$failedFiles[$lKey] = sprintf( T_('The file &laquo;%s&raquo; already exists.'), $newFile->dget( 'name' ) );
-			// Abort upload for this file
-			continue;
+			continue; // abort upload for this file
 		}
 
 		// Trigger plugin event
@@ -352,7 +431,7 @@
 			'size' => & $_FILES['uploadfile']['size'][$lKey],
 		) ) )
 		{
-			// Plugin returned 'false'. Abort file upload
+			// Plugin returned 'false' ... abort upload for this file
 			continue;
 		}
 
@@ -360,8 +439,7 @@
 		if( ! @move_uploaded_file( $_FILES['uploadfile']['tmp_name'][$lKey], $newFile->get_full_path() ) )
 		{
 			$failedFiles[$lKey] = T_('An unknown error occurred when moving the uploaded file on the server.');
-			// Abort upload for this file
-			continue;
+			continue; // abort upload for this file
 		}
 
 		// change to default chmod settings
@@ -482,6 +560,10 @@
 		// Store File object into DB
 		$newFile->dbsave();
 
+		// subtract this file from $files_allowed and $bytes_allowed
+		$files_allowed = $files_allowed - 1;
+		$bytes_allowed = $bytes_allowed - $_FILES['uploadfile']['size'][$lKey];
+
 		$Plugins->trigger_event( 'AfterFileSave', array(
 			'newFile' => & $newFile
 		) );
 
=== modified file 'qp_inc/files/views/_file_browse.view.php'
--- qp_inc/files/views/_file_browse.view.php	2013-03-18 19:20:42 +0000
+++ qp_inc/files/views/_file_browse.view.php	2013-04-18 18:37:26 +0000
@@ -303,10 +303,10 @@
 	echo '<div class="toolbaritem">';
 	$Form = new Form( NULL, 'fmbar_quick_upload', 'post', 'none', 'multipart/form-data' );
 	$Form->begin_form();
-	$Form->hidden_ctrl();
+	$Form->hidden( 'ctrl', 'upload' );
 	$Form->hidden( 'upload_quickmode', 1 );
 	// The following is mainly a hint to the browser.
-	$Form->hidden( 'MAX_FILE_SIZE', $Settings->get( 'upload_maxkb' )*1024 );
+	$Form->hidden( 'MAX_FILE_SIZE', $Settings->get( 'upload_maxkb' ) * 1024 );
 	$Form->hiddens_by_key( get_memorized('ctrl') );
 	echo '<div>';
 	echo '<input name="uploadfile[]" type="file" size="10" />';
 
=== modified file 'qp_inc/files/views/_file_browse_set.form.php'
--- qp_inc/files/views/_file_browse_set.form.php	2013-03-18 19:20:42 +0000
+++ qp_inc/files/views/_file_browse_set.form.php	2013-04-18 18:37:26 +0000
@@ -22,7 +22,7 @@
 {
 	echo '<p class="note">'.T_('See also:').' ';
 
-	if( $fm_FileRoot->type == 'collection' )
+	if( $fm_FileRoot->type == 'blog' )
 	{
 		echo T_('Blog Settings').' &gt; '.T_('General').' &gt; <a href="?ctrl=blog_settings&tab=general&blog='.$fm_FileRoot->in_type_ID.'">'
 			.T_('Media directory location').'</a> &bull; ';
 
=== modified file 'qp_inc/files/views/_file_list.inc.php'
--- qp_inc/files/views/_file_list.inc.php	2013-03-22 21:28:25 +0000
+++ qp_inc/files/views/_file_list.inc.php	2013-04-18 18:37:26 +0000
@@ -459,7 +459,7 @@
 	$title_options = array();
 	$caption_options = array();
 
-	if( $mode != 'upload' && ( $fm_Filelist->get_root_type() == 'collection' || ! empty( $Blog ) ) )
+	if( $mode != 'upload' && ( $fm_Filelist->get_root_type() == 'blog' || ! empty( $Blog ) ) )
 	{
 		// We are browsing files for a blog
 		// fp> TODO: use current as default but let user choose into which blog he wants to post
 
=== modified file 'qp_inc/files/views/_file_settings.form.php'
--- qp_inc/files/views/_file_settings.form.php	2013-03-22 21:28:25 +0000
+++ qp_inc/files/views/_file_settings.form.php	2013-04-18 18:37:26 +0000
@@ -66,79 +66,52 @@
 	return $r;
 }
 
-
-/**
- * Javascript to init hidden/shown state of a fastform field based on a checkbox
- *
- * EXPERIMENTAL
- * Will be moved to another file, I'm leaving it here for a short period, in order to provide context
- *
- * @param string form field id as used when creating it with the Form class
- * @param string DOM id
- */
-function JS_showhide_ffield_on_checkbox( $field_id, $checkbox_id )
-{
-	return '<script type="text/javascript">
-		document.getElementById("ffield_'.$field_id.'").style.display = (document.getElementById("'.$checkbox_id.'").checked ? "" : "none")
-	</script>';
-}
-
-
-/**
- * Javascript hide/show all DOM elements with a particular class based on current checkbox
- *
- * EXPERIMENTAL
- * Will be moved to another file, I'm leaving it here for a short period, in order to provide context
- *
- * @param string DOM class name
- */
-function JS_showhide_class_on_this( $class )
-{
-	return 'if( this.checked )
-		{
-			jQuery(".'.$class.'").show();
-		}
-		else
-		{
-			jQuery(".'.$class.'").hide();
-		}';
-}
-
-
-/**
- * Javascript hide/show a fastform field based on current checkbox
- *
- * EXPERIMENTAL
- * Will be moved to another file, I'm leaving it here for a short period, in order to provide context
- *
- * @param string DOM id
- */
-function JS_showhide_ffield_on_this( $field_id )
-{
-	return 'document.getElementById("ffield_'.$field_id.'").style.display = (this.checked ? "" : "none")';
-}
-
 $Form = new Form( NULL, 'files_checkchanges' );
 $Form->begin_form( 'fform', T_('File Settings') );
 $Form->hidden_ctrl();
 $Form->hidden( 'action', 'update' );
 
 $Form->begin_fieldset( T_('Accessible file roots'), array( 'id' => 'ffset_fileroots', 'class' => 'additional_file_settings' ) );
-$Form->checkbox( 'fm_enable_roots_blog', $Settings->get( 'fm_enable_roots_blog' ), T_('Enable blog directories'), T_('Check to enable root directories for blogs.' ) );
-$Form->checkbox( 'fm_enable_roots_user', $Settings->get( 'fm_enable_roots_user' ), T_('Enable user directories'), T_('Check to enable root directories for users.' ) );
-$Form->checkbox( 'fm_enable_roots_shared', $Settings->get( 'fm_enable_roots_shared' ), T_('Enable shared directory'), T_('Check to enable shared root directory.' ) );
-$Form->checkbox( 'fm_enable_roots_templates', $Settings->get( 'fm_enable_roots_templates' ), T_('Enable templates directory'), T_('Check to enable root directory for templates.' ) ); // fp> note: meaning may change to 1 dir per (installed) template
+$Form->checkbox_input( 'fm_enable_roots_blog', $Settings->get( 'fm_enable_roots_blog' ), T_('Enable blog directories'),
+	array( 'note' => T_('Check to enable root directories for blogs.'),
+		'onclick' => 'document.getElementById("fm_blog_limits").style.display = (this.checked==true ? "" : "none") ;' ) );
+echo '<div id="fm_blog_limits">';
+$Form->text_input( 'fm_blog_limit_files', $Settings->get( 'fm_blog_limit_files' ), 3, T_('blog file limit'), T_('This limits how many files a blog folder can have. Leave empty for no limit.') );
+$Form->text_input( 'fm_blog_limit_bytes', $Settings->get( 'fm_blog_limit_bytes' ), 6, T_('blog dir size'), T_('KB. This limits how many kilobytes a blog folder can have. Leave empty for no limit.' ) );
+echo '</div>';
+$Form->checkbox_input( 'fm_enable_roots_user', $Settings->get( 'fm_enable_roots_user' ), T_('Enable user directories'),
+	array( 'note' => T_('Check to enable root directories for users.' ),
+		'onclick' => 'document.getElementById("fm_user_limits").style.display = (this.checked==true ? "" : "none") ;' ) );
+echo '<div id="fm_user_limits">';
+$Form->text_input( 'fm_user_limit_files', $Settings->get( 'fm_user_limit_files' ), 3, T_('user file limit'), T_('This limits how many files a user folder can have. Leave empty for no limit.') );
+$Form->text_input( 'fm_user_limit_bytes', $Settings->get( 'fm_user_limit_bytes' ), 6, T_('user dir size'), T_('KB. This limits how many kilobytes a user folder can have. Leave empty for no limit.' ) );
+echo '</div>';
+$Form->checkbox_input( 'fm_enable_roots_shared', $Settings->get( 'fm_enable_roots_shared' ), T_('Enable shared directory'),
+	array( 'note' => T_('Check to enable shared root directory.' ),
+		'onclick' => 'document.getElementById("fm_shared_limits").style.display = (this.checked==true ? "" : "none") ;' ) );
+echo '<div id="fm_shared_limits">';
+$Form->text_input( 'fm_shared_limit_files', $Settings->get( 'fm_shared_limit_files' ), 3, T_('shared file limit'), T_('This limits how many files a shared folder can have. Leave empty for no limit.') );
+$Form->text_input( 'fm_shared_limit_bytes', $Settings->get( 'fm_shared_limit_bytes' ), 6, T_('shared dir size'), T_('KB. This limits how many kilobytes a shared folder can have. Leave empty for no limit.' ) );
+echo '</div>';
+$Form->checkbox_input( 'fm_enable_roots_templates', $Settings->get( 'fm_enable_roots_templates' ), T_('Enable templates directory'),
+	array( 'note' => T_('Check to enable root directory for templates.' ),
+		'onclick' => 'document.getElementById("fm_templates_limits").style.display = (this.checked==true ? "" : "none") ;' ) );
+echo '<div id="fm_templates_limits">';
+$Form->text_input( 'fm_templates_limit_files', $Settings->get( 'fm_templates_limit_files' ), 3, T_('template file limit'), T_('This limits how many files a template folder can have. Leave empty for no limit.') );
+$Form->text_input( 'fm_templates_limit_bytes', $Settings->get( 'fm_templates_limit_bytes' ), 6, T_('template dir size'), T_('KB. This limits how many kilobytes a template folder can have. Leave empty for no limit.' ) );
+echo '</div>';
 $Form->end_fieldset();
 
 $Form->begin_fieldset( T_('File creation options'), array( 'id' => 'ffset_filecreate', 'class' => 'additional_file_settings' ) );
 $Form->checkbox( 'fm_enable_create_dir', $Settings->get( 'fm_enable_create_dir' ), T_('Enable creation of folders'), T_('Check to enable creation of directories.' ) );
 $Form->checkbox( 'fm_enable_create_file', $Settings->get( 'fm_enable_create_file' ), T_('Enable creation of files'), T_('Check to enable creation of files.' ) );
 $Form->checkbox_input( 'upload_enabled', $Settings->get( 'upload_enabled' ), T_('Enable upload of files'), array(
-	'note' => T_('Check to allow uploading files in general.' ), 'onclick' => JS_showhide_ffield_on_this('upload_maxkb') ) );
+	'note' => T_('Check to allow uploading files in general.' ),
+		'onclick' => 'document.getElementById("upload_maxkb_div").style.display = (this.checked==true ? "" : "none") ;' ) );
+echo '<div id="upload_maxkb_div">';
 $Form->text_input( 'upload_maxkb', $Settings->get( 'upload_maxkb' ), 6, T_('Maximum upload filesize'),
 	sprintf( /* TRANS: first %s is setting/var name, second is file name, third is limit value */ T_('KB. This cannot be higher than your PHP/Webserver setting and the limit of %s (in %s), which is currently %s!'), '$upload_maxmaxkb', '/qp_config/_advanced.php', $upload_maxmaxkb.' '.T_('KB') ), array( 'maxlength' => 7, 'required' => true ) );
-// Javascript to init hidden/shown state:
-echo JS_showhide_ffield_on_checkbox( 'upload_maxkb', 'upload_enabled' );
+echo '</div>';
 $Form->end_fieldset();
 
 $Form->begin_fieldset( T_('Advanced options'), array( 'id' => 'ffset_fileadvanced', 'class' => 'additional_file_settings' ) );
 
=== modified file 'qp_inc/generic/model/_genericelement.class.php'
--- qp_inc/generic/model/_genericelement.class.php	2013-03-18 19:20:42 +0000
+++ qp_inc/generic/model/_genericelement.class.php	2013-04-18 18:37:26 +0000
@@ -79,8 +79,8 @@
 			$Form->global_icon( T_('Cancel editing!'), 'close', regenerate_url( 'action' ), T_('cancel') );
 		}
 		$Form->begin_form( 'fform', $creating ? T_('New element') : T_('Element') );
-		$Form->hidden_ctrl();
 		$Form->hidden( 'action', $creating ? 'create' : 'update' );
+		$Form->hidden( 'ctrl', $ctrl );
 		$Form->hiddens_by_key( get_memorized( 'action, ctrl' ) );
 		$Form->text_input( $this->dbprefix.'name', $this->name, $edited_name_maxlen, T_('name'), '', array( 'required' => true ) );
 		if( $creating )
 
=== modified file 'qp_inc/generic/views/_generic_category.form.php'
--- qp_inc/generic/views/_generic_category.form.php	2013-03-18 19:20:42 +0000
+++ qp_inc/generic/views/_generic_category.form.php	2013-04-18 18:37:26 +0000
@@ -22,8 +22,8 @@
 $Form = new Form( NULL, 'form' );
 $Form->global_icon( T_('Cancel editing!'), 'close', regenerate_url( 'action' ), T_('cancel') );
 $Form->begin_form( 'fform', $creating ? T_('New category') : T_('Category') );
-$Form->hidden_ctrl();
 $Form->hidden( 'action', $creating ? 'create' : 'update' );
+$Form->hidden( 'ctrl', $ctrl );
 $Form->hiddens_by_key( get_memorized( 'action, ctrl' ) );
 
 $Form->begin_fieldset( T_('Properties') );
 
=== modified file 'qp_inc/plugins/_plugin.class.php'
--- qp_inc/plugins/_plugin.class.php	2013-03-22 21:28:25 +0000
+++ qp_inc/plugins/_plugin.class.php	2013-04-18 18:37:26 +0000
@@ -809,6 +809,17 @@
 
 
 	/**
+	 * Event handler: Turns on "extended profile" feature
+	 *
+	 * Give it a true to give each user a second page of profile options
+	 */
+	function ActivateExtendedProfile( $activate = false )
+	{
+		return false;
+	}
+
+
+	/**
 	 * Event handler: Gets invoked in /admin.php after the menu structure is built
 	 *
 	 * Gets invoked in /admin.php for every backoffice page after the menu structure
 
=== modified file 'qp_inc/plugins/_plugin.funcs.php'
--- qp_inc/plugins/_plugin.funcs.php	2013-03-12 06:26:03 +0000
+++ qp_inc/plugins/_plugin.funcs.php	2013-04-18 18:37:26 +0000
@@ -925,7 +925,8 @@
 	if( isset( $meta['valid_pattern'] ) )
 	{
 		$param_pattern = is_array( $meta['valid_pattern'] ) ? $meta['valid_pattern']['pattern'] : $meta['valid_pattern'];
-		if( ! preg_match( $param_pattern, $value ) )
+		// checking for not empty values is a lazy solution to an unrequired field making an "error" even though it works correctly
+		if( ! preg_match( $param_pattern, $value ) && $value != '' )
 		{
 			$param_error = is_array( $meta['valid_pattern'] ) ? $meta['valid_pattern']['error'] : sprintf(T_('The value is invalid. It must match the regular expression &laquo;%s&raquo;.'), $param_pattern);
 			param_error( $param_name, $param_error );
 
=== modified file 'qp_inc/plugins/model/_plugins_admin.class.php'
--- qp_inc/plugins/model/_plugins_admin.class.php	2013-03-18 19:20:42 +0000
+++ qp_inc/plugins/model/_plugins_admin.class.php	2013-04-18 18:37:26 +0000
@@ -81,6 +81,7 @@
 		if( empty( $supported_events ) )
 		{
 			$supported_events = array(
+				'ActivateExtendedProfile' => 'Turns on "extended profile" feature',
 				'AdminAfterPageFooter' => 'This gets called after the backoffice HTML footer has been displayed.',
 				'AdminDisplayEditorButton' => 'Display action buttons on the edit screen(s)',
 				'AdminDisplayCommentToolbar' => 'Display a toolbar on the admin-side feedback form',
 
=== modified file 'qp_inc/sessions/_sessions.init.php'
--- qp_inc/sessions/_sessions.init.php	2013-03-22 21:28:25 +0000
+++ qp_inc/sessions/_sessions.init.php	2013-04-18 18:37:26 +0000
@@ -27,15 +27,12 @@
 
 // Aliases for table names
 $app_db_config['aliases']['T_basedomains'] = $app_db_tableprefix.'basedomains';
-$app_db_config['aliases']['T_goals'] = $app_db_tableprefix.'track__goal';
-$app_db_config['aliases']['T_goal_hits'] = $app_db_tableprefix.'track__goalhit';
+$app_db_config['aliases']['T_goals'] = $app_db_tableprefix.'goals';
+$app_db_config['aliases']['T_goal_hits'] = $app_db_tableprefix.'goal_hits';
 $app_db_config['aliases']['T_hitlog'] = $app_db_tableprefix.'hitlog';
-$app_db_config['aliases']['T_keyphrases'] = $app_db_tableprefix.'track__keyphrase';
+$app_db_config['aliases']['T_keyphrases'] = $app_db_tableprefix.'keyphrases';
 $app_db_config['aliases']['T_sessions'] = $app_db_tableprefix.'sessions';
 $app_db_config['aliases']['T_useragents'] = $app_db_tableprefix.'useragents';
-$app_db_config['aliases']['T_track__goal'] = $app_db_tableprefix.'track__goal'; // old, going away
-$app_db_config['aliases']['T_track__goalhit'] = $app_db_tableprefix.'track__goalhit'; // old, going away
-$app_db_config['aliases']['T_track__keyphrase'] = $app_db_tableprefix.'track__keyphrase'; // old, going away
 
 // Controller mappings
 $ctrl_mappings['stats'] = 'sessions/stats.ctrl.php';
 
=== modified file 'qp_inc/settings/model/_generalsettings.class.php'
--- qp_inc/settings/model/_generalsettings.class.php	2013-03-12 06:26:03 +0000
+++ qp_inc/settings/model/_generalsettings.class.php	2013-04-18 18:37:26 +0000
@@ -58,7 +58,7 @@
 		'newusers_canregister' => '0',
 		'newusers_level' => '1',
 		// "Display options" section
-		'default_admin_template' => 'wind',
+		'default_admin_template' => 'earth',
 		// "Email validation" section
 		'newusers_mustvalidate' => '1',
 		'newusers_revalidate_emailchg' => '0',
@@ -80,9 +80,17 @@
 		// GLOBAL SETTINGS -> FILES
 		// "Accessible file roots" section
 		'fm_enable_roots_blog' => '1',
+		'fm_blog_limit_files' => '',
+		'fm_blog_limit_bytes' => '',
 		'fm_enable_roots_user' => '1',
+		'fm_user_limit_files' => '',
+		'fm_user_limit_bytes' => '',
 		'fm_enable_roots_shared' => '0',
+		'fm_shared_limit_files' => '',
+		'fm_shared_limit_bytes' => '',
 		'fm_enable_roots_templates' => '0',
+		'fm_templates_limit_files' => '',
+		'fm_templates_limit_bytes' => '',
 		// "File creation options" section
 		'fm_enable_create_dir' => '1',
 		'fm_enable_create_file' => '1',
 
=== modified file 'qp_inc/templates/model/_template.class.php'
--- qp_inc/templates/model/_template.class.php	2013-03-22 21:28:25 +0000
+++ qp_inc/templates/model/_template.class.php	2013-04-18 18:37:26 +0000
@@ -194,6 +194,9 @@
 	 * Compare discovered containers to database info
 	 *
 	 * Called when reloading a template
+	 *
+	 * @todo (3085) EdB> There seems to be a bug in here that leaves mention of a
+	 * container that was removed when doing a reload.
 	 */
 	function db_compare_containers()
 	{
 
=== modified file 'qp_inc/tools/views/_system_list.view.php'
--- qp_inc/tools/views/_system_list.view.php	2013-03-18 19:20:42 +0000
+++ qp_inc/tools/views/_system_list.view.php	2013-04-18 18:37:26 +0000
@@ -39,19 +39,8 @@
 // Version check
 $app_timestamp = mysql2timestamp( $app_date );
 $app_date = date_i18n( locale_datefmt(), $app_timestamp );
-
-$bzr_revno = get_bzr_revision();
-if( $bzr_revno )
-{
-	/* TRANS: First %s: App version, second %s: release date, third %d: Bazaar revision number */
-	$ver_val = sprintf( T_( '%s released on %s &mdash; Bazaar revision %d' ), $app_version, $app_date, $bzr_revno );
-}
-else
-{
-	/* TRANS: First %s: App version, second %s: release date */
-	$ver_val = sprintf( T_( '%s released on %s' ), $app_version, $app_date );
-}
-init_system_check( sprintf( T_( '%s version' ), $app_name ), $ver_val );
+$ver_val = sprintf( T_('%s released on %s'), $app_version, $app_date );
+init_system_check( sprintf( T_('%s version'), $app_name ), $ver_val );
 
 // age check
 $app_age = ( $localtimenow - $app_timestamp ) / 3600 / 24 / 30; // approx age in months
@@ -63,13 +52,6 @@
 {
 	disp_system_check( 'warning', sprintf( T_('This version is aging. You may want to check for newer releases on').' <a href="'.$app_homepage.'">'.$app_name.'</a>.' ) );
 }
-elseif( $bzr_revno )
-{
-	disp_system_check( 'ok', sprintf( /* TRANS: %d: Bazaar revision number */
-		T_( 'This is a development version and not an official release, but it should be mostly operational.<br />'
-		.'If you report bugs in this version, mention that you are using the development version with '
-		.'<strong>Bazaar revision number %d</strong>.' ), $bzr_revno ) );
-}
 else
 {
 	disp_system_check( 'ok' );
 
=== modified file 'qp_inc/users/model/_user.class.php'
--- qp_inc/users/model/_user.class.php	2013-03-22 21:28:25 +0000
+++ qp_inc/users/model/_user.class.php	2013-04-18 18:37:26 +0000
@@ -903,13 +903,34 @@
 			'align' => '',
 		), $params );
 
-		$FileCache = & get_Cache( 'FileCache' );
-		$Avatar = & $FileCache->get_by_ID( $this->avatar_ID, false, false );
-
-		return array(
-			'tag' => $Avatar->get_thumb_imgtag( $params['size'], $params['class'], $params['align'] ),
-			'root' => $Avatar->_FileRoot->ID,
-		);
+
+		global $DB;
+		$query = 'SELECT file_path FROM T_files WHERE file_root_type = \'user\' AND file_ID = '.$this->avatar_ID;
+		if( $file_name = $DB->get_var( $query ) )
+		{
+			$FileCache = & get_Cache( 'FileCache' );
+			$Avatar = & $FileCache->get_by_root_and_path( 'user', $this->ID, $file_name );
+			return array(
+				'tag' => $Avatar->get_thumb_imgtag( $params['size'], $params['class'], $params['align'] ),
+				'root' => $Avatar->_FileRoot->ID,
+			);
+		}
+		elseif( is_null( $file_name ) )
+		{
+			// avatar file must have been deleted is all I can think of
+			$UserCache = & get_Cache( 'UserCache' );
+			$edited_User = & $UserCache->get_by_ID( $this->ID, false );
+			$edited_User->set( 'avatar_file_ID', NULL, true );
+			$edited_User->dbupdate();
+			// return an empty array as avatar
+			return array( 'tag' => '', 'root' => '' );
+		}
+		else
+		{
+			// this is a total mystery ... no file name but not null?
+			debug_die( 'file id '.$this->avatar_ID.' not found but file_name not null ... which is crazy' );
+		}
+
 	}
 
 
 
=== modified file 'qp_inc/users/model/_user.funcs.php'
--- qp_inc/users/model/_user.funcs.php	2013-03-22 21:28:25 +0000
+++ qp_inc/users/model/_user.funcs.php	2013-04-18 18:37:26 +0000
@@ -276,7 +276,7 @@
 
 
 /**
- * Template tag: Output a link to the backoffice
+ * Template tag: Display a link to the backoffice
  *
  * Usually provided in templates in order for newbies to find the admin interface
  * more easily...
@@ -284,9 +284,10 @@
  * @todo (2140) EdB> change to array of params
  * @param string To be displayed before the link.
  * @param string To be displayed after the link.
- * @param string The page/controller to link to inside of {@link $admin_url}
  * @param string Text for the link.
  * @param string Title for the link.
+ * @param string The page/controller to link to inside of {@link $admin_url}
+ * @param string the returned string if the user should not see the admin link
  */
 function user_admin_link( $before = '', $after = '', $link_text = '', $link_title = '#', $not_visible = '' )
 {
@@ -295,16 +296,16 @@
 
 
 /**
- * Template tag: Get a link to the backoffice
+ * Get a link to the backoffice
  *
  * Usually provided in templates in order for newbies to find the admin interface
  * more easily...
  *
  * @param string To be displayed before the link.
  * @param string To be displayed after the link.
- * @param string The page/controller to link to inside of {@link $admin_url}
  * @param string Text for the link.
  * @param string Title for the link.
+ * @param string The returned string if the user should not see the admin link
  * @return string
  */
 function get_user_admin_link( $before = '', $after = '', $link_text = '', $link_title = '#', $not_visible = '' )
@@ -343,19 +344,30 @@
 
 /**
  * Template tag: Display a link to user profile
+ *
+ * @param string To be displayed before the link.
+ * @param string To be displayed after the link.
+ * @param string Text for the link.
+ * @param string Title for the link.
+ * @param integer The ID of the user we want a profile link for
  */
-function user_profile_link( $before = '', $after = '', $link_text = '', $link_title = '#' )
+function user_profile_link( $before = '', $after = '', $link_text = '', $link_title = '#', $user_id = '#' )
 {
-	echo get_user_profile_link( $before, $after, $link_text, $link_title );
+	echo get_user_profile_link( $before, $after, $link_text, $link_title, $user_id );
 }
 
 
 /**
- * Template tag: Get a link to user profile
+ * Get a link to user profile
  *
+ * @param string To be displayed before the link.
+ * @param string To be displayed after the link.
+ * @param string Text for the link.
+ * @param string Title for the link.
+ * @param integer The ID of the user we want a profile for
  * @return string|false
  */
-function get_user_profile_link( $before = '', $after = '', $link_text = '', $link_title = '#' )
+function get_user_profile_link( $before = '', $after = '', $link_text = '', $link_title = '#', $user_id = '#' )
 {
 	global $current_User;
 
@@ -372,10 +384,20 @@
 	{
 		$link_text = str_replace( '%s', $current_User->login, $link_text );
 	}
-	if( $link_title == '#' ) $link_title = T_('Edit your profile');
+
+	if( $link_title == '#' )
+	{
+		$link_title = T_('Edit your profile');
+	}
+
+	if( $user_id == '#' )
+	{
+		$user_id = $current_User->ID;
+	}
+
 
 	$r = $before
-		.'<a href="'.get_user_profile_url().'" title="'.$link_title.'">'
+		.'<a href="'.get_user_profile_url( $user_id ).'" title="'.$link_title.'">'
 		.sprintf( $link_text, $current_User->login )
 		.'</a>'
 		.$after;
@@ -386,8 +408,11 @@
 
 /**
  * Get URL to edit user profile
+ *
+ * @param integer The ID of the user we want a profile for
+ * @return string The link to profile, either in admin or public with redirect
  */
-function get_user_profile_url()
+function get_user_profile_url( $user_id )
 {
 	global $admin_url;
 	global $Blog;
@@ -401,7 +426,7 @@
 	}
 	else
 	{
-		$url = url_add_param( $Blog->gen_blogurl(), 'disp=profile&amp;redirect_to='.rawurlencode( $ReqURI ) );
+		$url = url_add_param( $Blog->gen_blogurl(), 'disp=profile&amp;user_ID='.$user_id.'&amp;redirect_to='.rawurlencode( $ReqURI ) );
 	}
 
 	return $url;
 
=== modified file 'qp_inc/users/model/_usersettings.class.php'
--- qp_inc/users/model/_usersettings.class.php	2013-03-22 21:28:25 +0000
+++ qp_inc/users/model/_usersettings.class.php	2013-04-18 18:37:26 +0000
@@ -35,7 +35,7 @@
 		'fm_allowfiltering' => 'simple',
 		'blogperms_layout' => 'default', // selected view in blog (user/group) perms
 		'login_multiple_sessions' => 1, // allow multiple concurrent sessions? (PARAMOUNT ON DEMO SERVER)
-		'results_per_page' => 20,
+		'results_per_page' => 50,
 		'num_admin_blogs' => 10,
 	);
 
 
=== modified file 'qp_inc/users/users.ctrl.php'
--- qp_inc/users/users.ctrl.php	2013-03-22 21:28:25 +0000
+++ qp_inc/users/users.ctrl.php	2013-04-18 18:37:26 +0000
@@ -169,6 +169,17 @@
 	}
 }
 
+// add menu options if a plugin needs them and we are on a user page
+global $Plugins;
+
+if( $Plugins->trigger_event_first_true( 'ActivateExtendedProfile' ) && isset( $user_ID ) )
+{
+	$AdminUI->add_menu_entries( 'users', array( 
+		'profile' => array( 'text' => 'Profile', 'href' => $dispatcher.'?ctrl=users&amp;user_ID='.$user_ID ),
+		'users_ext' => array( 'text' => 'Extended Profile', 'href' => $dispatcher.'?ctrl=users&amp;x=1&amp;user_ID='.$user_ID )
+	) );
+}
+
 // Perform actions, if there were no errors
 if( ! $Messages->count('error') )
 {
 
=== modified file 'qp_inc/users/views/_user.form.php'
--- qp_inc/users/views/_user.form.php	2013-03-18 19:20:42 +0000
+++ qp_inc/users/views/_user.form.php	2013-04-18 18:37:26 +0000
@@ -20,6 +20,7 @@
 global $AdminUI;
 global $current_User;
 global $edited_User;
+global $lock_id_and_nick;
 global $Plugins;
 global $Settings;
 global $UserSettings;
@@ -112,14 +113,29 @@
 if( $action != 'view_user' )
 {
 	// We can edit the values
-	$Form->text_input( 'edited_user_login', $edited_User->login, 20, T_('Login'), '', array( 'required' => true ) );
+	if( $lock_id_and_nick && ( ! $current_User->ID === 1 ) )
+	{
+		// lock is set and user #1 is not out there ... no editing allowed
+		$Form->info( T_('Login'), $edited_User->get( 'login' ) );
+		$Form->hidden( 'edited_user_login', $edited_User->login );
+	}
+	else
+	{
+		$Form->text_input( 'edited_user_login', $edited_User->login, 20, T_('Login'), '', array( 'required' => true ) );
+	}
 	$Form->text_input( 'edited_user_firstname', $edited_User->firstname, 20, T_('First name'), '', array( 'maxlength' => 50 ) );
 	$Form->text_input( 'edited_user_lastname', $edited_User->lastname, 20, T_('Last name'), '', array( 'maxlength' => 50 ) );
-	$Form->text_input( 'edited_user_nickname', $edited_User->nickname, 20, T_('Nickname'), '', array( 'maxlength' => 50, 'required' => true ) );
+	if( $lock_id_and_nick && ( ! $current_User->ID === 1 ) )
+	{
+		// lock is set and user #1 is not out there ... no editing allowed
+		$Form->info( T_('Nickname'), $edited_User->get( 'nickname' ) );
+		$Form->hidden( 'edited_user_nickname', $edited_User->nickname );
+	}
+	else
+	{
+		$Form->text_input( 'edited_user_nickname', $edited_User->nickname, 20, T_('Nickname'), '', array( 'maxlength' => 50, 'required' => true ) );
+	}
 	$Form->select( 'edited_user_idmode', $edited_User->get( 'idmode' ), array( &$edited_User, 'callback_optionsForIdMode' ), T_('Identity shown') );
-	$Form->checkbox( 'edited_user_showonline', $edited_User->get( 'showonline' ), T_('Show online'), T_('Check this to be displayed as online when visiting the site.') );
-	$Form->checkbox( 'edited_user_set_login_multiple_sessions', $UserSettings->get( 'login_multiple_sessions', $edited_User->ID), T_('Multiple sessions'),
-		T_('Check this if you want to log in from different computers/browsers at the same time. Otherwise, logging in from a new computer/browser will disconnect you on the previous one.') );
 }
 else
 {
@@ -129,17 +145,14 @@
 	$Form->info( T_('Last name'), $edited_User->get( 'lastname' ) );
 	$Form->info( T_('Nickname'), $edited_User->get( 'nickname' ) );
 	$Form->info( T_('Identity shown'), $edited_User->get( 'preferredname' ) );
-	$Form->info( T_('Show online'), ( $edited_User->get( 'showonline' ) ) ? T_('yes') : T_('no') );
-	$Form->info( T_('Multiple sessions'), ( $UserSettings->get( 'login_multiple_sessions', $edited_User->ID ) ? T_('Allowed') : T_('Forbidden') ) );
 }
-$Form->end_fieldset();
 
-// "Extended Identity" section
 ob_start();
-$Form->begin_fieldset( T_('Extended Identity') );
 ob_start();
 $Plugins->restart();
-while( $loop_Plugin = & $Plugins->get_next() )
+// $edited_User->ID is 0 if we are copying/creating, so the avatar and biography
+// bits can't be added at this point. too lazy to really fix it is the thing ...
+while( $loop_Plugin = & $Plugins->get_next() && $edited_User->ID )
 {
 	if( $loop_Plugin->UserSettings )
 	{
@@ -154,7 +167,7 @@
 					// get avatar info
 					$avatar_info = $edited_User->get_avatar( array(
 							'size' => 'crop-64x64',
-							'class' => 'floatleft',
+							'class' => 'floatleft'
 						) );
 					$avatar_tag = $avatar_info['tag']; // '' if no avatar
 					$avatar_root = $avatar_info['root']; // '' if no avatar
@@ -179,7 +192,6 @@
 					}
 					$Form->info( T_( 'Avatar' ), $avatar_tag );
 				}
-
 				// biography field
 				if( $l_name == 'use_biography' )
 				{
@@ -187,13 +199,17 @@
 					{
 						$Form->textarea( 'edited_user_biography', $edited_User->get( 'biography' ), 5, T_('Biography'), T_('This is called for by a plugin so we do not know what it is used for.'), 50, 'large' );
 					}
+					else
+					{
+						$Form->info( T_('Biography'), $edited_User->get( 'biography' ), T_('This is called for by a plugin so we do not know what it is used for.') );
+					}
 				}
 			}
 		}
 	}
 }
 $has_contents = strlen( ob_get_contents() );
-$Form->end_fieldset();
+//$Form->end_fieldset();
 if( $has_contents )
 {
 	ob_end_flush();
@@ -206,6 +222,22 @@
 	ob_end_clean();
 }
 
+if( $action != 'view_user' )
+{
+	// We can edit the values
+	if( $lock_id_and_nick && ( ! $current_User->ID === 1 ) )
+	$Form->checkbox( 'edited_user_showonline', $edited_User->get( 'showonline' ), T_('Show online'), T_('Check this to be displayed as online when visiting the site.') );
+	$Form->checkbox( 'edited_user_set_login_multiple_sessions', $UserSettings->get( 'login_multiple_sessions', $edited_User->ID), T_('Multiple sessions'),
+		T_('Check this if you want to log in from different computers/browsers at the same time. Otherwise, logging in from a new computer/browser will disconnect you on the previous one.') );
+}
+else
+{
+	// display only
+	$Form->info( T_('Show online'), ( $edited_User->get( 'showonline' ) ) ? T_('yes') : T_('no') );
+	$Form->info( T_('Multiple sessions'), ( $UserSettings->get( 'login_multiple_sessions', $edited_User->ID ) ? T_('Allowed') : T_('Forbidden') ) );
+}
+$Form->end_fieldset();
+
 // "Password" section
 if( $action != 'view_user' )
 {
@@ -236,19 +268,14 @@
 	// We can edit the values
 	$Form->select( 'edited_user_locale', $edited_User->get( 'locale' ), 'locale_options_return', T_('Preferred locale'), T_('Preferred locale for admin interface, notifications, etc.'));
 	$Form->select_input_array( 'edited_user_admin_template', $value_admin_template, get_admin_templates(), T_('Admin template'), T_('The template defines how the backoffice appears to you.') );
-
 	// To display or hide icon legend
 	$Form->checkbox( 'edited_user_legend', $UserSettings->get( 'display_icon_legend', $edited_User->ID ), T_('Display icon legend'), T_('Display a legend at the bottom of every page including all action icons used on that page.') );
-
 	// To activate or deactivate bozo validator
 	$Form->checkbox( 'edited_user_bozo', $UserSettings->get( 'control_form_abortions', $edited_User->ID ), T_('Control form closing'), T_('This will alert you if you fill in data into a form and try to leave the form before submitting the data.') );
-
 	// To activate focus on first form input text
 	$Form->checkbox( 'edited_user_focusonfirst', $UserSettings->get( 'focus_on_first_input', $edited_User->ID ), T_('Focus on first field'), T_('The focus will automatically go to the first input text field.') );
-
 	// Number of results per page
 	$Form->text( 'edited_user_results_per_page', $UserSettings->get( 'results_per_page', $edited_User->ID ), 3, T_('Results per page'), T_('Number of rows displayed in results tables.') );
-
 	// Number of blogs to display in the admin
 	$Form->text( 'edited_user_num_admin_blogs', $UserSettings->get( 'num_admin_blogs', $edited_User->ID ), 2, T_('Blog menu length'), T_('Number of blogs displayed in the admin console before using a select box') );
 }
@@ -263,7 +290,6 @@
 $Form->end_fieldset();
 
 // "Plugin options" section
-
 if( $action != 'view_user' )
 {
 	// We can edit the values
 
=== modified file 'qp_inc/users/views/_user_list.view.php'
--- qp_inc/users/views/_user_list.view.php	2013-03-18 19:20:42 +0000
+++ qp_inc/users/views/_user_list.view.php	2013-04-18 18:37:26 +0000
@@ -16,11 +16,11 @@
 global $Settings;
 global $usedgroups;
 
-// query which groups have users (in order to prevent deletion of groups which have users)
+// query which groups have users (to prevent deletion of groups which have users)
 $usedgroups = $DB->get_col( 'SELECT grp_ID
 	FROM T_groups
 	INNER JOIN T_users ON user_grp_ID = grp_ID
-	GROUP BY grp_ID');
+	GROUP BY grp_ID' );
 
 // Query user list
 $keywords = param( 'keywords', 'string', '', true );
@@ -37,12 +37,14 @@
 	}
 }
 
-$sql = "SELECT T_users.*, grp_ID, grp_name, COUNT(blog_ID) AS nb_blogs
-				FROM T_users RIGHT JOIN T_groups ON user_grp_ID = grp_ID
-				LEFT JOIN T_blogs on user_ID = blog_owner_user_ID
-				WHERE $where_clause 1
-				GROUP BY user_ID, grp_ID
-				ORDER BY grp_name, *";
+$sql = "SELECT T_users.*, grp_ID, grp_name,
+	COUNT(blog_ID) AS nb_blogs
+	FROM T_users
+	RIGHT JOIN T_groups ON user_grp_ID = grp_ID
+	LEFT JOIN T_blogs on user_ID = blog_owner_user_ID
+	WHERE $where_clause 1
+	GROUP BY user_ID, grp_ID
+	ORDER BY grp_name, *";
 
 $count_sql = 'SELECT COUNT(*)
 	FROM T_users
@@ -111,10 +113,20 @@
 	'td' => '$user_firstname$ $user_lastname$',
 );
 
+// User #1 can see all ...
+if( $current_User->ID === '1' )
+{
+	$Results->cols[] = array(
+		'th' => T_('Email'),
+		'td_class' => 'shrinkwrap',
+		'td' => '%user_mailto( #user_email# )%',
+	);
+}
+
 $Results->cols[] = array(
-	'th' => T_('Email'),
+	'th' => T_('Message'),
 	'td_class' => 'shrinkwrap',
-	'td' => '%user_mailto( #user_email# )%',
+	'td' => '%user_message( #user_allow_msgform#, #user_email# , #user_ID#, #user_nickname# )%',
 );
 
 $Results->cols[] = array(
@@ -244,4 +256,19 @@
 	return action_icon( T_('Email').': '.$email, 'email', 'mailto:'.$email, T_('Email') );
 }
 
+/**
+ * dummy docblock
+ */
+function user_message( $allow_form, $email, $ID, $nickname )
+{
+	if( $allow_form === '0' )
+	{
+		return '&nbsp;';
+	}
+
+	$form_url = url_add_param( '', 'recipient_id='.$ID.'&amp;redirect_to='.rawurlencode( url_rel_to_same_host( regenerate_url( '', '', '', '&' ), '' ) ) );
+
+	return action_icon( sprintf( T_('Send email to %s'), $nickname ), 'email', $form_url );
+}
+
 ?>
 
=== modified file 'qp_install/_create_items.php'
--- qp_install/_create_items.php	2013-03-22 21:28:25 +0000
+++ qp_install/_create_items.php	2013-04-18 18:37:26 +0000
@@ -132,7 +132,7 @@
 $edited_Item = new Item();
 $edited_Item->insert( 1, T_('artists-paint-pots-2'), 'This shows the simplest attachment possible: the file name became the file\'s title, alt text, description, and post title.', $now, $cat_yellowstone, array(), 'published','en-US' );
 // attach an image to the item
-$edit_File = new File( 'collection', 4, 'artists-paint-pots-2.jpg' );
+$edit_File = new File( 'blog', 4, 'artists-paint-pots-2.jpg' );
 $edit_File->link_to_Item( $edited_Item );
 // add meta data for this image (only once per image!)
 $query = "UPDATE T_files SET file_title = 'artists-paint-pots-2', file_alt = 'artists-paint-pots-2', file_desc = 'artists-paint-pots-2' WHERE file_ID = {$edit_File->ID}";
@@ -162,7 +162,7 @@
 $edited_Item = new Item();
 $edited_Item->insert( 1, T_('Photo of Biscuit Basin'), 'This shows a customized "file title" field, which became the alt text and description and item title.', $now, $cat_yellowstone, array(), 'published','en-US' );
 // attach an image to the item
-$edit_File = new File( 'collection', 4, 'biscuit-basin.jpg' );
+$edit_File = new File( 'blog', 4, 'biscuit-basin.jpg' );
 $edit_File->link_to_Item( $edited_Item );
 // add meta data for this image (only once per image!)
 $query = "UPDATE T_files SET file_title = 'Photo of Biscuit Basin', file_alt = 'Photo of Biscuit Basin', file_desc = 'Photo of Biscuit Basin' WHERE file_ID = {$edit_File->ID}";
@@ -212,7 +212,7 @@
 $edited_Item = new Item();
 $edited_Item->insert( 1, T_('Emerald Pool, Yellowstone NP'), 'This image has all three attributes set to unique values, then this post was created with a unique title and content, then the image was attached to the post.', $now, $cat_yellowstone, array(), 'published','en-US' );
 // attach an image to the item
-$edit_File = new File( 'collection', 4, 'emerald-pool-in-yellowstone.jpg' );
+$edit_File = new File( 'blog', 4, 'emerald-pool-in-yellowstone.jpg' );
 $edit_File->link_to_Item( $edited_Item );
 // add meta data for this image (only once per image!)
 $query = "UPDATE T_files SET file_title = 'Emerald Pool, Yellowstone', file_alt = 'Photo of Emerald Pool in Yellowstone', file_desc = 'This is the \"description/caption\" field for the file name \"emerald-pool-in-yellowstone.jpg\"' WHERE file_ID = {$edit_File->ID}";
@@ -258,7 +258,7 @@
 $edited_Item = new Item();
 $edited_Item->insert( 1, T_('Mammoth Hot Springs'), '', $now, $cat_yellowstone, array(), 'published','en-US' );
 // attach an image to the item
-$edit_File = new File( 'collection', 4, 'mammoth-hot-springs.jpg' );
+$edit_File = new File( 'blog', 4, 'mammoth-hot-springs.jpg' );
 $edit_File->link_to_Item( $edited_Item );
 // add meta data for this image (only once per image!)
 $query = "UPDATE T_files SET file_title = 'Mammoth Hot Springs', file_alt = 'Mammoth Hot Springs', file_desc = 'Free Stock Photo of Mammoth Hot Springs - Yellowstone - Travel, from public-domain-photos.com' WHERE file_ID = {$edit_File->ID}";
@@ -317,7 +317,7 @@
 $edited_Item = new Item();
 $edited_Item->insert( 1, T_('Morning Glory Pool'), 'This photo has some text like a normal blog post might.', $now, $cat_yellowstone, array(), 'published','en-US' );
 // attach an image to the item
-$edit_File = new File( 'collection', 4, 'morning-glory-pool.jpg' );
+$edit_File = new File( 'blog', 4, 'morning-glory-pool.jpg' );
 $edit_File->link_to_Item( $edited_Item );
 // add meta data for this image (only once per image!)
 $query = "UPDATE T_files SET file_title = 'Morning Glory Pool', file_alt = 'Morning Glory Pool', file_desc = 'Free Stock Photo of Morning Glory Pool - Yellowstone - Travel, from public-domain-photos.com' WHERE file_ID = {$edit_File->ID}";
@@ -362,13 +362,13 @@
 $edited_Item = new Item();
 $edited_Item->insert( 1, T_('2 pics in one post'), 'This post shows how you can attach more than one image to a post. All of the Yellowstone photos came from <a href="http://www.public-domain-photos.com/travel/yellowstone">Public-Domain-Photos</a>.', $now, $cat_yellowstone, array(), 'published','en-US' );
 // attach an image to the item
-$edit_File = new File( 'collection', 4, 'mammoth-hot-springs.jpg' );
+$edit_File = new File( 'blog', 4, 'mammoth-hot-springs.jpg' );
 $edit_File->link_to_Item( $edited_Item );
 // add meta data for this image (only once per image!)
 $query = "UPDATE T_files SET file_title = 'Mammoth Hot Springs', file_alt = 'Mammoth Hot Springs', file_desc = 'Mammoth Hot Springs.' WHERE file_ID = {$edit_File->ID}";
 $DB->query( $query );
 // attach another image to the item
-$edit_File = new File( 'collection', 4, 'morning-glory-pool.jpg' );
+$edit_File = new File( 'blog', 4, 'morning-glory-pool.jpg' );
 $edit_File->link_to_Item( $edited_Item );
 // add meta data for this image (only once per image!)
 $query = "UPDATE T_files SET file_title = 'Morning Glory Pool', file_alt = 'Morning Glory Pool', file_desc = 'Morning Glory Pool.' WHERE file_ID = {$edit_File->ID}";
@@ -551,7 +551,7 @@
 
 Image used compliments of <a href="http://www.flickr.com/photos/leeturner/sets/72157622986782395/with/4278672768/" title="inserted image sample" target="_blank">Lee Turner</a>'), $now, $cat_appname );
 // attach an image to the item
-$edit_File = new File( 'collection', 2, 'waterfall.jpg' );
+$edit_File = new File( 'blog', 2, 'waterfall.jpg' );
 $edit_File->link_to_Item( $edited_Item );
 // add meta data for this image (only once per image!)
 $query = "UPDATE T_files SET file_title = 'waterfall', file_alt = 'waterfall', file_desc = 'waterfall' WHERE file_ID = {$edit_File->ID}";
@@ -573,7 +573,7 @@
 
 Image used compliments of <a href="http://innervisions.org.uk/bimble/2008/08/sunshine-and-showers" title="attached image sample" target="_blank">Yabs</a>'), $now, $cat_appname );
 // attach an image to the item
-$edit_File = new File( 'collection', 2, 'sunshine_and_flowers.jpeg' );
+$edit_File = new File( 'blog', 2, 'sunshine_and_flowers.jpeg' );
 $edit_File->link_to_Item( $edited_Item );
 // add meta data for this image (do once per default image!)
 $query = "UPDATE T_files SET file_title = 'Coral Jupiter', file_alt = 'home grown flowers', file_desc = 'Coral Jupiter - home grown flowers (caption/description field)' WHERE file_ID = {$edit_File->ID}";
 
=== modified file 'qp_install/_functions_dbupgrade.php'
--- qp_install/_functions_dbupgrade.php	2013-03-22 21:28:25 +0000
+++ qp_install/_functions_dbupgrade.php	2013-04-18 18:37:26 +0000
@@ -873,6 +873,303 @@
 		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
 	}
 
+	if( $cur_db_version < 44 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the bloggroups table to blog_groups ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."bloggroups RENAME TO ".$app_db_tableprefix."blog_groups" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 45 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the coll_settings table to blog_settings ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."coll_settings RENAME TO ".$app_db_tableprefix."blog_settings" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 46 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the blogusers table to blog_users ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."blogusers RENAME TO ".$app_db_tableprefix."blog_users" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 47 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the cron__log table to cron_log ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."cron__log RENAME TO ".$app_db_tableprefix."cron_log" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 48 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the cron__task table to cron_task ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."cron__task RENAME TO ".$app_db_tableprefix."cron_task" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 49 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the items__item table to items ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."items__item RENAME TO ".$app_db_tableprefix."items" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 50 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the postcats table to item_cats ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."postcats RENAME TO ".$app_db_tableprefix."item_cats" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 51 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the items__prerendering table to item_prerendering ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."items__prerendering RENAME TO ".$app_db_tableprefix."item_prerendering" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 52 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the items__status table to item_status ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."items__status RENAME TO ".$app_db_tableprefix."item_status" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 53 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the items__itemtag table to item_tags ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."items__itemtag RENAME TO ".$app_db_tableprefix."item_tags" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 54 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the items__type table to item_types ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."items__type RENAME TO ".$app_db_tableprefix."item_types" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 55 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the items__version table to item_versions ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."items__version RENAME TO ".$app_db_tableprefix."item_versions" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 56 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the pluginevents table to plugin_events ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."pluginevents RENAME TO ".$app_db_tableprefix."plugin_events" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 57 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the pluginsettings table to plugin_settings ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."pluginsettings RENAME TO ".$app_db_tableprefix."plugin_settings" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 58 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the pluginusersettings table to plugin_usersettings ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."pluginusersettings RENAME TO ".$app_db_tableprefix."plugin_usersettings" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 59 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the items__tag table to tags ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."items__tag RENAME TO ".$app_db_tableprefix."tags" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 60 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the templates__template table to templates ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."templates__template RENAME TO ".$app_db_tableprefix."templates" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 61 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the templates__container table to template_containers ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."templates__container RENAME TO ".$app_db_tableprefix."template_containers" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 62 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the usersettings table to user_settings ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."usersettings RENAME TO ".$app_db_tableprefix."user_settings" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 63 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the widget table to widgets ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."widget RENAME TO ".$app_db_tableprefix."widgets" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 64 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the track__keyphrase table to keyphrases ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."track__keyphrase RENAME TO ".$app_db_tableprefix."keyphrases" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 65 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the track__goal table to goals ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."track__goal RENAME TO ".$app_db_tableprefix."goals" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 66 )
+	{
+		$cur_db_version++;
+		echo 'Renaming the track__goalhit table to goal_hits ... ';
+		if( $DB->query( "ALTER TABLE ".$app_db_tableprefix."track__goalhit RENAME TO ".$app_db_tableprefix."goal_hits" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 67 )
+	{
+		$cur_db_version++;
+		echo 'Removing ptyp_ID = 1600 from item_types table ... ';
+		if( $DB->query( "DELETE FROM ".$app_db_tableprefix."item_types WHERE ptyp_ID = 1600" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 68 )
+	{
+		$cur_db_version++;
+		echo 'Modifying file_root_type in the files table ... ';
+		if( db_mod_col( $app_db_tableprefix."files", "file_root_type", "ENUM('absolute','user','blog','shared','templates','collection') NOT NULL DEFAULT 'absolute'" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 69 )
+	{
+		$cur_db_version++;
+		echo 'Updating file_root_type in the files table ... ';
+		if( $DB->query( "UPDATE ".$app_db_tableprefix."files SET template_type = REPLACE( file_root_type, 'collection', 'blog' )" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
+	if( $cur_db_version < 70 )
+	{
+		$cur_db_version++;
+		echo 'Modifying file_root_type in the files table ... ';
+		if( db_mod_col( $app_db_tableprefix."files", "file_root_type", "ENUM('absolute','user','blog','shared','templates') NOT NULL DEFAULT 'absolute'" ) !== false )
+		{
+			set_upgrade_checkpoint( $cur_db_version );
+		}
+		else debug_die( T_('Upgrader crashed doing step# ').$cur_db_version );
+	}
+
 // -----------------------------------------------------------------------------------------
 // Remember changing the DB schema, too! Check out these files:
 // - qp_inc/_core/model/__core.install.php
 
=== modified file 'qp_plugins/smilies_plugin/_smilies.plugin.php'
--- qp_plugins/smilies_plugin/_smilies.plugin.php	2013-03-22 21:28:25 +0000
+++ qp_plugins/smilies_plugin/_smilies.plugin.php	2013-04-18 18:37:26 +0000
@@ -172,7 +172,12 @@
 	 */
 	function DisplayCommentToolbar( & $params )
 	{
-		if( ( $this->Settings->get( 'render_comments' ) ) || ( is_logged_in() && $this->UserSettings->get( 'use_toolbar' ) ) )
+		$user_wants_toolbar = false;
+		if( is_logged_in() && ! is_null( $this->UserSettings ) )
+		{
+			$user_wants_toolbar = $this->UserSettings->get( 'use_toolbar' );
+		}
+		if( ( $this->Settings->get( 'render_comments' ) ) || $user_wants_toolbar )
 		{
 			return $this->make_the_toolbar( $params );
 		}
 
=== modified file 'qp_srvc/profile_update.php'
--- qp_srvc/profile_update.php	2013-03-22 21:28:25 +0000
+++ qp_srvc/profile_update.php	2013-04-18 18:37:26 +0000
@@ -88,7 +88,10 @@
 
 $current_User->set( 'firstname', $newuser_firstname );
 $current_User->set( 'lastname', $newuser_lastname );
-$current_User->set( 'nickname', $newuser_nickname );
+if( ! $lock_id_and_nick )
+{
+	$current_User->set( 'nickname', $newuser_nickname );
+}
 $current_User->set_email( $newuser_email );
 $current_User->set( 'url', $newuser_url );
 $current_User->set( 'idmode', $newuser_idmode );
 
=== modified file 'qp_srvc/register.php'
--- qp_srvc/register.php	2013-03-22 21:28:25 +0000
+++ qp_srvc/register.php	2013-04-18 18:37:26 +0000
@@ -67,6 +67,7 @@
 	) );
 
 	// all logins to be lowercase to guarantee uniqueness regardless of the database case handling for UNIQUE indexes
+	$login_raw = $login;
 	$login = strtolower( $login );
 
 	$UserCache = & get_Cache( 'UserCache' );
@@ -86,7 +87,7 @@
 	$new_User = new User();
 	$new_User->set( 'login', $login );
 	$new_User->set( 'pass', md5( $pass1 ) ); // encrypted
-	$new_User->set( 'nickname', $login );
+	$new_User->set( 'nickname', $login_raw );
 	$new_User->set_email( $email );
 	$new_User->set( 'ip', $Hit->IP );
 	$new_User->set( 'domain', $Hit->get_remote_host( true ) );