X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=install.php;h=6355cd67adc7f02901ac00d3ed03cc5e1a99ecea;hb=8af86cbf366d58248c6904c13acbf4c0f0ec4fa8;hp=9791eb2cd1de7bbb8a80e99374cba10bce1e3be4;hpb=eee45843b02c763d541a6422d715aca5798fd9cc;p=lhc%2Fweb%2Fwiklou.git

diff --git a/install.php b/install.php
index 9791eb2cd1..6355cd67ad 100644
--- a/install.php
+++ b/install.php
@@ -1,15 +1,11 @@
 <?
 
-if (!extension_loaded('mysql')) {
-    if (!dl('mysql.so')) {
-        print "Could not load MySQL driver! Please compile ".
-              "php --with-mysql or install the mysql.so module.\n";
-	exit;
-    }
-}
 # Install software and create new empty database.
 #
 
+include( "./install-utils.inc" );
+install_version_checks();
+
 if ( ! ( is_readable( "./LocalSettings.php" )
   && is_readable( "./AdminSettings.php" ) ) ) {
 	print "You must first create the files LocalSettings.php\n" .
@@ -39,10 +35,6 @@ if ( is_file( "{$IP}/Version.php" ) ) {
 	if ( ! ( "Y" == $response{0} || "y" == $response{0} ) ) { exit(); }
 }
 
-$wgCommandLineMode = true;
-umask( 000 );
-set_time_limit( 0 );
-
 #
 # Make the necessary directories
 #
@@ -67,14 +59,16 @@ copyfile( "./images", "wiki.png", $wgUploadDirectory );
 copyfile( "./languages", "Language.php", $IP );
 copyfile( "./languages", "Language" . ucfirst( $wgLanguageCode ) . ".php", $IP );
 
-$fp = fopen( $wgDebugLogFile, "w" );
-if ( false === $fp ) {
-	print "Could not create log file \"{$wgDebugLogFile}\".\n";
-	exit();
+if ( $wgDebugLogFile ) {
+	$fp = fopen( $wgDebugLogFile, "w" );
+	if ( false === $fp ) {
+		print "Could not create log file \"{$wgDebugLogFile}\".\n";
+		exit();
+	}
+	$d = date( "Y-m-d H:i:s" );
+	fwrite( $fp, "Wiki debug log file created {$d}\n\n" );
+	fclose( $fp );
 }
-$d = date( "Y-m-d H:i:s" );
-fwrite( $fp, "Wiki debug log file created {$d}\n\n" );
-fclose( $fp );
 
 if ( $wgUseTeX ) {
 	makedirectory( "{$IP}/math" );
@@ -115,21 +109,20 @@ $wgTitle = Title::newFromText( "Installation script" );
 # Now do the actual database creation
 #
 print "Creating database...\n";
-dbsource( $rconn, "./maintenance/database.sql" );
+dbsource( "./maintenance/database.sql", $rconn );
 
 mysql_select_db( $wgDBname, $rconn );
-dbsource( $rconn, "./maintenance/tables.sql" );
-dbsource( $rconn, "./maintenance/users.sql" );
-dbsource( $rconn, "./maintenance/initialdata.sql" );
-dbsource( $rconn, "./maintenance/interwiki.sql" );
+dbsource( "./maintenance/tables.sql", $rconn );
+dbsource( "./maintenance/users.sql", $rconn );
+dbsource( "./maintenance/initialdata.sql", $rconn );
+dbsource( "./maintenance/interwiki.sql", $rconn );
 
 populatedata(); # Needs internationalized messages
 
 print "Adding indexes...\n";
-dbsource( $rconn, "./maintenance/indexes.sql" );
+dbsource( "./maintenance/indexes.sql", $rconn );
 
-print "Done.\nBrowse \"{$wgServer}{$wgScript}\" to test,\n" .
-  "or \"run WikiSuite -b -o\" in test suite.\n";
+print "Done.\nBrowse \"{$wgServer}{$wgScript}\" to test.\n";
 exit();
 
 #
@@ -152,95 +145,6 @@ function makedirectory( $d ) {
 	}
 }
 
-function copyfile( $sdir, $name, $ddir, $perms = 0664 ) {
-	global $wgInstallOwner, $wgInstallGroup;
-
-	$d = "{$ddir}/{$name}";
-	if ( copy( "{$sdir}/{$name}", $d ) ) {
-		if ( isset( $wgInstallOwner ) ) { chown( $d, $wgInstallOwner ); }
-		if ( isset( $wgInstallGroup ) ) { chgrp( $d, $wgInstallGroup ); }
-		chmod( $d, $perms );
-		# print "Copied \"{$name}\" to \"{$ddir}\".\n";
-	} else {
-		print "Failed to copy file \"{$name}\" to \"{$ddir}\".\n";
-		exit();
-	}
-}
-
-function copydirectory( $source, $dest ) {
-	$handle = opendir( $source );
-	while ( false !== ( $f = readdir( $handle ) ) ) {
-		if ( "." == $f{0} ) continue;
-		# Something made all my "CVSs" go lowercase :(
-		if ( !strcasecmp( "CVS", $f ) ) continue;
-		copyfile( $source, $f, $dest );
-	}
-}
-
-function readconsole() {
-	$fp = fopen( "php://stdin", "r" );
-	$resp = trim( fgets( $fp, 1024 ) );
-	fclose( $fp );
-	return $resp;
-}
-
-#
-# Read and execute SQL commands from a file
-#
-function dbsource( $conn, $fname ) {
-	$fp = fopen( $fname, "r" );
-	if ( false === $fp ) {
-		print "Could not open \"{$fname}\".\n";
-		exit();
-	}
-
-	$cmd = "";
-	$done = false;
-
-	while ( ! feof( $fp ) ) {
-		$line = trim( fgets( $fp, 1024 ) );
-		$sl = strlen( $line ) - 1;
-
-		if ( $sl < 0 ) { continue; }
-		if ( "-" == $line{0} && "-" == $line{1} ) { continue; }
-
-		if ( ";" == $line{$sl} ) {
-			$done = true;
-			$line = substr( $line, 0, $sl );
-		}
-
-		if ( "" != $cmd ) { $cmd .= " "; }
-		$cmd .= $line;
-
-		if ( $done ) {
-			$cmd = replacevars( $cmd );
-			$res = mysql_query( $cmd, $conn );
-
-			if ( false === $res ) {
-				print "Query \"{$cmd}\" failed.\n";
-				exit();
-			}
-
-			$cmd = "";
-			$done = false;
-		}
-	}
-	fclose( $fp );
-}
-
-function replacevars( $ins ) {
-	$varnames = array(
-		"wgDBserver", "wgDBname", "wgDBintlname", "wgDBuser",
-		"wgDBpassword", "wgDBsqluser", "wgDBsqlpassword",
-		"wgDBadminuser", "wgDBadminpassword"
-	);
-
-	foreach ( $varnames as $var ) {
-		global $$var;
-		$ins = str_replace( '{$' . $var . '}', $$var, $ins );
-	}
-	return $ins;
-}
 
 function populatedata() {
 	global $wgDBadminpassword;
@@ -279,21 +183,24 @@ function populatedata() {
 	$sql = "DELETE FROM cur";
 	wfQuery( $sql, DB_WRITE, $fname );
 
+	$now = wfTimestampNow();
+	$won = wfInvertTimestamp( $now );
+	
 	$sql = "INSERT INTO cur (cur_namespace,cur_title,cur_text," .
-	  "cur_restrictions) VALUES ({$wns},'{$ulp}','" .
-	  wfStrencode( wfMsgNoDB( "uploadlogpagetext" ) ) . "','sysop')";
+	  "cur_restrictions,cur_timestamp,inverse_timestamp,cur_touched) VALUES ({$wns},'{$ulp}','" .
+	  wfStrencode( wfMsg( "uploadlogpagetext" ) ) . "','sysop','$now','$won','$now')";
 	wfQuery( $sql, DB_WRITE, $fname );
 
 	$sql = "INSERT INTO cur (cur_namespace,cur_title,cur_text," .
-	  "cur_restrictions) VALUES ({$wns},'{$dlp}','" .
-	  wfStrencode( wfMsgNoDB( "dellogpagetext" ) ) . "','sysop')";
+	  "cur_restrictions,cur_timestamp,inverse_timestamp,cur_touched) VALUES ({$wns},'{$dlp}','" .
+	  wfStrencode( wfMsg( "dellogpagetext" ) ) . "','sysop','$now','$won','$now')";
 	wfQuery( $sql, DB_WRITE, $fname );
 	
 	$titleobj = Title::newFromText( wfMsgNoDB( "mainpage" ) );
 	$title = $titleobj->getDBkey();
-	$sql = "INSERT INTO cur (cur_namespace,cur_title,cur_text) " .
+	$sql = "INSERT INTO cur (cur_namespace,cur_title,cur_text,cur_timestamp,inverse_timestamp,cur_touched) " .
 	  "VALUES (0,'$title','" .
-	  wfStrencode( wfMsgNoDB( "mainpagetext" ) ) . "')";
+	  wfStrencode( wfMsg( "mainpagetext" ) ) . "','$now','$won','$now')";
 	wfQuery( $sql, DB_WRITE, $fname );
 	
 	initialiseMessages();