ease up on the validation

darcs-hash:20080520210119-84dde-a9b74a933bd45b2e6b2f96a53a1be55caa0f7912.gz
This commit is contained in:
Evan Prodromou 2008-05-20 17:01:19 -04:00
parent 8fcce85864
commit e1f04061b9
2 changed files with 5 additions and 13 deletions

View File

@ -50,9 +50,4 @@ class Notice extends DB_DataObject
function validateContent() {
return Validate::string($this->content, array('min_length' => 1, 'max_length' => 140));
}
function validateUrl() {
return is_null($this->url) || (strlen($this->url) == 0) ||
Validate::uri($this->url, array('allowed_schemes' => array('http', 'https')));
}
}

View File

@ -83,22 +83,19 @@ class Profile extends DB_DataObject
}
function validateHomepage() {
return (is_null($this->homepage) ||
Validate::uri($this->homepage, array('allowed_schemes' => array('http', 'https'))));
return (strlen($this->homepage) == 0) ||
Validate::uri($this->homepage, array('allowed_schemes' => array('http', 'https'))));
}
function validateBio() {
return is_null($this->bio) ||
Validate::string($this->bio, array('min_length' => 1, 'max_length' => 140));
return Validate::string($this->bio, array('min_length' => 0, 'max_length' => 140));
}
function validateLocation() {
return is_null($this->location) ||
Validate::string($this->location, array('min_length' => 1, 'max_length' => 255));
return Validate::string($this->location, array('min_length' => 0, 'max_length' => 255));
}
function validateFullname() {
return is_null($this->fullname) ||
Validate::string($this->fullname, array('min_length' => 1, 'max_length' => 255));
return Validate::string($this->fullname, array('min_length' => 0, 'max_length' => 255));
}
}