summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/Avatar.php12
-rw-r--r--classes/Notice.php4
-rw-r--r--classes/Profile.php26
-rw-r--r--classes/Remote_profile.php5
-rw-r--r--classes/User.php9
-rw-r--r--doc/TODO18
6 files changed, 13 insertions, 61 deletions
diff --git a/classes/Avatar.php b/classes/Avatar.php
index 7af42c617..bf428edac 100644
--- a/classes/Avatar.php
+++ b/classes/Avatar.php
@@ -25,16 +25,4 @@ class Avatar extends DB_DataObject
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
-
- function validateMediatype() {
- return Validate::string($this->mediatype, array('min_length' => 1, 'max_length' => 32));
- }
-
- function validateFilename() {
- return Validate::string($this->filename, array('min_length' => 1, 'max_length' => 255));
- }
-
- function validateUrl() {
- return Validate::uri($this->url, array('allowed_schemes' => array('http', 'https')));
- }
}
diff --git a/classes/Notice.php b/classes/Notice.php
index eb08dde52..de3477c76 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -46,8 +46,4 @@ class Notice extends DB_DataObject
function getProfile() {
return Profile::staticGet($this->profile_id);
}
-
- function validateContent() {
- return Validate::string($this->content, array('min_length' => 1, 'max_length' => 140));
- }
}
diff --git a/classes/Profile.php b/classes/Profile.php
index 9cb486a48..5a678eb54 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -72,30 +72,4 @@ class Profile extends DB_DataObject
return NULL;
}
}
-
- function validateNickname() {
- return Validate::string($this->nickname, array('min_length' => 1, 'max_length' => 64,
- 'format' => VALIDATE_ALPHA_LOWER . VALIDATE_NUM));
- }
-
- function validateProfileurl() {
- return Validate::uri($this->profileurl, array('allowed_schemes' => array('http', 'https')));
- }
-
- function validateHomepage() {
- return (strlen($this->homepage) == 0) ||
- Validate::uri($this->homepage, array('allowed_schemes' => array('http', 'https')));
- }
-
- function validateBio() {
- return Validate::string($this->bio, array('min_length' => 0, 'max_length' => 140));
- }
-
- function validateLocation() {
- return Validate::string($this->location, array('min_length' => 0, 'max_length' => 255));
- }
-
- function validateFullname() {
- return Validate::string($this->fullname, array('min_length' => 0, 'max_length' => 255));
- }
}
diff --git a/classes/Remote_profile.php b/classes/Remote_profile.php
index 960372405..ea2f6d859 100644
--- a/classes/Remote_profile.php
+++ b/classes/Remote_profile.php
@@ -40,9 +40,4 @@ class Remote_profile extends DB_DataObject
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
-
- function validateUrl() {
- return is_null($this->url) ||
- Validate::uri($this->url, array('allowed_schemes' => array('http', 'https')));
- }
}
diff --git a/classes/User.php b/classes/User.php
index 16cafa635..41441a21d 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -60,13 +60,4 @@ class User extends DB_DataObject
$sub->subscribed = $other->id;
return $sub->find();
}
-
- function validateEmail() {
- return Validate::email($this->email, true);
- }
-
- function validateNickname() {
- return Validate::string($this->nickname, array('min_length' => 1, 'max_length' => 64,
- 'format' => VALIDATE_ALPHA_LOWER . VALIDATE_NUM));
- }
}
diff --git a/doc/TODO b/doc/TODO
index 412f7ba62..61d86fd7c 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -38,19 +38,21 @@
+ save profile URL on registration
+ require valid nicknames
+ reject empty notices
-- store canonical username for comparison and fetch
-- use only canonical usernames
+- validate registration form results
+- validate profilesettings form results
+- validate newnotice form results
+- remove validation code from classes
++ use only canonical usernames
- use only canonical email addresses
- RSS 1.0 feeds of a user's notices
- RSS 1.0 dump of a user's notices
- RSS 1.0 feed of all public notices
- RDF dump of entire site
- FOAF dump for user
-+ license on showstream
-+ license on shownotice
+- license on showstream
+- license on shownotice
- TOS checkbox on register
- pretty URLs
-- site logo
- instructions
- deal with PHP quotes escaping
- fix layout of textarea
@@ -61,6 +63,11 @@
- add a next page link to public
- add a next page link to all
- release 0.2
+- license per notice
+- allow mixed-case usernames
+- allow non-latin usernames
+- store canonical username for comparison and fetch
+- site logo
- set Last-Modified
- XML sitemap generation
- theme per site
@@ -98,6 +105,7 @@
- image notices
- video notices
- audio notices
+- license per attachment
- release 0.4
- forward notices to Jabber
- forward notices to other IM