forked from GNUsocial/gnu-social
only validate if values are sent
darcs-hash:20080612195324-84dde-cab5efa3218f3cd3632ced1c819a5be2edb3c5a0.gz
This commit is contained in:
parent
fa79d2c1d4
commit
47c3e474be
@ -70,20 +70,20 @@ class UpdateprofileAction extends Action {
|
||||
return false;
|
||||
}
|
||||
$nickname = $req->get_parameter('omb_listenee_nickname');
|
||||
if (!Validate::string($nickname, array('min_length' => 1,
|
||||
'max_length' => 64,
|
||||
'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
|
||||
if ($nickname && !Validate::string($nickname, array('min_length' => 1,
|
||||
'max_length' => 64,
|
||||
'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
|
||||
$this->client_error(_t('Nickname must have only letters and numbers and no spaces.'));
|
||||
return false;
|
||||
}
|
||||
$profile_url = $req->get_parameter('omb_listenee_profile');
|
||||
if (!common_valid_http_url($profile_url)) {
|
||||
$this->client_error(_t("Invalid profile URL '$profile_url'."));
|
||||
$license = $req->get_parameter('omb_listenee_license');
|
||||
if ($license && !common_valid_http_url($license)) {
|
||||
$this->client_error(_t("Invalid license URL '$license'"));
|
||||
return false;
|
||||
}
|
||||
$license = $req->get_parameter('omb_listenee_license');
|
||||
if (!common_valid_http_url($license)) {
|
||||
$this->client_error(_t("Invalid license URL '$license'."));
|
||||
$profile_url = $req->get_parameter('omb_listenee_profile');
|
||||
if ($profile_url && !common_valid_http_url($profile_url)) {
|
||||
$this->client_error(_t("Invalid profile URL '$profile_url'."));
|
||||
return false;
|
||||
}
|
||||
# optional stuff
|
||||
|
@ -67,7 +67,7 @@ class Action { // lawsuit
|
||||
common_server_error($msg, $code);
|
||||
}
|
||||
|
||||
function client_error($msg, $code=500) {
|
||||
function client_error($msg, $code=400) {
|
||||
$action = $this->trimmed('action');
|
||||
common_debug("User error '$code' on '$action': $msg", __FILE__);
|
||||
common_user_error($msg, $code);
|
||||
|
Loading…
Reference in New Issue
Block a user