adminUpdates setting not available now

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.

diff --git a/install.php b/install.php
index f9d69262e290090894546c1a0cbed1f1c591d990..a105e2e8c1cd3822743fc99823e9a68936aecdce 100644 (file)
--- a/install.php
+++ b/install.php
@@ -257,11 +257,6 @@ class WebInstaller extends Installer
                         <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>
                     </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>
             </fieldset>
             <fieldset id="settings_profile">
@@ -333,7 +328,6 @@ STR;
         $this->adminPass    = $post->string('admin_password');
         $adminPass2         = $post->string('admin_password2');
         $this->adminEmail   = $post->string('admin_email');
-        $this->adminUpdates = $post->string('admin_updates');
 
         $this->siteProfile = $post->string('site_profile');
 

diff --git a/lib/installer.php b/lib/installer.php
index 43d0507d8f0ef16a54e2dfca240cbbdb41b49efd..ed5bc540cfd380e1d75388ee1b39b8ee8841d86e 100644 (file)
--- 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;
 
@@ -520,19 +520,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 <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;
     }
 

diff --git a/plugins/DomainStatusNetwork/lib/domainstatusnetworkinstaller.php b/plugins/DomainStatusNetwork/lib/domainstatusnetworkinstaller.php
index ad57e134d1015582bc8b54508b07fd908753cda1..3780ff9e4fe7a6d4d80618f5e9a356f899941e04 100644 (file)
--- a/plugins/DomainStatusNetwork/lib/domainstatusnetworkinstaller.php
+++ b/plugins/DomainStatusNetwork/lib/domainstatusnetworkinstaller.php
@@ -133,7 +133,6 @@ class DomainStatusNetworkInstaller extends Installer
         $this->adminNick    = null;
         $this->adminPass    = null;
         $this->adminEmail   = null;
-        $this->adminUpdates = null;
 
         /** Should we skip writing the configuration file? */
         $this->skipConfig = true;

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