Merge lp:~quam-plures-core/quam-plures/bugfix-605962 into lp:quam-plures

[EdB]

Not sure how much info carries through from a bug report to here, so this branch fixes how it won't give you anything other than qp_ as the table prefix. 2-line fix :)

I also bumped up the PHP version check from 4.something to 5.2 with a stated 5.2.13 as the minimum acceptable version. Technically it doesn't check for the .13 part, but that is the lowest officially valid version out there so there you go.

Q: do we need to bump up the MySQL version check? It currently says 4.1 but maybe we want/need to bump that up to 5.0? It's in the same file so I figure this branch would be a good time to get that done if it needs to be done.

[Tilman Blumenbach (tblue)]

Re. PHP version: I think simply checking for PHP 5 -- at this time -- is enough (e. g. 500)
Re. MySQL: Yes, checking for at least version 5 sounds about right.

[lp:~quam-plures-core/quam-plures/bugfix-605962]

7509. By EdB on 2010-07-16

php and mysql minimum set to 5.0 each

[EdB (edb)]

php and mysql minimum set to 5.0 each

[Tilman Blumenbach (tblue)]

Should be good to go.

review: Approve

[lp:~quam-plures-core/quam-plures/bugfix-605962]

7510. By Tilman Blumenbach on 2010-07-19

Update PHP + MySQL version checks in Tools/System tab

7511. By Tilman Blumenbach on 2010-07-19

Fix incorrect PHP version number

=== modified file 'qp_inc/tools/system.ctrl.php'
--- qp_inc/tools/system.ctrl.php	2010-06-14 04:27:30 +0000
+++ qp_inc/tools/system.ctrl.php	2010-07-19 18:49:39 +0000
@@ -184,13 +184,9 @@
 // Version:
 $mysql_version = $DB->get_version();
 init_system_check( T_( 'MySQL version' ), $DB->version_long );
-if( version_compare( $mysql_version, '4.0' ) < 0 )
-{
-	disp_system_check( 'error', T_('This version is too old. The minimum recommended MySQL version is 4.1.') );
-}
-elseif( version_compare( $mysql_version, '4.1' ) < 0 )
-{
-	disp_system_check( 'warning', T_('This version is not guaranteed to work. The minimum recommended MySQL version is 4.1.') );
+if( version_compare( $mysql_version, '5.0' ) < 0 )
+{
+	disp_system_check( 'error', T_('This version is too old. The minimum recommended MySQL version is 5.0.') );
 }
 else
 {
@@ -233,13 +229,9 @@
 
 // PHP version
 init_system_check( T_( 'PHP version' ), PHP_VERSION );
-if( version_compare( PHP_VERSION, '4.1', '<' ) )
-{
-	disp_system_check( 'error', sprintf( T_('This version is too old. %1$s will not run correctly. You must ask your host to upgrade PHP before you can run %1$s.'), $app_name ) );
-}
-elseif( version_compare( PHP_VERSION, '4.3', '<' ) )
-{
-	disp_system_check( 'warning', sprintf( T_('This version is old. %1$s may run but some features may fail. You should ask your host to upgrade PHP before running %1$s.'), $app_name ) );
+if( version_compare( PHP_VERSION, '5.0.0', '<' ) )
+{
+	disp_system_check( 'error', sprintf( T_('This version is too old. %1$s will not run correctly. You must ask your host to upgrade PHP to version 5.0.0 or higher before you can run %1$s.'), $app_name ) );
 }
 else
 {

=== modified file 'qp_install/index.php'
--- qp_install/index.php	2010-07-13 07:50:32 +0000
+++ qp_install/index.php	2010-07-19 18:49:39 +0000
@@ -196,12 +196,12 @@
 		// Check MySQL version
 		$mysql_version = $DB->get_var( 'SELECT VERSION()' );
 		list( $mysl_version_main, $mysl_version_minor ) = explode( '.', $mysql_version );
-		if( ($mysl_version_main * 100 + $mysl_version_minor) < 401 )
+		if( ($mysl_version_main * 100 + $mysl_version_minor) < 500 )
 		{
 			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', '4.1', $mysql_version )
+						  $app_name, 'MySQL', '5.0', $mysql_version )
 				.'</strong></p></div>' );
 		}
 	}
@@ -209,12 +209,12 @@
 
 // Check PHP version
 list( $version_main, $version_minor ) = explode( '.', phpversion() );
-if( ($version_main * 100 + $version_minor) < 401 )
+if( ($version_main * 100 + $version_minor) < 500 )
 {
 	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', '4.1.0', phpversion() )
+				  $app_name, 'PHP', '5.0', phpversion() )
 		.'</strong></p></div>' );
 }
 
@@ -292,7 +292,7 @@
 						\s*[\'"]name[\'"]\s*=>\s*[\'"].*?[\'"],     ([^\n\r]*\r?\n)
 						\s*[\'"]host[\'"]\s*=>\s*[\'"].*?[\'"],     ([^\n\r]*\r?\n)
 						#ixs',
-					"#app_tableprefix\s*=\s*'.*?';#",
+					"#app_db_tableprefix\s*=\s*'.*?';#",
 					"#app_baseurl\s*=\s*'.*?';#",
 					"#app_config_is_done\s*=.*?;#",
 				),
@@ -302,7 +302,7 @@
 						."\t'password' => '".str_replace( "'", "\'", $conf_db_password )."',\$2"
 						."\t'name'     => '".str_replace( "'", "\'", $conf_db_name )."',\$3"
 						."\t'host'     => '".str_replace( "'", "\'", $conf_db_host )."',\$4",
-					"app_tableprefix = '".str_replace( "'", "\'", $conf_db_tableprefix )."';",
+					"app_db_tableprefix = '".str_replace( "'", "\'", $conf_db_tableprefix )."';",
 					"app_baseurl = '".str_replace( "'", "\'", $conf_baseurl )."';",
 					'app_config_is_done = 1;',
 				), $conf );