From 4fd1f6246ddc272192b293a5e5d5cb9dbd3e1cdf Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlezvous.ca>
Date: Sun, 22 Jun 2008 12:16:07 -0400
Subject: correctly use Confirm_address

darcs-hash:20080622161607-34904-d8e042b80fe6acd3cb6ad763216a0b1817752cac.gz
---
 classes/Confirm_address.php |  3 ++-
 classes/Sms_carrier.php     | 24 ++++++++++++++++++++++++
 classes/User.php            |  3 ++-
 classes/stoica.ini          | 13 +++++++++++++
 4 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 classes/Sms_carrier.php

(limited to 'classes')

diff --git a/classes/Confirm_address.php b/classes/Confirm_address.php
index f0c354bab..50711999f 100644
--- a/classes/Confirm_address.php
+++ b/classes/Confirm_address.php
@@ -13,7 +13,8 @@ class Confirm_address extends DB_DataObject
     public $code;                            // varchar(32)  primary_key not_null
     public $user_id;                         // int(4)   not_null
     public $address;                         // varchar(255)   not_null
-    public $address_type;                    // varchar(32)   not_null
+    public $address_extra;                   // varchar(255)   not_null
+    public $address_type;                    // varchar(8)   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
diff --git a/classes/Sms_carrier.php b/classes/Sms_carrier.php
new file mode 100644
index 000000000..5fb741731
--- /dev/null
+++ b/classes/Sms_carrier.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Table Definition for sms_carrier
+ */
+require_once 'DB/DataObject.php';
+
+class Sms_carrier extends DB_DataObject 
+{
+    ###START_AUTOCODE
+    /* the code below is auto generated do not remove the above tag */
+
+    public $__table = 'sms_carrier';                     // table name
+    public $id;                              // int(4)  primary_key not_null
+    public $name;                            // varchar(64)  unique_key
+    public $email_pattern;                   // varchar(255)   not_null
+    public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
+
+    /* Static get */
+    function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Sms_carrier',$k,$v); }
+
+    /* the code above is auto generated do not remove the tag below */
+    ###END_AUTOCODE
+}
diff --git a/classes/User.php b/classes/User.php
index 78815a72e..0e7fd5447 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -36,6 +36,7 @@ class User extends DB_DataObject
     public $email;                           // varchar(255)  unique_key
     public $jabber;                          // varchar(255)  unique_key
     public $sms;                             // varchar(64)  unique_key
+    public $carrier;                         // int(4)  
     public $uri;                             // varchar(255)  unique_key
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
@@ -68,7 +69,7 @@ class User extends DB_DataObject
 	
 	function updateKeys(&$orig) {
 		$parts = array();
-		foreach (array('nickname', 'email') as $k) {
+		foreach (array('nickname', 'email', 'jabber', 'sms', 'carrier') 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 d5f758c8c..3245b39b7 100644
--- a/classes/stoica.ini
+++ b/classes/stoica.ini
@@ -20,6 +20,7 @@ url = U
 code = 130
 user_id = 129
 address = 130
+address_extra = 130
 address_type = 130
 modified = 384
 
@@ -86,6 +87,17 @@ modified = 384
 id = K
 uri = U
 
+[sms_carrier]
+id = 129
+name = 2
+email_pattern = 130
+created = 142
+modified = 384
+
+[sms_carrier__keys]
+id = K
+name = U
+
 [subscription]
 subscriber = 129
 subscribed = 129
@@ -118,6 +130,7 @@ password = 2
 email = 2
 jabber = 2
 sms = 2
+carrier = 1
 uri = 2
 created = 142
 modified = 384
-- 
cgit v1.2.3-54-g00ecf