X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_person_signup.php;h=c32a79eb151b342602bbe23fb4128fbe08d56b77;hb=2000761d7f799df04644d6ed31dd1f16a3fbb660;hp=3c86c3968ee50c494af7d9f4ad3cfc314ee2f6a4;hpb=04a924c1bfe4b75ec196b004e1d9a53022888129;p=Pman.Core

diff --git a/DataObjects/Core_person_signup.php b/DataObjects/Core_person_signup.php
index 3c86c396..c32a79eb 100644
--- a/DataObjects/Core_person_signup.php
+++ b/DataObjects/Core_person_signup.php
@@ -24,77 +24,12 @@ class Pman_Core_DataObjects_Core_person_signup extends DB_DataObject
     public $created_dt;                      // datetime(19)  binary
     public $company_name;
     public $person_type;
-
-//    function verify($key) 
-//    {
-//        // if key matches verify_key
-//        // copy into person or other entity...
-//        // and delete....
-//        if ($this->get("verify_key", $key)) {
-//            $p = DB_DataObject::factory('person');
-//            $p->setFrom(array(
-//                'honor' => $this->honor,
-//                'name' => $this->name,
-//                'email' => $this->email,
-//                'firstname' => $this->firstname,
-//                'lastname' => $this->lastname,
-//                'firstname_alt' => $this->firstname_alt,
-//                'lastname_alt' => $this->lastname_alt));
-//
-//            if ($p->insert()) {
-//
-//                $temp_pwd = $p->generatePassword();
-//
-//                $this->delete();
-//
-//                //login
-//                @session_start();
-//
-//                $_SESSION['Hydra']['authUser'] = $p ? serialize($p) : false;
-//
-//                //mail pwd
-//                $c = DB_DataObject::factory('core_email');
-//                if (!$c->get('name', 'CORE_PERSON_SIGNUP_CONGRATULATION')) {
-//                    $this->jerr("can not find template");
-//                }
-//                $ret = $c->send(array(
-//                    'rcpts' => $this->email,
-//                    'honor' => $this->honor . ". " . $this->lastname,
-//                    'password' => $temp_pwd
-//                        ), true);
-//
-//                if (is_object($ret)) {
-//                    return false;
-//                }
-//                return true;
-//            } else {
-//                return false;
-//            }
-//        }
-//        return false;
-//    }
-//
-//    function convertTo($table) 
-//    {
-//        $t = DB_DataObject::factory($table);
-//        $ret = $t->get('email', $this->email);
-//        if ($ret != 0) {
-//            return false;
-//        } else {
-//            $t->setFrom(array(
-//                'honor' => $this->honor,
-//                'name' => $this->name,
-//                'email' => $this->email,
-//                'firstname' => $this->firstname,
-//                'lastname' => $this->lastname,
-//                'firstname_alt' => $this->firstname_alt,
-//                'lastname_alt' => $this->lastname_alt));
-//
-//            $t->insert();
-//            return true;
-//        }
-//    }
-
+    
+    public $person_id;
+    public $person_table;
+    
+    public $inviter_id;
+ 
     function convertTo($target = false)
     {
         if(!$target){
@@ -102,24 +37,24 @@ class Pman_Core_DataObjects_Core_person_signup extends DB_DataObject
         }
         
         $roo = HTML_FlexyFramework::get()->page;
-        
+        $old = clone($this);
+        // this shold not really happen...
         if($target->get('email', $this->email)){
-            return $target;
+            
+            return false;
         }
         
         $target->setFrom($this->toArray());
         
-        if(method_exists($target, 'beforeInsert')){
-            $target->beforeInsert(array(), $roo);
-        }
-        
         $target->insert();
         
-        if(method_exists($target, 'onInsert')){
-            $target->onInsert(array(), $roo);
-        }
+        $this->person_id = $target->id;
+        $this->person_table = $target->tableName();
+        $this->update($old);
         
-        $this->delete();
+        if(!empty($this->inviter_id) && method_exists($target, 'createFriend')){
+            $target->createFriend($this->inviter_id);
+        }
         
         return $target;
     }
@@ -140,7 +75,7 @@ class Pman_Core_DataObjects_Core_person_signup extends DB_DataObject
             return true;
         }
         
-        return false;
+        return $sent;
     }
     
     function getEmailFrom()