Index: branches/dev/html/mobile/shopping/index.php
===================================================================
--- branches/dev/html/mobile/shopping/index.php	(revision 12670)
+++ branches/dev/html/mobile/shopping/index.php	(revision 12693)
@@ -68,42 +68,4 @@
 // ¥ì¥¤¥¢¥¦¥È¥Ç¥¶¥¤¥ó¤ò¼èÆÀ
 $objPage = sfGetPageLayout($objPage, false, DEF_LAYOUT);
-/*
-//---- ÅÐÏ¿ÍÑ¥«¥é¥àÇÛÎó
-$arrRegistColumn = array(
-                             array(  "column" => "name01", "convert" => "aKV" ),
-                             array(  "column" => "name02", "convert" => "aKV" ),
-                             array(  "column" => "kana01", "convert" => "CKV" ),
-                             array(  "column" => "kana02", "convert" => "CKV" ),
-                             array(  "column" => "zip01", "convert" => "n" ),
-                             array(  "column" => "zip02", "convert" => "n" ),
-                             array(  "column" => "pref", "convert" => "n" ),
-                             array(  "column" => "addr01", "convert" => "aKV" ),
-                             array(  "column" => "addr02", "convert" => "aKV" ),
-                             array(  "column" => "email", "convert" => "a" ),
-                             array(  "column" => "email2", "convert" => "a" ),
-                             array(  "column" => "email_mobile", "convert" => "a" ),
-                             array(  "column" => "email_mobile2", "convert" => "a" ),
-                             array(  "column" => "tel01", "convert" => "n" ),
-                             array(  "column" => "tel02", "convert" => "n" ),
-                             array(  "column" => "tel03", "convert" => "n" ),
-                             array(  "column" => "fax01", "convert" => "n" ),
-                             array(  "column" => "fax02", "convert" => "n" ),
-                             array(  "column" => "fax03", "convert" => "n" ),
-                             array(  "column" => "sex", "convert" => "n" ),
-                             array(  "column" => "job", "convert" => "n" ),
-                             array(  "column" => "birth", "convert" => "n" ),
-                             array(  "column" => "reminder", "convert" => "n" ),
-                             array(  "column" => "reminder_answer", "convert" => "aKV"),
-                             array(  "column" => "password", "convert" => "a" ),
-                             array(  "column" => "password02", "convert" => "a" ),
-                             array(  "column" => "mailmaga_flg", "convert" => "n" ),
-                         );
-
-//---- ÅÐÏ¿½ü³°ÍÑ¥«¥é¥àÇÛÎó
-//$arrRejectRegistColumn = array("year", "month", "day", "email02", "email_mobile02","password","password02","reminder","reminder_answer");
-$arrRejectRegistColumn = array("year", "month", "day");
-*/
-//-------------------------------------¢¥NONMEMBER----------------------------------------------
-
 
 // ¥æ¡¼¥¶¥æ¥Ë¡¼¥¯ID¤Î¼èÆÀ¤È¹ØÆþ¾õÂÖ¤ÎÀµÅöÀ­¤ò¥Á¥§¥Ã¥¯
@@ -200,200 +162,9 @@
 /* Èó²ñ°÷ÆþÎÏ¥Ú¡¼¥¸¤Î¥»¥Ã¥È */
 function lfSetNonMember($objPage) {
-	
-    $arrRegistColumn = array(
-                             array(  "column" => "name01", "convert" => "aKV" ),
-                             array(  "column" => "name02", "convert" => "aKV" ),
-                             array(  "column" => "kana01", "convert" => "CKV" ),
-                             array(  "column" => "kana02", "convert" => "CKV" ),
-                             array(  "column" => "zip01", "convert" => "n" ),
-                             array(  "column" => "zip02", "convert" => "n" ),
-                             array(  "column" => "pref", "convert" => "n" ),
-                             array(  "column" => "addr01", "convert" => "aKV" ),
-                             array(  "column" => "addr02", "convert" => "aKV" ),
-                             array(  "column" => "email", "convert" => "a" ),
-                             array(  "column" => "email2", "convert" => "a" ),
-                             array(  "column" => "email_mobile", "convert" => "a" ),
-                             array(  "column" => "email_mobile2", "convert" => "a" ),
-                             array(  "column" => "tel01", "convert" => "n" ),
-                             array(  "column" => "tel02", "convert" => "n" ),
-                             array(  "column" => "tel03", "convert" => "n" ),
-                             array(  "column" => "fax01", "convert" => "n" ),
-                             array(  "column" => "fax02", "convert" => "n" ),
-                             array(  "column" => "fax03", "convert" => "n" ),
-                             array(  "column" => "sex", "convert" => "n" ),
-                             array(  "column" => "job", "convert" => "n" ),
-                             array(  "column" => "birth", "convert" => "n" ),
-                             array(  "column" => "reminder", "convert" => "n" ),
-                             array(  "column" => "reminder_answer", "convert" => "aKV"),
-                             array(  "column" => "password", "convert" => "a" ),
-                             array(  "column" => "password02", "convert" => "a" ),
-                             array(  "column" => "mailmaga_flg", "convert" => "n" ),
-                         );
-
-//---- ÅÐÏ¿½ü³°ÍÑ¥«¥é¥àÇÛÎó
-//$arrRejectRegistColumn = array("year", "month", "day", "email02", "email_mobile02","password","password02","reminder","reminder_answer");
-$arrRejectRegistColumn = array("year", "month", "day", "email02", "email_mobile02", "password02");
         
-    $objPage->tpl_mainpage = 'shopping/nonmember_set1.tpl';
+    $objPage->tpl_mainpage = 'nonmember/nonmember_set1.tpl';
 	$objPage->tpl_css = array();
 	$objPage->tpl_css[] = '/css/layout/login/nonmember.css';
-    
-    //-- POST¥Ç¡¼¥¿¤Î°ú¤­·Ñ¤®
-    $objPage->arrForm = $_POST;
-    
-    if($objPage->arrForm['year'] == '----') {
-        $objPage->arrForm['year'] = '';
-    }
-    
-    //$objPage->arrForm['email'] = strtolower($objPage->arrForm['email']);        // email¤Ï¤¹¤Ù¤Æ¾®Ê¸»ú¤Ç½èÍý
-    
-    //-- ÆþÎÏ¥Ç¡¼¥¿¤ÎÊÑ´¹
-    $objPage->arrForm = lfConvertParam($objPage->arrForm, $arrRegistColumn);
-
-    // Ìá¤ë¥Ü¥¿¥óÍÑ½èÍý
-    //return¤ÎÃæ¤Ë¸µ¤Î¥Ú¡¼¥¸¤ÎÌ¾Á°¤¬Æþ¤Ã¤Æ¤¤¤ë
-	if (!empty($_POST["return"])) {
-        switch ($_POST["mode2"]) {
-        case "deliv_date":	
-        
-        	break;
-        case "deliv":
-            $_POST["mode2"] = "set3";
-            break;
-        case "set3":
-            $_POST["mode2"] = "set2";
-            break;
-        default:
-            $_POST["mode2"] = "set1";
-            break;
-        }
-    }    
-
-    //--¡¡ÆþÎÏ¥¨¥é¡¼¥Á¥§¥Ã¥¯
-    if (!empty($_POST["mode2"])) {
-            if ($_POST["mode2"] == "set2") {
-            $objPage->arrErr = lfErrorCheck1($objPage->arrForm);
-            $objPage->tpl_mainpage = 'shopping/nonmember_set1.tpl';
-            $objPage->tpl_title = '¤ªµÒÍÍ¾ðÊóÆþÎÏ(1/3)';
-        } elseif ($_POST["mode2"] == "set3") {
-            $objPage->arrErr = lfErrorCheck2($objPage->arrForm);
-            $objPage->tpl_mainpage = 'shopping/nonmember_set2.tpl';
-            $objPage->tpl_title = '¤ªµÒÍÍ¾ðÊóÆþÎÏ(2/3)';
-        } elseif ($_POST["mode2"] == "deliv"){
-            $objPage->arrErr = lfErrorCheck3($objPage->arrForm);
-            $objPage->tpl_mainpage = 'shopping/nonmember_set3.tpl';
-            $objPage->tpl_title = '¤ªµÒÍÍ¾ðÊóÆþÎÏ(3/3)';
-        }
-    
-    //¥Õ¥©¡¼¥à¤ÎÃÍ¤ò$objPage¤Î¥­¡¼¤È¤·¤ÆÂåÆþ¤·¤Æ¤¤¤¯
-   foreach($objPage->arrForm as $key => $val) {
-        $objPage->$key = $val;
-        }
-    }
-
-		// ÆþÎÏ¥¨¥é¡¼¤Î¥Á¥§¥Ã¥¯
-    if ($objPage->arrErr || !empty($_POST["return"])) {     
-
-        //-- ¥Ç¡¼¥¿¤ÎÀßÄê
-        if ($_POST["mode2"] == "set1") {
-            $checkVal = array("email", "name01", "name02", "kana01", "kana02");
-        } elseif ($_POST["mode2"] == "set2") {
-            $checkVal = array("sex", "year", "month", "day", "zip01", "zip02");
-        } else {
-            $checkVal = array("pref", "addr01", "addr02", "tel01", "tel02", "tel03", "mail_flag");
-        }
-
-        foreach($objPage->arrForm as $key => $val) {
-            if ($key != "mode2" && $key != "submit" && $key != "return" && $key != session_name() && !in_array($key, $checkVal))
-                $objPage->list_data[ $key ] = $val;
-        }
-
-    } else {
-
-        //--¡¡¥Æ¥ó¥×¥ì¡¼¥ÈÀßÄê
-        if ($_POST["mode2"] == "set2") {
-            $objPage->tpl_mainpage = 'shopping/nonmember_set2.tpl';
-            $objPage->tpl_title = '¤ªµÒÍÍ¾ðÊóÆþÎÏ(2/3)';
-        } elseif ($_POST["mode2"] == "set3") {
-            $objPage->tpl_mainpage = 'shopping/nonmember_set3.tpl';
-            $objPage->tpl_title = '¤ªµÒÍÍ¾ðÊóÆþÎÏ(3/3)';
-
-            if (@$objPage->arrForm['pref'] == "" && @$objPage->arrForm['addr01'] == "" && @$objPage->arrForm['addr02'] == "") {
-                $address = lfGetAddress($_REQUEST['zip01'].$_REQUEST['zip02']);
-                $objPage->pref = @$address[0]['state'];
-                $objPage->addr01 = @$address[0]['city'] . @$address[0]['town'];
-            }
-        }
-
-        //-- ¥Ç¡¼¥¿ÀßÄê
-        unset($objPage->list_data);
-        if ($_POST["mode2"] == "set1") {
-            $checkVal = array("sex", "year", "month", "day", "zip01", "zip02");
-        } elseif ($_POST["mode2"] == "set2") {
-            $checkVal = array("pref", "addr01", "addr02", "tel01", "tel02", "tel03", "mail_flag");
-        } else {
-            $checkVal = array();
-        }
-
-//$objPage->list_data
-        foreach($objPage->arrForm as $key => $val) {
-            if ($key != "mode2" && $key != "submit" && $key != "confirm" && $key != "return" && $key != session_name() && !in_array($key, $checkVal)) {
-                $objPage->list_data[ $key ] = $val;
-            }
-        }
-
-        if ($_POST["mode2"] == "deliv") {
-            
-            $objFormParam = new SC_FormParam();
-            // ¥Ñ¥é¥á¡¼¥¿¾ðÊó¤Î½é´ü²½
-           
-            // POSTÃÍ¤Î¼èÆÀ
-            $objFormParam->setParam($_POST);
-            print_r($_POST);
-           	$arrRet = $objFormParam->getHashArray();
-			$sqlval = $objFormParam->getDbArray();
-            
-            // ÆþÎÏÃÍ¤Î¼èÆÀ
-            $objPage->arrForm = $objFormParam->getFormParamList();
-            $objPage->arrErr = $arrErr;
-            
-//            $cnt = 1;
-//            foreach($objOtherAddr as $val) {
-//                $objPage->arrAddr[$cnt] = $val;
-//                $cnt++;
-//            }
-         
-            lfRegistData($objPage->tpl_uniqid); 
-            
-            lfCopyDeliv($objPage->tpl_uniqid, $_POST);
-            
-           $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; 
-           $arrData = $_POST;
-           
-            $objPage->tpl_mainpage = 'shopping/nonmember_deliv.tpl';
-            $objPage->tpl_title = '¤ªÆÏ¤±Àè¾ðÊó';
-        }
-        
-         if ($_POST["mode2"] == "customer_addr") {
-          	print_r($_POST);
-          	if ($_POST['deli'] != "") {
-           lfRegistData($objPage->tpl_uniqid); 
-           setcookie('eccube_mobile','test');
-           echo $_COOKIE['eccube_mobile'];
-           header("Location:" . gfAddSessionId("./payment.php"));
-     		exit;
-	}else{
-		// ¥¨¥é¡¼¤òÊÖ¤¹
-		$arrErr['deli'] = '¢¨ ¤ªÆÏ¤±Àè¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£';
-	}
-	break;
-        }
-    }
-
-	return $objPage;
+    return $objPage;
 }
 
@@ -530,116 +301,3 @@
 	}
 }
-
-//-----------------------------NONMEMBER´Ø¿ô·²¢§------------------------------------------------------------------
-//----¡¡¼èÆÀÊ¸»úÎó¤ÎÊÑ´¹
-function lfConvertParam($array, $arrRegistColumn) {
-    /*
-     *  Ê¸»úÎó¤ÎÊÑ´¹
-     *  K :  ¡ÖÈ¾³Ñ(ÊÝ¶¸)ÊÒ²¾Ì¾¡×¤ò¡ÖÁ´³ÑÊÒ²¾Ì¾¡×¤ËÊÑ´¹
-     *  C :  ¡ÖÁ´³Ñ¤Ò¤é²¾Ì¾¡×¤ò¡ÖÁ´³Ñ¤«¤¿²¾Ì¾¡×¤ËÊÑ´¹
-     *  V :  ÂùÅÀÉÕ¤­¤ÎÊ¸»ú¤ò°ìÊ¸»ú¤ËÊÑ´¹¡£"K","H"¤È¶¦¤Ë»ÈÍÑ¤·¤Þ¤¹ 
-     *  n :  ¡ÖÁ´³Ñ¡×¿ô»ú¤ò¡ÖÈ¾³Ñ(ÊÝ¶¸)¡×¤ËÊÑ´¹
-     *  a :  Á´³Ñ±Ñ¿ô»ú¤òÈ¾³Ñ±Ñ¿ô»ú¤ËÊÑ´¹¤¹¤ë
-     */
-    // ¥«¥é¥àÌ¾¤È¥³¥ó¥Ð¡¼¥È¾ðÊó
-    foreach ($arrRegistColumn as $data) {
-        $arrConvList[ $data["column"] ] = $data["convert"];
-    }
-    // Ê¸»úÊÑ´¹
-    foreach ($arrConvList as $key => $val) {
-        // POST¤µ¤ì¤Æ¤­¤¿ÃÍ¤Î¤ßÊÑ´¹¤¹¤ë¡£
-        if(strlen(($array[$key])) > 0) {
-            $array[$key] = mb_convert_kana($array[$key] ,$val);
-        }
-    }
-    return $array;
-}
-
-//---- ÆþÎÏ¥¨¥é¡¼¥Á¥§¥Ã¥¯
-function lfErrorCheck1($array) {
-
-    global $objConn;
-    $objErr = new SC_CheckError($array);
-    
-    $objErr->doFunc(array("¤ªÌ¾Á°¡ÊÀ«¡Ë", 'name01', STEXT_LEN), array("EXIST_CHECK", "NO_SPTAB", "SPTAB_CHECK" ,"MAX_LENGTH_CHECK"));
-    $objErr->doFunc(array("¤ªÌ¾Á°¡ÊÌ¾¡Ë", 'name02', STEXT_LEN), array("EXIST_CHECK", "NO_SPTAB", "SPTAB_CHECK" , "MAX_LENGTH_CHECK"));
-    $objErr->doFunc(array("¤ªÌ¾Á°¡Ê¥«¥Ê/À«¡Ë", 'kana01', STEXT_LEN), array("EXIST_CHECK", "NO_SPTAB", "SPTAB_CHECK" ,"MAX_LENGTH_CHECK", "KANA_CHECK"));
-    $objErr->doFunc(array("¤ªÌ¾Á°¡Ê¥«¥Ê/Ì¾¡Ë", 'kana02', STEXT_LEN), array("EXIST_CHECK", "NO_SPTAB", "SPTAB_CHECK" ,"MAX_LENGTH_CHECK", "KANA_CHECK"));
-    $objErr->doFunc(array('¥á¡¼¥ë¥¢¥É¥ì¥¹', "email", MTEXT_LEN) ,array("NO_SPTAB", "EXIST_CHECK", "EMAIL_CHECK", "SPTAB_CHECK" ,"EMAIL_CHAR_CHECK", "MAX_LENGTH_CHECK", "MOBILE_EMAIL_CHECK"));
-
-    return $objErr->arrErr;
-}
-
-//---- ÆþÎÏ¥¨¥é¡¼¥Á¥§¥Ã¥¯
-function lfErrorCheck2($array) {
-
-    global $objConn, $objDate;
-    $objErr = new SC_CheckError($array);
-    
-    $objErr->doFunc(array("Í¹ÊØÈÖ¹æ1", "zip01", ZIP01_LEN ) ,array("EXIST_CHECK", "SPTAB_CHECK" ,"NUM_CHECK", "NUM_COUNT_CHECK"));
-    $objErr->doFunc(array("Í¹ÊØÈÖ¹æ2", "zip02", ZIP02_LEN ) ,array("EXIST_CHECK", "SPTAB_CHECK" ,"NUM_CHECK", "NUM_COUNT_CHECK")); 
-    $objErr->doFunc(array("Í¹ÊØÈÖ¹æ", "zip01", "zip02"), array("ALL_EXIST_CHECK"));
-
-    $objErr->doFunc(array("À­ÊÌ", "sex") ,array("SELECT_CHECK", "NUM_CHECK")); 
-    $objErr->doFunc(array("À¸Ç¯·îÆü (Ç¯)", "year", 4), array("EXIST_CHECK", "SPTAB_CHECK", "NUM_CHECK", "NUM_COUNT_CHECK"));
-    if (!isset($objErr->arrErr['year'])) {
-        $objErr->doFunc(array("À¸Ç¯·îÆü (Ç¯)", "year", $objDate->getStartYear()), array("MIN_CHECK"));
-        $objErr->doFunc(array("À¸Ç¯·îÆü (Ç¯)", "year", $objDate->getEndYear()), array("MAX_CHECK"));
-    }
-    $objErr->doFunc(array("À¸Ç¯·îÆü (·îÆü)", "month", "day"), array("SELECT_CHECK"));
-    if (!isset($objErr->arrErr['year']) && !isset($objErr->arrErr['month']) && !isset($objErr->arrErr['day'])) {
-        $objErr->doFunc(array("À¸Ç¯·îÆü", "year", "month", "day"), array("CHECK_DATE"));
-    }
-    
-    return $objErr->arrErr;
-}
-
-
-//---- ÆþÎÏ¥¨¥é¡¼¥Á¥§¥Ã¥¯
-function lfErrorCheck3($array) {
-
-    global $objConn;
-    $objErr = new SC_CheckError($array);
-    
-    $objErr->doFunc(array("ÅÔÆ»ÉÜ¸©", 'pref'), array("SELECT_CHECK","NUM_CHECK"));
-    $objErr->doFunc(array("»Ô¶èÄ®Â¼", "addr01", MTEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK" ,"MAX_LENGTH_CHECK"));
-    $objErr->doFunc(array("ÈÖÃÏ", "addr02", MTEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK" ,"MAX_LENGTH_CHECK"));
-    $objErr->doFunc(array("ÅÅÏÃÈÖ¹æ1", 'tel01'), array("EXIST_CHECK","SPTAB_CHECK" ));
-    $objErr->doFunc(array("ÅÅÏÃÈÖ¹æ2", 'tel02'), array("EXIST_CHECK","SPTAB_CHECK" ));
-    $objErr->doFunc(array("ÅÅÏÃÈÖ¹æ3", 'tel03'), array("EXIST_CHECK","SPTAB_CHECK" ));
-    $objErr->doFunc(array("ÅÅÏÃÈÖ¹æ", "tel01", "tel02", "tel03",TEL_ITEM_LEN) ,array("TEL_CHECK"));
-    
-    return $objErr->arrErr;
-}
-
-// Í¹ÊØÈÖ¹æ¤«¤é½»½ê¤Î¼èÆÀ
-function lfGetAddress($zipcode) {
-    global $arrPref;
-
-    $conn = new SC_DBconn(ZIP_DSN);
-
-    // Í¹ÊØÈÖ¹æ¸¡º÷Ê¸ºîÀ®
-    $zipcode = mb_convert_kana($zipcode ,"n");
-    $sqlse = "SELECT state, city, town FROM mtb_zip WHERE zipcode = ?";
-
-    $data_list = $conn->getAll($sqlse, array($zipcode));
-
-    // ¥¤¥ó¥Ç¥Ã¥¯¥¹¤ÈÃÍ¤òÈ¿Å¾¤µ¤»¤ë¡£
-    $arrREV_PREF = array_flip($arrPref);
-
-    /*
-        ÁíÌ³¾Ê¤«¤é¥À¥¦¥ó¥í¡¼¥É¤·¤¿¥Ç¡¼¥¿¤ò¤½¤Î¤Þ¤Þ¥¤¥ó¥Ý¡¼¥È¤¹¤ë¤È
-        °Ê²¼¤Î¤è¤¦¤ÊÊ¸»úÎó¤¬Æþ¤Ã¤Æ¤¤¤ë¤Î¤Ç   ÂÐºö¤¹¤ë¡£
-        ¡¦¡Ê£±¡¦£±£¹ÃúÌÜ¡Ë
-        ¡¦°Ê²¼¤Ë·ÇºÜ¤¬¤Ê¤¤¾ì¹ç
-    */
-    $town =  $data_list[0]['town'];
-    $town = ereg_replace("¡Ê.*¡Ë$","",$town);
-    $town = ereg_replace("°Ê²¼¤Ë·ÇºÜ¤¬¤Ê¤¤¾ì¹ç","",$town);
-    $data_list[0]['town'] = $town;
-    $data_list[0]['state'] = $arrREV_PREF[$data_list[0]['state']];
-
-    return $data_list;
-}
-//NONMEMBER_´Ø¿ô·²---------------------------------------------------------------------------------------
 ?>
