Misses this file to merge. I like the comments.

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

diff --git a/lib/installer.php b/lib/installer.php
index 0b71e0bf23a42717eafa28e8fed4978815621075..6b0278ee0b81b8dc83b97795dec26ea1d7c578b4 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
-        ),
+        ),*/
     );
 
     /**
@@ -96,25 +96,12 @@ abstract class Installer
             }
         }
 
-        if (version_compare(PHP_VERSION, '5.2.3', '<')) {
-            $this->warning('Require PHP version 5.2.3 or greater.');
-            $pass = false;
-        }
-
-        // Look for known library bugs
-        $str = "abcdefghijklmnopqrstuvwxyz";
-        $replaced = preg_replace('/[\p{Cc}\p{Cs}]/u', '*', $str);
-        if ($str != $replaced) {
-            $this->warning('PHP is linked to a version of the PCRE library ' .
-                           'that does not support Unicode properties. ' .
-                           'If you are running Red Hat Enterprise Linux / ' .
-                           'CentOS 5.4 or earlier, see <a href="' .
-                           'http://status.net/wiki/Red_Hat_Enterprise_Linux#PCRE_library' .
-                           '">our documentation page</a> on fixing this.');
+        if (version_compare(PHP_VERSION, '5.3.2', '<')) {
+            $this->warning('Require PHP version 5.3.2 or greater.');
             $pass = false;
         }
 
-        $reqs = array('gd', 'curl', 'json',
+        $reqs = array('gd', 'curl', 'intl', 'json',
                       'xmlwriter', 'mbstring', 'xml', 'dom', 'simplexml');
 
         foreach ($reqs as $req) {
@@ -237,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', 'activity');
         if (in_array($this->adminNick, $blacklist)) {
             $this->updateStatus('The user nickname "' . htmlspecialchars($this->adminNick) .
                          '" is reserved.', true);
@@ -306,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);
@@ -521,9 +516,9 @@ abstract class Installer
         if ($this->adminEmail) {
             $data['email'] = $this->adminEmail;
         }
-        $user = User::register($data);
-
-        if (empty($user)) {
+        try {
+            $user = User::register($data);
+        } catch (Exception $e) {
             return false;
         }
 
@@ -533,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;
     }
 
@@ -563,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);
         }
@@ -572,7 +554,7 @@ abstract class Installer
         }
 
         require_once INSTALLDIR . '/lib/framework.php';
-        StatusNet::initDefaults($this->server, $this->path);
+        GNUsocial::initDefaults($this->server, $this->path);
 
         if ($this->siteProfile == "singleuser") {
             // Until we use ['site']['profile']==='singleuser' everywhere