Introduced isCurrentProfileInScope() which shall check if current profile is

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

diff --git a/lib/installer.php b/lib/installer.php
index b649dc3e2c51a6caca4f051d9fb62dc28bc262e0..9a167618f7db42e8b4069ee759f32e39859833c2 100644 (file)
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -47,21 +47,21 @@ abstract class Installer
     /** DB info */
     public $host, $database, $dbtype, $username, $password, $db;
     /** Administrator info */
-    public $adminNick, $adminPass, $adminEmail, $adminUpdates;
+    public $adminNick, $adminPass, $adminEmail;
     /** Should we skip writing the configuration file? */
     public $skipConfig = false;
 
     public static $dbModules = array(
         'mysql' => array(
-            'name' => 'MySQL',
+            'name' => 'MariaDB (or MySQL 5.5+)',
             'check_module' => 'mysqli',
             'scheme' => 'mysqli', // DSN prefix for PEAR::DB
         ),
-        'pgsql' => array(
+/*        'pgsql' => array(
             'name' => 'PostgreSQL',
             'check_module' => 'pgsql',
             'scheme' => 'pgsql', // DSN prefix for PEAR::DB
-        ),
+        ),*/
     );
 
     /**
@@ -224,7 +224,7 @@ abstract class Installer
         }
         // @fixme hardcoded list; should use Nickname::isValid()
         // if/when it's safe to have loaded the infrastructure here
-        $blacklist = array('main', 'panel', 'twitter', 'settings', 'rsd.xml', 'favorited', 'featured', 'favoritedrss', 'featuredrss', 'rss', 'getfile', 'api', 'groups', 'group', 'peopletag', 'tag', 'user', 'message', 'conversation', 'bookmarklet', 'notice', 'attachment', 'search', 'index.php', 'doc', 'opensearch', 'robots.txt', 'xd_receiver.html', 'facebook');
+        $blacklist = array('main', 'panel', 'twitter', 'settings', 'rsd.xml', 'favorited', 'featured', 'favoritedrss', 'featuredrss', 'rss', 'getfile', 'api', 'groups', 'group', 'peopletag', 'tag', 'user', 'message', 'conversation', 'notice', 'attachment', 'search', 'index.php', 'doc', 'opensearch', 'robots.txt', 'xd_receiver.html', 'facebook');
         if (in_array($this->adminNick, $blacklist)) {
             $this->updateStatus('The user nickname "' . htmlspecialchars($this->adminNick) .
                          '" is reserved.', true);
@@ -293,6 +293,14 @@ abstract class Installer
             }
         }
 
+        if (!is_object($conn)) {
+            // No object at all
+            throw new Exception('Fatal error: conn is no object.');
+        } elseif (!$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);
@@ -520,19 +528,6 @@ abstract class Installer
         $user->grantRole('moderator');
         $user->grantRole('administrator');
 
-        // Attempt to do a remote subscribe to update@status.net
-        // Will fail if instance is on a private network.
-
-        if ($this->adminUpdates && class_exists('Ostatus_profile')) {
-            try {
-                $oprofile = Ostatus_profile::ensureProfileURL('http://update.status.net/');
-                Subscription::start($user->getProfile(), $oprofile->localProfile());
-                $this->updateStatus("Set up subscription to <a href='http://update.status.net/'>update@status.net</a>.");
-            } catch (Exception $e) {
-                $this->updateStatus("Could not set up subscription to <a href='http://update.status.net/'>update@status.net</a>.", true);
-            }
-        }
-
         return true;
     }
 
@@ -550,7 +545,7 @@ abstract class Installer
 
         $this->updateStatus("Initializing...");
         ini_set('display_errors', 1);
-        error_reporting(E_ALL);
+        error_reporting(E_ALL & ~E_STRICT & ~E_NOTICE);
         if (!defined('GNUSOCIAL')) {
             define('GNUSOCIAL', true);
         }