Merge lp:~edb/quam-plures/smarter_installer_plugins into lp:quam-plures

[EdB]

Installs plugins that are present instead of core installing a list (which may not be present in each installation). Also "tidies up" what we see when we do an installation.

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

[Tilman Blumenbach (tblue)]

Here are some things I'd fix (but I can't since I have no push access to the branch -- wrong owner):

1.) There are multiple occurrences of partly localized strings, like this:
  echo T_('Installing templates').' ... ';

I think you should include the ellipsis in the string that's passed to T_(). Think of languages written from right to left: It looks weird if there's an ellipsis in front of the status output...

2.) echo T_('Creating default settings').( count($override) ? ' (with '.count($override).' existing values)' : '' ).' ... ';

I'd make the rest of the output ("with %d existing values") localizable, too.

3.) Nitpicking: if( strpos( $entry, '_plugin' ) && $entry != 'generic_ping_plugin' && $entry != 'test_plugin' )

Just to be completely sure it's a valid plugin folder, I'd use this:
  if( substr( $entry, -7 ) == '_plugin' && $entry != 'generic_ping_plugin' && $entry != 'test_plugin' )

review: Needs Fixing

[EdB (edb)]

I'll get #2 and #3 done as soon as (and assuming) I can get bazaar to not be stupid again.

On adding punctuation to translatable bits, we decided a long time ago to not do that because it tends to cause multiple "the same but different" strings. Think templates is mostly where, but the problem is scattered throughout core. Pretty much one way or the other is where I'm at. If we want to do "include punctuation" we can, but then we need/ought to go back and put all the punctuations back into everything that it was removed from.

[Tilman Blumenbach (tblue)]

> On adding punctuation to translatable bits, we decided a long time ago to not do that because it tends to cause multiple "the same but different" strings. Think templates is mostly where, but the problem is scattered throughout core. Pretty much one way or the other is where I'm at. If we want to do "include punctuation" we can, but then we need/ought to go back and put all the punctuations back into everything that it was removed from.

Oooh, really? I must have missed/forgotten that. Well, I guess it's okay then.

[EdB (edb)]

BUT RTL followed by ... will look like crap. As will stuff like "by:" and "date:".

Back then another piece of the puzzle for minimizing translatables was removal of leading and trailing empty spaces. Perhaps that is where it should have stopped?

Anyway we need to revisit this topic. For this I can go ahead and put the ellipses in, but we really need to have a "core wide" answer for this type of thing.

[Tilman Blumenbach (tblue)]

Agreed. Maybe write some guidelines regarding localization?

[lp:~edb/quam-plures/smarter_installer_plugins]

7606. By EdB on 2011-07-12

adding core updates

7607. By EdB on 2011-07-13

improved "Creating default settings" line with a sprintf( 'foo %d bar' $thing ) type of thing

7608. By EdB on 2011-07-13

stronger check for a plugin folder, meaning something like "hide_plugins_widget" will not be seen as a plugin

[EdB (edb)]

Fixed items #2 and #3 and tested without issue :)

review: Needs Resubmitting

[Tilman Blumenbach (tblue)]

Looks good now!

review: Approve (merge)

=== 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-07-13 16:26:30 +0000
@@ -56,7 +56,7 @@
 	load_funcs('_core/model/db/_upgrade.funcs.php');
 
 	// Alter DB to match DB schema:
-	install_make_db_schema_current( true );
+	install_make_db_schema_current( false );
 }
 
 
@@ -73,7 +73,7 @@
 	global $Plugins;
 	$Plugins = new Plugins_admin_no_DB(); // COPY
 
-	echo 'Creating default blacklist entries... ';
+	echo T_('Creating default blacklist entries').' ... ';
 	$query = "INSERT INTO T_antispam(aspm_string) VALUES ".
 	"('online-casino'), ('penis-enlargement'), ".
 	"('order-viagra'), ('order-phentermine'), ('order-xenical'), ".
@@ -82,11 +82,10 @@
 	"('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... ';
+	echo T_('Creating default groups').' ... ';
 	$Group_Admins = new Group(); // COPY !
 	$Group_Admins->set( 'name', 'Administrators' );
 	$Group_Admins->set( 'perm_admin', 'visible' );
@@ -99,8 +98,6 @@
 	$Group_Admins->set( 'perm_templates', 1 );
 	$Group_Admins->set( 'perm_files', 'all' );
 	$Group_Admins->dbinsert();
-
-
 	// permissions generally one step down from group #1
 	$Group_Special = new Group();
 	$Group_Special->set( 'name', 'Special Bloggers' );
@@ -114,8 +111,6 @@
 	$Group_Special->set( 'perm_templates', 0 );
 	$Group_Special->set( 'perm_files', 'edit' );
 	$Group_Special->dbinsert();
-
-
 	// permissions generally one step down from group #2
 	$Group_Bloggers = new Group();
 	$Group_Bloggers->set( 'name', 'Bloggers' );
@@ -128,8 +123,6 @@
 	$Group_Bloggers->set( 'perm_templates', 0 );
 	$Group_Bloggers->set( 'perm_files', 'add' );
 	$Group_Bloggers->dbinsert();
-
-
 	// permissions generally one step down from group #3
 	$Group_Users = new Group();
 	$Group_Users->set( 'name', 'Basic Users' );
@@ -142,9 +135,9 @@
 	$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... ';
+	echo T_('Creating user 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', 'note', 'none' ),
@@ -175,12 +168,11 @@
 						( '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 T_('Creating default users').' ... ';
 	global $timestamp, $default_locale;
-
+	// user in group #1
 	$User_Admin = new User();
 	$User_Admin->set( 'login', param('conf_admin_login', 'string' ) );
 	$User_Admin->set( 'pass', md5(param('conf_admin_pass', 'string' )) );
@@ -194,7 +186,7 @@
 	$User_Admin->set_datecreated( installer_timestamp() );
 	$User_Admin->set_Group( $Group_Admins );
 	$User_Admin->dbinsert();
-
+	// user in group #2
 	$User_Special = new User();
 	$User_Special->set( 'login', 'demospecial' );
 	$User_Special->set( 'pass', md5(param('conf_admin_pass', 'string' )) );
@@ -208,7 +200,7 @@
 	$User_Special->set_datecreated( installer_timestamp() );
 	$User_Special->set_Group( $Group_Special );
 	$User_Special->dbinsert();
-
+	// user in group #3
 	$User_Bloggers = new User();
 	$User_Bloggers->set( 'login', 'demoblogger' );
 	$User_Bloggers->set( 'pass', md5(param('conf_admin_pass', 'string' )) );
@@ -222,7 +214,7 @@
 	$User_Bloggers->set_datecreated( installer_timestamp() );
 	$User_Bloggers->set_Group( $Group_Bloggers );
 	$User_Bloggers->dbinsert();
-
+	// user in group #4
 	$User_Demo = new User();
 	$User_Demo->set( 'login', 'demouser' );
 	$User_Demo->set( 'pass', md5(param('conf_admin_pass', 'string' )) );
@@ -236,11 +228,9 @@
 	$User_Demo->set_datecreated( installer_timestamp() );
 	$User_Demo->set_Group( $Group_Users );
 	$User_Demo->dbinsert();
-
 	task_end();
 
-	// added in Phoenix-Alpha
-	echo 'Creating default Post Types... ';
+	echo T_('Creating default Post Types').' ... ';
 	$DB->query( "
 		INSERT INTO T_items__type ( ptyp_ID, ptyp_name )
 		VALUES ( 1, 'Post' ),
@@ -254,11 +244,9 @@
 					 ( 3000, 'Sidebar link' ),
 					 ( 4000, 'Reserved' ),
 					 ( 5000, 'Reserved' ) " );
-	echo "OK.<br />\n";
-
-
-	// added in Phoenix-Beta
-	echo 'Creating default file types... ';
+	task_end();
+
+	echo T_('Creating default file types').' ... ';
 	// Contribs: feel free to add more types here...
 	// TODO: dh> shouldn't they get localized to the app's default locale? fp> ftyp_name, yes
 	$DB->query( "INSERT INTO T_filetypes
@@ -282,11 +270,11 @@
 			(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.
-		echo 'Activating selected default locale... ';
+		echo T_('Activating selected default locale').' ... ';
 		$DB->query( 'INSERT INTO T_locales '
 				.'( loc_locale, loc_charset, loc_datefmt, loc_timefmt, '
 				.'loc_startofweek, loc_name, loc_messages, loc_priority, '
@@ -300,7 +288,7 @@
 				.$DB->quote( $locales[$current_locale]['messages'] ).', '
 				.$DB->quote( $locales[$current_locale]['priority'] ).', '
 				.' 1)' );
-		echo 'OK.<br />', "\n";
+		task_end();
 	}
 
 	create_default_settings();
@@ -458,8 +446,7 @@
 
 	$default_blog_longdesc = T_("This is the long description for the blog named '%s'. %s");
 
-	echo "Creating default blogs... ";
-
+	echo T_('Creating default blogs').' ... ';
 	$blog_shortname = 'Blog A';
 	$blog_a_long = sprintf( T_('%s Title'), $blog_shortname );
 	$blog_stub = 'a';
@@ -506,19 +493,15 @@
 		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;
 
-	echo 'Creating sample categories... ';
-
+	echo T_('Creating sample categories').' ... ';
 	// Create categories for blog A
 	$cat_welcome = cat_create( 'Welcome', 'NULL', $blog_a_ID );
 	$cat_news = cat_create( 'News', 'NULL', $blog_a_ID );
 	$cat_post_features = cat_create( 'Post features', 'NULL', $blog_a_ID );
-
 	// Create categories for blog B
 	$cat_ann_b = cat_create( 'Announcements', 'NULL', $blog_b_ID );
 	$cat_appname = cat_create( sprintf( '%s Tips', $app_name ), 'NULL', $blog_b_ID );
@@ -534,21 +517,15 @@
 			$cat_renderers = cat_create( 'Text Renderers', $cat_sidebar, $blog_b_ID );
 			$cat_comments = cat_create( 'Comments', $cat_sidebar, $blog_b_ID );
 		$cat_toolbars = cat_create( 'Toolbars', $cat_writepage, $blog_b_ID );
-
 	// Create categories for linkblog
 	$cat_linkblog_b2evo = cat_create( $app_name, 'NULL', $blog_linkblog_ID );
 	$cat_linkblog_contrib = cat_create( 'Contributors', 'NULL', $blog_linkblog_ID );
-
 	// Create categories for photoblog
 	$cat_photo_album = cat_create( 'Owen Michael', 'NULL', $blog_photoblog_ID );
-
-	echo "OK.<br />\n";
-
-
-	echo 'Creating sample posts and comments... ';
-
+	task_end();
+
+	echo T_('Creating sample posts and comments').' ... ';
 	global $app_baseurl;
-
 	// sets up inserting tags without knowing what tags are used by which post IDs
 	$tag_id_counter = 0;
 
@@ -1051,10 +1028,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 +1053,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,10 +1136,10 @@
 	$edit_File = new File( 'collection', 1, 'qp-logo_337x76.jpg' );
 	$edit_File->link_to_Item( $edited_Item );
 
-	echo "OK.<br />\n";
-
-
-	echo 'Creating default group/blog permissions... ';
+	task_end();
+
+
+	echo T_('Creating default group/blog permissions').' ... ';
 	// Admin for blog A:
 	$query = "
 		INSERT INTO T_coll_group_perms( bloggroup_blog_ID, bloggroup_group_ID, bloggroup_ismember,
@@ -1188,11 +1160,11 @@
 			( $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...
-	echo 'Creating default user/blog permissions... ';
+	echo T_('Creating default user/blog permissions').' ... ';
 	// Admin for blog A:
 	$query = "INSERT INTO T_coll_user_perms( bloguser_blog_ID, bloguser_user_ID, bloguser_ismember,
 							bloguser_perm_poststatuses, bloguser_perm_delpost, bloguser_perm_comments,
@@ -1202,7 +1174,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_install.php'
--- qp_install/_functions_install.php	2010-12-31 12:12:03 +0000
+++ qp_install/_functions_install.php	2011-07-13 16:26:30 +0000
@@ -147,12 +147,10 @@
 	}
 
 	echo '<h2>';
-	printf( T_('Creating %s tables...'), $app_name );
+	printf( T_('Installing %s ...'), $app_name );
 	echo '</h2>';
 	flush();
 	create_tables();
-
-	echo '<h2>'.T_('Creating minimum default data...').'</h2>';
 	flush();
 	create_default_data();
 
@@ -160,20 +158,13 @@
 	{
 		global $Settings;
 
-		echo '<h2>'.T_('Installing sample contents...').'</h2>';
 		flush();
 
 		// We're gonna need some environment in order to create the demo contents...
 		load_class( 'settings/model/_generalsettings.class.php' );
 		load_class( 'users/model/_usersettings.class.php' );
-		/**
-		 * @var GeneralSettings
-		 */
 		$Settings = new GeneralSettings();
 
-		/**
-		 * @var UserCache
-		 */
 		$UserCache = & get_Cache( 'UserCache' );
 		// Create $current_User object.
 		// (Assigning by reference does not work with "global" keyword (PHP 5.2.8))
@@ -212,7 +203,7 @@
  */
 function task_end()
 {
-	echo "OK.<br />\n";
+	echo /* TRANS: "okay", or "good" */ T_('OK.')."<br />\n";
 	flush();
 }
 
@@ -274,7 +265,7 @@
 {
   global $DB;
 
-	echo "Checking for extra quote escaping in comments... ";
+	echo T_('Checking for extra quote escaping in comments').' ... ';
 	$query = "SELECT comment_ID, comment_content
 							FROM T_comments
 						 WHERE comment_content LIKE '%\\\\\\\\\'%'
@@ -283,7 +274,7 @@
 	$rows = $DB->get_results( $query, ARRAY_A );
 	if( $DB->num_rows )
 	{
-		echo 'Updating '.$DB->num_rows.' comments... ';
+		echo sprintf( T_('Updating %d comments ... '), $DB->num_rows );
 		foreach( $rows as $row )
 		{
 			$query = "UPDATE T_comments
@@ -292,7 +283,7 @@
 			$DB->query( $query );
 		}
 	}
-	echo "OK.<br />\n";
+	task_end();
 
 }
 
@@ -344,12 +335,11 @@
 			$insertvalues[] = '('.$DB->quote($name).', '.$DB->quote($defaults[$name]).')';
 		}
 	}
-
-	echo 'Creating default settings'.( count($override) ? ' (with '.count($override).' existing values)' : '' ).'... ';
+	echo T_('Creating default settings').( count( $override ) ? ' '.sprintf( T_('(with %d existing values)'), count( $override ) ) : '' ).' ... ';
 	$DB->query(
 		"INSERT INTO T_settings (set_name, set_value)
 		VALUES ".implode( ', ', $insertvalues ) );
-	echo "OK.<br />\n";
+	task_end();
 }
 
 
@@ -360,7 +350,7 @@
 {
 	load_funcs( 'templates/_template.funcs.php' );
 
-	echo 'Installing default templates... ';
+	echo T_('Installing templates').' ... ';
 
 	// Note: Template #1 will we used by Blog A
 	template_install( 'evopress' );
@@ -387,30 +377,21 @@
 	template_install( 'vastitude' );
 	template_install( '_atom' );
 	template_install( '_rss2' );
-
-	echo "OK.<br />\n";
+	task_end();
 }
 
 
 /**
  * Install basic plugins.
  *
- * This gets called separately on fresh installs.
- *
- * {@internal
- * NOTE: this won't call the "AfterInstall" method on the plugin nor install its DB schema.
- *       This get done in the plugins controller, on manually installing a plugin.
- *
- * If you change the number of plugins here, please also adjust {@link InstallUnitTestCase::nr_of_basic_plugins}.
- * }}
+ * This gets called separately on fresh installs and installs all plugins found
+ * in the qp_plugins folder EXCEPT 'test_plugin' and 'generic_ping_plugin'.
+ *
  *
  * @param integer Old DB version, so that only new plugins gets installed
  */
 function install_basic_plugins( $old_db_version = 0 )
 {
-	/**
-	 * @var Plugins_admin
-	 */
 	global $Plugins_admin;
 
 	$Plugins_admin = & get_Cache('Plugins_admin');
@@ -422,28 +403,46 @@
 
 	if( $old_db_version < 0001 )
 	{
-		install_plugin( 'adsense_plugin' ); // 'toolbars'
-		install_plugin( 'archives_plugin' ); // 'widgets' - one day this turns into a widget :)
-		install_plugin( 'auto_p_plugin' ); // 'renderers'
-		install_plugin( 'autolinks_plugin' ); // 'renderers'
-		install_plugin( 'basic_antispam_plugin' ); // 'antispam'
-		install_plugin( 'bbcode_plugin' ); // 'renderers'
-		install_plugin( 'calendar_plugin' ); // 'widgets' - one day this turns into a widget :)
-		install_plugin( 'captcha_img_plugin' ); // 'antispam'
-		install_plugin( 'code_highlight_plugin' ); // 'toolbars'
-		install_plugin( 'comment_gravatars_plugin' ); // 'comments'
-		install_plugin( 'commenttags_plugin' ); // 'comments'
-		install_plugin( 'gmcode_plugin' ); // 'renderers'
-		install_plugin( 'ping_pingomatic_plugin' ); // 'pingers'
-		install_plugin( 'quicktags_plugin' ); // 'toolbars'
-		install_plugin( 'smilies_plugin' ); // 'toolbars'
-		install_plugin( 'texturize_plugin' ); // 'renderers'
-		install_plugin( 'tinymce_plugin' ); // 'other'
-		install_plugin( 'turingtest_plugin' ); // 'antispam'
-		install_plugin( 'twitter_plugin' ); // 'pingers'
-		install_plugin( 'video_plugin' ); // 'toolbars'
-		install_plugin( 'whosonline_plugin' ); // 'widgets' - one day this turns into a widget :)
-		install_plugin( 'wikilinks_plugin' ); // 'renderers'
+		global $plugins_path;
+		// thanks to http://www.the-art-of-web.com/php/dirlist/ for the basis of the following code
+		// array to hold return value
+		$plugins = array();
+		// open pointer to directory and read list of folders/files
+		$d = dir( $plugins_path ) or die( sprintf( T_('Failed opening directory %s for reading'), $plugins_path ) );
+		while( false !== ( $entry = $d->read() ) )
+		{
+			// skip hidden folders
+			if( $entry[0] == '.' )
+			{
+				continue;
+			}
+			// save directory names
+			$plugins_path_entry = $plugins_path.$entry;
+			if( is_dir( $plugins_path_entry ) )
+			{
+				if( substr( $entry, -7 ) == '_plugin' && $entry != 'generic_ping_plugin' && $entry != 'test_plugin' )
+				{
+					$plugins[] = $entry;
+				}
+			}
+		}
+		$d->close();
+
+		// install all plugins alphabetically
+		echo T_('Installing plugins ... ');
+		sort( $plugins );
+		foreach( $plugins as $a_plugin )
+		{
+			install_plugin( $a_plugin );
+		}
+		task_end();
+	}
+
+	// perform AfterInstall() tasks
+	$Plugins_admin->restart();
+	while( $a_plugin = & $Plugins_admin->get_next() )
+	{
+		$Plugins_admin->call_method( $a_plugin->ID, 'AfterInstall', $params = array() );
 	}
 
 }
@@ -454,14 +453,11 @@
  */
 function uninstall_plugin( $plugin )
 {
-	/**
-	 * @var Plugins_admin
-	 */
 	global $Plugins_admin;
 
 	if( $edit_Plugin = & $Plugins_admin->get_by_classname( $plugin ) )
 	{ // plugin is installed
-		echo 'Uninstalling plugin: '.$plugin.'... ';
+		echo T_('Uninstalling plugin: ').$plugin.' ... ';
 		$Plugins_admin->uninstall( $edit_Plugin->ID );
 	}
 }
@@ -472,24 +468,18 @@
  */
 function install_plugin( $plugin )
 {
-	/**
-	 * @var Plugins_admin
-	 */
 	global $Plugins_admin;
 	global $DB;
 
-	echo 'Installing plugin: '.$plugin.'... ';
 	$edit_Plugin = & $Plugins_admin->install( $plugin, 'broken' ); // "broken" by default, gets adjusted later
 	if( ! is_a( $edit_Plugin, 'Plugin' ) )
 	{
-		echo $edit_Plugin."<br />\n";
 		return false;
 	}
 
-	// install tables if required
+	// perform GetDbLayout()
 	if( $db_layout = $edit_Plugin->GetDbLayout() )
 	{
-		echo 'creating table(s)... ';
 		foreach( $db_layout as $a_table )
 		{
 			$DB->query( $a_table );
@@ -501,14 +491,12 @@
 	if( $enable_return !== true )
 	{
 		$Plugins_admin->set_Plugin_status( $edit_Plugin, 'disabled' ); // does not unregister it
-		echo $enable_return."<br />\n";
 		return false;
 	}
 
 	$Plugins_admin->set_Plugin_status( $edit_Plugin, 'enabled' );
-
-	echo "OK.<br />\n";
 	return true;
+
 }
 
 
@@ -519,8 +507,7 @@
 {
 	global $DB;
 
-	echo 'Installing default widgets... ';
-
+	echo T_('Installing default widgets').' ... ';
 	// Add blog list to all blog Page Tops:
 	$DB->query( 'INSERT INTO T_widget( wi_coll_ID, wi_sco_name, wi_order, wi_type, wi_code, wi_params )
 							 SELECT blog_ID, "Page Top", 1, "widget", "bloglist", \'a:5:{s:14:"coll_list_type";s:6:"public";s:11:"widget_name";s:9:"Blog List";}\'
@@ -621,7 +608,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();
 }
 
 
@@ -646,7 +633,7 @@
 {
 	global $DB;
 
-	echo 'Creating relations... ';
+	echo T_('Creating relations').' ... ';
 
 	$DB->query( 'alter table T_coll_user_perms
 								add constraint FK_bloguser_blog_ID
@@ -810,7 +797,7 @@
 											on delete restrict
 											on update restrict' );
 
-	echo "OK.<br />\n";
+	task_end();
 }
 
 
@@ -834,11 +821,12 @@
 	}
 
 	// Load modules:
+	echo T_('Loading modules').' ... ';
 	foreach( $modules as $module )
 	{
-		echo 'Loading: '.$module.'/model/_'.$module.'.install.php<br />';
 		require_once $inc_path.$module.'/model/_'.$module.'.install.php';
 	}
+	task_end();
 
 }
 ?>

=== modified file 'qp_plugins/basic_antispam_plugin/_basic_antispam.plugin.php'
--- qp_plugins/basic_antispam_plugin/_basic_antispam.plugin.php	2011-03-01 19:59:37 +0000
+++ qp_plugins/basic_antispam_plugin/_basic_antispam.plugin.php	2011-07-13 16:26:30 +0000
@@ -293,24 +293,6 @@
 
 
 	/**
-	 * @see Plugin::AfterInstall()
-	 */
-	function AfterInstall()
-	{
-		global $Settings;
-
-		if( $Settings->get('hit_doublecheck_referer') )
-		{ // old general settings, "transform it"
-			$this->Settings->set( 'check_url_referers', '1' );
-			$this->Settings->dbupdate();
-		}
-
-		$Settings->delete('hit_doublecheck_referer');
-		$Settings->dbupdate();
-	}
-
-
-	/**
 	 * @see Plugin::AppendHitLog()
 	 */
 	function AppendHitLog( & $params )