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

License admin panel should allow empty or valid URLs for (license

Browse Source 
URL and license image URL) when selecting private or allrightsreserved
licenses.
This commit is contained in:
Zach Copley 2010-09-21 13:06:23 -07:00
parent 28fdc733a7
commit da4463cb76
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
actions/licenseadminpanel.php
View File

@ -161,12 +161,31 @@ class LicenseadminpanelAction extends AdminPanelAction
$options = array('allowed_schemes' => array('http', 'https')); $options = array('allowed_schemes' => array('http', 'https'));
if (!Validate::uri($values['license']['url'], $options)) { // URLs should be set for cc license
$this->clientError(_("Invalid license URL."));
if ($values['license']['type'] == 'cc') {
if (!Validate::uri($values['license']['url'], $options)) {
$this->clientError(_("Invalid license URL."));
}
if (!Validate::uri($values['license']['image'], $options)) {
$this->clientError(_("Invalid license image URL."));
}
} }
if (!Validate::uri($values['license']['image'], $options)) { // can be either blank or a valid URL for private & allrightsreserved
$this->clientError(_("Invalid license image URL."));
if (!empty($values['license']['url'])) {
if (!Validate::uri($values['license']['url'], $options)) {
$this->clientError(_("License URL must be blank or a valid URL."));
}
}
// can be either blank or a valid URL for private & allrightsreserved
if (!empty($values['license']['image'])) {
if (!Validate::uri($values['license']['image'], $options)) {
$this->clientError(_("License image must be blank or valid URL."));
}
} }
} }
} }