eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Paths admin panel should not insist on an ssl server being specified, 

ever.
This commit is contained in:
Zach Copley 2009-12-24 16:50:28 -06:00 committed by Evan Prodromou
parent 7f9b07d8c9
commit 1a462b04d7
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
actions/pathsadminpanel.php
View File

@ -162,12 +162,9 @@ class PathsadminpanelAction extends AdminPanelAction
// Validate SSL setup // Validate SSL setup
if (in_array($values['site']['ssl'], array('sometimes', 'always'))) { if (mb_strlen($values['site']['sslserver']) > 255) {
if (empty($values['site']['sslserver'])) { $this->clientError(_("Invalid SSL server. The maximum length is 255 characters."));
$this->clientError(_("You must set an SSL server when enabling SSL."));
}
} }
} }
} }

4
actions/siteadminpanel.php
View File

@ -191,10 +191,6 @@ class SiteadminpanelAction extends AdminPanelAction
$this->clientError(_("Snapshot frequency must be a number.")); $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 // Validate text limit
if (!Validate::number($values['site']['textlimit'], array('min' => 140))) { if (!Validate::number($values['site']['textlimit'], array('min' => 140))) {