Merge branch 'nightly' into 'nightly'

[quix0rs-gnu-social.git] / lib / installer.php

diff --git a/lib/installer.php b/lib/installer.php
index 738eb80472d46a4bced35a4fb234ee3395a9853e..346c706d61aab1fd4fe8a05363c4edd72e8c64be 100644 (file)
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -133,10 +133,16 @@ abstract class Installer
         }
 
         // Check the subdirs used for file uploads
-        $fileSubdirs = array('avatar', 'background', 'file');
+        $fileSubdirs = array('avatar', 'file');
         foreach ($fileSubdirs as $fileSubdir) {
-            $fileFullPath = INSTALLDIR."/$fileSubdir/";
-            if (!is_writable($fileFullPath)) {
+            $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: <code>%s</code>', $fileSubdir, $fileFullPath),
                                sprintf('On your server, try this command: <code>chmod a+w %s</code>', $fileFullPath));
                 $pass = false;
@@ -279,6 +285,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?
@@ -293,11 +304,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);
@@ -399,7 +405,7 @@ abstract class Installer
             'sitename' => $this->sitename,
             'server' => $this->server,
             'path' => $this->path,
-            'ssl' => in_array($this->ssl, array('never', 'sometimes', 'always'))
+            'ssl' => in_array($this->ssl, array('never', 'always'))
                      ? $this->ssl
                      : 'never',
             'db_database' => $this->db['database'],
@@ -518,7 +524,7 @@ abstract class Installer
             $data['email'] = $this->adminEmail;
         }
         try {
-            $user = User::register($data);
+            $user = User::register($data, true);    // true to skip email sending verification
         } catch (Exception $e) {
             return false;
         }