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

[EdB]

Started looking at the app_nonces branch and figured I'd better get this into merge immediately. Basically, seems to me that app_nonces doesn't address a better way to handle dbase upgrades - it just jumps on where that other app left off. This needed to do database upgrades in order to do what it does, and IMHO it does it way better.

Key changes other than that are primarily associated with templates. Instead of 'normal' and 'feed', we now have 'xhtml', 'feed', and 'other'. One day we'll be able to add 'html5' without issue. This branch then applies 'other' to the sitemap so it doesn't show up in lists of useful templates ... which makes sense. THERE IS NOTHING ACTUALLY GOING TOWARDS HTML5 IN THIS BRANCH! The name is functional for me because it is the first step in getting what I'm doing with html5 into core. I actually can use html5 templates, but not the full scope of that wanna-be "standard".

Anyway http://forums.quamplures.net/viewtopic.php?f=6&t=673 covers it and so much more :)

[EdB (edb)]

Oops. 2 bugs found and fixed. Sorry 'bout dat :(

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

7595. By EdB on 2011-03-08

new stuff in core now here - woohoo!

[Yabs (yabs)]

We need to get someone who's into html5 to review this :-S

¥

[EdB (edb)]

Bad name - it doesn't do anything about html5 ... other than "get ready". It changes displaying template types from 'normal' to 'xhtml' so that one day we can have 'html5' as well. It also creates a new type 'other' for pretty much the sitemap template because that one is neither display nor feed.

The biggest thing it does is the database update method which we discussed a bit in the forums. Each database activity increments the counter by one, and it uses another Setting to keep track of that. I forget exactly, but basically "goal" and "progress". When they are equal things are good, otherwise the upgrader crashed.

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

7596. By EdB on 2011-03-14

+core updates

[Yabs (yabs)]

Ok, I'll grab and test when I get a moment

¥

[EdB (edb)]

Is anyone looking at this? If so please hold off - sorry :(

In working multiple issues at the same time I observed that I should not have removed "task_end()" and would like to restore that BUT I need to test it for both upgrading and installing anew. I figured since I know of the issue now I ought to first let peeps know this isn't really as done as it should be before tinkering some more.

Marking "needs fixing" even though technically it doesn't need fixing, and will do a "resubmit" when I get it where I think it should be (again).

review: Needs Fixing

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

7597. By EdB on 2011-03-20

restored "task_end()", fixed bug, tidied up code

[EdB (edb)]

All better? Restored the "task_end()" function, fixed a really sloppy bug or two I still had in there, and did some tidying up of code. The index.php file SUCKED in terms of how tabbage was randomly thrown in with an intent to confuse :(

Tested as an upgrade, but just now I realized I didn't test it as a fresh installation. Should be no problem but I won't do a "resubmit" until I test it to prove it doesn't suck.

[EdB (edb)]

Upgrades from the zip without issue, installs without issue. Yay!

review: Needs Resubmitting

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

7598. By EdB on 2011-04-23

adding recent core updates

7599. By EdB on 2011-05-08

youtube patch

[Tilman Blumenbach (tblue)]

Not tested yet, but I've looked at the diff.

Line 1053-1056: It should be possible to reduce that to one SQL query:

  UPDATE T_templates__template SET template_type = 'other' WHERE template_name = 'Sitemap'

[Tilman Blumenbach (tblue)]

Apart from that, everything seems to work. :)

review: Approve

[EdB (edb)]

I'll look at that when I get home, which in theory is tomorrow but in truth probably won't be for 3 or 4 days.

Plus for some reason I had a thought that there is a possible condition out there in the wilds that is not covered properly by this branch. That is to say, a real world installation that upgrades (after and assuming merging this branch as-is) would experience a problem of some sort. The second problem is I can't remember what the first problem is. Anyway when I had the thought I thought "OMG that simply won't do ... you have to remember this and look at the code when you can".

So now I'll have to change this to a status other than in merge so it doesn't get merged. Or just say "don't merge this yet" because once again they're sending me messages probably telling me I have to drive to San Bernadino CA on the 15th even though I'm supposed to be home on the 13th. Which is completely impossible from where I am right now.

Love driving, but not the crap that surrounds the job.

review: Needs Fixing

[Tilman Blumenbach (tblue)]

Heh, okay, install and upgrade seemed to work for me here. :) Changed status to Work in Progress.

[EdB (edb)]

I just now remembered the problem. non-public template that says whatever the current type for a public-side template is would not be upgraded, so I want to make sure if the template says the original word that we (a) work and (b) flag them in some way that a template edit would be a smart thing.

Also I hope you've really drilled down on the upgrade portion. That was really what I wanted to get done with this branch. Each database action increments a temporary counter that needs to match the final database number. If we crash during upgrade we would know exactly where, if we don't then we're good. That was the idea anyway.

Your status change was better :)

[Tilman Blumenbach (tblue)]

Ah, I will take a closer look at the upgrade bits soon. I *think* it looked fine, though.

[Tilman Blumenbach (tblue)]

Do you mind moving branch ownership to quam-plures-core so I can make changes if necessary?

[Tilman Blumenbach (tblue)]

Okay, I have some changes locally but can't push them (see above).

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

7600. By Tilman Blumenbach on 2011-06-13

Merged trunk

7601. By Tilman Blumenbach on 2011-06-13

Code optimizations

7602. By Tilman Blumenbach on 2011-06-13

Minor fixes

7603. By EdB on 2011-06-18

see http://forums.quamplures.net/viewtopic.php?f=6&t=673&p=5498#p5498 :)

7604. By EdB on 2011-06-18

provide notification if a template still has "normal" for the type

7605. By EdB on 2011-06-24

adding dracones branch

7606. By EdB on 2011-06-25

clean up posting and validating XHTML

7607. By EdB on 2011-07-15

committing core commits :)

7608. By EdB on 2011-07-15

core up, core in

7609. By EdB on 2011-08-25

core to 7614

7610. By EdB on 2011-08-26

core up to 7618

7611. By EdB on 2011-09-01

core to 7620

Unmerged revisions

=== modified file 'qp_inc/_application.php'
--- qp_inc/_application.php	2010-12-31 12:53:51 +0000
+++ qp_inc/_application.php	2011-06-17 09:28:39 +0000
@@ -22,14 +22,13 @@
  * Release date (ISO)
  * @global string
  */
-$app_date = '2011-01-01'; // ground zero
+$app_date = '2011-03-21'; // a randomly selected day
 
 /**
  * This is used to check if the database is up to date.
- *
- * This will be incrememented by with each change in {@link upgrade_dbase_tables()}
+ * This will be incrememented by 1 with each change in {@link upgrade_dbase_tables()}
  */
-$app_db_version = 0;
+$app_db_version = 4;
 
 /**
  * Is displayed on the login screen:

=== modified file 'qp_inc/_core/model/__core.install.php'
--- qp_inc/_core/model/__core.install.php	2010-12-31 12:12:03 +0000
+++ qp_inc/_core/model/__core.install.php	2011-06-17 09:28:39 +0000
@@ -114,7 +114,7 @@
 		"CREATE TABLE T_templates__template (
 				template_ID      int(10) unsigned      NOT NULL auto_increment,
 				template_name    varchar(32)           NOT NULL,
-				template_type    enum('normal','feed') NOT NULL default 'normal',
+				template_type    enum('xhtml','feed','other') NOT NULL default 'xhtml',
 				template_folder  varchar(32)           NOT NULL,
 				PRIMARY KEY template_ID (template_ID),
 				UNIQUE template_folder( template_folder ),

=== modified file 'qp_inc/templates/model/_template.class.php'
--- qp_inc/templates/model/_template.class.php	2010-12-31 12:12:03 +0000
+++ qp_inc/templates/model/_template.class.php	2011-06-17 09:28:39 +0000
@@ -262,7 +262,7 @@
 	 */
 	function get_default_type()
 	{
-		return (substr($this->folder,0,1) == '_' ? 'feed' : 'normal');
+		return (substr( $this->folder,0,1 ) == '_' ? 'feed' : 'xhtml' );
 	}
 
 

=== modified file 'qp_inc/templates/views/_coll_sel_template.view.php'
--- qp_inc/templates/views/_coll_sel_template.view.php	2010-12-31 12:12:03 +0000
+++ qp_inc/templates/views/_coll_sel_template.view.php	2011-06-17 09:28:39 +0000
@@ -23,10 +23,9 @@
 $TemplateCache = & get_Cache( 'TemplateCache' );
 $TemplateCache->load_all();
 
-// TODO: this is like touching private parts :>
 foreach( $TemplateCache->cache as $Template )
 {
-	if( $Template->type != 'normal' )
+	if( $Template->type == 'feed' || $Template->type == 'other' )
 	{	// This template cannot be used here...
 		continue;
 	}

=== modified file 'qp_inc/templates/views/_coll_template.view.php'
--- qp_inc/templates/views/_coll_template.view.php	2010-12-31 12:12:03 +0000
+++ qp_inc/templates/views/_coll_template.view.php	2011-06-17 09:28:39 +0000
@@ -36,10 +36,9 @@
 	$TemplateCache = & get_Cache( 'TemplateCache' );
 	$TemplateCache->load_all();
 
-	// TODO: this is like touching private parts :>
 	foreach( $TemplateCache->cache as $Template )
 	{
-		if( $Template->type != 'normal' )
+		if( $Template->type == 'feed' || $Template->type == 'other' )
 		{	// This template cannot be used here...
 			continue;
 		}

=== modified file 'qp_inc/templates/views/_template.form.php'
--- qp_inc/templates/views/_template.form.php	2010-12-31 12:12:03 +0000
+++ qp_inc/templates/views/_template.form.php	2011-06-17 09:28:39 +0000
@@ -50,14 +50,12 @@
 		$Form->text_input( 'template_name', $edited_Template->name, 32, T_('Template name'), T_('As seen by blog owners'), array( 'required'=>true ) );
 
 		$Form->radio( 'template_type',
-									$edited_Template->type,
-									 array(
-													array( 'normal', T_( 'Normal' ), T_( 'Normal template for general browsing' ) ),
-													array( 'feed', T_( 'XML Feed' ), T_( 'Special system template for XML feeds like RSS and Atom' ) ),
-												),
-										T_( 'Template type' ),
-										true // separate lines
-								 );
+			$edited_Template->type, array(
+				array( 'xhtml', T_( 'XHTML' ), T_( 'XHTML (trans or strict) template for general browsing' ) ),
+				array( 'feed', T_( 'XML Feed' ), T_( 'Special system template for XML feeds like RSS and Atom' ) ),
+				array( 'other', T_( 'Other' ), T_( 'Template for anything other than general browsing or syndication feeds' ) ),
+			), T_( 'Template type' ), true // separate lines
+		);
 
 		if( $template_containers = $edited_Template->get_containers() )
 		{

=== modified file 'qp_install/_functions_create.php'
--- qp_install/_functions_create.php	2011-01-29 22:04:06 +0000
+++ qp_install/_functions_create.php	2011-06-17 09:28:39 +0000
@@ -82,8 +82,7 @@
 	"('order-cheap-pills'), ('buy-xenadrine'),	('xxx'), ".
 	"('paris-hilton'), ('parishilton'), ('camgirls'), ('adult-models')";
 	$DB->query( $query );
-	echo "OK.<br />\n";
-
+	task_end();
 
 	// highest order of permissions for group #1
 	echo 'Creating default groups... ';
@@ -142,7 +141,7 @@
 	$Group_Users->set( 'perm_templates', 0 );
 	$Group_Users->set( 'perm_files', 'view' );
 	$Group_Users->dbinsert();
-	echo "OK.<br />\n";
+	task_end();
 
 	echo 'Creating user field definitions... ';
 	$DB->query( "
@@ -175,10 +174,9 @@
 						( 'msn_im', 'MSN IM', 'text', 'note', 'none' ),
 						( 'skype', 'Skype ID', 'text', 'note', 'none' ),
 						( 'yahoo_im', 'Yahoo IM', 'text', 'note', 'none' );" );
-	echo "OK.<br />\n";
-
-
-	task_begin('Creating default users (one per group)...');
+	task_end();
+
+	echo 'Creating default users (one per group)...';
 	global $timestamp, $default_locale;
 
 	$User_Admin = new User();
@@ -236,7 +234,6 @@
 	$User_Demo->set_datecreated( installer_timestamp() );
 	$User_Demo->set_Group( $Group_Users );
 	$User_Demo->dbinsert();
-
 	task_end();
 
 	// added in Phoenix-Alpha
@@ -254,8 +251,7 @@
 					 ( 3000, 'Sidebar link' ),
 					 ( 4000, 'Reserved' ),
 					 ( 5000, 'Reserved' ) " );
-	echo "OK.<br />\n";
-
+	task_end();
 
 	// added in Phoenix-Beta
 	echo 'Creating default file types... ';
@@ -282,7 +278,7 @@
 			(16, 'mp4', 'MPEG video', 'video/mp4', 'mp4.png', 'browser', 1),
 			(17, 'mov', 'Quicktime video', 'video/quicktime', 'mov.png', 'browser', 1)
 		" );
-	echo "OK.<br />\n";
+	task_end();
 
 	if( ! empty( $current_locale ) )
 	{	// Make sure the user sees his new system localized.
@@ -300,7 +296,7 @@
 				.$DB->quote( $locales[$current_locale]['messages'] ).', '
 				.$DB->quote( $locales[$current_locale]['priority'] ).', '
 				.' 1)' );
-		echo 'OK.<br />', "\n";
+		task_end();
 	}
 
 	create_default_settings();
@@ -506,9 +502,7 @@
 		T_('This blog shows photos...'),
 		sprintf( $default_blog_longdesc, $blog_shortname, $blog_more_longdesc ),
 		4, 'photo', 1 ); // template ID, type, num_posts
-
-	echo "OK.<br />\n";
-
+	task_end();
 
 	global $query, $timestamp;
 
@@ -541,9 +535,7 @@
 
 	// Create categories for photoblog
 	$cat_photo_album = cat_create( 'Owen Michael', 'NULL', $blog_photoblog_ID );
-
-	echo "OK.<br />\n";
-
+	task_end();
 
 	echo 'Creating sample posts and comments... ';
 
@@ -1051,10 +1043,6 @@
 	$DB->query( $query );
 
 
-
-
-
-
 	// Insert a post into blog #1:
 	$now = date('Y-m-d H:i:s',installer_timestamp());
 	$edited_Item = new Item();
@@ -1080,7 +1068,6 @@
 	$DB->query( $query );
 
 
-
 	// Insert a post into blog #1:
 	$now = date('Y-m-d H:i:s',installer_timestamp());
 	$edited_Item = new Item();
@@ -1164,7 +1151,7 @@
 	$edit_File = new File( 'collection', 1, 'qp-logo_337x76.jpg' );
 	$edit_File->link_to_Item( $edited_Item );
 
-	echo "OK.<br />\n";
+	task_end();
 
 
 	echo 'Creating default group/blog permissions... ';
@@ -1188,7 +1175,7 @@
 			( $blog_linkblog_ID, ".$Group_Bloggers->ID.", 1, 'published,deprecated,protected,private,draft', 0, 0, 0, 0, 1, 1, 0 ),
 			( $blog_linkblog_ID, ".$Group_Users->ID.", 1, '', 0, 0, 0, 0, 0, 0, 0 )";
 	$DB->query( $query );
-	echo "OK.<br />\n";
+	task_end();
 
 	/*
 	// Note: we don't really need this any longer, but we might use it for a better default setup later...
@@ -1202,7 +1189,7 @@
 							( $blog_a_ID, ".$User_Demo->ID.", 1,
 							'published,deprecated,protected,private,draft', 1, 1, 0, 0, 1, 1, 1 )";
 	$DB->query( $query );
-	echo "OK.<br />\n";
+	task_end();
 	*/
 
 	install_basic_widgets();

=== modified file 'qp_install/_functions_dbupgrade.php'
--- qp_install/_functions_dbupgrade.php	2010-12-31 12:12:03 +0000
+++ qp_install/_functions_dbupgrade.php	2011-06-17 09:28:39 +0000
@@ -19,130 +19,6 @@
 
 load_funcs('_core/_param.funcs.php');
 
-
-/**
- * Create a DB version checkpoint
- *
- * This is useful when the next operation might timeout or fail!
- * The checkpoint will allow to restart the script and continue where it stopped
- *
- * @param string version of DB at checkpoint
- */
-function set_upgrade_checkpoint( $version )
-{
-	global $DB, $script_start_time, $locale;
-
-	echo "Creating DB schema version checkpoint at $version... ";
-
-	$query = "UPDATE T_settings
-							SET set_value = '$version'
-							WHERE set_name = 'db_version'";
-	$DB->query( $query );
-
-
-	$elapsed_time = time() - $script_start_time;
-
-	echo "OK. (Elapsed upgrade time: $elapsed_time seconds)<br />\n";
-	flush();
-
-	$max_exe_time = ini_get( 'max_execution_time' );
-	if( $max_exe_time && $elapsed_time > $max_exe_time - 10 )
-	{ // Max exe time not disabled and we're reaching the end
-		echo 'We are reaching the time limit for this script. Please click <a href="index.php?locale='.$locale.'&amp;action=upgradedb">continue</a>...';
-		// Dirty temporary solution:
-		exit(0);
-	}
-}
-
-
-/**
- * @return boolean Does a given index key name exist in DB?
- */
-function db_index_exists( $table, $index_name )
-{
-	global $DB;
-
-	$index_name = strtolower($index_name);
-
-	foreach( $DB->get_results('SHOW INDEX FROM '.$table) as $row )
-	{
-		if( strtolower($row->Key_name) == $index_name )
-		{
-			return true;
-		}
-	}
-
-	return false;
-}
-
-
-/**
- * @param string Table name
- * @param array Column names
- * @return boolean Does a list of given column names exist in DB?
- */
-function db_cols_exist( $table, $col_names )
-{
-	global $DB;
-
-	foreach( $col_names as $k => $v )
-		$col_names[$k] = strtolower($v);
-
-	foreach( $DB->get_results('SHOW COLUMNS FROM '.$table) as $row )
-		if( ($key = array_search(strtolower($row->Field), $col_names)) !== false )
-			unset( $col_names[$key] );
-
-	return count($col_names) == 0;
-}
-
-/**
- * Drops a column, if it exists.
- */
-function db_drop_col( $table, $col_name )
-{
-	global $DB;
-
-	if( ! db_col_exists($table, $col_name) )
-		return false;
-
-	$DB->query( 'ALTER TABLE '.$table.' DROP COLUMN '.$col_name );
-}
-
-/**
- * Add a column, if it does not already exist.
- * If it exists already, a "ALTER TABLE" statement will get executed instead.
- *
- * @return boolean True if the column has been added, False if not.
- */
-function db_add_col( $table, $col_name, $col_desc )
-{
-	global $DB;
-
-	if( db_col_exists($table, $col_name) )
-	{ // Column exists already, make sure it's the same.
-		$DB->query( 'ALTER TABLE '.$table.' MODIFY COLUMN '.$col_name.' '.$col_desc );
-		return false;
-	}
-
-	$DB->query( 'ALTER TABLE '.$table.' ADD COLUMN '.$col_name.' '.$col_desc );
-}
-
-
-/**
- * Add an INDEX. If another index with the same name already exists, it will
- * get dropped before.
- */
-function db_add_index( $table, $name, $def )
-{
-	global $DB;
-	if( db_index_exists($table, $name) )
-	{
-		$DB->query( 'ALTER TABLE '.$table.' DROP INDEX '.$name );
-	}
-	$DB->query( 'ALTER TABLE '.$table.' ADD INDEX '.$name.' ('.$def.')' );
-}
-
-
 /**
  * Converts languages in a given table into according locales
  *
@@ -185,9 +61,9 @@
 		{ // we have an old two letter lang code to convert
 			// and it doesn't match the default locale
 			foreach( $locales as $newlkey => $v )
-			{  // loop given locales
+			{ // loop given locales
 				if( substr($newlkey, 0, 2) == strtolower($lkey) ) # TODO: check if valid/suitable
-				{  // if language matches, update
+				{ // if language matches, update
 					$converted = $DB->query( "
 						UPDATE $table
 						   SET $columnlang = '$newlkey'
@@ -201,475 +77,260 @@
 		if( !$converted )
 		{ // we have nothing converted yet, setting default:
 			$DB->query( "UPDATE $table
-											SET $columnlang = '$default_locale'
+										SET $columnlang = '$default_locale'
 										WHERE $columnlang = '$lkey'" );
 			echo 'forced to default locale \''. $default_locale. '\'<br />';
 		}
 	}
 	echo "\n";
-}  // convert_lang_to_locale(-)
-
-
-/**
- * upgrade_dbase_tables(-)
+}
+
+
+/**
+ * Add a column, if it does not already exist.
+ * If it exists already, a "ALTER TABLE" statement will get executed instead.
+ *
+ * @return boolean True if the column has been added, False if not.
+ */
+function db_add_col( $table, $col_name, $col_desc )
+{
+	global $DB;
+
+	if( db_col_exists($table, $col_name) )
+	{ // Column exists already, make sure it's the same.
+		$DB->query( 'ALTER TABLE '.$table.' MODIFY COLUMN '.$col_name.' '.$col_desc );
+		return false;
+	}
+
+	$DB->query( 'ALTER TABLE '.$table.' ADD COLUMN '.$col_name.' '.$col_desc );
+}
+
+
+/**
+ * Add an INDEX. If another index with the same name already exists, it will
+ * get dropped before.
+ */
+function db_add_index( $table, $name, $def )
+{
+	global $DB;
+	if( db_index_exists($table, $name) )
+	{
+		$DB->query( 'ALTER TABLE '.$table.' DROP INDEX '.$name );
+	}
+	$DB->query( 'ALTER TABLE '.$table.' ADD INDEX '.$name.' ('.$def.')' );
+}
+
+
+/**
+ * @param string Table name
+ * @param array Column names
+ * @return boolean Does a list of given column names exist in DB?
+ */
+function db_cols_exist( $table, $col_names )
+{
+	global $DB;
+
+	foreach( $col_names as $k => $v )
+		$col_names[$k] = strtolower($v);
+
+	foreach( $DB->get_results('SHOW COLUMNS FROM '.$table) as $row )
+		if( ($key = array_search(strtolower($row->Field), $col_names)) !== false )
+			unset( $col_names[$key] );
+
+	return count($col_names) == 0;
+}
+
+/**
+ * Drops a column, if it exists.
+ */
+function db_drop_col( $table, $col_name )
+{
+	global $DB;
+
+	if( ! db_col_exists($table, $col_name) )
+		return false;
+
+	$DB->query( 'ALTER TABLE '.$table.' DROP COLUMN '.$col_name );
+}
+
+
+/**
+ * @return boolean Does a given index key name exist in DB?
+ */
+function db_index_exists( $table, $index_name )
+{
+	global $DB;
+
+	$index_name = strtolower($index_name);
+
+	foreach( $DB->get_results('SHOW INDEX FROM '.$table) as $row )
+	{
+		if( strtolower($row->Key_name) == $index_name )
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
+
+/**
+ * Create a DB version checkpoint
+ *
+ * This increments table.db_upgrade during an upgrade cycle. It starts matching
+ * table.db_version and end matching $app_db_version. If the upgrader crashes
+ * this value lets us pick up exactly where we left off :)
+ *
+ * @param string version of DB at checkpoint
+ */
+function set_upgrade_checkpoint( $version )
+{
+	global $DB, $script_start_time, $locale;
+
+	$DB->query( "UPDATE T_settings SET set_value = '$version' WHERE set_name = 'db_upgrade'" );
+
+	$max_exe_time = ini_get( 'max_execution_time' );
+	$elapsed_time = time() - $script_start_time;
+	if( $max_exe_time && $elapsed_time > $max_exe_time - 10 )
+	{ // Max exe time not disabled and we're reaching the end
+		echo 'We are reaching the time limit for this script. Please click <a href="index.php?locale='.$locale.'&amp;action=upgradedb">continue</a>...';
+		// Dirty temporary solution:
+		exit(0);
+	}
+
+	task_end();
+
+}
+
+
+/**
+ * Upgrade database tables
+ *
+ * This is a process. Life is a process. Therefore this is life.
  */
 function upgrade_dbase_tables()
 {
-	global $app_db_config, $app_db_tableprefix;
-	global $app_baseurl, $old_db_version, $app_db_version, $app_name;
-	global $Group_Admins, $Group_Special, $Group_Bloggers, $Group_Users;
-	global $locales, $default_locale;
+	global $old_db_version;
 	global $DB;
-	global $admin_url;
-
-	// new DB-delta functionality
-	global $schema_queries, $inc_path;
+	global $app_name;
+	global $app_db_version;
+	global $schema_queries;
 
 	// Load DB schema from modules
 	load_db_schema();
-
 	load_funcs('_core/model/db/_upgrade.funcs.php');
 
-
+	// BEGIN installation status checks...
 	echo '<p>'.T_('Checking DB schema version...').' ';
-	$old_db_version = get_db_version();
 
-	if( empty($old_db_version) )
+	// are we not installed?
+	$old_db_version = get_db_version( 'version' );
+	if( $old_db_version === NULL )
 	{
- 		printf( T_( '<p><strong>OOPS! %s doesn\'t seem to be installed yet.</strong></p>' ), $app_name );
- 		return;
+		printf( T_( '<strong>OOPS! %s doesn\'t seem to be installed yet.</strong></p>' ), $app_name );
+		return;
 	}
 
+	// are we too old to rock and roll or too young to die?
 	echo $old_db_version, ' : ';
-
-	if( $old_db_version < 9700 ) debug_die( T_('This version is too old!') );
-	if( $old_db_version > $app_db_version ) debug_die( T_('This version is too recent! We cannot downgrade to the version you are trying to install...') );
+	if( $old_db_version < 0 )
+	{
+		debug_die( T_('This version is too old!') );
+	}
+	if( $old_db_version > $app_db_version )
+	{
+		debug_die( T_('This version is too recent! We cannot downgrade to the version you are trying to install...') );
+	}
+
+	// did we crash while upgrading?
+	$cur_db_version = get_db_version( 'upgrade' );
+	if( $cur_db_version === NULL )
+	{	// Initialize current DB version (upgrade process):
+		$cur_db_version = $old_db_version;
+		$DB->query( "INSERT INTO T_settings (set_name, set_value) VALUES ('db_upgrade', '0')" );
+	}
+	else if( $cur_db_version != $old_db_version )
+	{
+		echo T_('It looks like we crashed while upgrading. We will try to pick up where we left off').'<br />';
+		echo sprintf( T_('You had version %s and crashed at version %s on the way to version %s.'), $old_db_version, $cur_db_version, $app_db_version ).' ... ';
+	}
+
 	echo "OK.<br />\n";
-
-
-	// Try to obtain some serious time to do some serious processing (5 minutes)
-	@set_time_limit( 300 );
-
-
-	if( $old_db_version < 9800 )
-	{	// 2.5.0 .... only ever happened in cvs?
-		echo 'Upgrading blogs table... ';
-		db_drop_col( 'T_blogs', 'blog_commentsexpire' );
-		echo "OK.<br />\n";
-
-		echo 'Upgrading items table... ';
-		$DB->query( "ALTER TABLE T_items__item
-			CHANGE COLUMN post_urltitle post_urltitle VARCHAR(210) NULL DEFAULT NULL,
-			CHANGE COLUMN post_order    post_order DOUBLE NULL,
-			ADD COLUMN post_titletag  VARCHAR(255) NULL DEFAULT NULL AFTER post_urltitle" );
-		echo "OK.<br />\n";
-
- 		echo 'Creating keyphrase table... ';
-		$query = "CREATE TABLE T_track__keyphrase (
-            keyp_ID      INT UNSIGNED NOT NULL AUTO_INCREMENT,
-            keyp_phrase  VARCHAR( 255 ) NOT NULL,
-            PRIMARY KEY        ( keyp_ID ),
-            UNIQUE keyp_phrase ( keyp_phrase )
-          )";
-		$DB->query( $query );
-		echo "OK.<br />\n";
-
- 		echo 'Upgrading hitlog table... ';
-		$query = "ALTER TABLE T_hitlog
-			 CHANGE COLUMN hit_ID hit_ID              INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
-			 CHANGE COLUMN hit_datetime hit_datetime  DATETIME NOT NULL DEFAULT '2000-01-01 00:00:00',
-			 ADD COLUMN hit_keyphrase_keyp_ID         INT UNSIGNED DEFAULT NULL AFTER hit_referer_dom_ID,
-			 ADD INDEX hit_remote_addr ( hit_remote_addr ),
-			 ADD INDEX hit_sess_ID        ( hit_sess_ID )";
-		$DB->query( $query );
-		echo "OK.<br />\n";
-
-		echo 'Upgrading sessions table... ';
-		$DB->query( "ALTER TABLE T_sessions
-			ALTER COLUMN sess_lastseen SET DEFAULT '2000-01-01 00:00:00',
-			ADD COLUMN sess_hitcount  INT(10) UNSIGNED NOT NULL DEFAULT 1 AFTER sess_key,
-			ADD KEY sess_user_ID (sess_user_ID)" );
-		echo "OK.<br />\n";
-
-		echo 'Creating goal tracking table... ';
-    $DB->query( "CREATE TABLE T_track__goal(
-					  goal_ID int(10) unsigned NOT NULL auto_increment,
-					  goal_name varchar(50) default NULL,
-					  goal_key varchar(32) default NULL,
-					  goal_redir_url varchar(255) default NULL,
-					  goal_default_value double default NULL,
-					  PRIMARY KEY (goal_ID),
-					  UNIQUE KEY goal_key (goal_key)
-          )" );
-
-    $DB->query( "CREATE TABLE T_track__goalhit (
-					  ghit_ID int(10) unsigned NOT NULL auto_increment,
-					  ghit_goal_ID    int(10) unsigned NOT NULL,
-					  ghit_hit_ID     int(10) unsigned NOT NULL,
-					  ghit_params     TEXT default NULL,
-					  PRIMARY KEY  (ghit_ID),
-					  KEY ghit_goal_ID (ghit_goal_ID),
-					  KEY ghit_hit_ID (ghit_hit_ID)
-         )" );
-		echo "OK.<br />\n";
-
-		set_upgrade_checkpoint( '9800' );
-	}
-
-
-	if( $old_db_version < 9900 )
-	{	// 3.0 part 1
-		task_begin( 'Updating keyphrases in hitlog table... ' );
-		flush();
-		load_class( 'sessions/model/_hit.class.php' );
-	  $sql = 'SELECT hit_ID, hit_referer
-  						FROM T_hitlog
-   					 WHERE hit_referer_type = "search"
-   				 		 AND hit_keyphrase_keyp_ID IS NULL'; // this line just in case we crashed in the middle, so we restart where we stopped
-		$rows = $DB->get_results( $sql, OBJECT, 'get all search hits' );
-		foreach( $rows as $row )
-		{
-			$keyphrase = Hit::extract_keyphrase_from_referer( $row->hit_referer );
-			if( empty( $keyphrase ) )
-			{
-				continue;
-			}
-
-			$DB->begin();
-
-			$sql = 'SELECT keyp_ID
-			          FROM T_track__keyphrase
-			         WHERE keyp_phrase = '.$DB->quote($keyphrase);
-			$keyp_ID = $DB->get_var( $sql, 0, 0, 'Get keyphrase ID' );
-
-			if( empty( $keyp_ID ) )
-			{
-				$sql = 'INSERT INTO T_track__keyphrase( keyp_phrase )
-				        VALUES ('.$DB->quote($keyphrase).')';
-				$DB->query( $sql, 'Add new keyphrase' );
-				$keyp_ID = $DB->insert_id;
-			}
-
-			$DB->query( 'UPDATE T_hitlog
-			                SET hit_keyphrase_keyp_ID = '.$keyp_ID.'
-			              WHERE hit_ID = '.$row->hit_ID, 'Update hit' );
-
-			$DB->commit();
-			echo ". \n";
-		}
-		task_end();
-
-		task_begin( 'Upgrading widgets table... ' );
-		$DB->query( "ALTER TABLE T_widget
-			CHANGE COLUMN wi_order wi_order INT(10) NOT NULL" );
-		task_end();
-
-		task_begin( 'Upgrading Files table... ' );
-		$DB->query( "ALTER TABLE T_files
-								CHANGE COLUMN file_root_type file_root_type enum('absolute','user','collection','shared','skins') not null default 'absolute'" );
-		task_end();
-
-		set_upgrade_checkpoint( '9900' );
-	}
-
-	if( $old_db_version < 9910 )
-	{	// 3.0 part 2
-
-		task_begin( 'Upgrading Blogs table... ' );
-		$DB->query( "ALTER TABLE T_blogs CHANGE COLUMN blog_name blog_name varchar(255) NOT NULL default ''" );
-		task_end();
-
-		task_begin( 'Adding new Post Types...' );
-		$DB->query( "
-			REPLACE INTO T_items__type( ptyp_ID, ptyp_name )
-			VALUES ( 1500, 'Intro-Main' ),
-						 ( 1520, 'Intro-Cat' ),
-						 ( 1530, 'Intro-Tag' ),
-						 ( 1570, 'Intro-Sub' ),
-						 ( 1600, 'Intro-All' ) " );
-		task_end();
-
-		task_begin( 'Creating table for User field definitions' );
-		$DB->query( "CREATE TABLE T_plugin_sharedfields (
-				psf_ID int(10) unsigned NOT NULL,
-				psf_type char(8) NOT NULL,
-				psf_name varchar(255) collate latin1_general_ci NOT NULL,
-				PRIMARY KEY  (psf_ID)
-			)" );
-		task_end();
-
-		task_begin( 'Creating default field definitions...' );
-		$DB->query( "
-			INSERT INTO T_plugin_sharedfields (psf_fieldname, psf_label, psf_type, psf_note, psf_validate)
-			 VALUES ( 'address_1', 'Address 1', 'text', '', 'none' ),
-							( 'address_2', 'Address 2', 'text', '', 'none' ),
-							( 'city', 'City', 'text', '', 'none' ),
-							( 'county', 'County', 'text', '', 'none' ),
-							( 'state', 'State', 'text', '', 'none' ),
-							( 'province', 'Province', 'text', '', 'none' ),
-							( 'postal_code', 'Postal Code', 'text', '', 'none' ),
-							( 'nation', 'Nation', 'text', '', 'none' ),
-							( 'home_phone', 'Home Phone', 'text', '', 'phone' ),
-							( 'cell_phone', 'Cell Phone', 'text', '', 'phone' ),
-							( 'home_fax', 'Home FAX', 'text', '', 'phone' ),
-							( 'birthday', 'Birthday', 'text', '', 'none' ),
-							( 'gender', 'Gender', 'text', '', 'none' ),
-							( 'avatar_ID', 'Avatar File #', 'text', '', 'number' ),
-							( 'digg_url', 'Digg', 'text', '', 'url' ),
-							( 'facebook', 'Facebook', 'text', '', 'url' ),
-							( 'flickr', 'Flickr', 'text', '', 'url' ),
-							( 'linkdin', 'LinkedIn', 'text', '', 'url' ),
-							( 'myspace', 'Myspace', 'text', '', 'url' ),
-							( 'stumble', 'StumbleUpon', 'text', '', 'url' ),
-							( 'twitter', 'Twitter', 'text', '', 'url' ),
-							( 'youtube', 'YouTube', 'text', '', 'url' ),
-							( 'aol_aim', 'AOL AIM', 'text', '', 'none' ),
-							( 'icq_id', 'ICQ ID', 'text', '', 'none' ),
-							( 'jabber', 'Jabber', 'text', '', 'none' ),
-							( 'msn_im', 'MSN IM', 'text', '', 'none' ),
-							( 'skype', 'Skype ID', 'text', '', 'none' ),
-							( 'yahoo_im', 'Yahoo IM', 'text', '', 'none' );" );
-		task_end();
-
-		task_begin( 'Creating table for User fields...' );
-		$DB->query( "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)
-			)" );
-		task_end();
-
-		set_upgrade_checkpoint( '9910' );
-	}
-
-	if( $old_db_version < 9920 )
-	{	// 3.1
-		task_begin( 'Upgrading Posts table... ' );
-		// This is for old posts that may have a post type of NULL which should never happen. ptyp 1 is for regular posts
-		$DB->query( "UPDATE T_items__item
-										SET post_ptyp_ID = 1
-									WHERE post_ptyp_ID IS NULL" );
-		$DB->query( "ALTER TABLE T_items__item
-							CHANGE COLUMN post_ptyp_ID post_ptyp_ID int(10) unsigned NOT NULL DEFAULT 1" );
-		task_end();
-
-		task_begin( 'Upgrading Categories table... ' );
-		$DB->query( "ALTER TABLE T_categories
-			CHANGE COLUMN cat_name cat_name varchar(255) NOT NULL,
-			CHANGE COLUMN cat_description cat_description varchar(255) NULL DEFAULT NULL" );
-		db_add_col( 'T_categories', 'cat_order', 'int(11) NULL DEFAULT NULL AFTER cat_description' );
-		db_add_index( 'T_categories', 'cat_order', 'cat_order' );
-
-		$DB->query( "UPDATE T_categories
-					SET cat_order = cat_ID" );
-		task_end();
-
-		task_begin( 'Upgrading widgets table... ' );
-		db_add_col( 'T_widget', 'wi_enabled', 'tinyint(1) NOT NULL DEFAULT 1 AFTER wi_order' );
-		task_end();
-	}
-	if( $old_db_version < 9930 )
-	{	// 3.1 continued
-		task_begin( 'Updating item types...' );
-		$DB->query( "
-			REPLACE INTO T_items__type ( ptyp_ID, ptyp_name )
-			VALUES ( 3000, 'Sidebar link' )" );
-		echo "OK.<br />\n";
-		task_end();
-
-		task_begin( 'Updating items table...' );
-		$DB->query( "ALTER TABLE T_items__item ENGINE=innodb" );	// fp> hum... this originally was a test :)
-		task_end();
-
-		task_begin( 'Creating versions table...' );
-		$DB->query( "CREATE TABLE T_items__version (
-	            iver_itm_ID        INT UNSIGNED NOT NULL ,
-	            iver_edit_user_ID  INT UNSIGNED NOT NULL ,
-	            iver_edit_datetime DATETIME NOT NULL ,
-	            iver_status        ENUM('published','deprecated','protected','private','draft','redirected') NULL ,
-	            iver_title         TEXT NULL ,
-	            iver_content       MEDIUMTEXT NULL ,
-	            INDEX iver_itm_ID ( iver_itm_ID )
-	            ) ENGINE = innodb" );
-		task_end();
-
-		task_begin( 'Updating group permissions...' );
-		$DB->query( "UPDATE T_groups
-										SET grp_perm_xhtml_css_tweaks = 1
-									WHERE grp_ID <= 3" );
-		task_end();
-
-		set_upgrade_checkpoint( '9930' );
-	}
-
-	if( $old_db_version < 9940 )
-	{	// 3.2
-		task_begin( 'Updating hitlog table...' );
-		$DB->query( "ALTER TABLE T_hitlog ADD COLUMN hit_serprank INT UNSIGNED DEFAULT NULL AFTER hit_keyphrase_keyp_ID" );
-		task_end();
-
-		task_begin( 'Updating versions table...' );
-		$DB->query( "ALTER TABLE T_items__version
-								CHANGE COLUMN iver_edit_user_ID iver_edit_user_ID  INT UNSIGNED NULL" );
-		task_end();
-	}
-
-	if( $old_db_version < 9950 )
-	{	// 3.3
-		task_begin( 'Altering Blogs table... ' );
-		$DB->query( "ALTER TABLE T_blogs CHANGE COLUMN blog_shortname blog_shortname varchar(255) default ''" );
-		task_end();
-
-		task_begin( 'Altering default dates... ' );
-		$DB->query( "ALTER TABLE T_links
-      ALTER COLUMN link_datecreated SET DEFAULT '2000-01-01 00:00:00',
-      ALTER COLUMN link_datemodified SET DEFAULT '2000-01-01 00:00:00'" );
-		$DB->query( "ALTER TABLE T_cron__task
-      ALTER COLUMN ctsk_start_datetime SET DEFAULT '2000-01-01 00:00:00'" );
-		$DB->query( "ALTER TABLE T_cron__log
-      ALTER COLUMN clog_realstart_datetime SET DEFAULT '2000-01-01 00:00:00'" );
-		task_end();
-
- 		task_begin( 'Altering Items table... ' );
-		$DB->query( "ALTER TABLE T_items__item
-			ADD COLUMN post_metadesc VARCHAR(255) NULL DEFAULT NULL AFTER post_titletag,
-			ADD COLUMN post_metakeywords VARCHAR(255) NULL DEFAULT NULL AFTER post_metadesc,
-			ADD COLUMN post_editor_code VARCHAR(32) NULL COMMENT 'Plugin code of the editor used to edit this post' AFTER post_varchar3" );
-		task_end();
-
-		task_begin( 'Forcing AutoP posts to html editor...' );
-		$DB->query( 'UPDATE T_items__item
-											SET post_editor_code = "html"
-										WHERE post_renderers = "default"
-											 OR post_renderers LIKE "%qp_auto_p%"' );
-		task_end();
-
-		set_upgrade_checkpoint( '9950' );
-	}
-
-	if( $old_db_version < 9960 )
-	{	// 3.3
-
-		echo "Renaming tables...";
-		$DB->save_error_state();
-		$DB->halt_on_error = false;
-		$DB->show_errors = false;
-		$DB->query( "ALTER TABLE {$app_db_tableprefix}users_fields RENAME TO T_plugin_sharedvalues" );
-		$DB->restore_error_state();
-		echo "OK.<br />\n";
-
-		// fp> The following is more tricky to do with CHARACTER SET. During upgrade, we don't know what the admin actually wants.
-		task_begin( 'Making sure all tables use desired storage ENGINE...' );
-		foreach( $schema_queries as $table_name=>$table_def )
-		{
-			if( $DB->query( 'SHOW TABLES LIKE \''.$table_name.'\'' )
-				&& preg_match( '/ ENGINE = ([a-z]+) /is', $table_def[1], $matches ) )
-			{	// If the table exists and has an ENGINE definition:
-				echo $table_name.':'.$matches[1].'<br />';
-				$DB->query( "ALTER TABLE $table_name ENGINE = ".$matches[1] );
-			}
-		}
-		task_end();
-
-		set_upgrade_checkpoint( '9960' );
-	}
-
-
-	// --- QUAM PLURES UPGRADES ---
-	// NOTE: This is for reference ONLY!
-
-	if( $old_db_version < 100000 )
-	{	// 0.0.0
-		task_begin( 'Updating widgets table...' );
-		$DB->query( "ALTER TABLE T_widget
-								CHANGE COLUMN wi_type wi_type  ENUM('widget', 'core', 'plugin') NOT NULL DEFAULT 'widget'" );
-		$DB->query( "UPDATE T_widget SET wi_type='widget' WHERE NOT( wi_type='plugin' )" );
-		$DB->query( "ALTER TABLE T_widget
-								CHANGE COLUMN wi_type wi_type  ENUM('widget', 'plugin') NOT NULL DEFAULT 'widget'" );
-		task_end();
-
-		// rename skins to templates
-		task_begin( 'Renaming skins to templates...' );
-		$DB->query( "ALTER TABLE T_blogs CHANGE blog_skin_ID blog_template_ID INT( 10 ) UNSIGNED NOT NULL DEFAULT 1" );
-		$DB->query( "ALTER TABLE T_files
-			CHANGE file_root_type file_root_type ENUM( 'absolute', 'user', 'collection', 'shared', 'skins', 'templates' )
-			CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL DEFAULT 'absolute'" );
-		$DB->query( "UPDATE T_files SET file_root_type='templates' WHERE file_root_type='skins'" );
-		$DB->query( "ALTER TABLE T_files
-			CHANGE file_root_type file_root_type ENUM( 'absolute', 'user', 'collection', 'shared', 'templates' )
-			CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL DEFAULT 'absolute'" );
-		$DB->query( "ALTER TABLE {$app_db_tableprefix}skins__container CHANGE sco_skin_ID sco_template_ID INT( 10 ) UNSIGNED NOT NULL" );
-		$DB->query( "RENAME TABLE {$app_db_tableprefix}skins__container TO {$app_db_tableprefix}templates__container" );
-
-		$DB->query( "ALTER TABLE {$app_db_tableprefix}skins__skin
-			CHANGE skin_ID template_ID INT( 10 ) UNSIGNED NOT NULL AUTO_INCREMENT,
-			CHANGE skin_name template_name VARCHAR( 32 ) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL,
-			CHANGE skin_type template_type ENUM( 'normal', 'feed' ) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL DEFAULT 'normal',
-			CHANGE skin_folder template_folder VARCHAR( 32 ) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL" );
-		$DB->query( "ALTER TABLE {$app_db_tableprefix}skins__skin
-			DROP INDEX skin_folder, ADD UNIQUE template_folder ( template_folder ),
-			DROP INDEX skin_name, ADD INDEX template_name ( template_name )" );
-		$DB->query( "RENAME TABLE {$app_db_tableprefix}skins__skin TO {$app_db_tableprefix}templates__template" );
-
-		task_end();
-
-		// Spyware removed, kill associated setting
-		task_begin( 'Killing b2evolution.net polling times... ' );
-		$DB->query( "
-			DELETE FROM T_settings
-			WHERE set_name = 'evonet_last_attempt'
-				 OR set_name = 'evonet_last_update'" );
-		task_end();
-
-		set_upgrade_checkpoint( '100000' );
-	}
-	if( $old_db_version < 100010 )
-	{	// 0.0.0, part #2
-		task_begin( 'Updating user table...' );
-		$DB->query( 'ALTER TABLE T_users MODIFY user_pass CHAR(40) NOT NULL' );
-		task_end();
-
-		task_begin( 'Adding salts to user passwords...' );
-		$DB->query( 'UPDATE T_users SET user_pass = SHA1( CONCAT( user_login, user_pass ) )' );
-		task_end();
-
-		set_upgrade_checkpoint( '100010' );
-	}
-
-
-	/*
-	 * ADD UPGRADES HERE.
-	 *
-	 * ALL DB CHANGES MUST BE EXPLICITELY CARRIED OUT. DO NOT RELY ON SCHEMA UPDATES!
-	 * Schema updates do not survive after several incremental changes.
-	 *
-	 * NOTE: every change that gets done here, should bump {@link $app_db_version} (by 100).
-	 */
-
-	// Just in case, make sure the db schema version is upto date at the end.
-	if( $old_db_version != $app_db_version )
-	{ // Update DB schema version to $app_db_version
-		set_upgrade_checkpoint( $app_db_version );
-	}
-
-
-
-
-	// This has to be at the end because plugin install may fail if the DB schema is not current (matching Plugins class).
-	// Only new default plugins will be installed, based on $old_db_version.
-	// dh> NOTE: if this fails (e.g. fatal error in one of the plugins), it will not get repeated
-	install_basic_plugins( $old_db_version );
-
-
-	/*
-	 * Check to make sure the DB schema is up to date:
-	 */
+	// END installation status checks...
+
+	// Try to obtain some serious time to do some serious processing (5 minutes and 57 seconds)
+	@set_time_limit( 357 );
+
+	// ---------------------------------------------------------------------------
+	// BEGIN UPGRADES FROM V0.0.0 ($app_db_version = 0)
+	// ---------------------------------------------------------------------------
+
+	// ---------------------------------------------------------------------------
+	// BEGIN BRANCH: html5_step_one
+	// https://code.launchpad.net/~edb/quam-plures/html5_step_one
+	// ---------------------------------------------------------------------------
+
+	if( $old_db_version < 1 )
+	{	// change the template_type options...
+		echo 'Upgrading templates__template table (1 of 4) ... ';
+		db_add_col( "T_templates__template", "template_type", "ENUM('xhtml', 'normal', 'feed', 'other') NOT NULL DEFAULT 'xhtml'" );
+		set_upgrade_checkpoint( '1' );
+	}
+
+	if( $old_db_version < 2 )
+	{	// change "normal" types to "xhtml"
+		echo 'Upgrading templates__template table (2 of 4) ... ';
+		$DB->query( "UPDATE T_templates__template SET template_type = REPLACE( template_type, 'normal', 'xhtml' )" );
+		set_upgrade_checkpoint( '2' );
+	}
+
+	if( $old_db_version < 3 )
+	{	// if Sitemap is installed change the type to "other"
+		echo 'Upgrading templates__template table (3 of 4) ... ';
+		$DB->query( "UPDATE T_templates__template SET template_type = 'other' WHERE template_name = 'Sitemap'" );
+		set_upgrade_checkpoint( '3' );
+	}
+
+	if( $old_db_version < 4 )
+	{	// change the template_type options again...
+		echo 'Upgrading templates__template table (4 of 4) ... ';
+		db_add_col( "T_templates__template", "template_type", "ENUM('xhtml', 'feed', 'other') NOT NULL DEFAULT 'xhtml'" );
+		set_upgrade_checkpoint( '4' );
+	}
+
+	// ---------------------------------------------------------------------------
+	// END BRANCH: html5_step_one
+	// ---------------------------------------------------------------------------
+
+	/*****************************************************************************
+	 * ADD UPGRADES HERE!                                                        *
+	 * Remember changing the DB schema, too! This provides for fully automatic   *
+	 * upgrades when there were changes but the DB version seems to be           *
+	 * up-to-date. Look at the following files:                                  *
+	 *   qp_inc/_core/model/__core.install.php                                   *
+	 *   qp_inc/sessions/model/_sessions.install.php                             *
+	 *****************************************************************************/
+
+	// ---------------------------------------------------------------------------
+	// THE FOLLOWING STUFF GETS DONE AFTER ALL THE DATABASE CHANGES ARE DONE
+	// ---------------------------------------------------------------------------
+
+	// set db_version to match what our last upgrade value said we were at
+	$end_of_upgrade = get_db_version( 'upgrade' );
+	$DB->query( "UPDATE T_settings SET set_value = '$end_of_upgrade' WHERE set_name = 'db_version'" );
+
+	// double-check our upgrade against our target
+	if( $end_of_upgrade != $app_db_version )
+	{	// This is a serious problem that should never reach production!
+		// It means that our branch-work wasn't done well, so fix it :)
+		debug_die( 'The end of the upgrade process did not get us where we needed to be! '.$end_of_upgrade.' vs '.$app_db_version );
+	}
+
+	// Check to make sure the DB schema is up to date:
 	$upgrade_db_deltas = array(); // This holds changes to make, if any (just all queries)
-
 	foreach( $schema_queries as $table => $query_info )
-	{	// For each table in the schema, check diffs...
+	{ // For each table in the schema, check diffs...
 		foreach( db_delta( $query_info[1], array('drop_column', 'drop_index') ) as $table => $queries )
 		{
 			foreach( $queries as $qinfo )
@@ -689,7 +350,6 @@
 	else
 	{
 		// delta queries have to be confirmed or executed now..
-
 		$confirmed_db_upgrade = param('confirmed', 'integer', 0); // force confirmation
 		$upgrade_db_deltas_confirm_md5 = param( 'upgrade_db_deltas_confirm_md5', 'string', '' );
 
@@ -720,12 +380,8 @@
 			$Form->hidden( 'upgrade_db_deltas_confirm_md5', md5(implode( '', $upgrade_db_deltas )) );
 			$Form->hidden( 'action', $action );
 			$Form->hidden( 'locale', $locale );
-
-
-			echo '<p>'.T_('The version number is correct, but we have detected changes in the database schema. This can happen with CVS versions...').'</p>';
-
+			echo '<p>'.T_('The version number is correct, but we have detected changes in the database schema. This can happen with <abbr title="Version Control System">VCS</abbr> versions...').'</p>';
 			echo '<p>'.T_('The following database changes will be carried out. If you are not sure what this means, it will probably be alright.').'</p>';
-
 			echo '<ul>';
 			foreach( $upgrade_db_deltas as $l_delta )
 			{
@@ -746,5 +402,4 @@
 	return true;
 }
 
-
 ?>

=== modified file 'qp_install/_functions_install.php'
--- qp_install/_functions_install.php	2010-12-31 12:12:03 +0000
+++ qp_install/_functions_install.php	2011-06-17 09:28:39 +0000
@@ -121,7 +121,7 @@
 	 */
 	require_once dirname(__FILE__).'/_functions_create.php';
 
-	if( $old_db_version = get_db_version() )
+	if( ( $old_db_version = get_db_version( 'version' ) ) !== NULL )
 	{
 		echo '<p><strong>';
 		printf( T_('OOPS! It seems %s is already installed!'), $app_name );
@@ -197,27 +197,22 @@
 
 
 /**
- * Begin install task.
- * This will offer other display methods in the future
- */
-function task_begin( $title )
-{
-	echo $title;
-}
-
-
-/**
  * End install task.
  * This will offer other display methods in the future
  */
 function task_end()
 {
-	echo "OK.<br />\n";
+	echo T_('OK.')."<br />\n";
 	flush();
 }
 
 
-function get_db_version()
+/**
+ * Get DB version
+ *
+ * returns either the database version or the version during upgrading
+ */
+function get_db_version( $which )
 {
 	global $DB;
 
@@ -227,13 +222,13 @@
 
 	$r = NULL;
 
-	if( db_col_exists( 'T_settings', 'set_name' ) )
-	{ // we have new table format (since 0.9)
+	if( $which == 'version' )
+	{ // actual value (after successful install or upgrade)
 		$r = $DB->get_var( 'SELECT set_value FROM T_settings WHERE set_name = "db_version"' );
 	}
-	else
-	{
-		$r = $DB->get_var( 'SELECT db_version FROM T_settings' );
+	if( $which == 'upgrade' )
+	{ // value while upgrading (matches db_version when done)
+		$r = $DB->get_var( 'SELECT set_value FROM T_settings WHERE set_name = "db_upgrade"' );
 	}
 
 	$DB->restore_error_state();
@@ -292,7 +287,7 @@
 			$DB->query( $query );
 		}
 	}
-	echo "OK.<br />\n";
+	task_end();
 
 }
 
@@ -349,7 +344,7 @@
 	$DB->query(
 		"INSERT INTO T_settings (set_name, set_value)
 		VALUES ".implode( ', ', $insertvalues ) );
-	echo "OK.<br />\n";
+	task_end();
 }
 
 
@@ -387,8 +382,7 @@
 	template_install( 'vastitude' );
 	template_install( '_atom' );
 	template_install( '_rss2' );
-
-	echo "OK.<br />\n";
+	task_end();
 }
 
 
@@ -420,7 +414,9 @@
 	// each plugin (which may then use (User)Settings in PluginInit (through Plugin::__get)).
 	$GLOBALS['Plugins'] = & $Plugins_admin;
 
-	if( $old_db_version < 0001 )
+	// Tblue> 0001 is octal notation and _could_ lead to unwanted side effects
+	//        in the future (if changed).
+	if( $old_db_version < 1 )
 	{
 		install_plugin( 'adsense_plugin' ); // 'toolbars'
 		install_plugin( 'archives_plugin' ); // 'widgets' - one day this turns into a widget :)
@@ -621,7 +617,7 @@
 							 SELECT blog_ID, "Sidebar 2", 4, "widget", "free_html", \'a:5:{s:5:"title";s:9:"Sidebar 2";s:7:"content";s:162:"This is the "Sidebar 2" container. You can place any widget you like in here. In the evo toolbar at the top of this page, select "Customize", then "Blog Widgets".";s:11:"widget_name";s:9:"Free HTML";s:16:"widget_css_class";s:0:"";s:9:"widget_ID";s:0:"";}\'
 							   FROM T_blogs' );
 
-	echo "OK.<br />\n";
+	task_end();
 }
 
 
@@ -810,7 +806,7 @@
 											on delete restrict
 											on update restrict' );
 
-	echo "OK.<br />\n";
+	task_end();
 }
 
 
@@ -841,4 +837,5 @@
 	}
 
 }
+
 ?>

=== modified file 'qp_install/index.php'
--- qp_install/index.php	2011-02-07 05:27:47 +0000
+++ qp_install/index.php	2011-06-17 09:28:39 +0000
@@ -146,35 +146,32 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php locale_lang() ?>" lang="<?php locale_lang() ?>">
 <head>
-	<title><?php
-		printf( /* TRANS: %s: Application name */ T_('%s installer'), $app_name );
-		if( $title )
-		{
-			echo ': ', $title;
-		}
-	?></title>
-	<link rel="icon" href="../favicon.ico" type="image/x-icon"/>
-	<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon"/>
-	<meta name="viewport" content="width = 750" />
-	<link href="../qp_rsc/css/support_install.css" rel="stylesheet" type="text/css" />
+<title><?php
+	printf( /* TRANS: %s: Application name */ T_('%s installer'), $app_name );
+	if( $title )
+	{
+		echo ': ', $title;
+	}
+?></title>
+<link rel="icon" href="../favicon.ico" type="image/x-icon"/>
+<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon"/>
+<meta name="viewport" content="width = 750" />
+<link href="../qp_rsc/css/support_install.css" rel="stylesheet" type="text/css" />
 </head>
 
 <body>
 
-	<div class="wrapper">
-		<?php display_locale_selector(); ?>
-		<div class="menu_top">
-		<?php echo T_('Current installation') ?>:
-		<a href="index.php?locale=<?php echo $default_locale ?>"><?php echo T_('Install menu') ?></a>
-		</div>
+<div class="wrapper">
+<?php display_locale_selector(); ?>
+<div class="menu_top">
+<?php echo T_('Current installation') ?>:
+<a href="index.php?locale=<?php echo $default_locale ?>"><?php echo T_('Install menu') ?></a>
+</div>
 
 <?php
-
 block_open();
-
 if( $app_config_is_done || (($action != 'start') && ($action != 'default') && ($action != 'conf')) )
 { // Connect to DB:
-
 	$tmp_db_config = $app_db_config;
 
 	// We want a friendly message if we can't connect:
@@ -206,8 +203,8 @@
 		{
 			die( '<div class="error"><p class="error"><strong>'
 				.sprintf( T_('The minimum requirement for this version of %s is %s version %s '
-							.'but you are trying to use version %s!'),
-						  $app_name, 'MySQL', '5.0', $mysql_version )
+						.'but you are trying to use version %s!'),
+					$app_name, 'MySQL', '5.0', $mysql_version )
 				.'</strong></p></div>' );
 		}
 	}
@@ -219,8 +216,8 @@
 {
 	die( '<div class="error"><p class="error"><strong>'
 		.sprintf( T_( 'The minimum requirement for this version of %s is %s version %s but you are '
-					 .'trying to use version %s!'),
-				  $app_name, 'PHP', '5.0', phpversion() )
+				.'trying to use version %s!'),
+			$app_name, 'PHP', '5.0', phpversion() )
 		.'</strong></p></div>' );
 }
 
@@ -240,15 +237,10 @@
 switch( $action )
 {
 	case 'conf':
-		/*
-		 * -----------------------------------------------------------------------------------
-		 * Write conf file:
-		 * -----------------------------------------------------------------------------------
-		 */
+		/* Write conf file */
 		display_locale_selector();
 
 		block_open();
-
 		param( 'conf_db_user', 'string', true );
 		param( 'conf_db_password', '', true );
 		param( 'conf_db_name', 'string', true );
@@ -259,15 +251,16 @@
 
 		// Connect to DB:
 		$DB = new DB( array(
-			'user' => $conf_db_user,
-			'password' => $conf_db_password,
-			'name' => $conf_db_name,
-			'host' => $conf_db_host,
-			'aliases' => $app_db_config['aliases'],
-			'use_transactions' => $app_db_config['use_transactions'],
-			'table_options' => $app_db_config['table_options'],
-			'connection_charset' => $app_db_config['connection_charset'],
-			'halt_on_error' => false ) );
+				'user' => $conf_db_user,
+				'password' => $conf_db_password,
+				'name' => $conf_db_name,
+				'host' => $conf_db_host,
+				'aliases' => $app_db_config['aliases'],
+				'use_transactions' => $app_db_config['use_transactions'],
+				'table_options' => $app_db_config['table_options'],
+				'connection_charset' => $app_db_config['connection_charset'],
+				'halt_on_error' => false )
+			);
 		if( $DB->error )
 		{ // restart conf
 			echo '<p class="error">'.T_('It seems that the database config settings you entered don\'t work. Please check them carefully and try again...').'</p>';
@@ -321,12 +314,12 @@
 				<p><strong><?php printf( T_('We cannot automatically create or update your config file [%s]!'), $conf_filepath ); ?></strong></p>
 				<p><strong><?php echo T_('You need to update the config file manually:') ?></strong></p>
 				<ol>
-					<li><?php echo T_('Create a new text file with a text editor.') ?></li>
-					<li><?php echo T_('Copy the contents from the box below.') ?></li>
-					<li><?php echo T_('Paste them into your local text editor. <strong>ATTENTION: make sure there is ABSOLUTELY NO WHITESPACE after the final <code>?&gt;</code> in the file.</strong> Any space, tab, newline or blank line at the end of the conf file may prevent cookies from being set when you try to log in later.') ?></li>
-					<li><?php echo T_('Save the file locally under the name <code>_main_config.php</code>') ?></li>
-					<li><?php echo T_('Upload the file to your server, into the <code>/qp_config</code> folder.') ?></li>
-					<li><?php printf( T_('When done <a %s>call the installer</a> again. The installer will rerun tests to connect to your database.'), 'href="index.php?locale='.$default_locale.'"') ?></li>
+				<li><?php echo T_('Create a new text file with a text editor.') ?></li>
+				<li><?php echo T_('Copy the contents from the box below.') ?></li>
+				<li><?php echo T_('Paste them into your local text editor. <strong>ATTENTION: make sure there is ABSOLUTELY NO WHITESPACE after the final <code>?&gt;</code> in the file.</strong> Any space, tab, newline or blank line at the end of the conf file may prevent cookies from being set when you try to log in later.') ?></li>
+				<li><?php echo T_('Save the file locally under the name <code>_main_config.php</code>') ?></li>
+				<li><?php echo T_('Upload the file to your server, into the <code>/qp_config</code> folder.') ?></li>
+				<li><?php printf( T_('When done <a %s>call the installer</a> again. The installer will rerun tests to connect to your database.'), 'href="index.php?locale='.$default_locale.'"') ?></li>
 				</ol>
 				<p><?php echo T_('This is how your _main_config.php should look like:') ?></p>
 				<blockquote>
@@ -354,11 +347,7 @@
 
 	case 'start':
 	case 'default':
-		/*
-		 * -----------------------------------------------------------------------------------
-		 * Start of install procedure:
-		 * -----------------------------------------------------------------------------------
-		 */
+		/* Start of install procedure */
 		if( $action == 'start' || !$app_config_is_done )
 		{
 			display_locale_selector();
@@ -378,7 +367,6 @@
 			}
 			else
 			{
-
 			// Set default params if not provided otherwise:
 			param( 'conf_db_user', 'string', $app_db_config['user'] );
 			param( 'conf_db_password', '', $app_db_config['password'] );
@@ -391,7 +379,6 @@
 				$app_baseurl .= ':'.$_SERVER['SERVER_PORT'];
 			$app_baseurl .= preg_replace( '#/qp_install(/(index.php)?)?$#', '', $ReqPath ).'/';
 			param( 'conf_baseurl', 'string', $app_baseurl );
-
 			?>
 
 			<p><?php echo T_('The basic configuration file (<code>/qp_config/_main_config.php</code>) has not been created yet. If your server supports it, you can automatically generate it by filling out the form below.') ?></p>
@@ -399,61 +386,57 @@
 			<p><?php printf( T_('This is the minimum info we need to set up %s on this server:'), $app_name ); ?></p>
 
 			<form class="fform" name="form" action="index.php" method="post">
-				<input type="hidden" name="action" value="conf" />
-				<input type="hidden" name="locale" value="<?php echo $default_locale; ?>" />
-
-				<fieldset>
-					<legend><?php echo T_('Blog settings') ?></legend>
-					<?php
-						form_text( 'conf_baseurl', $conf_baseurl, 50, T_('Website address'),
-							sprintf( /* TRANS: %1$s: App name */
-									 T_('This is where %1$s and your blogs reside by default. '
-									   .'CHECK THIS CAREFULLY or not much will work. If you want to '
-									   .'test %1$s on your local machine, in order for login cookies '
-									   .'to work, you MUST use http://<strong>localhost</strong>/path... '
-									   .'Do NOT use your machine\'s name!' ), $app_name ),
-							120 );
-					?>
-				</fieldset>
-
-				<fieldset>
-					<legend><?php echo T_('Database you want to install into') ?></legend>
-					<p class="note"><?php
-						printf( /* TRANS: %1$s: App name. */
-								T_( '%1$s stores blog posts, comments, user permissions, etc. in a MySQL '
-								   .'database. You must create this database prior to installing %1$s '
-								   .'and provide the access parameters to this database below. If '
-								   .'you are not familiar with this, you can ask your hosting provider '
-								   .'to create the database for you.' ), $app_name );
-					?></p>
-					<?php
-						form_text( 'conf_db_host', $conf_db_host, 16, T_('MySQL Host/Server'), T_( 'Typically looks like "localhost" or "sql-6" or "sql-8.yourhost.net"...' ), 120 );
-						form_text( 'conf_db_name', $conf_db_name, 16, T_('MySQL Database'), T_( 'Name of the MySQL database you have created on the server' ), 100);
-						form_text( 'conf_db_user', $conf_db_user, 16, T_('MySQL Username'), sprintf( T_('Used by %s to access the MySQL database' ), $app_name ), 100 );
-						form_text( 'conf_db_password', $conf_db_password, 16, T_('MySQL Password'), sprintf( T_('Used by %s to access the MySQL database' ), $app_name ), 100 ); // no need to hide this. nobody installs an application from a public place
-						form_text( 'conf_db_tableprefix', $conf_db_tableprefix, 16, T_('MySQL tables prefix'), sprintf( T_('All DB tables will be prefixed with this. You need to change this only if you want to have multiple %s installations in the same DB.' ), $app_name ), 30 );
-					?>
-				</fieldset>
-
-				<div class="buttons">
-					<input type="submit" name="submit" value="<?php echo T_('Update config file') ?>" class="search" />
-					<input type="reset" value="<?php echo T_('Reset') ?>" class="search" />
-				</div>
+			<input type="hidden" name="action" value="conf" />
+			<input type="hidden" name="locale" value="<?php echo $default_locale; ?>" />
+
+			<fieldset>
+			<legend><?php echo T_('Blog settings') ?></legend>
+			<?php
+			form_text( 'conf_baseurl', $conf_baseurl, 50, T_('Website address'),
+				sprintf( /* TRANS: %1$s: App name */
+					T_('This is where %1$s and your blogs reside by default. '
+						.'CHECK THIS CAREFULLY or not much will work. If you want to '
+						.'test %1$s on your local machine, in order for login cookies '
+						.'to work, you MUST use http://<strong>localhost</strong>/path... '
+						.'Do NOT use your machine\'s name!' ), $app_name ),
+				120 );
+			?>
+			</fieldset>
+
+			<fieldset>
+			<legend><?php echo T_('Database you want to install into') ?></legend>
+			<p class="note"><?php
+			printf( /* TRANS: %1$s: App name. */
+				T_( '%1$s stores blog posts, comments, user permissions, etc. in a MySQL '
+					.'database. You must create this database prior to installing %1$s '
+					.'and provide the access parameters to this database below. If '
+					.'you are not familiar with this, you can ask your hosting provider '
+					.'to create the database for you.' ), $app_name );
+			?></p>
+			<?php
+			form_text( 'conf_db_host', $conf_db_host, 16, T_('MySQL Host/Server'), T_( 'Typically looks like "localhost" or "sql-6" or "sql-8.yourhost.net"...' ), 120 );
+			form_text( 'conf_db_name', $conf_db_name, 16, T_('MySQL Database'), T_( 'Name of the MySQL database you have created on the server' ), 100);
+			form_text( 'conf_db_user', $conf_db_user, 16, T_('MySQL Username'), sprintf( T_('Used by %s to access the MySQL database' ), $app_name ), 100 );
+			form_text( 'conf_db_password', $conf_db_password, 16, T_('MySQL Password'), sprintf( T_('Used by %s to access the MySQL database' ), $app_name ), 100 ); // no need to hide this. nobody installs an application from a public place
+			form_text( 'conf_db_tableprefix', $conf_db_tableprefix, 16, T_('MySQL tables prefix'), sprintf( T_('All DB tables will be prefixed with this. You need to change this only if you want to have multiple %s installations in the same DB.' ), $app_name ), 30 );
+			?>
+			</fieldset>
+
+			<div class="buttons">
+			<input type="submit" name="submit" value="<?php echo T_('Update config file') ?>" class="search" />
+			<input type="reset" value="<?php echo T_('Reset') ?>" class="search" />
+			</div>
 
 			</form>
 
 			<?php
 			break;
-			}
 		}
-		// if config was already done, move on to main menu:
+	}
+	// if config was already done, move on to main menu:
 
 	case 'menu':
-		/*
-		 * -----------------------------------------------------------------------------------
-		 * Menu
-		 * -----------------------------------------------------------------------------------
-		 */
+		/* Menu */
 		param('conf_admin_login', 'string' );
 		param('conf_admin_pass', 'string' );
 		param('conf_admin_email', 'string' );
@@ -466,115 +449,116 @@
 		?>
 		<h1><?php printf( T_('Install %s version %s'), $app_name, $app_version ); ?></h1>
 
-		<?php
-			$old_db_version = get_db_version();
-		?>
+		<?php $old_db_version = get_db_version( 'version' ); ?>
 
 		<form action="index.php" method="post">
-			<input type="hidden" name="locale" value="<?php echo $default_locale ?>" />
-			<input type="hidden" name="confirmed" value="0" />
-			<input type="hidden" name="installer_version" value="10" />
-
-			<div id="op-newdb" class="op-group">
-			<input type="radio" name="action" id="newdb" value="newdb"
-				<?php
-					// fp> change the above to 'newdbsettings' for an additional settings screen.
-					if( is_null($old_db_version) )
-					{
-						echo 'checked="checked"';
-					}
-				?>
-				/>
-				<label for="newdb" class="option"><?php
-					printf( T_('<strong>New Install</strong>: Install %s database tables.'), $app_name );
-				?></label>
-			<div class="options">
-			<h3><?php echo T_('Admin account details' ); ?></h3>
-				<?php
-				if( !empty( $msg ) )
-				{
-					echo '<p class="error">'.implode( '<br />', $msg ).'</p>';
-				}
-				form_text( 'conf_admin_login', $conf_admin_login, 50, T_('Login'), T_('This will be used to create your admin account.' ), 80 );
-				form_text( 'conf_admin_pass', $conf_admin_pass, 50, T_('Password'), T_('We advise you use a strong password' ), 80 );
-				form_text( 'conf_admin_email', $conf_admin_email, 50, T_('Your email'), T_('This will be used to receive notifications for comments on your blog, etc.' ), 80 );
-			?></div>
-			<div class="options">
-				<h3><?php echo T_('Example posts' ); ?></h3>
-				<input type="checkbox" name="create_sample_contents" id="create_sample_contents" value="1" checked="checked" />
-				<label for="create_sample_contents"><?php
-					printf( T_('Also install sample blogs &amp; sample contents. The sample posts explain '
-							  .'several features of %s. This is highly recommended for new users.'),
-							$app_name );
-				?></label>
-			</div>
-			</div>
-
-			<?php if( $app_db_version )
+		<input type="hidden" name="locale" value="<?php echo $default_locale ?>" />
+		<input type="hidden" name="confirmed" value="0" />
+		<input type="hidden" name="installer_version" value="10" />
+
+		<div id="op-newdb" class="op-group">
+		<input type="radio" name="action" id="newdb" value="newdb"
+		<?php
+		// fp> change the above to 'newdbsettings' for an additional settings screen.
+		if( is_null($old_db_version) )
+		{
+			echo 'checked="checked" ';
+		}
+		?>
+		/>
+		<label for="newdb" class="option"><?php
+		printf( T_('<strong>New Install</strong>: Install %s database tables.'), $app_name );
+		?></label>
+
+		<div class="options">
+		<h3><?php echo T_('Admin account details' ); ?></h3>
+		<?php
+		if( !empty( $msg ) )
+		{
+			echo '<p class="error">'.implode( '<br />', $msg ).'</p>';
+		}
+		form_text( 'conf_admin_login', $conf_admin_login, 50, T_('Login'), T_('This will be used to create your admin account.' ), 80 );
+		form_text( 'conf_admin_pass', $conf_admin_pass, 50, T_('Password'), T_('We advise you use a strong password' ), 80 );
+		form_text( 'conf_admin_email', $conf_admin_email, 50, T_('Your email'), T_('This will be used to receive notifications for comments on your blog, etc.' ), 80 );
+		?></div>
+
+		<div class="options">
+		<h3><?php echo T_('Example posts' ); ?></h3>
+		<input type="checkbox" name="create_sample_contents" id="create_sample_contents" value="1" checked="checked" />
+		<label for="create_sample_contents"><?php
+		printf( T_('Also install sample blogs &amp; sample contents. The sample posts explain '
+				.'several features of %s. This is highly recommended for new users.'),
+			$app_name );
+		?></label>
+		</div>
+
+		</div>
+
+		<?php
+		if( $app_db_version !== NULL )
+		{
+			?>
+			<div id="op-dbupgrade" class="op-group">
+			<input type="radio" name="action" id="dbupgrade" value="dbupgrade"
+			<?php
+			if( !is_null($old_db_version) && $old_db_version < $app_db_version )
 			{
-				?>
-				<div id="op-dbupgrade" class="op-group">
-				<input type="radio" name="action" id="dbupgrade" value="dbupgrade"
-				<?php
-				if( !is_null($old_db_version) && $old_db_version < $app_db_version )
-				{
-					echo 'checked="checked"';
-				}
-				?>
-				/>
-				<label for="dbupgrade"><?php
-				printf( /* TRANS: %1$s: App name. */ T_('<strong>Upgrade from a previous version of %1$s</strong>'), $app_name );
-				?></label>
-				<p class="options"><?php
-				echo sprintf( T_('Upgrade your '
+				echo 'checked="checked" ';
+			}
+			?>
+			/>
+			<label for="dbupgrade"><?php
+			printf( /* TRANS: %1$s: App name. */ T_('<strong>Upgrade from a previous version of %1$s</strong>'), $app_name );
+			?></label>
+			<p class="options"><?php
+			echo sprintf( T_('Upgrade your '
 					.'%1$s database tables in order to make them compatible with the current '
 					.'version.'), $app_name ).'</p><p class="options">'
-					.T_('<strong>WARNING:</strong> If you have modified your database, '
-					.'this operation may fail. Make sure you have a backup.');
-				?></p>
-				</div>
-				<?php
-			}
+			.T_('<strong>WARNING:</strong> If you have modified your database, '
+				.'this operation may fail. Make sure you have a backup.');
+			?></p>
+			</div>
+			<?php
+		}
 
-			if( $app_allow_dbase_reset == 1 )
-			{
-				?>
-				<div class="op-deletedb"><input type="radio" name="action" id="deletedb" value="deletedb" />
-				<label for="deletedb"><strong><?php printf( T_('Delete %s tables'), $app_name ); ?></strong></label>
-				<p class="options"><?php
-				printf( /* TRANS: %1$s: App name. */
-					T_('If you have installed %1$s tables before and wish to start anew, '
+		if( $app_allow_dbase_reset == 1 )
+		{
+			?>
+			<div class="op-deletedb"><input type="radio" name="action" id="deletedb" value="deletedb" />
+			<label for="deletedb"><strong><?php printf( T_('Delete %s tables'), $app_name ); ?></strong></label>
+			<p class="options"><?php
+			printf( /* TRANS: %1$s: App name. */
+				T_('If you have installed %1$s tables before and wish to start anew, '
 					.'you must delete the %1$s tables before you can start a new installation. <br />'
 					.'<strong>WARNING: All your %1$s tables and data will be lost!!!</strong> '
 					.'Any non-%1$s tables will remain untouched though.'), $app_name );
-				?></p>
-				<input type="radio" name="action" id="start" value="start" />
-				<label for="start"><strong><?php echo T_('Change your base configuration'); ?></strong></label>
-				<p class="options"><?php
-				printf( T_('(see recap below): '
+			?></p>
+			<input type="radio" name="action" id="start" value="start" />
+			<label for="start"><strong><?php echo T_('Change your base configuration'); ?></strong></label>
+			<p class="options"><?php
+			printf( T_('(see recap below): '
 					.'You only want to do this in rare occasions where you may have moved '
 					.'your %s files or database to a different location...'), $app_name );
-				?></p></div>
-				<?php
-			}
-
-			if( $app_allow_dbase_reset != 1 )
-			{
-				echo '<div class="floatright"><a href="index.php?action=deletedb&amp;locale='.$default_locale.'">'.T_('Need to start anew?').' &raquo;</a></div>';
-			}
-			?>
-
-			<p>
-			<input type="submit" value="&nbsp; <?php echo T_('GO!')?> &nbsp;"
-				onclick="var dc = document.getElementById( 'deletedb' ); if( dc && dc.checked ) { if ( confirm( '<?php
-					printf( /* TRANS: %s gets replaced by app name, usually "quamplures" */ TS_( 'Are you sure you want to delete your existing %s tables?\nDo you have a backup?' ), $app_name );
-					?>' ) ) { this.form.confirmed.value = 1; return true; } else return false; }" />
-			</p>
-			</form>
+			?></p></div>
+			<?php
+		}
+
+		if( $app_allow_dbase_reset != 1 )
+		{
+			echo '<div class="floatright"><a href="index.php?action=deletedb&amp;locale='.$default_locale.'">'.T_('Need to start anew?').' &raquo;</a></div>';
+		}
+		?>
+
+		<p>
+		<input type="submit" value="&nbsp; <?php echo T_('GO!')?> &nbsp;"
+			onclick="var dc = document.getElementById( 'deletedb' ); if( dc && dc.checked ) { if ( confirm( '<?php
+				printf( /* TRANS: %s gets replaced by app name, usually "quamplures" */ TS_( 'Are you sure you want to delete your existing %s tables?\nDo you have a backup?' ), $app_name );
+				?>' ) ) { this.form.confirmed.value = 1; return true; } else return false; }" />
+		</p>
+
+		</form>
 		<?php
-
 		block_close();
-
 		display_base_config_recap();
 		break;
 

=== modified file 'qp_plugins/xml_feeds_widget/_xml_feeds.widget.php'
--- qp_plugins/xml_feeds_widget/_xml_feeds.widget.php	2010-12-31 12:12:03 +0000
+++ qp_plugins/xml_feeds_widget/_xml_feeds.widget.php	2011-06-17 09:28:39 +0000
@@ -125,7 +125,6 @@
 		$TemplateCache = & get_Cache( 'TemplateCache' );
 		$TemplateCache->load_by_type( 'feed' );
 
-		// TODO: this is like touching private parts :>
 		foreach( $TemplateCache->cache as $Template )
 		{
 			if( $Template->type != 'feed' )

=== modified file 'qp_templates/_sitemap/_template.class.php'
--- qp_templates/_sitemap/_template.class.php	2010-07-13 18:25:00 +0000
+++ qp_templates/_sitemap/_template.class.php	2011-06-17 09:28:39 +0000
@@ -32,7 +32,7 @@
 	 */
 	function get_default_type()
 	{
-		return 'normal';
+		return 'other';
 	}
 
 }

=== modified file 'qp_templates/asevo/_template.class.php'
--- qp_templates/asevo/_template.class.php	2010-08-07 15:42:57 +0000
+++ qp_templates/asevo/_template.class.php	2011-06-17 09:28:39 +0000
@@ -32,7 +32,7 @@
 	 */
 	function get_default_type()
 	{
-		return 'normal';
+		return 'xhtml';
 	}
 
 

=== modified file 'qp_templates/basic/_template.class.php'
--- qp_templates/basic/_template.class.php	2010-08-07 15:42:57 +0000
+++ qp_templates/basic/_template.class.php	2011-06-17 09:28:39 +0000
@@ -32,7 +32,7 @@
 	 */
 	function get_default_type()
 	{
-		return 'normal';
+		return 'xhtml';
 	}
 
 

=== modified file 'qp_templates/custom/_template.class.php'
--- qp_templates/custom/_template.class.php	2010-08-07 15:42:57 +0000
+++ qp_templates/custom/_template.class.php	2011-06-17 09:28:39 +0000
@@ -32,7 +32,7 @@
 	 */
 	function get_default_type()
 	{
-		return 'normal';
+		return 'xhtml';
 	}
 
 

=== modified file 'qp_templates/evocamp/_template.class.php'
--- qp_templates/evocamp/_template.class.php	2010-08-07 15:42:57 +0000
+++ qp_templates/evocamp/_template.class.php	2011-06-17 09:28:39 +0000
@@ -32,7 +32,7 @@
 	 */
 	function get_default_type()
 	{
-		return 'normal';
+		return 'xhtml';
 	}
 
 

=== modified file 'qp_templates/evopress/_template.class.php'
--- qp_templates/evopress/_template.class.php	2010-08-07 15:42:57 +0000
+++ qp_templates/evopress/_template.class.php	2011-06-17 09:28:39 +0000
@@ -32,7 +32,7 @@
 	 */
 	function get_default_type()
 	{
-		return 'normal';
+		return 'xhtml';
 	}
 
 

=== modified file 'qp_templates/glossyblue/_template.class.php'
--- qp_templates/glossyblue/_template.class.php	2010-08-07 15:42:57 +0000
+++ qp_templates/glossyblue/_template.class.php	2011-06-17 09:28:39 +0000
@@ -32,7 +32,7 @@
 	 */
 	function get_default_type()
 	{
-		return 'normal';
+		return 'xhtml';
 	}
 
 

=== modified file 'qp_templates/intense/_template.class.php'
--- qp_templates/intense/_template.class.php	2010-08-07 15:42:57 +0000
+++ qp_templates/intense/_template.class.php	2011-06-17 09:28:39 +0000
@@ -32,7 +32,7 @@
 	 */
 	function get_default_type()
 	{
-		return 'normal';
+		return 'xhtml';
 	}
 
 

=== modified file 'qp_templates/miami_blue/_template.class.php'
--- qp_templates/miami_blue/_template.class.php	2010-08-07 15:42:57 +0000
+++ qp_templates/miami_blue/_template.class.php	2011-06-17 09:28:39 +0000
@@ -32,7 +32,7 @@
 	 */
 	function get_default_type()
 	{
-		return 'normal';
+		return 'xhtml';
 	}
 
 

=== modified file 'qp_templates/natural_pink/_template.class.php'
--- qp_templates/natural_pink/_template.class.php	2010-08-07 15:42:57 +0000
+++ qp_templates/natural_pink/_template.class.php	2011-06-17 09:28:39 +0000
@@ -32,7 +32,7 @@
 	 */
 	function get_default_type()
 	{
-		return 'normal';
+		return 'xhtml';
 	}
 
 

=== modified file 'qp_templates/nifty_corners/_template.class.php'
--- qp_templates/nifty_corners/_template.class.php	2010-08-07 15:42:57 +0000
+++ qp_templates/nifty_corners/_template.class.php	2011-06-17 09:28:39 +0000
@@ -32,7 +32,7 @@
 	 */
 	function get_default_type()
 	{
-		return 'normal';
+		return 'xhtml';
 	}
 
 

=== modified file 'qp_templates/photoblog/_template.class.php'
--- qp_templates/photoblog/_template.class.php	2010-08-07 15:42:57 +0000
+++ qp_templates/photoblog/_template.class.php	2011-06-17 09:28:39 +0000
@@ -32,7 +32,7 @@
 	 */
 	function get_default_type()
 	{
-		return 'normal';
+		return 'xhtml';
 	}
 
 

=== modified file 'qp_templates/pixelgreen/_template.class.php'
--- qp_templates/pixelgreen/_template.class.php	2010-08-07 15:42:57 +0000
+++ qp_templates/pixelgreen/_template.class.php	2011-06-17 09:28:39 +0000
@@ -32,7 +32,7 @@
 	 */
 	function get_default_type()
 	{
-		return 'normal';
+		return 'xhtml';
 	}
 
 

=== modified file 'qp_templates/pluralism/_template.class.php'
--- qp_templates/pluralism/_template.class.php	2010-08-07 15:42:57 +0000
+++ qp_templates/pluralism/_template.class.php	2011-06-17 09:28:39 +0000
@@ -32,7 +32,7 @@
 	 */
 	function get_default_type()
 	{
-		return 'normal';
+		return 'xhtml';
 	}
 
 

=== modified file 'qp_templates/terrafirma/_template.class.php'
--- qp_templates/terrafirma/_template.class.php	2010-08-07 15:42:57 +0000
+++ qp_templates/terrafirma/_template.class.php	2011-06-17 09:28:39 +0000
@@ -32,7 +32,7 @@
 	 */
 	function get_default_type()
 	{
-		return 'normal';
+		return 'xhtml';
 	}
 
 

=== modified file 'qp_templates/vastitude/_template.class.php'
--- qp_templates/vastitude/_template.class.php	2010-08-07 15:42:57 +0000
+++ qp_templates/vastitude/_template.class.php	2011-06-17 09:28:39 +0000
@@ -32,7 +32,7 @@
 	 */
 	function get_default_type()
 	{
-		return 'normal';
+		return 'xhtml';
 	}