X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsiteadminpanel.php;h=5e29f4c19124bae6df47c0211d3944361bca2ebd;hb=e119362fde9eabb27d48c94a98624aeae68e436c;hp=ce6d3f544671be4799975d77fb8cee2f25bbd27c;hpb=3ec022307cedfe4b41a4d177b1749b617798bfb1;p=quix0rs-gnu-social.git

diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php
index ce6d3f5446..5e29f4c191 100644
--- a/actions/siteadminpanel.php
+++ b/actions/siteadminpanel.php
@@ -92,8 +92,7 @@ class SiteadminpanelAction extends AdminPanelAction
     {
         static $settings = array('site' => array('name', 'broughtby', 'broughtbyurl',
                                                  'email', 'timezone', 'language',
-                                                 'ssl', 'sslserver', 'site', 'path',
-                                                 'textlimit', 'dupelimit', 'locale_path'),
+                                                 'site', 'textlimit', 'dupelimit'),
                                  'snapshot' => array('run', 'reporturl', 'frequency'));
 
         static $booleans = array('site' => array('private', 'inviteonly', 'closed', 'fancy'));
@@ -192,22 +191,10 @@ class SiteadminpanelAction extends AdminPanelAction
             $this->clientError(_("Snapshot frequency must be a number."));
         }
 
-        // Validate SSL setup
-
-        if (in_array($values['site']['ssl'], array('sometimes', 'always'))) {
-            if (empty($values['site']['sslserver'])) {
-                $this->clientError(_("You must set an SSL sever when enabling SSL."));
-            }
-        }
-
-        if (mb_strlen($values['site']['sslserver']) > 255) {
-            $this->clientError(_("Invalid SSL server. Max length is 255 characters."));
-        }
-
         // Validate text limit
 
         if (!Validate::number($values['site']['textlimit'], array('min' => 140))) {
-            $this->clientError(_("Minimum text limit is 140c."));
+            $this->clientError(_("Minimum text limit is 140 characters."));
         }
 
         // Validate dupe limit
@@ -216,14 +203,6 @@ class SiteadminpanelAction extends AdminPanelAction
             $this->clientError(_("Dupe limit must 1 or more seconds."));
         }
 
-        // Validate locales path
-
-        // XXX: What else do we need to validate for lacales path here? --Z
-
-        if (!empty($values['site']['locale_path']) && !is_readable($values['site']['locale_path'])) {
-            $this->clientError(sprintf(_("Locales directory not readable: %s"), $values['site']['locale_path']));
-        }
-
     }
 }
 
@@ -270,25 +249,33 @@ class SiteAdminPanelForm extends AdminForm
 
     function formData()
     {
+        $this->out->elementStart('fieldset', array('id' => 'settings_admin_general'));
+        $this->out->element('legend', null, _('General'));
         $this->out->elementStart('ul', 'form_data');
         $this->li();
         $this->input('name', _('Site name'),
                      _('The name of your site, like "Yourcompany Microblog"'));
         $this->unli();
+
         $this->li();
         $this->input('broughtby', _('Brought by'),
                      _('Text used for credits link in footer of each page'));
         $this->unli();
+
         $this->li();
         $this->input('broughtbyurl', _('Brought by URL'),
                      _('URL used for credits link in footer of each page'));
         $this->unli();
         $this->li();
         $this->input('email', _('Email'),
-                     _('contact email address for your site'));
-
+                     _('Contact email address for your site'));
         $this->unli();
+        $this->out->elementEnd('ul');
+        $this->out->elementEnd('fieldset');
 
+        $this->out->elementStart('fieldset', array('id' => 'settings_admin_local'));
+        $this->out->element('legend', null, _('Local'));
+        $this->out->elementStart('ul', 'form_data');
         $timezones = array();
 
         foreach (DateTimeZone::listIdentifiers() as $k => $v) {
@@ -298,38 +285,38 @@ class SiteAdminPanelForm extends AdminForm
         asort($timezones);
 
         $this->li();
-
         $this->out->dropdown('timezone', _('Default timezone'),
                              $timezones, _('Default timezone for the site; usually UTC.'),
                              true, $this->value('timezone'));
-
         $this->unli();
-        $this->li();
 
+        $this->li();
         $this->out->dropdown('language', _('Language'),
                              get_nice_language_list(), _('Default site language'),
                              false, $this->value('language'));
-
         $this->unli();
 
-        $this->li();
-        $this->input('locale_path', _('Path to locales'), _('Directory path to locales'));
-        $this->unli();
+        $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->input('path', _('Path'), _('Site path'));
-        $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'),
@@ -347,51 +334,38 @@ class SiteAdminPanelForm extends AdminForm
                              (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');
         $this->li();
-
         $snapshot = array('web' => _('Randomly during Web hit'),
                           'cron' => _('In a scheduled job'),
                           'never' => _('Never'));
-
         $this->out->dropdown('run', _('Data snapshots'),
                              $snapshot, _('When to send statistical data to status.net servers'),
                              false, $this->value('run', 'snapshot'));
-
         $this->unli();
-        $this->li();
 
+        $this->li();
         $this->input('frequency', _('Frequency'),
-                     _('Snapshots will be sent once every N Web hits'),
+                     _('Snapshots will be sent once every N web hits'),
                      'snapshot');
-
         $this->unli();
 
         $this->li();
-
         $this->input('reporturl', _('Report URL'),
                      _('Snapshots will be sent to this URL'),
                      'snapshot');
-
-        $this->unli();
-
-        $this->li();
-
-        $ssl = array('never' => _('Never'),
-                     'sometimes' => _('Sometimes'),
-                     'always' => _('Always'));
-
-        $this->out->dropdown('ssl', _('Use SSL'),
-                             $ssl, _('When to use SSL'),
-                             false, $this->value('ssl', 'site'));
-
-        $this->unli();
-
-        $this->li();
-        $this->input('sslserver', _('SSL Server'),
-                     _('Server to direct SSL requests to'));
         $this->unli();
+        $this->out->elementEnd('ul');
+        $this->out->elementEnd('fieldset');
 
+        $this->out->elementStart('fieldset', array('id' => 'settings_admin_limits'));
+        $this->out->element('legend', null, _('Limits'));
+        $this->out->elementStart('ul', 'form_data');
         $this->li();
         $this->input('textlimit', _('Text limit'), _('Maximum number of characters for notices.'));
         $this->unli();
@@ -399,8 +373,8 @@ class SiteAdminPanelForm extends AdminForm
         $this->li();
         $this->input('dupelimit', _('Dupe limit'), _('How long users must wait (in seconds) to post the same thing again.'));
         $this->unli();
-
         $this->out->elementEnd('ul');
+        $this->out->elementEnd('fieldset');
     }
 
     /**