X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Finstaller.php;h=9551b693675b179b4d5bf596a7d57dc05ce6e1f0;hb=586fb5a5175d7a10f5f78dd026434e48202e5451;hp=bfe8c5259fbf447c2d518dbbeda2b2c37aa9b280;hpb=2f708663679eb549568f9ad3722885297a587020;p=quix0rs-gnu-social.git
diff --git a/lib/installer.php b/lib/installer.php
index bfe8c5259f..9551b69367 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -34,7 +34,7 @@
* @author Tom Adams %s
chmod a+w %s
', INSTALLDIR));
$pass = false;
}
// Check the subdirs used for file uploads
- $fileSubdirs = array('avatar', 'background', 'file');
- foreach ($fileSubdirs as $fileSubdir) {
- $fileFullPath = INSTALLDIR."/$fileSubdir/";
- if (!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;
+ // TODO get another flag for this --skipFileSubdirCreation
+ if (!$this->skipConfig) {
+ define('GNUSOCIAL', true);
+ define('STATUSNET', true);
+ require_once INSTALLDIR . '/lib/language.php';
+ $_server=$this->server; $_path=$this->path; // We won't be using those so it's safe to do this small hack
+ require_once INSTALLDIR.DIRECTORY_SEPARATOR.'lib'.DIRECTORY_SEPARATOR.'default.php';
+ $fileSubdirs = [empty($this->avatarDir) ? $default['avatar']['dir'] : $this->avatarDir,
+ empty($this->fileDir) ? $default['attachments']['dir'] : $this->fileDir];
+ unset($default);
+ foreach ($fileSubdirs as $fileFullPath) {
+ 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;
+ }
}
}
-
return $pass;
}
@@ -227,7 +230,7 @@ abstract class Installer
$fail = false;
if (empty($this->adminNick)) {
- $this->updateStatus("No initial StatusNet user nickname specified.", true);
+ $this->updateStatus("No initial user nickname specified.", true);
$fail = true;
}
if ($this->adminNick && !preg_match('/^[0-9a-z]{1,64}$/', $this->adminNick)) {
@@ -237,7 +240,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);
@@ -245,7 +248,7 @@ abstract class Installer
}
if (empty($this->adminPass)) {
- $this->updateStatus("No initial StatusNet user password specified.", true);
+ $this->updateStatus("No initial user password specified.", true);
$fail = true;
}
@@ -259,16 +262,12 @@ abstract class Installer
*/
function validateSiteProfile()
{
- $fail = false;
-
- $sprofile = $this->siteProfile;
-
- if (empty($sprofile)) {
+ if (empty($this->siteProfile)) {
$this->updateStatus("No site profile selected.", true);
- $fail = true;
+ return false;
}
- return !$fail;
+ return true;
}
/**
@@ -296,6 +295,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?
@@ -305,7 +309,7 @@ abstract class Installer
} else if ($this->dbtype == 'pgsql') {
$record = $conn->getRow('SHOW server_encoding');
if ($record->server_encoding != 'UTF8') {
- $this->updateStatus("StatusNet requires UTF8 character encoding. Your database is ". htmlentities($record->server_encoding));
+ $this->updateStatus("GNU social requires UTF8 character encoding. Your database is ". htmlentities($record->server_encoding));
return false;
}
}
@@ -411,7 +415,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'],
@@ -436,17 +440,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";
-
- // Auto memcache support detection
- $cfg .= '
-foreach(array("Memcache", "Memcached") as $plugin) :
- if (class_exists($plugin)) {
- addPlugin($plugin);
- break;
- }
-endforeach;
-';
+ "\$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);
@@ -522,11 +520,14 @@ endforeach;
/**
* Create the initial admin user account.
- * Side effect: may load portions of StatusNet framework.
+ * Side effect: may load portions of GNU social framework.
* Side effect: outputs program info
*/
function registerInitialUser()
{
+ // initalize hostname from install arguments, so it can be used to find
+ // the /etc config file from the commandline installer
+ $server = $this->server;
require_once INSTALLDIR . '/lib/common.php';
$data = array('nickname' => $this->adminNick,
@@ -535,9 +536,9 @@ endforeach;
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;
}
@@ -547,19 +548,6 @@ endforeach;
$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;
}
@@ -573,17 +561,25 @@ endforeach;
*/
function doInstall()
{
+ global $config;
+
$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);
}
if (!defined('STATUSNET')) {
define('STATUSNET', true);
}
+
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
+ $config['singleuser']['enabled'] = true;
+ }
try {
$this->db = $this->setupDatabase();
@@ -597,10 +593,10 @@ endforeach;
return false;
}
+ if (!$this->skipConfig) {
// Make sure we can write to the file twice
$oldUmask = umask(000);
- if (!$this->skipConfig) {
$this->updateStatus("Writing config file...");
$res = $this->writeConf();
@@ -618,7 +614,7 @@ endforeach;
);
} else {
$this->updateStatus(
- "Could not create initial StatusNet user (administrator).",
+ "Could not create initial user account.",
true
);
return false;
@@ -633,19 +629,19 @@ endforeach;
$this->updateStatus("Can't write to config file.", true);
return false;
}
- }
// Restore original umask
umask($oldUmask);
// Set permissions back to something decent
chmod(INSTALLDIR.'/config.php', 0644);
+ }
$scheme = $this->ssl === 'always' ? 'https' : 'http';
$link = "{$scheme}://{$this->server}/{$this->path}";
- $this->updateStatus("StatusNet has been installed at $link");
+ $this->updateStatus("GNU social has been installed at $link");
$this->updateStatus(
- "DONE! You can visit your new StatusNet site (login as '$this->adminNick'). If this is your first StatusNet install, you may want to poke around our Getting Started guide."
+ '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;