X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Finstaller.php;h=9551b693675b179b4d5bf596a7d57dc05ce6e1f0;hb=586fb5a5175d7a10f5f78dd026434e48202e5451;hp=d2fda9256094a0dfff2b2e2454a71511a3add094;hpb=ec257d940a3dda9f6db153efc46342a348560192;p=quix0rs-gnu-social.git
diff --git a/lib/installer.php b/lib/installer.php
index d2fda92560..9551b69367 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -46,6 +46,8 @@ abstract class Installer
public $sitename, $server, $path, $fancy, $siteProfile, $ssl;
/** DB info */
public $host, $database, $dbtype, $username, $password, $db;
+ /** Storage info */
+ public $avatarDir, $fileDir;
/** Administrator info */
public $adminNick, $adminPass, $adminEmail;
/** Should we skip writing the configuration file? */
@@ -85,7 +87,7 @@ abstract class Installer
$pass = true;
$config = INSTALLDIR.'/config.php';
- if (file_exists($config)) {
+ if (!$this->skipConfig && file_exists($config)) {
if (!is_writable($config) || filesize($config) > 0) {
if (filesize($config) == 0) {
$this->warning('Config file "config.php" already exists and is empty, but is not writable.');
@@ -126,29 +128,37 @@ abstract class Installer
}
// @fixme this check seems to be insufficient with Windows ACLs
- if (!is_writable(INSTALLDIR)) {
+ if (!$this->skipConfig && !is_writable(INSTALLDIR)) {
$this->warning(sprintf('Cannot write config file to: %s
chmod a+w %s
', INSTALLDIR));
$pass = false;
}
// Check the subdirs used for file uploads
- $fileSubdirs = array('avatar', 'file');
- foreach ($fileSubdirs as $fileSubdir) {
- $fileFullPath = INSTALLDIR."/$fileSubdir";
- if (!file_exists($fileFullPath)) {
- $pass = $pass && mkdir($fileFullPath);
- } elseif (!is_dir($fileFullPath)) {
- $this->warning(sprintf('GNU social expected a directory but found something else on this path: %s', $fileFullPath),
- 'Either make sure it goes to a directory or remove it and a directory will be created.');
- $pass = false;
- } elseif (!is_writable($fileFullPath)) {
- $this->warning(sprintf('Cannot write to %s directory: %s
', $fileSubdir, $fileFullPath),
- sprintf('On your server, try this command: chmod a+w %s
', $fileFullPath));
- $pass = false;
+ // TODO get another flag for this --skipFileSubdirCreation
+ if (!$this->skipConfig) {
+ define('GNUSOCIAL', true);
+ define('STATUSNET', true);
+ require_once INSTALLDIR . '/lib/language.php';
+ $_server=$this->server; $_path=$this->path; // We won't be using those so it's safe to do this small hack
+ require_once INSTALLDIR.DIRECTORY_SEPARATOR.'lib'.DIRECTORY_SEPARATOR.'default.php';
+ $fileSubdirs = [empty($this->avatarDir) ? $default['avatar']['dir'] : $this->avatarDir,
+ empty($this->fileDir) ? $default['attachments']['dir'] : $this->fileDir];
+ unset($default);
+ foreach ($fileSubdirs as $fileFullPath) {
+ if (!file_exists($fileFullPath)) {
+ $pass = $pass && mkdir($fileFullPath);
+ } elseif (!is_dir($fileFullPath)) {
+ $this->warning(sprintf('GNU social expected a directory but found something else on this path: %s', $fileFullPath),
+ 'Either make sure it goes to a directory or remove it and a directory will be created.');
+ $pass = false;
+ } elseif (!is_writable($fileFullPath)) {
+ $this->warning(sprintf('Cannot write to %s directory: %s
', $fileSubdir, $fileFullPath),
+ sprintf('On your server, try this command: chmod a+w %s
', $fileFullPath));
+ $pass = false;
+ }
}
}
-
return $pass;
}
@@ -285,6 +295,11 @@ abstract class Installer
$this->updateStatus("Checking database...");
$conn = $this->connectDatabase($dsn);
+ if (!$conn instanceof DB_common) {
+ // Is not the right instance
+ throw new Exception('Cannot connect to database: ' . $conn->getMessage());
+ }
+
// ensure database encoding is UTF8
if ($this->dbtype == 'mysql') {
// @fixme utf8m4 support for mysql 5.5?
@@ -299,11 +314,6 @@ abstract class Installer
}
}
- if (!$conn instanceof DB_common) {
- // Is not the right instance
- throw new Exception('Cannot connect to database: ' . $conn->getMessage());
- }
-
$res = $this->updateStatus("Creating database tables...");
if (!$this->createCoreTables($conn)) {
$this->updateStatus("Error creating tables.", true);
@@ -515,6 +525,9 @@ abstract class Installer
*/
function registerInitialUser()
{
+ // initalize hostname from install arguments, so it can be used to find
+ // the /etc config file from the commandline installer
+ $server = $this->server;
require_once INSTALLDIR . '/lib/common.php';
$data = array('nickname' => $this->adminNick,
@@ -580,10 +593,10 @@ abstract class Installer
return false;
}
+ if (!$this->skipConfig) {
// Make sure we can write to the file twice
$oldUmask = umask(000);
- if (!$this->skipConfig) {
$this->updateStatus("Writing config file...");
$res = $this->writeConf();
@@ -616,12 +629,12 @@ abstract class Installer
$this->updateStatus("Can't write to config file.", true);
return false;
}
- }
// Restore original umask
umask($oldUmask);
// Set permissions back to something decent
chmod(INSTALLDIR.'/config.php', 0644);
+ }
$scheme = $this->ssl === 'always' ? 'https' : 'http';
$link = "{$scheme}://{$this->server}/{$this->path}";