diff options
| author | Mike Cochrane <mikec@mikenz.geek.nz> | 2008-07-09 18:46:30 -0400 |
|---|---|---|
| committer | Mike Cochrane <mikec@mikenz.geek.nz> | 2008-07-09 18:46:30 -0400 |
| commit | 4b656f47dff2bd6eed4dcfad060b8434d052d883 (patch) | |
| tree | 6acc353a739f712ecbca9d825dcb7fa16f429ff1 /classes/User.php | |
| parent | 67921b1c1871e881f71f8f15aa7fc9c2b11da64d (diff) | |
Merge conflicts and kill a whole lot of trailing whitespace on lines.
darcs-hash:20080709224630-533db-b5399baef280133858dac9b89c2cd6a2aba9f861.gz
Diffstat (limited to 'classes/User.php')
| -rw-r--r-- | classes/User.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/classes/User.php b/classes/User.php index ab550b8e1..b928b69ca 100644 --- a/classes/User.php +++ b/classes/User.php @@ -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,14 +32,14 @@ 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 $jabber; // varchar(255) unique_key - public $jabbernotify; // tinyint(1) - public $updatefrompresence; // tinyint(1) + public $jabbernotify; // tinyint(1) + public $updatefrompresence; // tinyint(1) public $sms; // varchar(64) unique_key - public $carrier; // int(4) - public $smsnotify; // tinyint(1) + public $carrier; // int(4) + public $smsnotify; // tinyint(1) public $uri; // varchar(255) unique_key public $created; // datetime() not_null public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP @@ -69,7 +69,7 @@ class User extends DB_DataObject } # 'update' won't write key columns, so we have to do it ourselves. - + function updateKeys(&$orig) { $parts = array(); foreach (array('nickname', 'email', 'jabber', 'sms', 'carrier') as $k) { @@ -82,11 +82,11 @@ class User extends DB_DataObject return true; } $toupdate = implode(', ', $parts); - $qry = 'UPDATE ' . $this->tableName() . ' SET ' . $toupdate . + $qry = 'UPDATE ' . $this->tableName() . ' SET ' . $toupdate . ' WHERE id = ' . $this->id; return $this->query($qry); } - + function allowed_nickname($nickname) { # XXX: should already be validated for size, content, etc. static $blacklist = array('rss', 'xrds', 'doc', 'main', |