X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_person_signup.php;h=a59f67d09c430106d492c9741c341a68911d7ed2;hp=42c3d215e89c2681d0b24c61c445fe237d108f68;hb=HEAD;hpb=446a6f2fe93d842ef93e6160e2c82ef302957b02 diff --git a/DataObjects/Core_person_signup.php b/DataObjects/Core_person_signup.php index 42c3d215..a59f67d0 100644 --- a/DataObjects/Core_person_signup.php +++ b/DataObjects/Core_person_signup.php @@ -1,9 +1,9 @@ whereAdd("verify_key = '".$key."'"); - if($this->count() > 0 ){ - $row = $this->fetch(); - $p = DB_DataObject::factory('person'); - $p->honor = $row->honor; - $p->name = $row->name; - $p->email = $row->email; - $p->firstname = $row->firstname; - $p->lastname = $row->lastname; - $p->firstname_alt = $row->firstname_alt; - $p->lastname_alt = $row->lastname_alt; - $temp_pwd = $p->generatePassword(); - //$temp_pwd = mt_rand(100000,999999); - //$p->passwd = $temp_pwd; - if($p->insert()){ - $this->delete(); - } + if(!$target){ + return false; } + $roo = HTML_FlexyFramework::get()->page; + $old = clone($this); + // this shold not really happen... + if($target->get('email', $this->email)){ + return false; + } + + $target->setFrom($this->toArray()); + + $target->insert(); + + $this->person_id = $target->id; + $this->person_table = $target->tableName(); + $this->update($old); + if(!empty($this->inviter_id) && method_exists($target, 'createFriend')){ + $target->createFriend($this->inviter_id); + } + + return $target; + } + + function sendVerification($template, $roo) + { + $content = array( + 'template' => $template, + 'person' => $this, + 'serverName' => $_SERVER['SERVER_NAME'], + 'baseURL' => $roo->baseURL + ); + + $sent = DB_DataObject::factory('core_email')->send($content); + + if(!is_object($sent)){ + return true; + } + + return $sent; + } + + function getEmailFrom() + { + if (empty($this->name)) { + return $this->email; + } + return '"' . addslashes($this->name) . '" <' . $this->email . '>'; } } - \ No newline at end of file