This commit is contained in:
Steven Mondji-Lerider 2012-11-30 09:14:26 +00:00
parent c76779d840
commit 7f70edd150
1 changed files with 35 additions and 6 deletions

View File

@ -804,7 +804,14 @@ class m_dom {
if (empty($value) or is_null($value)) {return true;} if (empty($value) or is_null($value)) {return true;}
break; break;
case 'URL': case 'URL':
if ( $value == strval($value)) {return true;} if ( $value == strval($value)) {
if(filter_var($value, FILTER_VALIDATE_URL)){
return true;
}else{
$err->raise("dom",_("invalid url"));
return false;
}
}
break; break;
case 'DIRECTORY': case 'DIRECTORY':
if (substr($value,0,1)!="/") { if (substr($value,0,1)!="/") {
@ -817,18 +824,39 @@ class m_dom {
return true; return true;
break; break;
case 'IP': case 'IP':
if (checkip($value)) {return true;} if (checkip($value)) {
return true;
}else{
$err->raise("dom",_("The ip address is invalid"));
return false;
}
break; break;
case 'IPV6': case 'IPV6':
if (checkipv6($value)) {return true;} if (checkip($value)) {
return true;
}else{
$err->raise("dom",_("The ip address is invalid"));
return false;
}
break; break;
case 'DOMAIN': case 'DOMAIN':
if (checkcname($value)) {return true;} if (checkcname($value)) {
return true;
}else{
$err->raise("dom",_("The name you entered is incorrect"));
return false;
}
break; break;
case 'TXT': case 'TXT':
if ( $value == strval($value)) {return true;} if ( $value == strval($value)) {
return true;
}else{
$err->raise("dom",_("The TXT value you entered is incorrect"));
return false;
}
break; break;
default: default:
$err->raise("dom",_("Invalid domain type selected, please check"));
return false; return false;
break; break;
} }
@ -904,7 +932,8 @@ class m_dom {
} }
if (! $this->check_type_value($type,$dest)) { if (! $this->check_type_value($type,$dest)) {
$err->raise("dom",_("Invalid domain type selected, please check")); //plutot verifier si la chaine d'erreur est vide avant de raise sinon sa veut dire que l(erruer est deja remonté
#$err->raise("dom",_("Invalid domain type selected, please check"));
return false; return false;
} }