diff options
| author | Zach Copley <zach@status.net> | 2009-12-24 16:50:28 -0600 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-12-24 15:15:37 -0800 |
| commit | 1a462b04d7594159e90b514538ddbe3f7effd7f8 (patch) | |
| tree | adf42d15109d4b4710532356f57e724e68f0cc32 /actions | |
| parent | 7f9b07d8c9840944ea7ebf437f45e44584bcb5ee (diff) | |
Paths admin panel should not insist on an ssl server being specified,
ever.
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/pathsadminpanel.php | 7 | ||||
| -rw-r--r-- | actions/siteadminpanel.php | 4 |
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))) { |