summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2009-12-24 16:50:28 -0600
committerZach Copley <zach@status.net>2009-12-24 16:50:28 -0600
commit5f6df8c0c4274e7d900335bba87341f9768e7467 (patch)
tree677d1b86e5e71341092e338def6b416b0263a66c
parent4ed969a8accf889cbcf1cdbe2e80f406f3154cbe (diff)
Paths admin panel should not insist on an ssl server being specified,
ever.
-rw-r--r--actions/pathsadminpanel.php7
-rw-r--r--actions/siteadminpanel.php4
2 files changed, 2 insertions, 9 deletions
diff --git a/actions/pathsadminpanel.php b/actions/pathsadminpanel.php
index c6daa1734..d39c7c449 100644
--- 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."));
}
-
}
}
diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php
index f260a4476..5e29f4c19 100644
--- a/actions/siteadminpanel.php
+++ b/actions/siteadminpanel.php
@@ -191,10 +191,6 @@ class SiteadminpanelAction extends AdminPanelAction
$this->clientError(_("Snapshot frequency must be a number."));
}
- 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))) {