Index: branches/dev/html/mobile/mypage/change_complete.php
===================================================================
--- branches/dev/html/mobile/mypage/change_complete.php (revision 11460)
+++ branches/dev/html/mobile/mypage/change_complete.php (revision 11648)
@@ -23,5 +23,5 @@
//¥í¥°¥¤¥óȽÄê
-if (!$objCustomer->isLoginSuccess()){
+if (!$objCustomer->isLoginSuccess(true)){
sfDispSiteError(CUSTOMER_ERROR);
}else {
Index: branches/dev/html/mobile/mypage/history.php
===================================================================
--- branches/dev/html/mobile/mypage/history.php (revision 11460)
+++ branches/dev/html/mobile/mypage/history.php (revision 11648)
@@ -51,17 +51,24 @@
$next = "¼¡¤Ø¢ª";
} else {
- $next = "¼¡¤Ø¢ª";
+ $next = "";
}
// previous
if ($pageNo - HISTORY_NUM > 0) {
- $previous = "¢«Á°";
+ $previous = "¢«Á°¤Ø";
} elseif ($pageNo == 0) {
- $previous = "¢«Á°";
+ $previous = "";
} else {
- $previous = "¢«Á°";
+ $previous = "¢«Á°¤Ø";
}
-$objPage->tpl_strnavi = $previous . " | " . $next;
+// bar
+if ($next != '' && $previous != '') {
+ $bar = " | ";
+} else {
+ $bar = "";
+}
+
+$objPage->tpl_strnavi = $previous . $bar . $next;
$objView->assignobj($objPage); //$objpageÆâ¤ÎÁ´¤Æ¤Î¥Æ¥ó¥×¥ì¡¼¥ÈÊÑ¿ô¤òsmarty¤Ë³ÊǼ
$objView->display(SITE_FRAME); //¥Ñ¥¹¤È¥Æ¥ó¥×¥ì¡¼¥ÈÊÑ¿ô¤Î¸Æ¤Ó½Ð¤·¡¢¼Â¹Ô
Index: branches/dev/html/mobile/mypage/change.php
===================================================================
--- branches/dev/html/mobile/mypage/change.php (revision 11460)
+++ branches/dev/html/mobile/mypage/change.php (revision 11648)
@@ -127,17 +127,14 @@
$objPage->tpl_mainpage = 'mypage/set2.tpl';
$objPage->tpl_title = 'ÅÐÏ¿Êѹ¹(3/3)';
-
- $address = lfGetAddress($_REQUEST['zip01'].$_REQUEST['zip02']);
-
- $objPage->arrForm['pref'] = @$address[0]['state'];
- $objPage->arrForm['addr01'] = @$address[0]['city'] . @$address[0]['town'];
} elseif ($_POST["mode"] == "confirm") {
//¥Ñ¥¹¥ï¡¼¥Éɽ¼¨
$passlen = strlen($objPage->arrForm['password']);
$objPage->passlen = lfPassLen($passlen);
-
- //¥á¡¼¥ë¼õ¤±¼è¤ê
- if ($objPage->arrForm['mail_flag'] = "ON") {
- $objPage->arrForm['mail_flag'] = "2";
+
+ // ¥á¡¼¥ë¼õ¤±¼è¤ê
+ if (strtolower($_POST['mail_flag']) == "on") {
+ $_POST['mail_flag'] = "2";
+ } else {
+ $_POST['mail_flag'] = "3";
}
@@ -165,7 +162,7 @@
$email_flag = true;
- if($objPage->arrForm['email'] != $objCustomer->getValue('email')) {
+ if($objPage->arrForm['email'] != $objCustomer->getValue('email_mobile')) {
//¥á¡¼¥ë¥¢¥É¥ì¥¹¤Î½ÅÊ£¥Á¥§¥Ã¥¯
- $email_cnt = $objQuery->count("dtb_customer","del_flg=0 AND email=?", array($objPage->arrForm['email']));
+ $email_cnt = $objQuery->count("dtb_customer","del_flg=0 AND (email=? OR email_mobile=?)", array($objPage->arrForm['email'], $objPage->arrForm['email']));
if ($email_cnt > 0){
$email_flag = false;
@@ -299,24 +296,24 @@
$objErr->doFunc(array("¤ªÌ¾Á°¡ÊÀ«¡Ë", 'name01', STEXT_LEN), array("EXIST_CHECK", "SPTAB_CHECK" ,"MAX_LENGTH_CHECK"));
$objErr->doFunc(array("¤ªÌ¾Á°¡Ê̾¡Ë", 'name02', STEXT_LEN), array("EXIST_CHECK", "SPTAB_CHECK" ,"MAX_LENGTH_CHECK"));
- $objErr->doFunc(array("¥Õ¥ê¥¬¥Ê¡Ê¥»¥¤¡Ë", 'kana01', STEXT_LEN), array("EXIST_CHECK", "SPTAB_CHECK" ,"MAX_LENGTH_CHECK", "KANA_CHECK"));
- $objErr->doFunc(array("¥Õ¥ê¥¬¥Ê¡Ê¥á¥¤¡Ë", 'kana02', STEXT_LEN), array("EXIST_CHECK", "SPTAB_CHECK" ,"MAX_LENGTH_CHECK", "KANA_CHECK"));
+ $objErr->doFunc(array("¤ªÌ¾Á°¡Ê¥«¥Ê/À«¡Ë", 'kana01', STEXT_LEN), array("EXIST_CHECK", "SPTAB_CHECK" ,"MAX_LENGTH_CHECK", "KANA_CHECK"));
+ $objErr->doFunc(array("¤ªÌ¾Á°¡Ê¥«¥Ê/̾¡Ë", 'kana02', STEXT_LEN), array("EXIST_CHECK", "SPTAB_CHECK" ,"MAX_LENGTH_CHECK", "KANA_CHECK"));
$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("ÅÔÆ»Éܸ©", 'pref'), array("SELECT_CHECK","NUM_CHECK"));
- $objErr->doFunc(array("¤´½»½ê1", "addr01", MTEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK" ,"MAX_LENGTH_CHECK"));
- $objErr->doFunc(array("¤´½»½ê2", "addr02", MTEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK" ,"MAX_LENGTH_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('¥á¡¼¥ë¥¢¥É¥ì¥¹', "email", MTEXT_LEN) ,array("EXIST_CHECK", "EMAIL_CHECK", "NO_SPTAB" ,"EMAIL_CHAR_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_LEN) ,array("TEL_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_LEN) ,array("TEL_CHECK"));
$objErr->doFunc(array("FAXÈÖ¹æ", "fax01", "fax02", "fax03", TEL_LEN) ,array("TEL_CHECK"));
- $objErr->doFunc(array("¤´ÀÊÌ", "sex") ,array("SELECT_CHECK", "NUM_CHECK"));
+ $objErr->doFunc(array("ÀÊÌ", "sex") ,array("SELECT_CHECK", "NUM_CHECK"));
$objErr->doFunc(array("¤´¿¦¶È", "job") ,array("NUM_CHECK"));
$objErr->doFunc(array("À¸Ç¯·îÆü", "year", "month", "day"), array("CHECK_DATE"));
$objErr->doFunc(array("¥Ñ¥¹¥ï¡¼¥É", 'password', PASSWORD_LEN1, PASSWORD_LEN2), array("EXIST_CHECK", "ALNUM_CHECK", "NUM_RANGE_CHECK"));
- $objErr->doFunc(array("¥Ñ¥¹¥ï¡¼¥É¤ò˺¤ì¤¿¤È¤¤Î¼ÁÌä", "reminder") ,array("SELECT_CHECK", "NUM_CHECK"));
- $objErr->doFunc(array("¥Ñ¥¹¥ï¡¼¥É¤ò˺¤ì¤¿¤È¤¤ÎÅú¤¨", "reminder_answer", STEXT_LEN) ,array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+ $objErr->doFunc(array("¥Ñ¥¹¥ï¡¼¥É³ÎǧÍѤμÁÌä", "reminder") ,array("SELECT_CHECK", "NUM_CHECK"));
+ $objErr->doFunc(array("¥Ñ¥¹¥ï¡¼¥É³ÎǧÍѤμÁÌä¤ÎÅú¤¨", "reminder_answer", STEXT_LEN) ,array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
return $objErr->arrErr;
@@ -332,6 +329,6 @@
$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("¤ªÌ¾Á°¡Ê¥«¥Ê/À«¡Ë", '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"));
@@ -361,6 +358,6 @@
$objErr->doFunc(array("¥Ñ¥¹¥ï¡¼¥É", 'password', PASSWORD_LEN1, PASSWORD_LEN2), array("EXIST_CHECK", "SPTAB_CHECK" ,"ALNUM_CHECK", "NUM_RANGE_CHECK"));
- $objErr->doFunc(array("¥Ñ¥¹¥ï¡¼¥É¤ò˺¤ì¤¿¤È¤¤Î¥Ò¥ó¥È ¼ÁÌä", "reminder") ,array("SELECT_CHECK", "NUM_CHECK"));
- $objErr->doFunc(array("¥Ñ¥¹¥ï¡¼¥É¤ò˺¤ì¤¿¤È¤¤Î¥Ò¥ó¥È Åú¤¨", "reminder_answer", STEXT_LEN) ,array("EXIST_CHECK","SPTAB_CHECK" , "MAX_LENGTH_CHECK"));
+ $objErr->doFunc(array("¥Ñ¥¹¥ï¡¼¥É³ÎǧÍѤμÁÌä", "reminder") ,array("SELECT_CHECK", "NUM_CHECK"));
+ $objErr->doFunc(array("¥Ñ¥¹¥ï¡¼¥É³ÎǧÍѤμÁÌä¤ÎÅú¤¨", "reminder_answer", STEXT_LEN) ,array("EXIST_CHECK","SPTAB_CHECK" , "MAX_LENGTH_CHECK"));
return $objErr->arrErr;
@@ -377,5 +374,5 @@
$objErr->doFunc(array("͹ÊØÈÖ¹æ", "zip01", "zip02"), array("ALL_EXIST_CHECK"));
- $objErr->doFunc(array("¤´ÀÊÌ", "sex") ,array("SELECT_CHECK", "NUM_CHECK"));
+ $objErr->doFunc(array("ÀÊÌ", "sex") ,array("SELECT_CHECK", "NUM_CHECK"));
$objErr->doFunc(array("À¸Ç¯·îÆü", "year", "month", "day"), array("SELECT_CHECK", "CHECK_DATE"));
@@ -390,10 +387,10 @@
$objErr->doFunc(array("ÅÔÆ»Éܸ©", 'pref'), array("SELECT_CHECK","NUM_CHECK"));
- $objErr->doFunc(array("¤´½»½ê1", "addr01", MTEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK" ,"MAX_LENGTH_CHECK"));
- $objErr->doFunc(array("¤´½»½ê2", "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"));
+ $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;
@@ -449,7 +446,8 @@
$ret = $objQuery->select("*","dtb_customer","customer_id=?", array($objCustomer->getValue('customer_id')));
$arrForm = $ret[0];
+ $arrForm['email'] = $arrForm['email_mobile'];
//¥á¥ë¥Þ¥¬¥Õ¥é¥°¼èÆÀ
- $arrForm['mail_flag'] = $objQuery->get("dtb_customer_mail","mail_flag","email=?", array($objCustomer->getValue('email')));
+ $arrForm['mail_flag'] = $objQuery->get("dtb_customer_mail","mail_flag","email=?", array($objCustomer->getValue('email_mobile')));
//ÃÂÀ¸Æü¤Îǯ·îÆü¼èÆÀ
Index: branches/dev/html/mobile/mypage/index.php
===================================================================
--- branches/dev/html/mobile/mypage/index.php (revision 11460)
+++ branches/dev/html/mobile/mypage/index.php (revision 11648)
@@ -30,4 +30,7 @@
$objPage = sfGetPageLayout($objPage, false, "mypage/index.php");
+// ·ÈÂÓüËöID¤¬°ìÃפ¹¤ë²ñ°÷¤¬Â¸ºß¤¹¤ë¤«¤É¤¦¤«¤ò¥Á¥§¥Ã¥¯¤¹¤ë¡£
+$objPage->tpl_valid_phone_id = $objCustomer->checkMobilePhoneId();
+
// ¥í¥°¥¤¥ó½èÍý
if($_POST['mode'] == 'login') {
@@ -44,5 +47,6 @@
if (count($arrErr) == 0){
- if($objCustomer->getCustomerDataFromEmailPass($arrForm['login_pass'], $arrForm['login_email'])) {
+ if($objCustomer->getCustomerDataFromMobilePhoneIdPass($arrForm['login_pass']) ||
+ $objCustomer->getCustomerDataFromEmailPass($arrForm['login_pass'], $arrForm['login_email'], true)) {
// ¥í¥°¥¤¥ó¤¬À®¸ù¤·¤¿¾ì¹ç¤Ï·ÈÂÓüËöID¤òÊݸ¤¹¤ë¡£
$objCustomer->updateMobilePhoneId();
@@ -72,5 +76,5 @@
// ¥í¥°¥¤¥ó¥Á¥§¥Ã¥¯
-if(!isset($_SESSION['customer'])) {
+if(!$objCustomer->isLoginSuccess()) {
$objPage->tpl_mainpage = 'mypage/login.tpl';
$objView->assignArray($objFormParam->getHashArray());
Index: branches/dev/html/mobile/shopping/deliv_addr.php
===================================================================
--- branches/dev/html/mobile/shopping/deliv_addr.php (revision 11460)
+++ branches/dev/html/mobile/shopping/deliv_addr.php (revision 11648)
@@ -115,16 +115,16 @@
$objErr->doFunc(array("¤ªÌ¾Á°¡ÊÀ«¡Ë", 'name01', STEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK","MAX_LENGTH_CHECK"));
$objErr->doFunc(array("¤ªÌ¾Á°¡Ê̾¡Ë", 'name02', STEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK", "MAX_LENGTH_CHECK"));
- $objErr->doFunc(array("¥Õ¥ê¥¬¥Ê¡ÊÀ«¡Ë", 'kana01', STEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK", "MAX_LENGTH_CHECK", "KANA_CHECK"));
- $objErr->doFunc(array("¥Õ¥ê¥¬¥Ê¡Ê̾¡Ë", 'kana02', STEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK", "MAX_LENGTH_CHECK", "KANA_CHECK"));
+ $objErr->doFunc(array("¤ªÌ¾Á°¡Ê¥«¥Ê/À«¡Ë", 'kana01', STEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK", "MAX_LENGTH_CHECK", "KANA_CHECK"));
+ $objErr->doFunc(array("¤ªÌ¾Á°¡Ê¥«¥Ê/̾¡Ë", 'kana02', STEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK", "MAX_LENGTH_CHECK", "KANA_CHECK"));
$objErr->doFunc(array("͹ÊØÈÖ¹æ1", "zip01", ZIP01_LEN ) ,array("EXIST_CHECK", "NUM_CHECK", "NUM_COUNT_CHECK"));
$objErr->doFunc(array("͹ÊØÈÖ¹æ2", "zip02", ZIP02_LEN ) ,array("EXIST_CHECK", "NUM_CHECK", "NUM_COUNT_CHECK"));
$objErr->doFunc(array("͹ÊØÈÖ¹æ", "zip01", "zip02"), array("ALL_EXIST_CHECK"));
$objErr->doFunc(array("ÅÔÆ»Éܸ©", 'pref'), array("SELECT_CHECK","NUM_CHECK"));
- $objErr->doFunc(array("¤´½»½ê¡Ê1¡Ë", "addr01", MTEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK","MAX_LENGTH_CHECK"));
- $objErr->doFunc(array("¤´½»½ê¡Ê2¡Ë", "addr02", MTEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK","MAX_LENGTH_CHECK"));
- $objErr->doFunc(array("¤ªÅÅÏÃÈÖ¹æ1", 'tel01'), array("EXIST_CHECK","NUM_CHECK"));
- $objErr->doFunc(array("¤ªÅÅÏÃÈÖ¹æ2", 'tel02'), array("EXIST_CHECK","NUM_CHECK"));
- $objErr->doFunc(array("¤ªÅÅÏÃÈÖ¹æ3", 'tel03'), array("EXIST_CHECK","NUM_CHECK"));
- $objErr->doFunc(array("¤ªÅÅÏÃÈÖ¹æ", "tel01", "tel02", "tel03", TEL_LEN) ,array("TEL_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","NUM_CHECK"));
+ $objErr->doFunc(array("ÅÅÏÃÈÖ¹æ2", 'tel02'), array("EXIST_CHECK","NUM_CHECK"));
+ $objErr->doFunc(array("ÅÅÏÃÈÖ¹æ3", 'tel03'), array("EXIST_CHECK","NUM_CHECK"));
+ $objErr->doFunc(array("ÅÅÏÃÈÖ¹æ", "tel01", "tel02", "tel03", TEL_LEN) ,array("TEL_CHECK"));
return $objErr->arrErr;
@@ -137,6 +137,6 @@
$objErr->doFunc(array("¤ªÌ¾Á°¡ÊÀ«¡Ë", 'name01', STEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK","MAX_LENGTH_CHECK"));
$objErr->doFunc(array("¤ªÌ¾Á°¡Ê̾¡Ë", 'name02', STEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK", "MAX_LENGTH_CHECK"));
- $objErr->doFunc(array("¥Õ¥ê¥¬¥Ê¡ÊÀ«¡Ë", 'kana01', STEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK", "MAX_LENGTH_CHECK", "KANA_CHECK"));
- $objErr->doFunc(array("¥Õ¥ê¥¬¥Ê¡Ê̾¡Ë", 'kana02', STEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK", "MAX_LENGTH_CHECK", "KANA_CHECK"));
+ $objErr->doFunc(array("¤ªÌ¾Á°¡Ê¥«¥Ê/À«¡Ë", 'kana01', STEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK", "MAX_LENGTH_CHECK", "KANA_CHECK"));
+ $objErr->doFunc(array("¤ªÌ¾Á°¡Ê¥«¥Ê/̾¡Ë", 'kana02', STEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK", "MAX_LENGTH_CHECK", "KANA_CHECK"));
$objErr->doFunc(array("͹ÊØÈÖ¹æ1", "zip01", ZIP01_LEN ) ,array("EXIST_CHECK", "NUM_CHECK", "NUM_COUNT_CHECK"));
$objErr->doFunc(array("͹ÊØÈÖ¹æ2", "zip02", ZIP02_LEN ) ,array("EXIST_CHECK", "NUM_CHECK", "NUM_COUNT_CHECK"));
@@ -151,10 +151,10 @@
$objErr->doFunc(array("ÅÔÆ»Éܸ©", 'pref'), array("SELECT_CHECK","NUM_CHECK"));
- $objErr->doFunc(array("¤´½»½ê¡Ê1¡Ë", "addr01", MTEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK","MAX_LENGTH_CHECK"));
- $objErr->doFunc(array("¤´½»½ê¡Ê2¡Ë", "addr02", MTEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK","MAX_LENGTH_CHECK"));
- $objErr->doFunc(array("¤ªÅÅÏÃÈÖ¹æ1", 'tel01'), array("EXIST_CHECK","NUM_CHECK"));
- $objErr->doFunc(array("¤ªÅÅÏÃÈÖ¹æ2", 'tel02'), array("EXIST_CHECK","NUM_CHECK"));
- $objErr->doFunc(array("¤ªÅÅÏÃÈÖ¹æ3", 'tel03'), array("EXIST_CHECK","NUM_CHECK"));
- $objErr->doFunc(array("¤ªÅÅÏÃÈÖ¹æ", "tel01", "tel02", "tel03", TEL_LEN) ,array("TEL_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","NUM_CHECK"));
+ $objErr->doFunc(array("ÅÅÏÃÈÖ¹æ2", 'tel02'), array("EXIST_CHECK","NUM_CHECK"));
+ $objErr->doFunc(array("ÅÅÏÃÈÖ¹æ3", 'tel03'), array("EXIST_CHECK","NUM_CHECK"));
+ $objErr->doFunc(array("ÅÅÏÃÈÖ¹æ", "tel01", "tel02", "tel03", TEL_LEN) ,array("TEL_CHECK"));
return $objErr->arrErr;
Index: branches/dev/html/mobile/cart/index.php
===================================================================
--- branches/dev/html/mobile/cart/index.php (revision 11460)
+++ branches/dev/html/mobile/cart/index.php (revision 11648)
@@ -39,16 +39,4 @@
switch($_POST['mode']) {
-case 'up':
- $objCartSess->upQuantity($_POST['cart_no']);
- sfReload();
- break;
-case 'down':
- $objCartSess->downQuantity($_POST['cart_no']);
- sfReload();
- break;
-case 'delete':
- $objCartSess->delProduct($_POST['cart_no']);
- sfReload();
- break;
case 'confirm':
// ¥«¡¼¥ÈÆâ¾ðÊó¤Î¼èÆÀ
@@ -90,4 +78,19 @@
}
+switch($_GET['mode']) {
+case 'up':
+ $objCartSess->upQuantity($_GET['cart_no']);
+ sfReload(session_name() . '=' . session_id());
+ break;
+case 'down':
+ $objCartSess->downQuantity($_GET['cart_no']);
+ sfReload(session_name() . '=' . session_id());
+ break;
+case 'delete':
+ $objCartSess->delProduct($_GET['cart_no']);
+ sfReload(session_name() . '=' . session_id());
+ break;
+}
+
// ¥«¡¼¥È½¸·×½èÍý
$objPage = sfTotalCart($objPage, $objCartSess, $arrInfo);
Index: branches/dev/html/mobile/magazine/confirm.php
===================================================================
--- branches/dev/html/mobile/magazine/confirm.php (revision 11460)
+++ branches/dev/html/mobile/magazine/confirm.php (revision 11648)
@@ -144,5 +144,4 @@
$objQuery = new SC_Query();
- $objQuery->insert("dtb_customer_mail", $arrRegist);
//--¡¡´û¤Ë¥á¥ë¥Þ¥¬ÅÐÏ¿¤·¤Æ¤¤¤ë¤«¤ÎȽÄê
@@ -165,5 +164,18 @@
$sql = "SELECT secret_key FROM dtb_customer_mail WHERE email = ?";
- return $objConn->getOne($sql, array($email));
+ $uniqid = $objConn->getOne($sql, array($email));
+
+ if ($uniqid == '') {
+ $count = 1;
+ while ($count != 0) {
+ $uniqid = sfGetUniqRandomId("t");
+ $count = $objConn->getOne("SELECT COUNT(*) FROM dtb_customer_mail WHERE secret_key = ?", array($uniqid));
+ }
+
+ $objQuery = new SC_Query();
+ $objQuery->update("dtb_customer_mail", array('secret_key' => $uniqid), "email = '" .addslashes($email). "'");
+ }
+
+ return $uniqid;
}
@@ -176,5 +188,5 @@
// NULL¤â¹ØÆɤȤߤʤ¹
- if (count($mailResult) == 0 or ($mailResult[1] != null and $mailResult[1] <= 2 )) {
+ if (count($mailResult) == 0 or ($mailResult[1] != null and $mailResult[1] != 2 )) {
return false;
} else {
Index: branches/dev/html/mobile/index.php
===================================================================
--- branches/dev/html/mobile/index.php (revision 11460)
+++ branches/dev/html/mobile/index.php (revision 11648)
@@ -15,4 +15,5 @@
$objPage = new LC_Page();
$conn = new SC_DBConn();
+$objCustomer = new SC_Customer();
// ¥ì¥¤¥¢¥¦¥È¥Ç¥¶¥¤¥ó¤ò¼èÆÀ
@@ -20,4 +21,5 @@
$objView = new SC_SiteView();
+$objView->assign("isLogin", $objCustomer->isLoginSuccess());
$objView->assignobj($objPage);
$objView->display(SITE_FRAME);
Index: branches/dev/html/mobile/entry/index.php
===================================================================
--- branches/dev/html/mobile/entry/index.php (revision 11460)
+++ branches/dev/html/mobile/entry/index.php (revision 11648)
@@ -329,6 +329,6 @@
$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("¤ªÌ¾Á°¡Ê¥«¥Ê/À«¡Ë", '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"));
@@ -357,6 +357,6 @@
$objErr->doFunc(array("¥Ñ¥¹¥ï¡¼¥É", 'password', PASSWORD_LEN1, PASSWORD_LEN2), array("EXIST_CHECK", "SPTAB_CHECK" ,"ALNUM_CHECK", "NUM_RANGE_CHECK"));
- $objErr->doFunc(array("¥Ñ¥¹¥ï¡¼¥É¤ò˺¤ì¤¿¤È¤¤Î¥Ò¥ó¥È ¼ÁÌä", "reminder") ,array("SELECT_CHECK", "NUM_CHECK"));
- $objErr->doFunc(array("¥Ñ¥¹¥ï¡¼¥É¤ò˺¤ì¤¿¤È¤¤Î¥Ò¥ó¥È Åú¤¨", "reminder_answer", STEXT_LEN) ,array("EXIST_CHECK","SPTAB_CHECK" , "MAX_LENGTH_CHECK"));
+ $objErr->doFunc(array("¥Ñ¥¹¥ï¡¼¥É³ÎǧÍѤμÁÌä", "reminder") ,array("SELECT_CHECK", "NUM_CHECK"));
+ $objErr->doFunc(array("¥Ñ¥¹¥ï¡¼¥É³ÎǧÍѤμÁÌä¤ÎÅú¤¨", "reminder_answer", STEXT_LEN) ,array("EXIST_CHECK","SPTAB_CHECK" , "MAX_LENGTH_CHECK"));
return $objErr->arrErr;
@@ -373,5 +373,5 @@
$objErr->doFunc(array("͹ÊØÈÖ¹æ", "zip01", "zip02"), array("ALL_EXIST_CHECK"));
- $objErr->doFunc(array("¤´ÀÊÌ", "sex") ,array("SELECT_CHECK", "NUM_CHECK"));
+ $objErr->doFunc(array("ÀÊÌ", "sex") ,array("SELECT_CHECK", "NUM_CHECK"));
$objErr->doFunc(array("À¸Ç¯·îÆü", "year", "month", "day"), array("SELECT_CHECK", "CHECK_DATE"));
@@ -386,10 +386,10 @@
$objErr->doFunc(array("ÅÔÆ»Éܸ©", 'pref'), array("SELECT_CHECK","NUM_CHECK"));
- $objErr->doFunc(array("¤´½»½ê1", "addr01", MTEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK" ,"MAX_LENGTH_CHECK"));
- $objErr->doFunc(array("¤´½»½ê2", "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"));
+ $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;
Index: branches/dev/html/mobile/entry/email_mobile.php
===================================================================
--- branches/dev/html/mobile/entry/email_mobile.php (revision 11460)
+++ branches/dev/html/mobile/entry/email_mobile.php (revision 11648)
@@ -36,5 +36,5 @@
$objPage->arrErr = lfCheckError($objFormParam, $objCustomer);
- if (empty($arrRet)) {
+ if (empty($objPage->arrErr)) {
lfRegister($objFormParam, $objCustomer);
$objPage->tpl_mainpage = 'entry/email_mobile_complete.tpl';
Index: branches/dev/html/mobile/products/list.php
===================================================================
--- branches/dev/html/mobile/products/list.php (revision 11460)
+++ branches/dev/html/mobile/products/list.php (revision 11648)
@@ -29,6 +29,6 @@
//ɽ¼¨·ï¿ô¤ÎÁªÂò
-if(sfIsInt($_POST['disp_number'])) {
- $objPage->disp_number = $_POST['disp_number'];
+if(sfIsInt($_REQUEST['disp_number'])) {
+ $objPage->disp_number = $_REQUEST['disp_number'];
} else {
//ºÇ¾®É½¼¨·ï¿ô¤òÁªÂò
@@ -37,5 +37,5 @@
//ɽ¼¨½ç½ø¤ÎÊݸ
-$objPage->orderby = $_POST['orderby'];
+$objPage->orderby = $_REQUEST['orderby'];
// GET¤Î¥«¥Æ¥´¥êID¤ò¸µ¤ËÀµ¤·¤¤¥«¥Æ¥´¥êID¤ò¼èÆÀ¤¹¤ë¡£
@@ -44,6 +44,8 @@
// ¥¿¥¤¥È¥ëÊÔ½¸
$tpl_subtitle = "";
+$tpl_search_mode = false;
if($_GET['mode'] == 'search'){
$tpl_subtitle = "¸¡º÷·ë²Ì";
+ $tpl_search_mode = true;
}elseif ($category_id == "" ) {
$tpl_subtitle = "Á´¾¦ÉÊ";
@@ -74,5 +76,5 @@
// ¾¦ÉÊ°ìÍ÷¤Îɽ¼¨½èÍý
- $objPage = lfDispProductsList($category_id, $_GET['name'], $objPage->disp_number, $_POST['orderby']);
+ $objPage = lfDispProductsList($category_id, $_GET['name'], $objPage->disp_number, $_REQUEST['orderby']);
// ¸¡º÷¾ò·ï¤ò²èÌ̤Ëɽ¼¨
@@ -126,5 +128,25 @@
+// ¥Ú¡¼¥¸Á÷¤êµ¡Ç½ÍѤÎURL¤òºîÀ®¤¹¤ë¡£
+$objURL = new Net_URL($_SERVER['PHP_SELF']);
+foreach ($_REQUEST as $key => $value) {
+ if ($key == session_name() || $key == 'pageno') {
+ continue;
+ }
+ $objURL->addQueryString($key, mb_convert_encoding($value, 'SJIS', 'EUC-JP'));
+}
+
+if ($objPage->objNavi->now_page > 1) {
+ $objURL->addQueryString('pageno', $objPage->objNavi->now_page - 1);
+ $objPage->tpl_previous_page = $objURL->path . '?' . $objURL->getQueryString();
+}
+if ($objPage->objNavi->now_page < $objPage->objNavi->max_page) {
+ $objURL->addQueryString('pageno', $objPage->objNavi->now_page + 1);
+ $objPage->tpl_next_page = $objURL->path . '?' . $objURL->getQueryString();
+}
+
+
$objPage->tpl_subtitle = $tpl_subtitle;
+$objPage->tpl_search_mode = $tpl_search_mode;
// »ÙʧÊýË¡¤Î¼èÆÀ
@@ -153,5 +175,5 @@
global $objPage;
$objQuery = new SC_Query();
- $objPage->tpl_pageno = $_POST['pageno'];
+ $objPage->tpl_pageno = $_REQUEST['pageno'];
//ɽ¼¨·ï¿ô¤Ç¥Æ¥ó¥×¥ì¡¼¥È¤òÀÚ¤êÂؤ¨¤ë
@@ -195,5 +217,5 @@
// ¥Ú¡¼¥¸Á÷¤ê¤Î¼èÆÀ
- $objNavi = new SC_PageNavi($_POST['pageno'], $linemax, $disp_num, "fnNaviPage", NAVI_PMAX);
+ $objNavi = new SC_PageNavi($_REQUEST['pageno'], $linemax, $disp_num, "fnNaviPage", NAVI_PMAX);
$strnavi = $objNavi->strnavi;
@@ -222,4 +244,5 @@
}
+ $objPage->objNavi =& $objNavi;
return $objPage;
}