Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

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

diff --git a/actions/pathsadminpanel.php b/actions/pathsadminpanel.php
index c6daa173456dd24b80d153e90ee391adf502b11d..3779fcfaaaeb94c90bd4dc47c4d47be23386524f 100644 (file)
--- a/actions/pathsadminpanel.php
+++ b/actions/pathsadminpanel.php
@@ -162,12 +162,9 @@ class PathsadminpanelAction extends AdminPanelAction
 
         // 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."));
         }
-
     }
 
 }
@@ -308,7 +305,7 @@ class PathsAdminPanelForm extends AdminForm
         $this->unli();
 
         $this->li();
-        $this->input('sslserver', _('SSL Server'),
+        $this->input('sslserver', _('SSL server'),
                      _('Server to direct SSL requests to'), 'site');
         $this->unli();
         $this->out->elementEnd('ul');