Twitter-compatible API - /statuses/show - better err msg if notice doesn't exist

[quix0rs-gnu-social.git] / classes / User.php

diff --git a/classes/User.php b/classes/User.php
index a6c860588b6c027bf0b6582b2426816719eda778..491f68df24e77cde5d2c5650d77005da527ab36c 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -32,26 +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 $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
 
@@ -145,4 +145,91 @@ class User extends DB_DataObject
                
                return $notice;
        }
+       
+       static function register($fields) {
+
+               extract($fields);
+               
+               $profile = new Profile();
+
+               $profile->query('BEGIN');
+
+               $profile->nickname = $nickname;
+               $profile->profileurl = common_profile_url($nickname);
+               
+               if ($fullname) {
+                       $profile->fullname = $fullname;
+               }
+               if ($homepage) {
+                       $profile->homepage = $homepage;
+               }
+               if ($bio) {
+                       $profile->bio = $bio;
+               }
+               if ($location) {
+                       $profile->location = $location;
+               }
+               $profile->created = DB_DataObject_Cast::dateTime(); # current time
+               
+               $id = $profile->insert();
+
+               if (!$id) {
+                       common_log_db_error($profile, 'INSERT', __FILE__);
+                   return FALSE;
+               }
+               
+               $user = new User();
+               
+               $user->id = $id;
+               $user->nickname = $nickname;
+               $user->password = common_munge_password($password, $id);
+               $user->created =  DB_DataObject_Cast::dateTime(); # current time
+               $user->uri = common_user_uri($user);
+
+               $result = $user->insert();
+
+               if (!$result) {
+                       common_log_db_error($user, 'INSERT', __FILE__);
+                       return FALSE;
+               }
+
+               # Everyone is subscribed to themself
+
+               $subscription = new Subscription();
+               $subscription->subscriber = $user->id;
+               $subscription->subscribed = $user->id;
+               $subscription->created = $user->created;
+               
+               $result = $subscription->insert();
+               
+               if (!$result) {
+                       common_log_db_error($subscription, 'INSERT', __FILE__);
+                       return FALSE;
+               }
+               
+               if ($email) {
+
+                       $confirm = new Confirm_address();
+                       $confirm->code = common_confirmation_code(128);
+                       $confirm->user_id = $user->id;
+                       $confirm->address = $email;
+                       $confirm->address_type = 'email';
+
+                       $result = $confirm->insert();
+                       if (!$result) {
+                               common_log_db_error($confirm, 'INSERT', __FILE__);
+                               return FALSE;
+                       }
+               }
+
+               $profile->query('COMMIT');
+
+               if ($email) {
+                       mail_confirm_address($confirm->code,
+                                                                $profile->nickname,
+                                                                $email);
+               }
+
+               return $user;
+       }
 }