Merge branch 'master' into 'nightly'

[quix0rs-gnu-social.git] / actions / accessadminpanel.php

diff --git a/actions/accessadminpanel.php b/actions/accessadminpanel.php
index 73354e97a7bd1c47fb14395bc3b6c4ec51021422..c414e13d3fa28922aae01ad8701d7b225c97076a 100644 (file)
--- a/actions/accessadminpanel.php
+++ b/actions/accessadminpanel.php
@@ -27,9 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Administer site access settings
@@ -40,7 +38,6 @@ if (!defined('STATUSNET')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class AccessadminpanelAction extends AdminPanelAction
 {
     /**
@@ -48,10 +45,9 @@ class AccessadminpanelAction extends AdminPanelAction
      *
      * @return string page title
      */
-
     function title()
     {
-        // TRANS: Page title
+        // TRANS: Page title for Access admin panel that allows configuring site access.
         return _('Access');
     }
 
@@ -60,10 +56,9 @@ class AccessadminpanelAction extends AdminPanelAction
      *
      * @return string instructions
      */
-
     function getInstructions()
     {
-       // TRANS: Page notice
+        // TRANS: Page notice.
         return _('Site access settings');
     }
 
@@ -72,7 +67,6 @@ class AccessadminpanelAction extends AdminPanelAction
      *
      * @return void
      */
-
     function showForm()
     {
         $form = new AccessAdminPanelForm($this);
@@ -85,10 +79,10 @@ class AccessadminpanelAction extends AdminPanelAction
      *
      * @return void
      */
-
     function saveSettings()
     {
-        static $booleans = array('site' => array('private', 'inviteonly', 'closed'));
+        static $booleans = array('site' => array('private', 'inviteonly', 'closed'),
+                                 'public' => array('localonly'));
 
         foreach ($booleans as $section => $parts) {
             foreach ($parts as $setting) {
@@ -110,7 +104,6 @@ class AccessadminpanelAction extends AdminPanelAction
 
         return;
     }
-
 }
 
 class AccessAdminPanelForm extends AdminForm
@@ -120,7 +113,6 @@ class AccessAdminPanelForm extends AdminForm
      *
      * @return int ID of the form
      */
-
     function id()
     {
         return 'form_site_admin_panel';
@@ -131,7 +123,6 @@ class AccessAdminPanelForm extends AdminForm
      *
      * @return string class of the form
      */
-
     function formClass()
     {
         return 'form_settings';
@@ -142,7 +133,6 @@ class AccessAdminPanelForm extends AdminForm
      *
      * @return string URL of the action
      */
-
     function action()
     {
         return common_local_url('accessadminpanel');
@@ -153,24 +143,15 @@ class AccessAdminPanelForm extends AdminForm
      *
      * @return void
      */
-
     function formData()
     {
-       $this->out->elementStart('fieldset', array('id' => 'settings_admin_access'));
-       // TRANS: Form legend for registration form.
+        $this->out->elementStart('fieldset', array('id' => 'settings_admin_account_access'));
+        // TRANS: Form legend for registration form.
         $this->out->element('legend', null, _('Registration'));
         $this->out->elementStart('ul', 'form_data');
-        $this->li();
-        // TRANS: Checkbox instructions for admin setting "Private"
-        $instructions = _('Prohibit anonymous users (not logged in) from viewing site?');
-        // TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-        $this->out->checkbox('private', _m('LABEL', 'Private'),
-                             (bool) $this->value('private'),
-                             $instructions);
-        $this->unli();
 
         $this->li();
-        // TRANS: Checkbox instructions for admin setting "Invite only"
+        // TRANS: Checkbox instructions for admin setting "Invite only".
         $instructions = _('Make registration invitation only.');
         // TRANS: Checkbox label for configuring site as invite only.
         $this->out->checkbox('inviteonly', _('Invite only'),
@@ -179,13 +160,41 @@ class AccessAdminPanelForm extends AdminForm
         $this->unli();
 
         $this->li();
-        // TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
+        // TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
         $instructions = _('Disable new registrations.');
         // TRANS: Checkbox label for disabling new user registrations.
         $this->out->checkbox('closed', _('Closed'),
                              (bool) $this->value('closed'),
                              $instructions);
         $this->unli();
+
+        $this->out->elementEnd('ul');
+        $this->out->elementEnd('fieldset');
+
+
+        // Public access settings (login requirements for feeds etc.)
+           $this->out->elementStart('fieldset', array('id' => 'settings_admin_public_access'));
+           // TRANS: Form legend for registration form.
+        $this->out->element('legend', null, _('Feed access'));
+        $this->out->elementStart('ul', 'form_data');
+        $this->li();
+        // TRANS: Checkbox instructions for admin setting "Private".
+        $instructions = _('Prohibit anonymous users (not logged in) from viewing site?');
+        // TRANS: Checkbox label for prohibiting anonymous users from viewing site.
+        $this->out->checkbox('private', _m('LABEL', 'Private'),
+                             (bool) $this->value('private'),
+                             $instructions);
+        $this->unli();
+
+        $this->li();
+        // TRANS: Description of the full network notice stream views..
+        $instructions = _('The full network view includes (public) remote notices which may be unrelated to local conversations.');
+        // TRANS: Checkbox label for hiding remote network posts if they have not been interacted with locally.
+        $this->out->checkbox('localonly', _('Restrict full network view to accounts'),
+                             (bool) $this->value('localonly', 'public'),
+                             $instructions);
+        $this->unli();
+
         $this->out->elementEnd('ul');
         $this->out->elementEnd('fieldset');
     }
@@ -195,12 +204,11 @@ class AccessAdminPanelForm extends AdminForm
      *
      * @return void
      */
-
     function formActions()
     {
-        // TRANS: Title / tooltip for button to save access settings in site admin panel
-        $title = _('Save access settings');
+        // TRANS: Button title to save access settings in site admin panel.
+        $title = _('Save access settings.');
+        // TRANS: Button text to save access settings in site admin panel.
         $this->out->submit('submit', _m('BUTTON', 'Save'), 'submit', null, $title);
     }
-
 }