diff --git a/install.php b/install.php
index 3abacc185ed..632e7aedb6d 100644
--- a/install.php
+++ b/install.php
@@ -3,7 +3,7 @@
/// If config.php exists already then we are not needed.
-if (file_exists('./config.php')) {
+if (file_exists('./config.php')) {
header('Location: index.php');
die;
} else {
@@ -97,18 +97,18 @@ if (isset($_POST['stage'])) {
if ($nextstage < 0) $nextstage = WELCOME;
-
+
/// Store any posted data
foreach ($_POST as $setting=>$value) {
$INSTALL[$setting] = $value;
}
-
+
} else {
$goforward = true;
$nextstage = WELCOME;
-
+
}
//==========================================================================//
@@ -201,7 +201,7 @@ if (isset($_GET['help'])) {
/// Are we in config download mode?
if (isset($_GET['download'])) {
- header("Content-Type: application/download\n");
+ header("Content-Type: application/download\n");
header("Content-Disposition: attachment; filename=\"config.php\"");
echo $INSTALL['config'];
exit;
@@ -218,7 +218,7 @@ if (isset($_GET['download'])) {
if ($INSTALL['stage'] == DIRECTORY) {
error_reporting(0);
-
+
/// check wwwroot
if (ini_get('allow_url_fopen')) {
if (($fh = @fopen($INSTALL['wwwrootform'].'/install.php', 'r')) === false) {
@@ -227,12 +227,12 @@ if ($INSTALL['stage'] == DIRECTORY) {
}
}
if ($fh) fclose($fh);
-
+
/// check dirroot
if (($fh = @fopen($INSTALL['dirrootform'].'/install.php', 'r')) === false ) {
$errormsg .= get_string('dirrooterror', 'install').'
';
$INSTALL['dirrootform'] = $INSTALL['dirroot'];
- }
+ }
if ($fh) fclose($fh);
/// check dataroot
@@ -240,7 +240,7 @@ if ($INSTALL['stage'] == DIRECTORY) {
if (make_upload_directory('sessions', false) === false ) {
$errormsg .= get_string('datarooterror', 'install').'
';
}
- if ($fh) fclose($fh);
+ if ($fh) fclose($fh);
if (!empty($errormsg)) $nextstage = DIRECTORY;
@@ -262,7 +262,7 @@ if ($INSTALL['stage'] == DATABASE) {
} else {
$INSTALL['skipdbencodingtest'] = false;
}
-
+
/// different format for postgres7 by socket
if ($INSTALL['dbtype'] == 'postgres7' and ($INSTALL['dbhost'] == 'localhost' || $INSTALL['dbhost'] == '127.0.0.1')) {
$INSTALL['dbhost'] = "user='{$INSTALL['dbuser']}' password='{$INSTALL['dbpass']}' dbname='{$INSTALL['dbname']}'";
@@ -335,11 +335,11 @@ if ($INSTALL['stage'] == DATABASE) {
if (empty($errormsg)) {
- error_reporting(0); // Hide errors
+ error_reporting(0); // Hide errors
if (! $dbconnected = $db->Connect($INSTALL['dbhost'],$INSTALL['dbuser'],$INSTALL['dbpass'],$INSTALL['dbname'])) {
/// The following doesn't seem to work but we're working on it
- /// If you come up with a solution for creating a database in MySQL
+ /// If you come up with a solution for creating a database in MySQL
/// feel free to put it in and let us know
if ($dbconnected = $db->Connect($INSTALL['dbhost'],$INSTALL['dbuser'],$INSTALL['dbpass'])) {
switch ($INSTALL['dbtype']) { /// Try to create a database
@@ -384,7 +384,7 @@ if ($INSTALL['stage'] == DATABASE) {
$nextstage = DATABASE;
$INSTALL['showskipdbencodingtest'] = true;
$INSTALL['dbencodingtestresults'] = false;
- }
+ }
} else {
$INSTALL['showskipdbencodingtest'] = true;
$INSTALL['dbencodingtestresults'] = false;
@@ -537,7 +537,7 @@ if ($INSTALL['stage'] == DOWNLOADLANG && $INSTALL['downloadlangpack']) {
$INSTALL['showdownloadlangpack'] = false;
$INSTALL['downloadlangpackerror'] = $downloaderror;
}
-}
+}
@@ -591,7 +591,7 @@ if ($nextstage == SAVE) {
fwrite($fh, $str);
fclose($fh);
}
-
+
$INSTALL['config'] = $str;
}
@@ -681,7 +681,7 @@ if (isset($_GET['help'])) {
".get_string('configfilenotwritten', 'install')."
"; - + echo "| \n"; - echo " | \n"; + echo " | \n"; $installoptions = array(); - $installoptions['download'] = 1; + $installoptions['download'] = 1; print_single_button("install.php", $installoptions, get_string('download', 'install')); echo " | \n"; - echo "\n"; + echo " | \n"; print_single_button("index.php", $options, get_string('continue')." »"); echo " | \n"; echo "