X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Finstaller.php;h=ff7677dc7d86ba03ef06499d1946c7c5adddd5c0;hb=3326b7b850f538f0e3c2c7969c5e566e2a374ffb;hp=5e483df82cc1372821b5ab3f4b3dc7999cf0b6ea;hpb=e506b8f7f9b02dc3eccded47275d2798eff5b3ac;p=quix0rs-gnu-social.git
diff --git a/lib/installer.php b/lib/installer.php
index 5e483df82c..ff7677dc7d 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -47,7 +47,7 @@ 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;
@@ -96,12 +96,12 @@ abstract class Installer
}
}
- if (version_compare(PHP_VERSION, '5.3.2', '<')) {
- $this->warning('Require PHP version 5.3.2 or greater.');
+ if (version_compare(PHP_VERSION, '5.5.0', '<')) {
+ $this->warning('Require PHP version 5.5.0 or greater.');
$pass = false;
}
- $reqs = array('gd', 'curl', 'json',
+ $reqs = array('gd', 'curl', 'intl', 'json',
'xmlwriter', 'mbstring', 'xml', 'dom', 'simplexml');
foreach ($reqs as $req) {
@@ -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: %s
', $fileSubdir, $fileFullPath),
sprintf('On your server, try this command: chmod a+w %s
', $fileFullPath));
$pass = false;
@@ -224,7 +230,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 +299,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);
@@ -419,7 +433,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 +526,9 @@ abstract class Installer
if ($this->adminEmail) {
$data['email'] = $this->adminEmail;
}
- $user = User::register($data);
-
- if (empty($user)) {
+ try {
+ $user = User::register($data, true); // true to skip email sending verification
+ } catch (Exception $e) {
return false;
}
@@ -520,19 +538,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 +555,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 +564,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 +631,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;