X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Finstaller.php;h=0a46b2a50815e697647d7c87371d9faf3bcf0b42;hb=e6507a0f180bfe70d36599c4c269eb3b08b9f61d;hp=b649dc3e2c51a6caca4f051d9fb62dc28bc262e0;hpb=c0f65f6ea76ffa035cbf2c4126bedaae9d8752c8;p=quix0rs-gnu-social.git
diff --git a/lib/installer.php b/lib/installer.php
index b649dc3e2c..0a46b2a508 100644
--- 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
- ),
+ ),*/
);
/**
@@ -101,7 +101,7 @@ abstract class Installer
$pass = false;
}
- $reqs = array('gd', 'curl', 'json',
+ $reqs = array('gd', 'curl', 'intl', 'json',
'xmlwriter', 'mbstring', 'xml', 'dom', 'simplexml');
foreach ($reqs as $req) {
@@ -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', 'activity');
if (in_array($this->adminNick, $blacklist)) {
$this->updateStatus('The user nickname "' . htmlspecialchars($this->adminNick) .
'" is reserved.', true);
@@ -293,6 +293,11 @@ 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);
@@ -419,7 +424,11 @@ abstract class Installer
// database
"\$config['db']['database'] = {$vals['db_database']};\n\n".
($this->db['type'] == 'pgsql' ? "\$config['db']['quote_identifiers'] = true;\n\n":'').
- "\$config['db']['type'] = {$vals['db_type']};\n\n";
+ "\$config['db']['type'] = {$vals['db_type']};\n\n".
+
+ "// Uncomment below for better performance. Just remember you must run\n".
+ "// php scripts/checkschema.php whenever your enabled plugins change!\n".
+ "//\$config['db']['schemacheck'] = 'script';\n\n";
// Normalize line endings for Windows servers
$cfg = str_replace("\n", PHP_EOL, $cfg);
@@ -508,9 +517,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;
}
@@ -520,19 +529,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 update@status.net.");
- } catch (Exception $e) {
- $this->updateStatus("Could not set up subscription to update@status.net.", true);
- }
- }
-
return true;
}
@@ -550,7 +546,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);
}
@@ -559,7 +555,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
@@ -626,7 +622,7 @@ abstract class Installer
$this->updateStatus("GNU social has been installed at $link");
$this->updateStatus(
- 'DONE! You can visit your new GNU social site (log in as "'.htmlspecialchars($this->adminNick).'"). If this is your first GNU social install, make your experience the best possible by visiting our resource site to join the mailing list and good documentation.'
+ 'DONE! You can visit your new GNU social site (log in as "'.htmlspecialchars($this->adminNick).'"). If this is your first GNU social install, make your experience the best possible by visiting our resource site to join the mailing list or IRC.. FAQ is found here.'
);
return true;