Merge branch 'locshunt' into 0.9.x

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

diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php
index b963336e60d6f0be7e734dd95f13d818a2b4067b..5e29f4c19124bae6df47c0211d3944361bca2ebd 100644 (file)
--- 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',
-                                                 'textlimit', 'dupelimit'),
+                                                 'site', 'textlimit', 'dupelimit'),
                                  'snapshot' => array('run', 'reporturl', 'frequency'));
 
         static $booleans = array('site' => array('private', 'inviteonly', 'closed', 'fancy'));
@@ -192,18 +191,6 @@ 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 server when enabling SSL."));
-            }
-        }
-
-        if (mb_strlen($values['site']['sslserver']) > 255) {
-            $this->clientError(_("Invalid SSL server. The maximum length is 255 characters."));
-        }
-
         // Validate text limit
 
         if (!Validate::number($values['site']['textlimit'], array('min' => 140))) {
@@ -376,26 +363,6 @@ class SiteAdminPanelForm extends AdminForm
         $this->out->elementEnd('ul');
         $this->out->elementEnd('fieldset');
 
-        $this->out->elementStart('fieldset', array('id' => 'settings_admin_ssl'));
-        $this->out->element('legend', null, _('SSL'));
-        $this->out->elementStart('ul', 'form_data');
-        $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');