[Svn-src-all:3886] [version-2_12_4en 22800] #2238 Merged r22580, r22604 and r22798
michael_nelson
admin ＠ mail.ec-cube.net
2013年 5月 7日 (火) 20:58:23 JST
Subversion committed to /home/svn/open 22800
http://svn.ec-cube.net/open_trac/changeset/22800
┌────────────────────────────┐
│更新者 : michael_nelson │
│更新日時: 2013-05-07 20:58:23 +0900 (火, 07 5月 2013)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#2238 Merged r22580, r22604 and r22798
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
_U branches/version-2_12_4en/
_U branches/version-2_12_4en/data/
U branches/version-2_12_4en/data/Smarty/templates/default/shopping/multiple.tpl
U branches/version-2_12_4en/data/Smarty/templates/mobile/shopping/multiple.tpl
U branches/version-2_12_4en/data/Smarty/templates/sphone/shopping/multiple.tpl
U branches/version-2_12_4en/data/class/pages/cart/LC_Page_Cart.php
U branches/version-2_12_4en/data/class/pages/forgot/LC_Page_Forgot.php
Property changes on: branches/version-2_12_4en
___________________________________________________________________
変更: svn:mergeinfo
- /branches/version-2_12-dev:21998-22057,22062-22080,22083-22086,22089-22095,22097-22098,22104-22107,22111-22120,22123-22143,22145-22146,22158,22164-22165,22167-22169,22187-22196,22199-22204,22231,22241
/branches/version-2_12_2:21999-22009
/branches/version-2_12_3:22219-22261
/branches/version-2_12_3en-p1:22525-22541
/branches/version-2_4:18516-18517,18519,18522-18525,18527,18531,18541,18555,18560
/branches/version-2_4-dev:18473-18475
+ /branches/version-2_12-dev:21998-22057,22062-22080,22083-22086,22089-22095,22097-22098,22104-22107,22111-22120,22123-22143,22145-22146,22158,22164-22165,22167-22169,22187-22196,22199-22204,22231,22241,22580,22604,22798
/branches/version-2_12_2:21999-22009
/branches/version-2_12_3:22219-22261
/branches/version-2_12_3en-p1:22525-22541
/branches/version-2_4:18516-18517,18519,18522-18525,18527,18531,18541,18555,18560
/branches/version-2_4-dev:18473-18475
Property changes on: branches/version-2_12_4en/data
___________________________________________________________________
変更: svn:mergeinfo
- /branches/version-2_12-dev:22241
/branches/version-2_12-dev/data:21998-22057,22062-22080,22083-22086,22089-22095,22097-22098,22104-22107,22111-22120,22123-22143,22145-22146,22158,22164-22165,22167-22169,22187-22196,22199-22204,22231,22241
/branches/version-2_12_2/data:21999-22009
/branches/version-2_12_3/data:22219-22261
/branches/version-2_12_3en-p1/data:22525-22541
/branches/version-2_4/data:18516-18517,18519,18522-18525,18527,18531,18541,18555,18560
/branches/version-2_4-dev/data:18473-18475
+ /branches/version-2_12-dev:22241
/branches/version-2_12-dev/data:21998-22057,22062-22080,22083-22086,22089-22095,22097-22098,22104-22107,22111-22120,22123-22143,22145-22146,22158,22164-22165,22167-22169,22187-22196,22199-22204,22231,22241,22580,22604,22798
/branches/version-2_12_2/data:21999-22009
/branches/version-2_12_3/data:22219-22261
/branches/version-2_12_3en-p1/data:22525-22541
/branches/version-2_4/data:18516-18517,18519,18522-18525,18527,18531,18541,18555,18560
/branches/version-2_4-dev/data:18473-18475
変更: branches/version-2_12_4en/data/Smarty/templates/default/shopping/multiple.tpl
===================================================================
--- branches/version-2_12_4en/data/Smarty/templates/default/shopping/multiple.tpl 2013-05-07 11:03:54 UTC (rev 22799)
+++ branches/version-2_12_4en/data/Smarty/templates/default/shopping/multiple.tpl 2013-05-07 11:58:23 UTC (rev 22800)
@@ -87,28 +87,28 @@
<!--{if $arrErr[$key][$index] != ''}-->
<span class="attention"><!--{$arrErr[$key][$index]}--></span>
<!--{/if}-->
- <input type="text" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->" class="box40" style="<!--{$arrErr[$key][$index]|sfGetErrorColor}-->" />
+ <input type="text" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" class="box40" style="<!--{$arrErr[$key][$index]|sfGetErrorColor}-->" />
</td>
<td>
<input type="hidden" name="cart_no[<!--{$index}-->]" value="<!--{$index}-->" />
<!--{assign var=key value="product_class_id"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->" />
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
<!--{assign var=key value="name"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->" />
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
<!--{assign var=key value="class_name1"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->" />
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
<!--{assign var=key value="class_name2"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->" />
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
<!--{assign var=key value="classcategory_name1"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->" />
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
<!--{assign var=key value="classcategory_name2"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->" />
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
<!--{assign var=key value="main_image"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->" />
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
<!--{assign var=key value="main_list_image"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->" />
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
<!--{assign var=key value="price"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->" />
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
<!--{assign var=key value="shipping"}-->
<!--{if strlen($arrErr[$key][$index]) >= 1}-->
<div class="attention"><!--{$arrErr[$key][$index]}--></div>
変更: branches/version-2_12_4en/data/Smarty/templates/mobile/shopping/multiple.tpl
===================================================================
--- branches/version-2_12_4en/data/Smarty/templates/mobile/shopping/multiple.tpl 2013-05-07 11:03:54 UTC (rev 22799)
+++ branches/version-2_12_4en/data/Smarty/templates/mobile/shopping/multiple.tpl 2013-05-07 11:58:23 UTC (rev 22800)
@@ -34,27 +34,27 @@
<!--{assign var=index value=$smarty.section.line.index}-->
<input type="hidden" name="cart_no[<!--{$index}-->]" value="<!--{$index}-->">
<!--{assign var=key value="product_class_id"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->">
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->">
<!--{assign var=key value="name"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->">
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->">
<!--{assign var=key value="class_name1"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->">
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->">
<!--{assign var=key value="class_name2"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->">
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->">
<!--{assign var=key value="classcategory_name1"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->">
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->">
<!--{assign var=key value="classcategory_name2"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->">
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->">
<!--{assign var=key value="main_image"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->">
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->">
<!--{assign var=key value="main_list_image"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->">
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->">
<!--{assign var=key value="price"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->">
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->">
<!--{* 商品名 *}-->◎<!--{$arrForm.name.value[$index]|h}--><br>
- <!--{* 規格名1 *}--><!--{if $arrForm.classcategory_name1.value[$index] != ""}--><!--{$arrForm.class_name1.value[$index]}-->：<!--{$arrForm.classcategory_name1.value[$index]}--><br><!--{/if}-->
- <!--{* 規格名2 *}--><!--{if $arrForm.classcategory_name2.value[$index] != ""}--><!--{$arrForm.class_name2.value[$index]}-->：<!--{$arrForm.classcategory_name2.value[$index]}--><br><!--{/if}-->
+ <!--{* 規格名1 *}--><!--{if $arrForm.classcategory_name1.value[$index] != ""}--><!--{$arrForm.class_name1.value[$index]|h}-->：<!--{$arrForm.classcategory_name1.value[$index]|h}--><br><!--{/if}-->
+ <!--{* 規格名2 *}--><!--{if $arrForm.classcategory_name2.value[$index] != ""}--><!--{$arrForm.class_name2.value[$index]|h}-->：<!--{$arrForm.classcategory_name2.value[$index]|h}--><br><!--{/if}-->
<!--{* 販売価格 *}-->
<!--{$arrForm.price.value[$index]|sfCalcIncTax|number_format}-->円<br>
@@ -62,7 +62,7 @@
<!--{if $arrErr[$key][$index] != ''}-->
<font color="#FF0000"><!--{$arrErr[$key][$index]}--></font>
<!--{/if}-->
- 数量：<input type="text" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->" size="4">
+ 数量：<input type="text" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" size="4">
<br>
<!--{assign var=key value="shipping"}-->
変更: branches/version-2_12_4en/data/Smarty/templates/sphone/shopping/multiple.tpl
===================================================================
--- branches/version-2_12_4en/data/Smarty/templates/sphone/shopping/multiple.tpl 2013-05-07 11:03:54 UTC (rev 22799)
+++ branches/version-2_12_4en/data/Smarty/templates/sphone/shopping/multiple.tpl 2013-05-07 11:58:23 UTC (rev 22800)
@@ -71,7 +71,7 @@
<ul>
<li class="result"><span class="mini">数量</li>
<li>
- <input type="number" name="<!--{$key}-->[<!--{$index}-->]" class="cartin_quantity txt" value="<!--{$arrForm[$key].value[$index]}-->" max="9" style="" />
+ <input type="number" name="<!--{$key}-->[<!--{$index}-->]" class="cartin_quantity txt" value="<!--{$arrForm[$key].value[$index]|h}-->" max="9" style="" />
</li>
</ul>
</div>
@@ -81,23 +81,23 @@
<div class="btn_area_btm">
<input type="hidden" name="cart_no[<!--{$index}-->]" value="<!--{$index}-->" />
<!--{assign var=key value="product_class_id"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->" />
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
<!--{assign var=key value="name"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->" />
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
<!--{assign var=key value="class_name1"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->" />
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
<!--{assign var=key value="class_name2"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->" />
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
<!--{assign var=key value="classcategory_name1"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->" />
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
<!--{assign var=key value="classcategory_name2"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->" />
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
<!--{assign var=key value="main_image"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->" />
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
<!--{assign var=key value="main_list_image"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->" />
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
<!--{assign var=key value="price"}-->
- <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->" />
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
<!--{assign var=key value="shipping"}-->
<select name="<!--{$key}-->[<!--{$index}-->]" class="boxLong data-role-none"><!--{html_options options=$addrs selected=$arrForm[$key].value[$index]}--></select>
</div>
変更: branches/version-2_12_4en/data/class/pages/cart/LC_Page_Cart.php
===================================================================
--- branches/version-2_12_4en/data/class/pages/cart/LC_Page_Cart.php 2013-05-07 11:03:54 UTC (rev 22799)
+++ branches/version-2_12_4en/data/class/pages/cart/LC_Page_Cart.php 2013-05-07 11:58:23 UTC (rev 22800)
@@ -82,7 +82,7 @@
$objSiteSess = new SC_SiteSession_Ex();
$objCustomer = new SC_Customer_Ex();
- $objFormParam = $this->lfInitParam($_REQUEST);
+ $objFormParam = $this->lfInitParam($_POST);
$this->mode = $this->getMode();
$this->cartKeys = $objCartSess->getKeys();
@@ -95,6 +95,13 @@
$cart_no = $objFormParam->getValue('cart_no');
$cartKey = $objFormParam->getValue('cartKey');
+
+ // エラーチェック
+ $arrError = $objFormParam->checkError();
+ if(isset($arrError) && !empty($arrError)) {
+ SC_Utils_Ex::sfDispSiteError(CART_NOT_FOUND);
+ SC_Response_Ex::actionExit();
+ }
switch ($this->mode) {
case 'confirm':
@@ -206,7 +213,7 @@
// PC版での値引き継ぎ用
$objFormParam->addParam(t('c_Category ID_01'), 'category_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
// スマートフォン版での数量変更用
- $objFormParam->addParam(t('c_Quantity_01'), 'quantity', INT_LEN, 'n', array('EXIST_CHECK', 'ZERO_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam(t('c_Quantity_01'), 'quantity', INT_LEN, 'n', array('ZERO_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
// 値の取得
$objFormParam->setParam($arrRequest);
// 入力値の変換
変更: branches/version-2_12_4en/data/class/pages/forgot/LC_Page_Forgot.php
===================================================================
--- branches/version-2_12_4en/data/class/pages/forgot/LC_Page_Forgot.php 2013-05-07 11:03:54 UTC (rev 22799)
+++ branches/version-2_12_4en/data/class/pages/forgot/LC_Page_Forgot.php 2013-05-07 11:58:23 UTC (rev 22800)
@@ -149,7 +149,7 @@
function lfCheckForgotMail(&$arrForm, &$arrReminder) {
$errmsg = NULL;
$objQuery =& SC_Query_Ex::getSingletonInstance();
- $where = '(email Like ? OR email_mobile Like ?) AND name01 Like ? AND name02 Like ? AND del_flg = 0';
+ $where = '(email = ? OR email_mobile = ?) AND name01 = ? AND name02 = ? AND del_flg = 0';
$arrVal = array($arrForm['email'], $arrForm['email'], $arrForm['name01'], $arrForm['name02']);
$result = $objQuery->select('reminder, status', 'dtb_customer', $where, $arrVal);
if (isset($result[0]['reminder']) and isset($arrReminder[$result[0]['reminder']])) {
@@ -197,8 +197,8 @@
$objQuery =& SC_Query_Ex::getSingletonInstance();
$cols = 'customer_id, reminder, reminder_answer, salt';
$table = 'dtb_customer';
- $where = '(email Like ? OR email_mobile Like ?)'
- . ' AND name01 Like ? AND name02 Like ?'
+ $where = '(email = ? OR email_mobile = ?)'
+ . ' AND name01 = ? AND name02 = ?'
. ' AND status = 2 AND del_flg = 0';
$arrVal = array($arrForm['email'], $arrForm['email'],
$arrForm['name01'], $arrForm['name02']);
Svn-src-all メーリングリストの案内