X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsiteadminpanel.php;h=8c8f8b3742bf5c28590281c59dc14504c828b521;hb=72460091ddc6763cb8d62f9d865390ea4973dd44;hp=5e29f4c19124bae6df47c0211d3944361bca2ebd;hpb=1a462b04d7594159e90b514538ddbe3f7effd7f8;p=quix0rs-gnu-social.git

diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php
index 5e29f4c191..8c8f8b3742 100644
--- a/actions/siteadminpanel.php
+++ b/actions/siteadminpanel.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
  * @author    Sarven Capadisli <csarven@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2010 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -95,8 +95,6 @@ class SiteadminpanelAction extends AdminPanelAction
                                                  'site', 'textlimit', 'dupelimit'),
                                  'snapshot' => array('run', 'reporturl', 'frequency'));
 
-        static $booleans = array('site' => array('private', 'inviteonly', 'closed', 'fancy'));
-
         $values = array();
 
         foreach ($settings as $section => $parts) {
@@ -105,12 +103,6 @@ class SiteadminpanelAction extends AdminPanelAction
             }
         }
 
-        foreach ($booleans as $section => $parts) {
-            foreach ($parts as $setting) {
-                $values[$section][$setting] = ($this->boolean($setting)) ? 1 : 0;
-            }
-        }
-
         // This throws an exception on validation errors
 
         $this->validate($values);
@@ -127,12 +119,6 @@ class SiteadminpanelAction extends AdminPanelAction
             }
         }
 
-        foreach ($booleans as $section => $parts) {
-            foreach ($parts as $setting) {
-                Config::save($section, $setting, $values[$section][$setting]);
-            }
-        }
-
         $config->query('COMMIT');
 
         return;
@@ -151,10 +137,10 @@ class SiteadminpanelAction extends AdminPanelAction
         $values['site']['email'] = common_canonical_email($values['site']['email']);
 
         if (empty($values['site']['email'])) {
-            $this->clientError(_('You must have a valid contact email address'));
+            $this->clientError(_('You must have a valid contact email address.'));
         }
         if (!Validate::email($values['site']['email'], common_config('email', 'check_domain'))) {
-            $this->clientError(_('Not a valid email address'));
+            $this->clientError(_('Not a valid email address.'));
         }
 
         // Validate timezone
@@ -169,7 +155,7 @@ class SiteadminpanelAction extends AdminPanelAction
 
         if (!is_null($values['site']['language']) &&
             !in_array($values['site']['language'], array_keys(get_nice_language_list()))) {
-            $this->clientError(sprintf(_('Unknown language "%s"'), $values['site']['language']));
+            $this->clientError(sprintf(_('Unknown language "%s".'), $values['site']['language']));
         }
 
         // Validate report URL
@@ -299,44 +285,6 @@ class SiteAdminPanelForm extends AdminForm
         $this->out->elementEnd('ul');
         $this->out->elementEnd('fieldset');
 
-        $this->out->elementStart('fieldset', array('id' => 'settings_admin_urls'));
-        $this->out->element('legend', null, _('URLs'));
-        $this->out->elementStart('ul', 'form_data');
-        $this->li();
-        $this->input('server', _('Server'), _('Site\'s server hostname.'));
-        $this->unli();
-
-        $this->li();
-        $this->out->checkbox('fancy', _('Fancy URLs'),
-                             (bool) $this->value('fancy'),
-                             _('Use fancy (more readable and memorable) URLs?'));
-        $this->unli();
-        $this->out->elementEnd('ul');
-        $this->out->elementEnd('fieldset');
-
-        $this->out->elementStart('fieldset', array('id' => 'settings_admin_access'));
-        $this->out->element('legend', null, _('Access'));
-        $this->out->elementStart('ul', 'form_data');
-        $this->li();
-        $this->out->checkbox('private', _('Private'),
-                             (bool) $this->value('private'),
-                             _('Prohibit anonymous users (not logged in) from viewing site?'));
-        $this->unli();
-
-        $this->li();
-        $this->out->checkbox('inviteonly', _('Invite only'),
-                             (bool) $this->value('inviteonly'),
-                             _('Make registration invitation only.'));
-        $this->unli();
-
-        $this->li();
-        $this->out->checkbox('closed', _('Closed'),
-                             (bool) $this->value('closed'),
-                             _('Disable new registrations.'));
-        $this->unli();
-        $this->out->elementEnd('ul');
-        $this->out->elementEnd('fieldset');
-
         $this->out->elementStart('fieldset', array('id' => 'settings_admin_snapshots'));
         $this->out->element('legend', null, _('Snapshots'));
         $this->out->elementStart('ul', 'form_data');