X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Finstaller.php;h=a9d8090110a0039d9b8ba89fa1ed4c9337bf4287;hb=43a67b150a4e4285224ccf695171df731c736a1e;hp=589a19a66ebc041cc3ca65e12c01e99a794ce688;hpb=50d5f5e04c9c37eb5ba20e1dbcd8ceb832d8be81;p=quix0rs-gnu-social.git
diff --git a/lib/installer.php b/lib/installer.php
index 589a19a66e..a9d8090110 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -32,6 +32,7 @@
* @author Sarven Capadisli %s
chmod a+w %s
', INSTALLDIR));
@@ -314,7 +323,7 @@ abstract class Installer
$this->updateStatus(sprintf("Adding %s data to database...", $name));
$res = $this->runDbScript($scr.'.sql', $conn, 'pgsql');
if ($res === false) {
- $this->updateStatus(sprintf("Can't run %d script.", $name), true);
+ $this->updateStatus(sprintf("Can't run %s script.", $name), true);
return false;
}
}
@@ -382,6 +391,30 @@ abstract class Installer
return $db;
}
+ /**
+ * Return a parseable PHP literal for the given value.
+ * This will include quotes for strings, etc.
+ *
+ * @param mixed $val
+ * @return string
+ */
+ function phpVal($val)
+ {
+ return var_export($val, true);
+ }
+
+ /**
+ * Return an array of parseable PHP literal for the given values.
+ * These will include quotes for strings, etc.
+ *
+ * @param mixed $val
+ * @return array
+ */
+ function phpVals($map)
+ {
+ return array_map(array($this, 'phpVal'), $map);
+ }
+
/**
* Write a stock configuration file.
*
@@ -391,24 +424,36 @@ abstract class Installer
*/
function writeConf()
{
+ $vals = $this->phpVals(array(
+ 'sitename' => $this->sitename,
+ 'server' => $this->server,
+ 'path' => $this->path,
+ 'db_database' => $this->db['database'],
+ 'db_type' => $this->db['type'],
+ ));
+
// assemble configuration file in a string
$cfg = "sitename}';\n\n".
+ "\$config['site']['name'] = {$vals['sitename']};\n\n".
// site location
- "\$config['site']['server'] = '{$this->server}';\n".
- "\$config['site']['path'] = '{$this->path}'; \n\n".
+ "\$config['site']['server'] = {$vals['server']};\n".
+ "\$config['site']['path'] = {$vals['path']}; \n\n".
// checks if fancy URLs are enabled
($this->fancy ? "\$config['site']['fancy'] = true;\n\n":'').
// database
- "\$config['db']['database'] = '{$this->db['database']}';\n\n".
+ "\$config['db']['database'] = {$vals['db_database']};\n\n".
($this->db['type'] == 'pgsql' ? "\$config['db']['quote_identifiers'] = true;\n\n":'').
- "\$config['db']['type'] = '{$this->db['type']}';\n\n";
+ "\$config['db']['type'] = {$vals['db_type']};\n\n";
+
+ // Normalize line endings for Windows servers
+ $cfg = str_replace("\n", PHP_EOL, $cfg);
+
// write configuration file out to install directory
$res = file_put_contents(INSTALLDIR.'/config.php', $cfg);
@@ -438,7 +483,7 @@ abstract class Installer
case 'mysqli':
$res = $conn->query($stmt);
if ($res === false) {
- $error = $conn->error();
+ $error = $conn->error;
}
break;
case 'pgsql':