[Svn-src-all:3904] [version-2_12-dev 22818] #2236 2.12.3にて行われていた対応(r22231,r22241,r22282,r22348,r22374,r22376,r22440,r22545,r22546)を元に戻します
m_uehara
admin ＠ mail.ec-cube.net
2013年 5月 14日 (火) 12:08:46 JST
Subversion committed to /home/svn/open 22818
http://svn.ec-cube.net/open_trac/changeset/22818
┌────────────────────────────┐
│更新者 : m_uehara │
│更新日時: 2013-05-14 12:08:44 +0900 (火, 14 5月 2013)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#2236 2.12.3にて行われていた対応(r22231,r22241,r22282,r22348,r22374,r22376,r22440,r22545,r22546)を元に戻します
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_12-dev/data/Smarty/templates/default/contact/confirm.tpl
U branches/version-2_12-dev/data/Smarty/templates/default/products/review_confirm.tpl
U branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_find2.tpl
U branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_item.tpl
U branches/version-2_12-dev/data/Smarty/templates/sphone/products/detail.tpl
U branches/version-2_12-dev/data/class/helper/SC_Helper_Address.php
U branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php
U branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php
U branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php
U branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php
U branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php
U branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php
U branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
U branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
U branches/version-2_12-dev/html/install/index.php
変更: branches/version-2_12-dev/data/Smarty/templates/default/contact/confirm.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/contact/confirm.tpl 2013-05-13 15:30:26 UTC (rev 22817)
+++ branches/version-2_12-dev/data/Smarty/templates/default/contact/confirm.tpl 2013-05-14 03:08:44 UTC (rev 22818)
@@ -37,11 +37,11 @@
<col width="30%" />
<col width="70%" />
<tr>
- <th>お名前<span class="attention">※</span></th>
+ <th>お名前</th>
<td><!--{$arrForm.name01.value|h}--> <!--{$arrForm.name02.value|h}--></td>
</tr>
<tr>
- <th>お名前(フリガナ)<span class="attention">※</span></th>
+ <th>お名前(フリガナ)</th>
<td><!--{$arrForm.kana01.value|h}--> <!--{$arrForm.kana02.value|h}--></td>
</tr>
<tr>
@@ -65,11 +65,11 @@
</td>
</tr>
<tr>
- <th>メールアドレス<span class="attention">※</span></th>
+ <th>メールアドレス</th>
<td><a href="mailto:<!--{$arrForm.email.value|escape:'hex'}-->"><!--{$arrForm.email.value|escape:'hexentity'}--></a></td>
</tr>
<tr>
- <th>お問い合わせ内容<span class="attention">※</span></th>
+ <th>お問い合わせ内容</th>
<td><!--{$arrForm.contents.value|h|nl2br}--></td>
</tr>
</table>
変更: branches/version-2_12-dev/data/Smarty/templates/default/products/review_confirm.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/products/review_confirm.tpl 2013-05-13 15:30:26 UTC (rev 22817)
+++ branches/version-2_12-dev/data/Smarty/templates/default/products/review_confirm.tpl 2013-05-14 03:08:44 UTC (rev 22818)
@@ -41,7 +41,7 @@
<td><!--{$arrForm.name|h}--></td>
</tr>
<tr>
- <th>投稿者名<span class="attention">※</span></th>
+ <th>投稿者名</th>
<td><!--{$arrForm.reviewer_name|h}--></td>
</tr>
<tr>
@@ -53,15 +53,15 @@
<td><!--{if $arrForm.sex eq 1}-->男性<!--{elseif $arrForm.sex eq 2}-->女性<!--{/if}--></td>
</tr>
<tr>
- <th>おすすめレベル<span class="attention">※</span></th>
+ <th>おすすめレベル</th>
<td><span class="recommend_level"><!--{$arrRECOMMEND[$arrForm.recommend_level]}--></span></td>
</tr>
<tr>
- <th>タイトル<span class="attention">※</span></th>
+ <th>タイトル</th>
<td><!--{$arrForm.title|h}--></td>
</tr>
<tr>
- <th>コメント<span class="attention">※</span></th>
+ <th>コメント</th>
<td><!--{$arrForm.comment|h|nl2br}--></td>
</tr>
</table>
変更: branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_find2.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_find2.tpl 2013-05-13 15:30:26 UTC (rev 22817)
+++ branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_find2.tpl 2013-05-14 03:08:44 UTC (rev 22818)
@@ -36,7 +36,7 @@
<!--{html_options options=$arrClassCat2 selected=$arrForm.classcategory_id2.value}-->
</select><br>
<input type="hidden" name="mode" value="selectItem">
- <input type="hidden" name="classcategory_id1" value="<!--{$arrForm.classcategory_id1.value}-->">
+ <input type="hidden" name="classcategory_id1" value="<!--{$arrForm.classcategory_id1.value|h}-->">
<input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->">
<center><input type="submit" name="submit" value="次へ"></center>
</form>
変更: branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_item.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_item.tpl 2013-05-13 15:30:26 UTC (rev 22817)
+++ branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_item.tpl 2013-05-14 03:08:44 UTC (rev 22818)
@@ -33,8 +33,8 @@
<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->">
<input type="text" name="quantity" size="3" value="<!--{$arrForm.quantity.value|default:1|h}-->" maxlength=<!--{$smarty.const.INT_LEN}--> istyle="4"><br>
<input type="hidden" name="mode" value="cart">
- <input type="hidden" name="classcategory_id1" value="<!--{$arrForm.classcategory_id1.value}-->">
- <input type="hidden" name="classcategory_id2" value="<!--{$arrForm.classcategory_id2.value}-->">
+ <input type="hidden" name="classcategory_id1" value="<!--{$arrForm.classcategory_id1.value|h}-->">
+ <input type="hidden" name="classcategory_id2" value="<!--{$arrForm.classcategory_id2.value|h}-->">
<input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->">
<input type="hidden" name="product_class_id" value="<!--{$tpl_product_class_id}-->">
<input type="hidden" name="product_type" value="<!--{$tpl_product_type}-->">
変更: branches/version-2_12-dev/data/Smarty/templates/sphone/products/detail.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/products/detail.tpl 2013-05-13 15:30:26 UTC (rev 22817)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/products/detail.tpl 2013-05-14 03:08:44 UTC (rev 22818)
@@ -376,7 +376,7 @@
</ul>
<!--{/if}-->
</div>
- </div>
+
<!--お客様の声ここまで-->
変更: branches/version-2_12-dev/data/class/helper/SC_Helper_Address.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Address.php 2013-05-13 15:30:26 UTC (rev 22817)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Address.php 2013-05-14 03:08:44 UTC (rev 22818)
@@ -36,7 +36,7 @@
* @param array $sqlval
* @return array()
*/
- function save($sqlval) {
+ function registAddress($sqlval) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$customer_id = $sqlval['customer_id'];
$other_deliv_id = $sqlval['other_deliv_id'];
@@ -76,7 +76,7 @@
* @param integer $other_deliv_id
* @return array()
*/
- function get($other_deliv_id) {
+ function getAddress($other_deliv_id) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
$address = $objQuery->select('*', 'dtb_other_deliv', 'other_deliv_id = ?', array($other_deliv_id));
return $address ? $address[0] : FALSE;
@@ -105,7 +105,7 @@
* @param integer $delivId
* @return void
*/
- function delete($other_deliv_id) {
+ function deleteAddress($other_deliv_id) {
$where = 'other_deliv_id = ?';
$objQuery =& SC_Query_Ex::getSingletonInstance();
$objQuery->delete('dtb_other_deliv', $where, array($other_deliv_id));
変更: branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php 2013-05-13 15:30:26 UTC (rev 22817)
+++ branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php 2013-05-14 03:08:44 UTC (rev 22818)
@@ -220,13 +220,23 @@
function changeData(&$objFormParam) {
$objQuery =& SC_Query_Ex::getSingletonInstance();
- if (!SC_Utils_Ex::sfIsInt($objFormParam->getValue('template_id'))) {
- trigger_error('テンプレートが指定されていません。', E_USER_ERROR);
+ $template_id = $objFormParam->getValue('template_id');
+
+ // 未選択時
+ if (strlen($template_id) === 0) {
+ $mailTemplates = null;
}
+ // 有効選択時
+ elseif (SC_Utils_Ex::sfIsInt($template_id)) {
+ $where = 'template_id = ?';
+ $arrWhereVal = array($template_id);
+ $mailTemplates = $objQuery->getRow('subject, header, footer', 'dtb_mailtemplate', $where, $arrWhereVal);
+ }
+ // 不正選択時
+ else {
+ trigger_error('テンプレートの指定が不正。', E_USER_ERROR);
+ }
- $where = 'template_id = ?';
- $arrWhereVal = array($objFormParam->getValue('template_id'));
- $mailTemplates = $objQuery->getRow('subject, header, footer', 'dtb_mailtemplate', $where, $arrWhereVal);
if (empty($mailTemplates)) {
foreach (array('subject','header','footer') as $key) {
$objFormParam->setValue($key, '');
変更: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php 2013-05-13 15:30:26 UTC (rev 22817)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ReviewEdit.php 2013-05-14 03:08:44 UTC (rev 22818)
@@ -87,7 +87,7 @@
case 'complete':
$this->arrErr = $objFormParam->checkError();
// エラー無し
- if (!SC_Utils_Ex::isBlank($this->arrErr)) {
+ if (SC_Utils_Ex::isBlank($this->arrErr)) {
// レビュー情報の更新
$this->lfRegistReviewData($this->arrForm['review_id'], $objFormParam);
// レビュー情報のDB取得
変更: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php 2013-05-13 15:30:26 UTC (rev 22817)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php 2013-05-14 03:08:44 UTC (rev 22818)
@@ -583,7 +583,7 @@
}
// 在庫無制限フラグ列を利用する場合、
- if (array_key_exists('stock_unlimited', $sqlval)) {
+ if (array_key_exists('stock_unlimited', $sqlval) and $sqlval['stock_unlimited'] != '') {
// 在庫無制限フラグ = 無制限の場合、
if ($sqlval['stock_unlimited'] == UNLIMITED_FLG_UNLIMITED) {
$sqlval['stock'] = null;
変更: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php 2013-05-13 15:30:26 UTC (rev 22817)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php 2013-05-14 03:08:44 UTC (rev 22818)
@@ -84,7 +84,7 @@
SC_Response_Ex::actionExit();
}
- $objAddress->delete($objFormParam->getValue('other_deliv_id'));
+ $objAddress->deleteAddress($objFormParam->getValue('other_deliv_id'));
break;
// スマートフォン版のもっと見るボタン用
変更: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php 2013-05-13 15:30:26 UTC (rev 22817)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php 2013-05-14 03:08:44 UTC (rev 22818)
@@ -135,7 +135,7 @@
default :
if ($_GET['other_deliv_id'] != '') {
- $arrOtherDeliv = $objAddress->get($_SESSION['other_deliv_id']);
+ $arrOtherDeliv = $objAddress->getAddress($_SESSION['other_deliv_id']);
//不正アクセス判定
if (!$objCustomer->isLoginSuccess(true) || !$arrOtherDeliv) {
@@ -173,7 +173,7 @@
$sqlval['other_deliv_id'] = $arrRet['other_deliv_id'];
$sqlval['customer_id'] = $customer_id;
- $objAddress->save($sqlval);
+ $objAddress->registAddress($sqlval);
}
function lfRegistDataNonMember($objFormParam) {
変更: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php 2013-05-13 15:30:26 UTC (rev 22817)
+++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php 2013-05-14 03:08:44 UTC (rev 22818)
@@ -252,8 +252,7 @@
header('Content-Length: ' . $content_length);
}
echo fread($fp, $content_length) ;
- ob_flush();
- flush();
+ SC_Utils_Ex::sfFlush();
}
/**
@@ -305,8 +304,8 @@
while (!feof($realpath) && (!connection_aborted()) && ($bytes_send<$new_length)) {
$buffer = fread($realpath, $chunksize);
print($buffer);
- ob_flush();
- flush();
+ SC_Utils_Ex::sfFlush();
+ SC_Utils_Ex::extendTimeOut();
$bytes_send += strlen($buffer);
}
fclose($realpath);
変更: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php 2013-05-13 15:30:26 UTC (rev 22817)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php 2013-05-14 03:08:44 UTC (rev 22818)
@@ -109,7 +109,7 @@
switch ($this->getMode()) {
// 削除
case 'delete':
- $objAddress->delete($arrForm['other_deliv_id']);
+ $objAddress->deleteAddress($arrForm['other_deliv_id']);
break;
// 会員登録住所に送る
@@ -227,7 +227,7 @@
}
// 別のお届け先がチェックされている場合
else {
- $arrOtherDeliv = $objAddress->get($other_deliv_id);
+ $arrOtherDeliv = $objAddress->getAddress($other_deliv_id);
if (!$arrOtherDeliv) {
return false;
}
変更: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php 2013-05-13 15:30:26 UTC (rev 22817)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php 2013-05-14 03:08:44 UTC (rev 22818)
@@ -306,7 +306,7 @@
if ($objCustomer->isLoginSuccess(true)) {
if ($other_deliv_id != 0) {
- $otherDeliv = $objAddress->get($other_deliv_id);
+ $otherDeliv = $objAddress->getAddress($other_deliv_id);
foreach ($otherDeliv as $key => $val) {
$arrValues[$other_deliv_id]['shipping_' . $key] = $val;
}
変更: branches/version-2_12-dev/html/install/index.php
===================================================================
--- branches/version-2_12-dev/html/install/index.php 2013-05-13 15:30:26 UTC (rev 22817)
+++ branches/version-2_12-dev/html/install/index.php 2013-05-14 03:08:44 UTC (rev 22818)
@@ -197,12 +197,14 @@
}
//マスターデータのキャッシュを削除
- $cache_dir = '../../data/cache/';
+ $cache_dir = DATA_REALDIR . 'cache/';
$res_dir = opendir($cache_dir);
while ($file_name = readdir($res_dir)){
//dummy以外は削除
if ($file_name != 'dummy'){
- unlink($cache_dir . $file_name);
+ if (is_file($cache_dir . $file_name)) {
+ unlink($cache_dir . $file_name);
+ }
}
}
closedir($res_dir);
Svn-src-all メーリングリストの案内