summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-05-20 15:14:12 -0400
committerEvan Prodromou <evan@prodromou.name>2008-05-20 15:14:12 -0400
commit52600ce0b063e68e622b19699841e41b5ddbf2d1 (patch)
treef19fcc9ed0834259d2e5ab2aa22758ddfb7f34a0 /classes
parent3f5ededc01d8eedac2a9a75917849fbe78a3e701 (diff)
trim whitespace
darcs-hash:20080520191412-84dde-a607dbe848279639630edd1ab4616d05cc2318d1.gz
Diffstat (limited to 'classes')
-rw-r--r--classes/Avatar.php12
-rw-r--r--classes/Notice.php20
-rw-r--r--classes/Profile.php38
-rw-r--r--classes/Remote_profile.php12
-rw-r--r--classes/Subscription.php12
-rw-r--r--classes/User.php20
6 files changed, 57 insertions, 57 deletions
diff --git a/classes/Avatar.php b/classes/Avatar.php
index 57e0d2fa8..7af42c617 100644
--- a/classes/Avatar.php
+++ b/classes/Avatar.php
@@ -4,18 +4,18 @@
*/
require_once 'DB/DataObject.php';
-class Avatar extends DB_DataObject
+class Avatar extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
public $__table = 'avatar'; // table name
public $profile_id; // int(4) primary_key not_null
- public $original; // tinyint(1)
+ public $original; // tinyint(1)
public $width; // int(4) primary_key not_null
public $height; // int(4) primary_key not_null
public $mediatype; // varchar(32) not_null
- public $filename; // varchar(255)
+ public $filename; // varchar(255)
public $url; // varchar(255) unique_key
public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
@@ -25,15 +25,15 @@ 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 3e6835ec9..f06b21d6c 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1,18 +1,18 @@
<?php
-/*
+/*
* Laconica - a distributed open-source microblogging tool
* Copyright (C) 2008, Controlez-Vous, Inc.
- *
+ *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -24,7 +24,7 @@ if (!defined('LACONICA')) { exit(1); }
*/
require_once 'DB/DataObject.php';
-class Notice extends DB_DataObject
+class Notice extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
@@ -32,8 +32,8 @@ class Notice extends DB_DataObject
public $__table = 'notice'; // table name
public $id; // int(4) primary_key not_null
public $profile_id; // int(4) not_null
- public $content; // varchar(140)
- public $url; // varchar(255)
+ public $content; // varchar(140)
+ public $url; // varchar(255)
public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
@@ -45,18 +45,18 @@ class Notice extends DB_DataObject
// XXX: if profile_id changes, this goes invalid. To be fair, that's a very edge case
static $profile;
-
+
function getProfile() {
if (!$this->profile) {
$this->profile = Profile::staticGet($this->profile_id);
}
return $this->profile;
}
-
+
function validateContent() {
return Validate::string($this->content, array('min_length' => 1, 'max_length' => 140));
}
-
+
function validateUrl() {
return is_null($this->url) ||
Validate::uri($this->url, array('allowed_schemes' => array('http', 'https')));
diff --git a/classes/Profile.php b/classes/Profile.php
index 4119cd411..650b44244 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -1,18 +1,18 @@
<?php
-/*
+/*
* Laconica - a distributed open-source microblogging tool
* Copyright (C) 2008, Controlez-Vous, Inc.
- *
+ *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -24,7 +24,7 @@ if (!defined('LACONICA')) { exit(1); }
*/
require_once 'DB/DataObject.php';
-class Profile extends DB_DataObject
+class Profile extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
@@ -32,11 +32,11 @@ class Profile extends DB_DataObject
public $__table = 'profile'; // table name
public $id; // int(4) primary_key not_null
public $nickname; // varchar(64) not_null
- public $fullname; // varchar(255)
- public $profileurl; // varchar(255)
- public $homepage; // varchar(255)
- public $bio; // varchar(140)
- public $location; // varchar(255)
+ public $fullname; // varchar(255)
+ public $profileurl; // varchar(255)
+ public $homepage; // varchar(255)
+ public $bio; // varchar(140)
+ public $location; // varchar(255)
public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
@@ -45,7 +45,7 @@ class Profile extends DB_DataObject
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
-
+
function getAvatar($width, $height=NULL) {
$avatar = DB_DataObject::factory('avatar');
$avatar->profile_id = $this->id;
@@ -61,7 +61,7 @@ class Profile extends DB_DataObject
return NULL;
}
}
-
+
function getOriginalAvatar() {
$avatar = DB_DataObject::factory('avatar');
$avatar->profile_id = $this->id;
@@ -72,31 +72,31 @@ 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 (is_null($this->homepage) ||
Validate::uri($this->homepage, array('allowed_schemes' => array('http', 'https'))));
}
-
+
function validateBio() {
- return is_null($this->bio) ||
+ return is_null($this->bio) ||
Validate::string($this->bio, array('min_length' => 1, 'max_length' => 140));
}
-
+
function validateLocation() {
return is_null($this->location) ||
Validate::string($this->location, array('min_length' => 1, 'max_length' => 255));
}
-
+
function validateFullname() {
return is_null($this->fullname) ||
Validate::string($this->fullname, array('min_length' => 1, 'max_length' => 255));
diff --git a/classes/Remote_profile.php b/classes/Remote_profile.php
index f36ac5f0c..960372405 100644
--- a/classes/Remote_profile.php
+++ b/classes/Remote_profile.php
@@ -1,18 +1,18 @@
<?php
-/*
+/*
* Laconica - a distributed open-source microblogging tool
* Copyright (C) 2008, Controlez-Vous, Inc.
- *
+ *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -24,7 +24,7 @@ if (!defined('LACONICA')) { exit(1); }
*/
require_once 'DB/DataObject.php';
-class Remote_profile extends DB_DataObject
+class Remote_profile extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
@@ -40,7 +40,7 @@ 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/Subscription.php b/classes/Subscription.php
index ca2b21c02..db79c8f9d 100644
--- a/classes/Subscription.php
+++ b/classes/Subscription.php
@@ -1,18 +1,18 @@
<?php
-/*
+/*
* Laconica - a distributed open-source microblogging tool
* Copyright (C) 2008, Controlez-Vous, Inc.
- *
+ *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -24,7 +24,7 @@ if (!defined('LACONICA')) { exit(1); }
*/
require_once 'DB/DataObject.php';
-class Subscription extends DB_DataObject
+class Subscription extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
@@ -32,7 +32,7 @@ class Subscription extends DB_DataObject
public $__table = 'subscription'; // table name
public $subscriber; // int(4) primary_key not_null
public $subscribed; // int(4) primary_key not_null
- public $token; // varchar(255)
+ public $token; // varchar(255)
public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
diff --git a/classes/User.php b/classes/User.php
index 8effd856a..16cafa635 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -1,18 +1,18 @@
<?php
-/*
+/*
* Laconica - a distributed open-source microblogging tool
* Copyright (C) 2008, Controlez-Vous, Inc.
- *
+ *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -24,7 +24,7 @@ if (!defined('LACONICA')) { exit(1); }
require_once 'DB/DataObject.php';
require_once 'Validate.php';
-class User extends DB_DataObject
+class User extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
@@ -32,7 +32,7 @@ class User extends DB_DataObject
public $__table = 'user'; // table name
public $id; // int(4) primary_key not_null
public $nickname; // varchar(64) unique_key
- public $password; // varchar(255)
+ public $password; // varchar(255)
public $email; // varchar(255) unique_key
public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
@@ -42,7 +42,7 @@ class User extends DB_DataObject
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
-
+
function getProfile() {
$profile = DB_DataObject::factory('profile');
$profile->id = $this->id;
@@ -52,7 +52,7 @@ class User extends DB_DataObject
}
return NULL;
}
-
+
function isSubscribed($other) {
assert(!is_null($other));
$sub = DB_DataObject::factory('subscription');
@@ -60,11 +60,11 @@ 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));