Index: /branches/dev/html/mobile/shopping/nonmember.php
===================================================================
--- /branches/dev/html/mobile/shopping/nonmember.php	(revision 12541)
+++ /branches/dev/html/mobile/shopping/nonmember.php	(revision 12566)
@@ -189,36 +189,6 @@
         }
 
-        if ($_POST["mode"] == "deliv") {
-            
-            $objFormParam = new SC_FormParam();
-            // ¥Ñ¥é¥á¡¼¥¿¾ðÊó¤Î½é´ü²½
-           
-            // POSTÃͤμèÆÀ
-            $objFormParam->setParam($_POST);
-            
-            // ÆþÎÏÃͤμèÆÀ
-            $objPage->arrForm = $objFormParam->getFormParamList();
-            $objPage->arrErr = $arrErr;
-            
-//            $cnt = 1;
-//            foreach($objOtherAddr as $val) {
-//                $objPage->arrAddr[$cnt] = $val;
-//                $cnt++;
-//            }
-            
-           $objPage->arrAddr[0]['zip01'] = $objPage->zip01;
-           $objPage->arrAddr[0]['zip02'] = $objPage->zip02;
-           $objPage->arrAddr[0]['pref'] = $objPage->pref;
-           $objPage->arrAddr[0]['addr01'] = $objPage->addr01;
-           $objPage->arrAddr[0]['addr02'] = $objPage->addr02;
-           
-            $objPage->tpl_mainpage = 'shopping/deliv.tpl';
-            $objPage->tpl_title = '¤ªÆϤ±Àè¾ðÊó';
-        }
-        
-         if ($_POST["mode"] == "customer_addr") {
-
-
-            
+//        if ($_POST["mode"] == "deliv") {
+//            
 //            $objFormParam = new SC_FormParam();
 //            // ¥Ñ¥é¥á¡¼¥¿¾ðÊó¤Î½é´ü²½
@@ -243,8 +213,10 @@
 //           $objPage->arrAddr[0]['addr02'] = $objPage->addr02;
 //           
-//           foreach($objOtherAddr as $val) {
-//               $objPage->arrAddr[$cnt] = $val;
-//               $cnt++;
-//            }
+//            $objPage->tpl_mainpage = 'shopping/deliv.tpl';
+//            $objPage->tpl_title = '¤ªÆϤ±Àè¾ðÊó';
+//        }
+        
+         if ($_POST["mode"] == "customer_addr") {
+           $objPage->uniqid = lfRegistData ($objPage->arrForm, $arrRegistColumn, $arrRejectRegistColumn); 
            header("Location:" . gfAddSessionId("./payment.php"));
         print($_POST);
@@ -253,11 +225,11 @@
         //--¡¡²¾ÅÐÏ¿¤È´°Î»²èÌÌ
         if ($_POST["mode"] == "complete") {
-            //$objPage->uniqid = lfRegistData ($objPage->arrForm, $arrRegistColumn, $arrRejectRegistColumn);
+            $objPage->uniqid = lfRegistData ($objPage->arrForm, $arrRegistColumn, $arrRejectRegistColumn);
 
             // ¶õ¥á¡¼¥ë¤ò¼õ¿®ºÑ¤ß¤Î¾ì¹ç¤Ï¤¹¤°¤ËËÜÅÐÏ¿´°Î»¤Ë¤¹¤ë¡£
-            if (isset($_SESSION['mobile']['kara_mail_from'])) {
-                header("Location:" . gfAddSessionId(MOBILE_URL_DIR . "regist/index.php?mode=regist&id=" . $objPage->uniqid));
-                exit;
-            }
+//            if (isset($_SESSION['mobile']['kara_mail_from'])) {
+//                header("Location:" . gfAddSessionId(MOBILE_URL_DIR . "regist/index.php?mode=regist&id=" . $objPage->uniqid));
+//                exit;
+//            }
 
             $objPage->tpl_mainpage = 'shopping/complete.tpl';
@@ -305,81 +277,25 @@
 
 //---- function·²
-function lfRegistData ($array, $arrRegistColumn, $arrRejectRegistColumn) {
-    global $objConn;
-
-    // ²¾ÅÐÏ¿
-    foreach ($arrRegistColumn as $data) {
-        if (strlen($array[ $data["column"] ]) > 0 && ! in_array($data["column"], $arrRejectRegistColumn)) {
-            $arrRegist[ $data["column"] ] = $array[ $data["column"] ];
-        }
-    }
-        
-    // ÃÂÀ¸Æü¤¬ÆþÎϤµ¤ì¤Æ¤¤¤ë¾ì¹ç
-    if (strlen($array["year"]) > 0 ) {
-        $arrRegist["birth"] = $array["year"] ."/". $array["month"] ."/". $array["day"] ." 00:00:00";
-    }
-    
-    // ¥Ñ¥¹¥ï¡¼¥É¤Î°Å¹æ²½
-    $arrRegist["password"] = sha1($arrRegist["password"] . ":" . AUTH_MAGIC);
-    
-    $count = 1;
-    while ($count != 0) {
-        $uniqid = sfGetUniqRandomId("t");
-        $count = $objConn->getOne("SELECT COUNT(*) FROM dtb_customer WHERE secret_key = ?", array($uniqid));
-    }
-
-    switch($array["mailmaga_flg"]) {
-        case 1:
-            $arrRegist["mailmaga_flg"] = 4; 
-            break;
-        case 2:
-            $arrRegist["mailmaga_flg"] = 5; 
-            break;
-        default:
-            $arrRegist["mailmaga_flg"] = 6;
-            break;
-    }
-        
-    $arrRegist["secret_key"] = $uniqid;     // ²¾ÅÐÏ¿IDȯ¹Ô
-    $arrRegist["create_date"] = "now()";    // ºîÀ®Æü
-    $arrRegist["update_date"] = "now()";    // ¹¹¿·Æü
-    $arrRegist["first_buy_date"] = "";      // ºÇ½é¤Î¹ØÆþÆü
-    
-    // ·ÈÂӥ᡼¥ë¥¢¥É¥ì¥¹
-    $arrRegist['email_mobile'] = $arrRegist['email'];
-
-    //-- ²¾ÅÐÏ¿¼Â¹Ô
-    $objConn->query("BEGIN");
-
+function lfRegistData($uniqid) {
+    global $objFormParam;
+    $arrRet = $objFormParam->getHashArray();
+    $sqlval = $objFormParam->getDbArray();
+    // ÅÐÏ¿¥Ç¡¼¥¿¤ÎºîÀ®
+    $sqlval['order_temp_id'] = $uniqid;
+    $sqlval['order_birth'] = sfGetTimestamp($arrRet['year'], $arrRet['month'], $arrRet['day']);
+    $sqlval['update_date'] = 'Now()';
+    $sqlval['customer_id'] = '0';
+    
+    // ´û¸¥Ç¡¼¥¿¤Î¥Á¥§¥Ã¥¯
     $objQuery = new SC_Query();
-    $objQuery->insert("dtb_customer", $arrRegist);
-
-/* ¥á¥ë¥Þ¥¬²ñ°÷µ¡Ç½¤Ï¸½ºßÄä»ßÃæ¡¡2007/03/07
-    //--¡¡Èó²ñ°÷¤Ç¥á¥ë¥Þ¥¬ÅÐÏ¿¤·¤Æ¤¤¤ë¤«¤ÎȽÄê
-    $sql = "SELECT count(*) FROM dtb_customer_mail WHERE email = ?";
-    $mailResult = $objConn->getOne($sql, array($arrRegist["email"]));
-
-    //--¡¡¥á¥ë¥Þ¥¬²¾ÅÐÏ¿¼Â¹Ô
-    $arrRegistMail["email"] = $arrRegist["email"];  
-    if ($array["mailmaga_flg"] == 1) {
-        $arrRegistMail["mailmaga_flg"] = 4; 
-    } elseif ($array["mailmaga_flg"] == 2) {
-        $arrRegistMail["mailmaga_flg"] = 5; 
+    $where = "order_temp_id = ?";
+    $cnt = $objQuery->count("dtb_order_temp", $where, array($uniqid));
+    // ´û¸¥Ç¡¼¥¿¤¬¤Ê¤¤¾ì¹ç
+    if ($cnt == 0) {
+        $sqlval['create_date'] = 'Now()';
+        $objQuery->insert("dtb_order_temp", $sqlval);
     } else {
-        $arrRegistMail["mailmaga_flg"] = 6; 
-    }
-    $arrRegistMail["update_date"] = "now()";
-    
-    // Èó²ñ°÷¤Ç¥á¥ë¥Þ¥¬ÅÐÏ¿¤·¤Æ¤¤¤ë¾ì¹ç
-    if ($mailResult == 1) {     
-        $objQuery->update("dtb_customer_mail", $arrRegistMail, "email = '" .addslashes($arrRegistMail["email"]). "'");          
-    } else {                //¡¡¿·µ¬ÅÐÏ¿¤Î¾ì¹ç
-        $arrRegistMail["create_date"] = "now()";
-        $objQuery->insert("dtb_customer_mail", $arrRegistMail);     
-    }
-*/
-    $objConn->query("COMMIT");
-
-    return $uniqid;
+        $objQuery->update("dtb_order_temp", $sqlval, $where, array($uniqid));
+    }
 }