wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adminUpdates setting not available now

Browse Source 
We don't run a service similar to update.status.net yet. Maybe we should,
but that's for the future to decide. Currently I view it as a callback
that we want to avoid.
This commit is contained in:
Mikael Nordfeldth 2014-05-19 14:53:11 +02:00
parent 1207f4f06f
commit fb82c75b49
4 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install.php
View File

@ -257,11 +257,6 @@ class WebInstaller extends Installer
<input id="admin_email" name="admin_email" value="{$post->value('admin_email')}" /> <input id="admin_email" name="admin_email" value="{$post->value('admin_email')}" />
<p class="form_guide">Optional email address for the initial user (administrator)</p> <p class="form_guide">Optional email address for the initial user (administrator)</p>
</li> </li>
<li>
<label for="admin_updates">Subscribe to announcements</label>
<input type="checkbox" id="admin_updates" name="admin_updates" value="true" checked="checked" />
<p class="form_guide">Release and security feed from <a href="http://update.status.net/">update@status.net</a> (recommended)</p>
</li>
</ul> </ul>
</fieldset> </fieldset>
<fieldset id="settings_profile"> <fieldset id="settings_profile">
@ -333,7 +328,6 @@ STR;
$this->adminPass = $post->string('admin_password'); $this->adminPass = $post->string('admin_password');
$adminPass2 = $post->string('admin_password2'); $adminPass2 = $post->string('admin_password2');
$this->adminEmail = $post->string('admin_email'); $this->adminEmail = $post->string('admin_email');
$this->adminUpdates = $post->string('admin_updates');
$this->siteProfile = $post->string('site_profile'); $this->siteProfile = $post->string('site_profile');

15
lib/installer.php
View File

@ -47,7 +47,7 @@ abstract class Installer
/** DB info */ /** DB info */
public $host, $database, $dbtype, $username, $password, $db; public $host, $database, $dbtype, $username, $password, $db;
/** Administrator info */ /** Administrator info */
public $adminNick, $adminPass, $adminEmail, $adminUpdates; public $adminNick, $adminPass, $adminEmail;
/** Should we skip writing the configuration file? */ /** Should we skip writing the configuration file? */
public $skipConfig = false; public $skipConfig = false;
@ -520,19 +520,6 @@ abstract class Installer
$user->grantRole('moderator'); $user->grantRole('moderator');
$user->grantRole('administrator'); $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; return true;
} }

1
plugins/DomainStatusNetwork/lib/domainstatusnetworkinstaller.php
View File

@ -133,7 +133,6 @@ class DomainStatusNetworkInstaller extends Installer
$this->adminNick = null; $this->adminNick = null;
$this->adminPass = null; $this->adminPass = null;
$this->adminEmail = null; $this->adminEmail = null;
$this->adminUpdates = null;
/** Should we skip writing the configuration file? */ /** Should we skip writing the configuration file? */
$this->skipConfig = true; $this->skipConfig = true;

4
scripts/install_cli.php
View File

@ -84,7 +84,6 @@ class CliInstaller extends Installer
'--admin-nick' => 'adminNick', '--admin-nick' => 'adminNick',
'--admin-pass' => 'adminPass', '--admin-pass' => 'adminPass',
'--admin-email' => 'adminEmail', '--admin-email' => 'adminEmail',
'--admin-updates' => 'adminUpdates',
'--site-profile' => 'siteProfile' '--site-profile' => 'siteProfile'
); );
@ -106,7 +105,6 @@ class CliInstaller extends Installer
// defaults // defaults
$this->dbtype = 'mysql'; $this->dbtype = 'mysql';
$this->adminUpdates = true;
$this->verbose = true; $this->verbose = true;
// ssl is defaulted in lib/installer.php // ssl is defaulted in lib/installer.php
@ -115,7 +113,7 @@ class CliInstaller extends Installer
if (isset($map[$arg])) { if (isset($map[$arg])) {
$var = $map[$arg]; $var = $map[$arg];
$this->$var = $option[1]; $this->$var = $option[1];
if ($var == 'adminUpdates' || $arg == '--fancy') { if ($arg == '--fancy') {
$this->$var = ($option[1] != 'false') && ($option[1] != 'no'); $this->$var = ($option[1] != 'false') && ($option[1] != 'no');
} }
} else if ($arg == '--skip-config') { } else if ($arg == '--skip-config') {