diff options
| author | mikec <mikec@mikenz.geek.nz> | 2008-07-21 09:56:37 -0400 |
|---|---|---|
| committer | mikec <mikec@mikenz.geek.nz> | 2008-07-21 09:56:37 -0400 |
| commit | a4fa34cecbd038fb2cc323aefd2b32739aaee7d5 (patch) | |
| tree | 040f9ea3ee60f79c814d6732e5360a0dc687428d /classes | |
| parent | d48609ac51f9f7aa5b57df1e9ab9aa7353721c00 (diff) | |
Resolve conflicts after pull from evan
darcs-hash:20080721135637-edabd-cca33bc0a0936423b9fd2ffdf9413236123d680e.gz
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/User.php | 24 | ||||
| -rw-r--r-- | classes/stoica.ini | 4 |
2 files changed, 18 insertions, 10 deletions
diff --git a/classes/User.php b/classes/User.php index b7feab602..a6c860588 100644 --- a/classes/User.php +++ b/classes/User.php @@ -32,22 +32,26 @@ 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 $incomingemail; // varchar(255) unique_key public $emailnotifysub; // tinyint(1) default_1 + public $emailmicroid; // tinyint(1) default_1 + public $language; // varchar(50) + public $timezone; // varchar(50) + public $emailpost; // tinyint(1) default_1 public $jabber; // varchar(255) unique_key - public $jabbernotify; // tinyint(1) - public $jabberreplies; // tinyint(1) + public $jabbernotify; // tinyint(1) + public $jabberreplies; // tinyint(1) public $jabbermicroid; // tinyint(1) default_1 - public $updatefrompresence; // tinyint(1) + public $updatefrompresence; // tinyint(1) public $sms; // varchar(64) unique_key - public $carrier; // int(4) - public $smsnotify; // tinyint(1) - public $smsreplies; // tinyint(1) - public $smsemail; // varchar(255) + public $carrier; // int(4) + public $smsnotify; // tinyint(1) + public $smsreplies; // tinyint(1) + public $smsemail; // varchar(255) public $uri; // varchar(255) unique_key - public $autosubscribe; // tinyint(1) + public $autosubscribe; // tinyint(1) public $created; // datetime() not_null public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP @@ -79,7 +83,7 @@ class User extends DB_DataObject function updateKeys(&$orig) { $parts = array(); - foreach (array('nickname', 'email', 'jabber', 'sms', 'carrier') as $k) { + foreach (array('nickname', 'email', 'jabber', 'incomingemail', 'sms', 'carrier', 'smsemail', 'language', 'timezone') as $k) { if (strcmp($this->$k, $orig->$k) != 0) { $parts[] = $k . ' = ' . $this->_quote($this->$k); } diff --git a/classes/stoica.ini b/classes/stoica.ini index 31fb6d159..3042b3aa0 100644 --- a/classes/stoica.ini +++ b/classes/stoica.ini @@ -172,6 +172,10 @@ password = 2 email = 2 incomingemail = 2 emailnotifysub = 17 +emailmicroid = 17 +language = 2 +timezone = 2 +emailpost = 17 jabber = 2 jabbernotify = 17 jabberreplies = 17 |