X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_person_signup.php;h=417ea05a1fa823fbdcb706d09bfe001480c8e47c;hb=68ba5ab44c147c86688edcf71275be29e81a189a;hp=e462219dc7959d45e9d920a6bfb92871dcdc90db;hpb=631eb7fb96d7aec20b43c063b0ad32873c657a41;p=Pman.Core

diff --git a/DataObjects/Core_person_signup.php b/DataObjects/Core_person_signup.php
index e462219d..417ea05a 100644
--- a/DataObjects/Core_person_signup.php
+++ b/DataObjects/Core_person_signup.php
@@ -1,10 +1,10 @@
 <?php
+
 /**
  * Table Definition for Person
  */
 require_once 'DB/DataObject.php';
 
-
 class Pman_Core_DataObjects_Core_person_signup extends DB_DataObject 
 {
     ###START_AUTOCODE
@@ -13,78 +13,111 @@ class Pman_Core_DataObjects_Core_person_signup extends DB_DataObject
     public $__table = 'core_person_signup';                          // table name
     public $id;                              // int(11)  not_null primary_key auto_increment
     public $email;                           // string(128)  not_null
-    
     public $name;                            // string(128)  not_null
     public $firstname;                            // string(128)  not_null
     public $lastname;                            // string(128)  not_null
     public $firstname_alt;                            // string(128)  not_null
     public $lastname_alt;                            // string(128)  not_null
-    
-    
     public $honor;                            // string(128)  not_null
     public $verify_key;                      // int(11)
     public $verified;
-    
-
     public $created_dt;                      // datetime(19)  binary
 
-    
-    
-    
-    
-    function verify($key)
-    {
-        // if key matches verify_key
-        // copy into person or other entity...
-        // and delete....
-        //$this->whereAdd("verify_key = '".$key."'");
-        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();
+//    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;
+//        }
+//    }
 
-                //login
-                @session_start();
+    function sendVerification($roo)
+    {
         
-                $_SESSION['Hydra']['authUser'] = $p ? serialize($p) : false;
+        $content = array(
+            'template'      => 'CORE_PERSON_SIGNUP_VERIFICATION',
+            'person'        => $this,
+            'serverName'    => $_SERVER['SERVER_NAME'],
+            'baseURL'       => $roo->baseURL
+        );
 
-                //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)) {
-                    $this->addEvent('SYSERR',false, $ret->getMessage());
-                    $this->jerr($ret->getMessage());
-                }
-                $this->jok("SENT");
-                return true;
-            }else{
-                error_log("db insert error");
-                return false;
-            }   
+        $sent = DB_DataObject::factory('core_email')->send($content);
+        
+        if(!is_object($sent)){
+            return true;
         }
-        return false;
         
+        return false;
+    }
+    
+    function getEmailFrom()
+    {
+        if (empty($this->name)) {
+            return $this->email;
+        }
+        return '"' . addslashes($this->name) . '" <' . $this->email . '>';
     }
 }
 
-    
\ No newline at end of file