$pass = true;
$config = INSTALLDIR.'/config.php';
- if (file_exists($config)) {
+ if (!$this->skipConfig && file_exists($config)) {
if (!is_writable($config) || filesize($config) > 0) {
if (filesize($config) == 0) {
$this->warning('Config file "config.php" already exists and is empty, but is not writable.');
}
}
- 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) {
}
// @fixme this check seems to be insufficient with Windows ACLs
- if (!is_writable(INSTALLDIR)) {
+ if (!$this->skipConfig && !is_writable(INSTALLDIR)) {
$this->warning(sprintf('Cannot write config file to: <code>%s</code></p>', INSTALLDIR),
sprintf('On your server, try this command: <code>chmod a+w %s</code>', INSTALLDIR));
$pass = false;
}
// Check the subdirs used for file uploads
- $fileSubdirs = array('avatar', 'background', 'file');
+ // TODO get another flag for this --skipFileSubdirCreation
+ if (!$this->skipConfig) {
+ $fileSubdirs = array($this->avatarDir, $this->fileDir);
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: <code>%s</code>', $fileSubdir, $fileFullPath),
sprintf('On your server, try this command: <code>chmod a+w %s</code>', $fileFullPath));
$pass = false;
}
}
-
+ }
return $pass;
}
}
// @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', '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);
$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?
}
}
- 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);
'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'],
// 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);
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;
}
}
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
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();
$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("GNU social has been installed at $link");
$this->updateStatus(
- '<strong>DONE!</strong> You can visit your <a href="'.htmlspecialchars($link).'">new GNU social site</a> (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 <a href="http://gnu.io/resources/">good documentation</a>.'
+ '<strong>DONE!</strong> You can visit your <a href="'.htmlspecialchars($link).'">new GNU social site</a> (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 <a href="https://gnu.io/social/resources/">mailing list or IRC</a>. <a href="'.htmlspecialchars($link).'/doc/faq">FAQ is found here</a>.'
);
return true;