X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=config%2Findex.php;h=55011e107cdd5f5f6642f2814c4d372eb6b57890;hb=a60bd5060a67ece7ca5192566d0b95c4f0257813;hp=b6d944b20da0ccd600134b39922a0ff5e6406abb;hpb=8f11162800f85e1e9a94b171877c928d2a40f095;p=lhc%2Fweb%2Fwiklou.git

diff --git a/config/index.php b/config/index.php
index b6d944b20d..55011e107c 100644
--- a/config/index.php
+++ b/config/index.php
@@ -19,7 +19,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 # http://www.gnu.org/copyleft/gpl.html
 
-error_reporting( E_ALL );
+error_reporting( E_ALL | E_STRICT );
 header( "Content-type: text/html; charset=utf-8" );
 @ini_set( "display_errors", true );
 
@@ -246,7 +246,7 @@ if( !is_writable( "." ) ) {
 	<p>To make the directory writable on a Unix/Linux system:</p>
 
 	<pre>
-	cd <i>/path/to/wiki</i>
+	cd <i>" . htmlspecialchars( dirname( dirname( __FILE__ ) ) ) . "</i>
 	chmod a+w config
 	</pre>
 	
@@ -328,7 +328,7 @@ foreach (array_keys($ourdb) as $db) {
 		$ourdb[$db]['havedriver'] = 1;
 	}
 }
-error_reporting( E_ALL );
+error_reporting( E_ALL | E_STRICT );
 
 if (!$phpdatabases) {
 	print "Could not find a suitable database driver!<ul>";
@@ -466,23 +466,16 @@ if( !function_exists( 'preg_match' ) )
 	Perl-compatible regular expression functions." );
 
 $memlimit = ini_get( "memory_limit" );
-$conf->raiseMemory = false;
-if( empty( $memlimit ) || $memlimit == -1 ) {
+if( $memlimit == -1 ) {
 	print "<li>PHP is configured with no <tt>memory_limit</tt>.</li>\n";
 } else {
-	print "<li>PHP's <tt>memory_limit</tt> is " . htmlspecialchars( $memlimit ) . ". ";
-	$n = intval( $memlimit );
-	if( preg_match( '/^([0-9]+)[Mm]$/', trim( $memlimit ), $m ) ) {
-		$n = intval( $m[1] * (1024*1024) );
-	}
-	if( $n < 20*1024*1024 ) {
-		print "Attempting to raise limit to 20M... ";
-		if( false === ini_set( "memory_limit", "20M" ) ) {
-			print "failed.<br /><b>" . htmlspecialchars( $memlimit ) . " seems too low, installation may fail!</b>";
-		} else {
-			$conf->raiseMemory = true;
-			print "ok.";
-		}
+	print "<li>PHP's <tt>memory_limit</tt> is " . htmlspecialchars( $memlimit ). " bytes. ";
+	$newlimit = wfMemoryLimit();
+	$memlimit = wfShorthandToInteger( $memlimit );
+	if( $newlimit < $memlimit ) {
+		print "<b>Failed raising limit, installation may fail.</b>";
+	} elseif ( $newlimit > $memlimit )  {
+		print "Raised <tt>memory_limit</tt> to " . htmlspecialchars( $newlimit ) . " bytes. ";
 	}
 	print "</li>\n";
 }
@@ -516,6 +509,24 @@ if( !( $conf->turck || $conf->eaccel || $conf->apc || $conf->xcache ) ) {
 		cannot use these for object caching.</li>' );
 }
 
+$conf->phpCliPath = false;
+$phpClilocations = array_merge(
+	array(
+		"/usr/bin",
+		"/usr/local/bin",
+		"/opt/csw/bin",
+		"/usr/gnu/bin",
+		"/usr/sfw/bin" ),
+	explode( PATH_SEPARATOR, getenv( "PATH" ) ) );
+$phpClinames = array( "php", "php.exe" );
+foreach ($phpClilocations as $loc) {
+	$exe = locate_executable($loc, $phpClinames);
+	if ($exe !== false) {
+		$conf->phpCliPath= $exe;
+		break;
+	}
+}
+
 $conf->diff3 = false;
 $diff3locations = array_merge(
 	array(
@@ -615,6 +626,7 @@ print "<li style='font-weight:bold;color:green;font-size:110%'>Environment check
 	$conf->RootUser = importPost( "RootUser", "root" );
 	$conf->RootPW = importPost( "RootPW", "" );
 	$useRoot = importCheck( 'useroot', false );
+	$conf->populateadmin = importCheck( 'populateadmin', false );
 	$conf->LanguageCode = importPost( "LanguageCode", "en" );
 	## MySQL specific:
 	$conf->DBprefix     = importPost( "DBprefix" );
@@ -674,7 +686,7 @@ if( !preg_match( '/^[A-Za-z_0-9]*$/', $conf->DBprefix_ora ) ) {
 	$errs["DBprefix_ora"] = "Invalid table prefix";
 }
 
-error_reporting( E_ALL );
+error_reporting( E_ALL | E_STRICT );
 
 /**
  * Initialise $wgLang and $wgContLang to something so we can
@@ -831,10 +843,12 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 			define( 'STDERR', fopen("php://stderr", "wb"));
 		$wgUseDatabaseMessages = false; /* FIXME: For database failure */
 		require_once( "$IP/includes/Setup.php" );
+		Language::getLocalisationCache()->disableBackend();
+		
 		chdir( "config" );
 
 		$wgTitle = Title::newFromText( "Installation script" );
-		error_reporting( E_ALL );
+		error_reporting( E_ALL | E_STRICT );
 		print "<li>Loading class: " . htmlspecialchars( $dbclass ) . "</li>\n";
 		if ( $conf->DBtype != 'sqlite' ) {
 			$dbc = new $dbclass;
@@ -916,6 +930,10 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 			echo( "<li>Attempting to connect to database \"" . htmlspecialchars( $wgDBname ) . 
 				"\" as \"" . htmlspecialchars( $db_user ) . "\"..." );
 			$wgDatabase = $dbc->newFromParams($wgDBserver, $db_user, $db_pass, $wgDBname, 1);
+			// enable extra debug messages
+			$dbc->setMode(DatabaseIbm_db2::INSTALL_MODE);
+			$wgDatabase->setMode(DatabaseIbm_db2::INSTALL_MODE);
+			
 			if (!$wgDatabase->isOpen()) {
 				print " error: " . htmlspecialchars( $wgDatabase->lastError() ) . "</li>\n";
 			} else {
@@ -980,7 +998,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 						if ($wgDatabase->isOpen()) {
 							$wgDBOracleDefTS = $conf->DBdefTS_ora;
 							$wgDBOracleTempTS = $conf->DBtempTS_ora;
-							dbsource( "../maintenance/ora/user.sql", $wgDatabase );
+							$wgDatabase->sourceFile( "../maintenance/ora/user.sql"  );
 						} else {
 							echo "<li>Invalid database superuser, please supply a valid superuser account.</li>";
 							echo "<li>ERR: ".print_r(oci_error(), true)."</li>";
@@ -1003,7 +1021,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 				$myver = $wgDatabase->getServerVersion();
 			}
 		} else { # not mysql
-			error_reporting( E_ALL );
+			error_reporting( E_ALL | E_STRICT );
 			$wgSuperUser = '';
 			## Possible connect as a superuser
 			// Changed !mysql to postgres check since it seems to only apply to postgres
@@ -1026,6 +1044,10 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 			$wgDatabase = $dbc->newFromParams($wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, 1);
 			if (!$wgDatabase->isOpen()) {
 				print " error: " . htmlspecialchars( $wgDatabase->lastError() ) . "</li>\n";
+				$errs["DBserver"] = "Could not connect to database as user";
+				$errs["DBuser"] = "Check username";
+				$errs["DBpassword"] = "and password";
+				continue;
 			} else {
 				$myver = $wgDatabase->getServerVersion();
 			}
@@ -1153,7 +1175,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 							print " <b class='error'>If the next step fails, see <a href='http://dev.mysql.com/doc/mysql/en/old-client.html'>http://dev.mysql.com/doc/mysql/en/old-client.html</a> for help.</b>";
 						}
 						print "</li>\n";
-						dbsource( "../maintenance/users.sql", $wgDatabase );
+						$wgDatabase->sourceFile( "../maintenance/users.sql" );
 					}
 				}
 			}
@@ -1164,13 +1186,14 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 			chdir( "config" );
 			print "</pre>\n";
 			print "<ul><li>Finished update checks.</li>\n";
+		// if tables don't yet exist
 		} else {
 			# Determine available storage engines if possible
 			if ( $conf->DBtype == 'mysql' && version_compare( $myver, "4.1.2", "ge" ) ) {
 				$res = $wgDatabase->query( 'SHOW ENGINES' );
 				$found = false;
 				while ( $row = $wgDatabase->fetchObject( $res ) ) {
-					if ( $row->Engine == $conf->DBengine ) {
+					if ( $row->Engine == $conf->DBengine && ( $row->Support == 'YES' || $row->Support == 'DEFAULT' ) ) {
 						$found = true;
 						break;
 					}
@@ -1187,8 +1210,8 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 			# FIXME: Check for errors
 			print "<li>Creating tables...";
 			if ($conf->DBtype == 'mysql') {
-				dbsource( "../maintenance/tables.sql", $wgDatabase );
-				dbsource( "../maintenance/interwiki.sql", $wgDatabase );
+				$wgDatabase->sourceFile( "../maintenance/tables.sql" );
+				$wgDatabase->sourceFile( "../maintenance/interwiki.sql" );
 			} elseif (is_callable(array($wgDatabase, 'setup_database'))) {
 				$wgDatabase->setup_database();
 			}
@@ -1198,6 +1221,20 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 			}
 
 			print " done.</li>\n";
+			
+		
+			if ($conf->DBtype == 'ibm_db2') {
+				// Now that table creation is done, make sure everything is committed
+				// Do this before doing inserts through API
+				if ($wgDatabase->lastError()) {
+					print "<li>Errors encountered during table creation -- rolled back</li>\n";
+					$wgDatabase->rollback();
+				}
+				else {
+					print "<li>MediaWiki tables successfully created</li>\n";
+					$wgDatabase->commit();
+				}
+			}
 
 			print "<li>Initializing statistics...</li>\n";
 			$wgDatabase->insert( 'site_stats',
@@ -1221,7 +1258,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 				} else {
 					# Yes, so run the grants
 					echo( "<li>" . htmlspecialchars( "Granting user permissions to $wgDBuser on $wgDBname..." ) );
-					dbsource( "../maintenance/users.sql", $wgDatabase );
+					$wgDatabase->sourceFile( "../maintenance/users.sql" );
 					echo( "success.</li>\n" );
 				}
 			}
@@ -1261,8 +1298,6 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 			$revid = $revision->insertOn( $wgDatabase );
 			$article->updateRevisionOn( $wgDatabase, $revision );
 		}
-		// Now that all database work is done, make sure everything is committed
-		$wgDatabase->commit();
 
 		/* Write out the config file now that all is well */
 		print "<li style=\"list-style: none\">\n";
@@ -1343,7 +1378,7 @@ if( count( $errs ) ) {
 		<ul class="plain">
 		<li><?php aField( $conf, "License", "No license metadata", "radio", "none" ); ?></li>
 		<li><?php aField( $conf, "License", "Public Domain", "radio", "pd" ); ?></li>
-		<li><?php aField( $conf, "License", "GNU Free Documentation License 1.2 (Wikipedia-compatible)", "radio", "gfdl1_2" ); ?></li>
+		<li><?php aField( $conf, "License", "GNU Free Documentation License 1.2", "radio", "gfdl1_2" ); ?></li>
 		<li><?php aField( $conf, "License", "GNU Free Documentation License 1.3", "radio", "gfdl1_3" ); ?></li>
 		<li><?php
 			aField( $conf, "License", "A Creative Commons license - ", "radio", "cc" );
@@ -1527,6 +1562,8 @@ if( count( $errs ) ) {
 		<label class="column">Superuser account:</label>
 		<input type="checkbox" name="useroot" id="useroot" <?php if( $useRoot ) { ?>checked="checked" <?php } ?> />
 		&nbsp;<label for="useroot">Use superuser account</label>
+		<input type="checkbox" name="populateadmin" id="populateadmin" <?php if( $conf->populateadmin ) { ?>checked="checked" <?php } ?> />
+		&nbsp;<label for="populateadmin">Set as admin user for maintenance</label>
 	</div>
 	<div class="config-input"><?php aField( $conf, "RootUser", "Superuser name:", "text" ); ?></div>
 	<div class="config-input"><?php aField( $conf, "RootPW", "Superuser password:", "password" ); ?></div>
@@ -1792,6 +1829,11 @@ function writeLocalSettings( $conf ) {
 		# Needs literal string interpolation for the current style path
 		$slconf['RightsIcon'] = $conf->RightsIcon;
 	}
+	
+	if( $conf->populateadmin ) {
+		$slconf['DBadminuser'] = $conf->RootUser;
+		$slconf['DBadminpassword'] = $conf->RootPW;
+	}
 
 	if( $conf->DBtype == 'mysql' ) {
 		$dbsettings =
@@ -1858,9 +1900,6 @@ set_include_path( implode( PATH_SEPARATOR, \$path ) . PATH_SEPARATOR . get_inclu
 
 require_once( \"\$IP/includes/DefaultSettings.php\" );
 
-# If PHP's memory limit is very low, some operations may fail.
-" . ($conf->raiseMemory ? '' : '# ' ) . "ini_set( 'memory_limit', '20M' );" . "
-
 if ( \$wgCommandLineMode ) {
 	if ( isset( \$_SERVER ) && array_key_exists( 'REQUEST_METHOD', \$_SERVER ) ) {
 		die( \"This script must be run from the command line\\n\" );
@@ -1899,6 +1938,10 @@ if ( \$wgCommandLineMode ) {
 
 {$dbsettings}
 
+## Database admin settings, used for maintenance scripts
+\$wgDBadminuser     = \"". ($conf->populateadmin ? $slconf['DBadminuser'] : '' )."\";
+\$wgDBadminpassword     = \"". ($conf->populateadmin ? $slconf['DBadminpassword'] : '' )."\";
+
 ## Shared memory settings
 \$wgMainCacheType = $cacheType;
 \$wgMemCachedServers = $mcservers;
@@ -1924,6 +1967,11 @@ if ( \$wgCommandLineMode ) {
 ## you can enable inline LaTeX equations:
 \$wgUseTeX           = false;
 
+## Set \$wgCacheDirectory to a writable directory on the web server
+## to make your wiki go slightly faster. The directory should not
+## be publically accessible from the web.
+#\$wgCacheDirectory = \"\$IP/cache\";
+
 \$wgLocalInterwiki   = strtolower( \$wgSitename );
 
 \$wgLanguageCode = \"{$slconf['LanguageCode']}\";
@@ -1946,6 +1994,8 @@ if ( \$wgCommandLineMode ) {
 
 \$wgDiff3 = \"{$slconf['diff3']}\";
 
+\$wgPhpCliPath = \"{$slconf['phpCliPath']}\";
+
 # When you make changes to this configuration file, this will make
 # sure that cached pages are cleared.
 \$wgCacheEpoch = max( \$wgCacheEpoch, gmdate( 'YmdHis', @filemtime( __FILE__ ) ) );
@@ -2055,7 +2105,7 @@ function getLanguageList() {
 		if( preg_match( '/Messages([A-Z][a-z_]+)\.php$/', $f, $m ) ) {
 			$code = str_replace( '_', '-', strtolower( $m[1] ) );
 			if( isset( $wgLanguageNames[$code] ) ) {
-				$name = $code . ' - ' . $wgLanguageNames[$code];
+				$name = wfBCP47( $code ) . ' - ' . $wgLanguageNames[$code];
 			} else {
 				$name = $code;
 			}