From e032a4fb04fe11b485ff3c0d7ea8de6854b88c00 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Fri, 14 Apr 2006 20:58:25 +0000
Subject: [PATCH] Some minor changes to the installer after I reinstalled MW
 from scracth: * show realpath when asking to chmod g+w ./config * hide errors
 returned when trying to dl() mysql.so / pgsql.so * cleanly outputbuffer when
 dieing out

---
 RELEASE-NOTES     |  3 +++
 config/index.php  |  5 +++--
 install-utils.inc | 50 +++++++++++++++++++++++++++++++++++++++++++----
 3 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 92188b2cf8..106c51862f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -68,6 +68,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   anchor identifiers
 * (bug 5519) Allow sidebar cache to be disabled; disable it by default.
 * Maintenance script to import the contents of a text file into a wiki page
+* installer: show realpath when asking to chmod g+w ./config
+* installer: hide errors returned when trying to dl() mysql.so / pgsql.so
+* installer: cleanly outputbuffer when dieing out
 
 == Compatibility ==
 
diff --git a/config/index.php b/config/index.php
index 8bb6247099..f0daca84a2 100644
--- a/config/index.php
+++ b/config/index.php
@@ -163,7 +163,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>$IP</i>
 	chmod a+w config
 	</pre>" );
 }
@@ -1309,7 +1309,8 @@ if ( \$wgCommandLineMode ) {
 }
 
 function dieout( $text ) {
-	die( $text . "\n\n</body>\n</html>" );
+	outputFooter( $text );
+	die();
 }
 
 function importVar( &$var, $name, $default = "" ) {
diff --git a/install-utils.inc b/install-utils.inc
index 9a8bab1272..1f5679dd1e 100644
--- a/install-utils.inc
+++ b/install-utils.inc
@@ -17,15 +17,20 @@ function install_version_checks() {
 
 	$gotdatabase = 0;
 	## XXX We should quiet the warnings thrown here
-	if (extension_loaded('mysql') or dl('mysql.so')) {
+	if (extension_loaded('mysql') or @dl('mysql.so')) {
 		$gotdatabase = 'mysql';
 	}
-	else if (extension_loaded('pgsql') or dl('pgsql.so')) {
+	else if (extension_loaded('pgsql') or @dl('pgsql.so')) {
 		$gotdatabase = 'pg';
 	}
 	if (!$gotdatabase) {
-		print "Could not load the MySQL or the PostgreSQL driver! Please compile ".
-			  "php with either --with-mysql or --with-pgsql, or install the mysql.so or pg.so module.\n";
+		global $wgCommandLineMode;
+
+		$error ="Could not load the MySQL or the PostgreSQL driver! Please compile ".
+			  "php with either --with-mysql or --with-pgsql, or install the mysql.so or pg.so module.<br/>\n".
+			  " If the database extension is installed (eg php-mysql), make sure it is enabled in your php.ini.\n";
+		if( $wgCommandLineMode ) { print $error; }
+		else { outputFooter($error); }
 		exit;
 	}
 
@@ -157,4 +162,41 @@ function field_info( $table, $field ) {
 	return false;
 }
 
+/**
+ * Used to end the HTML stream when we die out
+ */
+function outputFooter( $text ) {
+print $text;
+print <<<END
+</div></div></div>
+
+
+<div id="column-one">
+    <div class="portlet" id="p-logo">
+      <a style="background-image: url(../skins/common/images/mediawiki.png);"
+        href="http://www.mediawiki.org/"
+        title="Main Page"></a>
+    </div>
+    <script type="text/javascript"> if (window.isMSIE55) fixalpha(); </script>
+    <div class='portlet'><div class='pBody'>
+        <ul>
+            <li><strong><a href="http://www.mediawiki.org/">MediaWiki home</a></strong></li>
+            <li><a href="../README">Readme</a></li>
+            <li><a href="../RELEASE-NOTES">Release notes</a></li>
+            <li><a href="../docs/">Documentation</a></li>
+            <li><a href="http://meta.wikipedia.org/wiki/MediaWiki_User's_Guide">User's Guide</a></li>
+            <li><a href="http://meta.wikimedia.org/wiki/MediaWiki_FAQ">FAQ</a></li>
+        </ul>
+        <p style="font-size:90%;margin-top:1em">MediaWiki is Copyright &copy; 2001-2006 by Magnus Manske, Brion Vibber, Lee Daniel Crocker, Tim Starling, Erik M&ouml;ller, Gabriel Wicke and others.</p>
+    </div></div>
+</div>
+
+</div>
+
+</body>
+</html>
+
+END;
+
+}
 ?>
-- 
2.20.1