[Svn-src-all:4342] [version-2_13-dev 23256] #2427 (SC_SessionFactory_UseRequest#initSession URLパスでリダイレクトしている)
Seasoft
admin ＠ mail.ec-cube.net
2013年 10月 28日 (月) 09:17:35 JST
Subversion committed to /home/svn/open 23256
http://svn.ec-cube.net/open_trac/changeset/23256
┌────────────────────────────┐
│更新者 : Seasoft │
│更新日時: 2013-10-28 09:17:34 +0900 (月, 28 10月 2013)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#2427 (SC_SessionFactory_UseRequest#initSession URLパスでリダイレクトしている)
#2445 (TOPページのURLに揺らぎがある)
#2446 (HTTP へ復帰すべき画面遷移でも HTTPS が維持される)
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_13-dev/data/Smarty/templates/default/contact/complete.tpl
U branches/version-2_13-dev/data/Smarty/templates/default/entry/complete.tpl
U branches/version-2_13-dev/data/Smarty/templates/default/entry/kiyaku.tpl
U branches/version-2_13-dev/data/Smarty/templates/default/error.tpl
U branches/version-2_13-dev/data/Smarty/templates/default/frontparts/bloc/cart.tpl
U branches/version-2_13-dev/data/Smarty/templates/default/header.tpl
U branches/version-2_13-dev/data/Smarty/templates/default/mypage/navi.tpl
U branches/version-2_13-dev/data/Smarty/templates/default/regist/complete.tpl
U branches/version-2_13-dev/data/Smarty/templates/default/shopping/complete.tpl
U branches/version-2_13-dev/data/Smarty/templates/default/shopping/deliv.tpl
U branches/version-2_13-dev/data/Smarty/templates/default/shopping/multiple.tpl
U branches/version-2_13-dev/data/Smarty/templates/default/shopping/payment.tpl
U branches/version-2_13-dev/data/Smarty/templates/mobile/entry/kiyaku.tpl
U branches/version-2_13-dev/data/Smarty/templates/mobile/error.tpl
U branches/version-2_13-dev/data/Smarty/templates/mobile/footer.tpl
U branches/version-2_13-dev/data/Smarty/templates/sphone/cart/index.tpl
U branches/version-2_13-dev/data/Smarty/templates/sphone/contact/complete.tpl
U branches/version-2_13-dev/data/Smarty/templates/sphone/entry/complete.tpl
U branches/version-2_13-dev/data/Smarty/templates/sphone/entry/kiyaku.tpl
U branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/bloc/login.tpl
U branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/bloc/navi_footer.tpl
U branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/bloc/navi_header.tpl
U branches/version-2_13-dev/data/Smarty/templates/sphone/header.tpl
U branches/version-2_13-dev/data/Smarty/templates/sphone/mypage/navi.tpl
U branches/version-2_13-dev/data/Smarty/templates/sphone/regist/complete.tpl
U branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/complete.tpl
U branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/deliv.tpl
U branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/multiple.tpl
U branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/payment.tpl
U branches/version-2_13-dev/data/class/SC_Initial.php
U branches/version-2_13-dev/data/class/helper/SC_Helper_Purchase.php
U branches/version-2_13-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php
U branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php
U branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_Detail.php
U branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_List.php
U branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping.php
U branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
U branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
U branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
U branches/version-2_13-dev/data/class/sessionfactory/SC_SessionFactory_UseRequest.php
U branches/version-2_13-dev/data/mtb_constants_init.php
U branches/version-2_13-dev/html/install/sql/insert_data.sql
U branches/version-2_13-dev/test/class/page/LC_Page_Test.php
変更: branches/version-2_13-dev/data/Smarty/templates/default/contact/complete.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/default/contact/complete.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/default/contact/complete.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -42,7 +42,7 @@
<div class="btn_area">
<ul>
<li>
- <a href="<!--{$smarty.const.TOP_URLPATH}-->"><img class="hover_change_image" src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg" alt="トップページへ" /></a>
+ <a href="<!--{$smarty.const.TOP_URL}-->"><img class="hover_change_image" src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg" alt="トップページへ" /></a>
</li>
</ul>
</div>
変更: branches/version-2_13-dev/data/Smarty/templates/default/entry/complete.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/default/entry/complete.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/default/entry/complete.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -41,7 +41,7 @@
<div class="btn_area">
<ul>
<li>
- <a href="<!--{$smarty.const.TOP_URLPATH}-->"><img class="hover_change_image" src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg" alt="トップページへ" /></a>
+ <a href="<!--{$smarty.const.TOP_URL}-->"><img class="hover_change_image" src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg" alt="トップページへ" /></a>
</li>
</ul>
</div>
変更: branches/version-2_13-dev/data/Smarty/templates/default/entry/kiyaku.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/default/entry/kiyaku.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/default/entry/kiyaku.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -35,7 +35,7 @@
<div class="btn_area">
<ul>
<li>
- <a href="<!--{$smarty.const.TOP_URLPATH}-->">
+ <a href="<!--{$smarty.const.TOP_URL}-->">
<img class="hover_change_image" src="<!--{$TPL_URLPATH}-->img/button/btn_entry_cannot.jpg" alt="同意しない" />
</a>
</li>
変更: branches/version-2_13-dev/data/Smarty/templates/default/error.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/default/error.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/default/error.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -32,7 +32,7 @@
<ul>
<li>
<!--{if $return_top}-->
- <a href="<!--{$smarty.const.TOP_URLPATH}-->"><img class="hover_change_image" src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg" alt="トップページへ" /></a>
+ <a href="<!--{$smarty.const.TOP_URL}-->"><img class="hover_change_image" src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg" alt="トップページへ" /></a>
<!--{else}-->
<a href="javascript:history.back()"><img class="hover_change_image" src="<!--{$TPL_URLPATH}-->img/button/btn_back.jpg" alt="戻る" /></a>
<!--{/if}-->
変更: branches/version-2_13-dev/data/Smarty/templates/default/frontparts/bloc/cart.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/default/frontparts/bloc/cart.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/default/frontparts/bloc/cart.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -43,7 +43,7 @@
<!--{/if}-->
</div>
<div class="btn">
- <a href="<!--{$smarty.const.CART_URLPATH}-->"><img class="hover_change_image" src="<!--{$TPL_URLPATH}-->img/button/btn_bloc_cart.jpg" alt="カゴの中を見る" /></a>
+ <a href="<!--{$smarty.const.CART_URL}-->"><img class="hover_change_image" src="<!--{$TPL_URLPATH}-->img/button/btn_bloc_cart.jpg" alt="カゴの中を見る" /></a>
</div>
</div>
</div>
変更: branches/version-2_13-dev/data/Smarty/templates/default/header.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/default/header.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/default/header.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -26,7 +26,7 @@
<div id="header" class="clearfix">
<div id="logo_area">
<p id="site_description">EC-CUBE発!世界中を旅して見つけた立方体グルメを立方隊長が直送！</p>
- <a href="<!--{$smarty.const.TOP_URLPATH}-->"><img src="<!--{$TPL_URLPATH}-->img/common/logo.gif" alt="<!--{$arrSiteInfo.shop_name|h}-->/<!--{$tpl_title|h}-->" /></a>
+ <a href="<!--{$smarty.const.TOP_URL}-->"><img src="<!--{$TPL_URLPATH}-->img/common/logo.gif" alt="<!--{$arrSiteInfo.shop_name|h}-->/<!--{$tpl_title|h}-->" /></a>
</div>
<div id="header_utility">
<div id="headerInternalColumn">
@@ -55,7 +55,7 @@
<a href="<!--{$smarty.const.ROOT_URLPATH}-->entry/kiyaku.php"><img class="hover_change_image" src="<!--{$TPL_URLPATH}-->img/common/btn_header_entry.jpg" alt="会員登録" /></a>
</li>
<li>
- <a href="<!--{$smarty.const.CART_URLPATH}-->"><img class="hover_change_image" src="<!--{$TPL_URLPATH}-->img/common/btn_header_cart.jpg" alt="カゴの中を見る" /></a>
+ <a href="<!--{$smarty.const.CART_URL}-->"><img class="hover_change_image" src="<!--{$TPL_URLPATH}-->img/common/btn_header_cart.jpg" alt="カゴの中を見る" /></a>
</li>
</ul>
</div>
変更: branches/version-2_13-dev/data/Smarty/templates/default/mypage/navi.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/default/mypage/navi.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/default/mypage/navi.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -43,17 +43,17 @@
<!--{* 退会状態 *}-->
<!--{else}-->
- <li><a href="<!--{$smarty.const.TOP_URLPATH}-->" class="<!--{if $tpl_mypageno == 'index'}--> selected<!--{/if}-->">
+ <li><a href="<!--{$smarty.const.TOP_URL}-->" class="<!--{if $tpl_mypageno == 'index'}--> selected<!--{/if}-->">
購入履歴一覧</a></li>
<!--{if $smarty.const.OPTION_FAVORITE_PRODUCT == 1}-->
- <li><a href="<!--{$smarty.const.TOP_URLPATH}-->" class="<!--{if $tpl_mypageno == 'favorite'}--> selected<!--{/if}-->">
+ <li><a href="<!--{$smarty.const.TOP_URL}-->" class="<!--{if $tpl_mypageno == 'favorite'}--> selected<!--{/if}-->">
お気に入り一覧</a></li>
<!--{/if}-->
- <li><a href="<!--{$smarty.const.TOP_URLPATH}-->" class="<!--{if $tpl_mypageno == 'change'}--> selected<!--{/if}-->">
+ <li><a href="<!--{$smarty.const.TOP_URL}-->" class="<!--{if $tpl_mypageno == 'change'}--> selected<!--{/if}-->">
会員登録内容変更</a></li>
- <li><a href="<!--{$smarty.const.TOP_URLPATH}-->" class="<!--{if $tpl_mypageno == 'delivery'}--> selected<!--{/if}-->">
+ <li><a href="<!--{$smarty.const.TOP_URL}-->" class="<!--{if $tpl_mypageno == 'delivery'}--> selected<!--{/if}-->">
お届け先追加・変更</a></li>
- <li><a href="<!--{$smarty.const.TOP_URLPATH}-->" class="<!--{if $tpl_mypageno == 'refusal'}--> selected<!--{/if}-->">
+ <li><a href="<!--{$smarty.const.TOP_URL}-->" class="<!--{if $tpl_mypageno == 'refusal'}--> selected<!--{/if}-->">
退会手続き</a></li>
<!--{/if}-->
</ul>
変更: branches/version-2_13-dev/data/Smarty/templates/default/regist/complete.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/default/regist/complete.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/default/regist/complete.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -38,7 +38,7 @@
<div class="btn_area">
<ul>
<li>
- <a href="<!--{$smarty.const.TOP_URLPATH}-->"><img class="hover_change_image" src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg" alt="トップページへ" /></a>
+ <a href="<!--{$smarty.const.TOP_URL}-->"><img class="hover_change_image" src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg" alt="トップページへ" /></a>
</li>
</ul>
</div>
変更: branches/version-2_13-dev/data/Smarty/templates/default/shopping/complete.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/default/shopping/complete.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/default/shopping/complete.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -59,7 +59,7 @@
<div class="btn_area">
<ul>
<li>
- <a href="<!--{$smarty.const.TOP_URLPATH}-->">
+ <a href="<!--{$smarty.const.TOP_URL}-->">
<img class="hover_change_image" src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg" alt="トップページへ" />
</a>
</li>
変更: branches/version-2_13-dev/data/Smarty/templates/default/shopping/deliv.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/default/shopping/deliv.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/default/shopping/deliv.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -122,7 +122,7 @@
<div class="btn_area">
<ul>
<li>
- <a href="<!--{$smarty.const.CART_URLPATH}-->">
+ <a href="<!--{$smarty.const.CART_URL}-->">
<img class="hover_change_image" src="<!--{$TPL_URLPATH}-->img/button/btn_back.jpg" alt="戻る" />
</a>
</li>
変更: branches/version-2_13-dev/data/Smarty/templates/default/shopping/multiple.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/default/shopping/multiple.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/default/shopping/multiple.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -117,7 +117,7 @@
<div class="btn_area">
<ul>
<li>
- <a href="<!--{$smarty.const.CART_URLPATH}-->">
+ <a href="<!--{$smarty.const.CART_URL}-->">
<img class="hover_change_image" src="<!--{$TPL_URLPATH}-->img/button/btn_back.jpg" alt="戻る" name="back03" id="back03" />
</a>
</li>
変更: branches/version-2_13-dev/data/Smarty/templates/default/shopping/payment.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/default/shopping/payment.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/default/shopping/payment.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -100,7 +100,7 @@
*/
function remoteException(XMLHttpRequest, textStatus, errorThrown) {
alert('通信中にエラーが発生しました。カート画面に移動します。');
- location.href = '<!--{$smarty.const.CART_URLPATH}-->';
+ location.href = '<!--{$smarty.const.CART_URL}-->';
}
/**
変更: branches/version-2_13-dev/data/Smarty/templates/mobile/entry/kiyaku.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/mobile/entry/kiyaku.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/mobile/entry/kiyaku.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -36,5 +36,5 @@
<!--{/if}-->
<a href="<!--{$smarty.const.HTTPS_URL}-->entry/<!--{$smarty.const.DIR_INDEX_PATH}-->?<!--{$smarty.const.SID}-->" accesskey="1"><!--{1|numeric_emoji}-->同意して登録へ</a><br>
- <a href="<!--{$smarty.const.MOBILE_TOP_URLPATH}-->" accesskey="2"><!--{2|numeric_emoji}-->同意しない</a>
+ <a href="<!--{$smarty.const.TOP_URL}-->?<!--{$smarty.const.SID|h}-->" accesskey="2"><!--{2|numeric_emoji}-->同意しない</a>
<!--{/strip}-->
変更: branches/version-2_13-dev/data/Smarty/templates/mobile/error.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/mobile/error.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/mobile/error.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -28,6 +28,6 @@
<!--{if $return_top}-->
<br>
<br>
- <a href="<!--{$smarty.const.MOBILE_TOP_URLPATH}-->" accesskey="0"><!--{0|numeric_emoji}-->TOPページへ</a>
+ <a href="<!--{$smarty.const.TOP_URL}-->?<!--{$smarty.const.SID|h}-->" accesskey="0"><!--{0|numeric_emoji}-->TOPページへ</a>
<!--{/if}-->
<!--{/strip}-->
変更: branches/version-2_13-dev/data/Smarty/templates/mobile/footer.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/mobile/footer.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/mobile/footer.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -30,8 +30,8 @@
<hr>
<a href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php?<!--{$smarty.const.SID}-->" accesskey="8" utn><!--{8|numeric_emoji}-->MYページ</a><br>
- <a href="<!--{$smarty.const.MOBILE_CART_URLPATH}-->" accesskey="9"><!--{9|numeric_emoji}-->かごの中を見る</a><br>
- <a href="<!--{$smarty.const.MOBILE_TOP_URLPATH}-->" accesskey="0"><!--{0|numeric_emoji}-->TOPページへ</a><br>
+ <a href="<!--{$smarty.const.CART_URL}-->?<!--{$smarty.const.SID|h}-->" accesskey="9"><!--{9|numeric_emoji}-->かごの中を見る</a><br>
+ <a href="<!--{$smarty.const.TOP_URL}-->?<!--{$smarty.const.SID|h}-->" accesskey="0"><!--{0|numeric_emoji}-->TOPページへ</a><br>
<br>
<table border="0" cellpadding="0" cellspacing="0" width="100%">
変更: branches/version-2_13-dev/data/Smarty/templates/sphone/cart/index.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/cart/index.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/cart/index.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -80,7 +80,7 @@
<!--{/if}-->
<!--{/if}-->
- <form name="form<!--{$key}-->" id="form<!--{$key}-->" method="post" action="<!--{$smarty.const.CART_URLPATH|h}-->">
+ <form name="form<!--{$key}-->" id="form<!--{$key}-->" method="post" action="<!--{$smarty.const.CART_URL|h}-->">
<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
<!--{if 'sfGMOCartDisplay'|function_exists}-->
<!--{'sfGMOCartDisplay'|call_user_func}-->
@@ -155,7 +155,7 @@
<p class="empty"><em>※ 現在カート内に商品はございません。</em></p>
<!--{/if}-->
- <p><a rel="external" href="<!--{$smarty.const.ROOT_URLPATH}-->" class="btn_sub">お買い物を続ける</a></p>
+ <p><a rel="external" href="<!--{$smarty.const.TOP_URL}-->" class="btn_sub">お買い物を続ける</a></p>
</div><!-- /.form_area -->
変更: branches/version-2_13-dev/data/Smarty/templates/sphone/contact/complete.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/contact/complete.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/contact/complete.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -32,7 +32,7 @@
</div>
<div class="btn_area">
- <a class="btn_s btn_sub" href="<!--{$smarty.const.TOP_URLPATH}-->">トップページへ</a>
+ <a class="btn_s btn_sub" href="<!--{$smarty.const.TOP_URL}-->">トップページへ</a>
</div>
<hr>
<div class="shopInformation">
変更: branches/version-2_13-dev/data/Smarty/templates/sphone/entry/complete.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/entry/complete.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/entry/complete.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -32,7 +32,7 @@
<hr>
<div id="completetext">
<p>今後ともご愛顧賜りますよう、よろしくお願い申し上げます。</p>
- <a rel="external" class="btn_s btn_sub" href="<!--{$smarty.const.TOP_URLPATH}-->">トップページへ</a>
+ <a rel="external" class="btn_s btn_sub" href="<!--{$smarty.const.TOP_URL}-->">トップページへ</a>
</div>
</section>
変更: branches/version-2_13-dev/data/Smarty/templates/sphone/entry/kiyaku.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/entry/kiyaku.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/entry/kiyaku.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -31,7 +31,7 @@
<div class="btn_area">
<ul>
<li><a href="<!--{$smarty.const.ENTRY_URL}-->" class="btn" rel="external">同意して会員登録へ</a></li>
- <li><a href="<!--{$smarty.const.TOP_URLPATH}-->" class="btn_back" rel="external">同意しない</a></li>
+ <li><a href="<!--{$smarty.const.TOP_URL}-->" class="btn_back" rel="external">同意しない</a></li>
</ul>
</div>
@@ -40,7 +40,7 @@
<div class="btn_area">
<ul class="btn_btm">
<li><a href="<!--{$smarty.const.ENTRY_URL}-->" class="btn" rel="external">同意して会員登録へ</a></li>
- <li><a href="<!--{$smarty.const.TOP_URLPATH}-->" class="btn_back" rel="external">同意しない</a></li>
+ <li><a href="<!--{$smarty.const.TOP_URL}-->" class="btn_back" rel="external">同意しない</a></li>
</ul>
</div>
</section>
変更: branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/bloc/login.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/bloc/login.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/bloc/login.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -25,13 +25,13 @@
<ul>
<li><a rel="external" href="javascript:void(document.login_form_bloc.submit())"><img src="<!--{$TPL_URLPATH}-->img/icon/ico_login.png" width="22" height="21" alt="ログアウト" />ログアウト</a></li>
<li><a rel="external" href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php" data-transition="slideup"><img src="<!--{$TPL_URLPATH}-->img/icon/ico_mypage.png" width="22" height="21" alt="MYページ" />MYページ</a></li>
- <li><a rel="external" href="<!--{$smarty.const.CART_URLPATH|h}-->"><img src="<!--{$TPL_URLPATH}-->img/icon/ico_cart.png" width="22" height="21" alt="カートを見る" />カートを見る</a></li>
+ <li><a rel="external" href="<!--{$smarty.const.CART_URL|h}-->"><img src="<!--{$TPL_URLPATH}-->img/icon/ico_cart.png" width="22" height="21" alt="カートを見る" />カートを見る</a></li>
</ul>
<!--{else}-->
<ul>
<li><a href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php" data-transition="slideup"><img src="<!--{$TPL_URLPATH}-->img/icon/ico_login.png" width="22" height="21" alt="ログイン" />ログイン</a></li>
<li><a href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php" data-transition="slideup"><img src="<!--{$TPL_URLPATH}-->img/icon/ico_mypage.png" width="22" height="21" alt="MYページ" />MYページ</a></li>
- <li><a rel="external" href="<!--{$smarty.const.CART_URLPATH|h}-->"><img src="<!--{$TPL_URLPATH}-->img/icon/ico_cart.png" width="22" height="21" alt="カートを見る" />カートを見る</a></li>
+ <li><a rel="external" href="<!--{$smarty.const.CART_URL|h}-->"><img src="<!--{$TPL_URLPATH}-->img/icon/ico_cart.png" width="22" height="21" alt="カートを見る" />カートを見る</a></li>
</ul>
<!--{/if}-->
</nav>
変更: branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/bloc/navi_footer.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/bloc/navi_footer.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/bloc/navi_footer.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -28,6 +28,6 @@
<li><a data-transition="slideup" href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php"><img src="<!--{$TPL_URLPATH}-->img/button/btn_footer_mypage_off.png" alt="MYページ" width="75" height="50" /></a></li>
<li><a data-transition="slideup" href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php"><img src="<!--{$TPL_URLPATH}-->img/button/btn_footer_favorite_off.png" alt="お気に入り" width="75" height="50" /></a></li>
<!--{/if}-->
- <li><a rel="external" href="<!--{$smarty.const.CART_URLPATH|h}-->"><img src="<!--{$TPL_URLPATH}-->img/button/btn_footer_cart_off.png" alt="カゴの中を見る" width="75" height="50" /></a></li>
- <li><a rel="external" href="<!--{$smarty.const.ROOT_URLPATH}-->"><img src="<!--{$TPL_URLPATH}-->img/button/btn_footer_toppage_off.png" alt="トップページへ" width="75" height="50" /></a></li>
+ <li><a rel="external" href="<!--{$smarty.const.CART_URL|h}-->"><img src="<!--{$TPL_URLPATH}-->img/button/btn_footer_cart_off.png" alt="カゴの中を見る" width="75" height="50" /></a></li>
+ <li><a rel="external" href="<!--{$smarty.const.TOP_URL}-->"><img src="<!--{$TPL_URLPATH}-->img/button/btn_footer_toppage_off.png" alt="トップページへ" width="75" height="50" /></a></li>
</ul>
変更: branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/bloc/navi_header.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/bloc/navi_header.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/bloc/navi_header.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -43,7 +43,7 @@
<div class="popup_cart">
<!--{if count($arrCartList) > 0}-->
- <h2><a rel="external" href="<!--{$smarty.const.CART_URLPATH|h}-->">カートの中</a></h2>
+ <h2><a rel="external" href="<!--{$smarty.const.CART_URL|h}-->">カートの中</a></h2>
<!--{foreach from=$arrCartList item=key}-->
<div class="product_type">
<!--{if count($arrCartList) > 1}-->
変更: branches/version-2_13-dev/data/Smarty/templates/sphone/header.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/header.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/header.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -23,7 +23,7 @@
<!--{strip}-->
<header class="global_header clearfix">
<div id="logo_area">
- <a rel="external" href="<!--{$smarty.const.ROOT_URLPATH}-->"><img src="<!--{$TPL_URLPATH}-->img/header/logo.png" width="150" height="25" alt="<!--{$arrSiteInfo.shop_name|h}-->" /></a>
+ <a rel="external" href="<!--{$smarty.const.TOP_URL}-->"><img src="<!--{$TPL_URLPATH}-->img/header/logo.png" width="150" height="25" alt="<!--{$arrSiteInfo.shop_name|h}-->" /></a>
</div>
<div class="header_utility">
<!--{* ▼HeaderInternal COLUMN *}-->
変更: branches/version-2_13-dev/data/Smarty/templates/sphone/mypage/navi.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/mypage/navi.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/mypage/navi.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -37,13 +37,13 @@
<!--{else}-->
<!--{* 退会状態 *}-->
- <li class="nav_delivadd"><a href="<!--{$smarty.const.TOP_URLPATH}-->" class="<!--{if $tpl_mypageno == 'delivery'}--> selected<!--{/if}-->" rel="external">お届け先追加・変更</a></li>
- <li class="nav_change"><a href="<!--{$smarty.const.TOP_URLPATH}-->" class="<!--{if $tpl_mypageno == 'change'}--> selected<!--{/if}-->" rel="external">会員内容変更</a></li>
- <li class="nav_history"><a href="<!--{$smarty.const.TOP_URLPATH}-->" class="<!--{if $tpl_mypageno == 'index'}--> selected<!--{/if}-->" rel="external">購入履歴</a></li>
+ <li class="nav_delivadd"><a href="<!--{$smarty.const.TOP_URL}-->" class="<!--{if $tpl_mypageno == 'delivery'}--> selected<!--{/if}-->" rel="external">お届け先追加・変更</a></li>
+ <li class="nav_change"><a href="<!--{$smarty.const.TOP_URL}-->" class="<!--{if $tpl_mypageno == 'change'}--> selected<!--{/if}-->" rel="external">会員内容変更</a></li>
+ <li class="nav_history"><a href="<!--{$smarty.const.TOP_URL}-->" class="<!--{if $tpl_mypageno == 'index'}--> selected<!--{/if}-->" rel="external">購入履歴</a></li>
<!--{if $smarty.const.OPTION_FAVORITE_PRODUCT == 1}-->
- <li class="nav_favorite"><a href="<!--{$smarty.const.TOP_URLPATH}-->" class="<!--{if $tpl_mypageno == 'favorite'}--> selected<!--{/if}-->" rel="external">お気に入り</a></li>
+ <li class="nav_favorite"><a href="<!--{$smarty.const.TOP_URL}-->" class="<!--{if $tpl_mypageno == 'favorite'}--> selected<!--{/if}-->" rel="external">お気に入り</a></li>
<!--{/if}-->
- <li class="nav_refusal"><a href="<!--{$smarty.const.TOP_URLPATH}-->" class="<!--{if $tpl_mypageno == 'refusal'}--> selected<!--{/if}-->" rel="external">退会手続き</a></li>
+ <li class="nav_refusal"><a href="<!--{$smarty.const.TOP_URL}-->" class="<!--{if $tpl_mypageno == 'refusal'}--> selected<!--{/if}-->" rel="external">退会手続き</a></li>
<!--{/if}-->
</ul>
<!--{/strip}-->
変更: branches/version-2_13-dev/data/Smarty/templates/sphone/regist/complete.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/regist/complete.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/regist/complete.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -30,7 +30,7 @@
<p>それではショッピングをお楽しみください。</p>
<p>今後ともご愛顧賜りますようよろしくお願い申し上げます。</p>
<div class="btn_area">
- <a rel="external" href="<!--{$smarty.const.TOP_URLPATH}-->" class="btn_toppage btn_sub">トップページへ</a>
+ <a rel="external" href="<!--{$smarty.const.TOP_URL}-->" class="btn_toppage btn_sub">トップページへ</a>
</div>
</div>
<hr>
変更: branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/complete.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/complete.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/complete.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -48,7 +48,7 @@
<p> 万一、ご確認メールが届かない場合は、トラブルの可能性もありますので大変お手数ではございますがもう一度お問い合わせいただくか、お電話にてお問い合わせくださいませ。</p>
<p>今後ともご愛顧賜りますようよろしくお願い申し上げます。</p>
<div class="btn_area">
- <a href="<!--{$smarty.const.TOP_URLPATH}-->" class="btn_toppage btn_sub" rel="external">トップページへ</a>
+ <a href="<!--{$smarty.const.TOP_URL}-->" class="btn_toppage btn_sub" rel="external">トップページへ</a>
</div>
</div>
<hr>
変更: branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/deliv.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/deliv.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/deliv.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -91,7 +91,7 @@
<ul class="btn_btm">
<li><a rel="external" href="javascript:eccube.setModeAndSubmit('customer_addr','','');" class="btn">選択したお届け先に送る</a></li>
- <li><a rel="external" href="<!--{$smarty.const.CART_URLPATH}-->" class="btn_back">戻る</a></li>
+ <li><a rel="external" href="<!--{$smarty.const.CART_URL}-->" class="btn_back">戻る</a></li>
</ul>
</form>
変更: branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/multiple.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/multiple.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/multiple.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -109,7 +109,7 @@
<ul class="btn_btm">
<li><a rel="external" href="javascript:void(document.form1.submit());" class="btn">選択したお届け先に送る</a></li>
- <li><a rel="external" href="<!--{$smarty.const.CART_URLPATH}-->" class="btn_back">戻る</a></li>
+ <li><a rel="external" href="<!--{$smarty.const.CART_URL}-->" class="btn_back">戻る</a></li>
</ul>
</form>
</div><!-- /.form_area -->
変更: branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/payment.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/payment.tpl 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/payment.tpl 2013-10-28 00:17:34 UTC (rev 23256)
@@ -87,7 +87,7 @@
*/
function remoteException(XMLHttpRequest, textStatus, errorThrown) {
alert('通信中にエラーが発生しました。カート画面に移動します。');
- location.href = '<!--{$smarty.const.CART_URLPATH}-->';
+ location.href = '<!--{$smarty.const.CART_URL}-->';
}
/**
変更: branches/version-2_13-dev/data/class/SC_Initial.php
===================================================================
--- branches/version-2_13-dev/data/class/SC_Initial.php 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/class/SC_Initial.php 2013-10-28 00:17:34 UTC (rev 23256)
@@ -218,13 +218,25 @@
* パラメーターの補完
*
* ソースのみ差し替えたバージョンアップを考慮したもの。
- * $this->defineIfNotDefined() で定義することを想定
+ * SC_Initial_Ex::defineIfNotDefined() で定義することを想定
*
* @access protected
* @return void
*/
public function complementParameter()
{
+ // 2.13.0 のデータとの互換用
+ /** サイトトップ */
+ SC_Initial_Ex::defineIfNotDefined('TOP_URL', HTTP_URL . DIR_INDEX_PATH);
+ /** カートトップ */
+ SC_Initial_Ex::defineIfNotDefined('CART_URL', HTTP_URL . 'cart/' . DIR_INDEX_PATH);
+
+ // 2.13.0 のテンプレートとの互換用
+ // @deprecated 2.13.1
+ /** サイトトップ */
+ SC_Initial_Ex::defineIfNotDefined('TOP_URLPATH', ROOT_URLPATH . DIR_INDEX_PATH);
+ /** カートトップ */
+ SC_Initial_Ex::defineIfNotDefined('CART_URLPATH', ROOT_URLPATH . 'cart/' . DIR_INDEX_PATH);
}
/**
変更: branches/version-2_13-dev/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- branches/version-2_13-dev/data/class/helper/SC_Helper_Purchase.php 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/class/helper/SC_Helper_Purchase.php 2013-10-28 00:17:34 UTC (rev 23256)
@@ -209,7 +209,7 @@
// カート内が空でないか
if (SC_Utils_Ex::isBlank($cartKey)) {
- SC_Response_Ex::sendRedirect(CART_URLPATH);
+ SC_Response_Ex::sendRedirect(CART_URL);
exit;
}
@@ -228,7 +228,7 @@
// 購入ボタンを押してから変化がないか
$quantity = $objCartSession->getTotalQuantity($cartKey);
if ($objCartSession->checkChangeCart($cartKey) || !($quantity > 0)) {
- SC_Response_Ex::sendRedirect(CART_URLPATH);
+ SC_Response_Ex::sendRedirect(CART_URL);
exit;
}
}
変更: branches/version-2_13-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php 2013-10-28 00:17:34 UTC (rev 23256)
@@ -191,7 +191,7 @@
SC_Response_Ex::sendRedirectFromUrlPath('mypage/login.php');
} else {
// 上記以外の場合、トップへ遷移
- SC_Response_Ex::sendRedirect(HTTP_URL);
+ SC_Response_Ex::sendRedirect(TOP_URL);
}
SC_Response_Ex::actionExit();
変更: branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php 2013-10-28 00:17:34 UTC (rev 23256)
@@ -73,7 +73,7 @@
}
$this->lfAddCartProducts($arrOrderDetail);
- SC_Response_Ex::sendRedirect(CART_URLPATH);
+ SC_Response_Ex::sendRedirect(CART_URL);
}
// 受注詳細データの取得
変更: branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_Detail.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_Detail.php 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_Detail.php 2013-10-28 00:17:34 UTC (rev 23256)
@@ -521,7 +521,7 @@
'product_id' => $this->objFormParam->getValue('product_id'),
);
- SC_Response_Ex::sendRedirect(CART_URLPATH, $arrQueryString);
+ SC_Response_Ex::sendRedirect(CART_URL, $arrQueryString);
SC_Response_Ex::actionExit();
}
}
変更: branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_List.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_List.php 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_List.php 2013-10-28 00:17:34 UTC (rev 23256)
@@ -566,7 +566,7 @@
'category_id' => $this->arrForm['category_id'],
);
- SC_Response_Ex::sendRedirect(CART_URLPATH, $arrQueryString);
+ SC_Response_Ex::sendRedirect(CART_URL, $arrQueryString);
SC_Response_Ex::actionExit();
}
$js_fnOnLoad .= $this->lfSetSelectedData($this->arrProducts, $this->arrForm, $arrErr, $target_product_id);
変更: branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping.php 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping.php 2013-10-28 00:17:34 UTC (rev 23256)
@@ -200,7 +200,7 @@
// 前のページに戻る
case 'return':
- SC_Response_Ex::sendRedirect(CART_URLPATH);
+ SC_Response_Ex::sendRedirect(CART_URL);
SC_Response_Ex::actionExit();
break;
変更: branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php 2013-10-28 00:17:34 UTC (rev 23256)
@@ -95,7 +95,7 @@
// カート内商品のチェック
$this->tpl_message = $objCartSess->checkProducts($this->cartKey);
if (!SC_Utils_Ex::isBlank($this->tpl_message)) {
- SC_Response_Ex::sendRedirect(CART_URLPATH);
+ SC_Response_Ex::sendRedirect(CART_URL);
SC_Response_Ex::actionExit();
}
変更: branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php 2013-10-28 00:17:34 UTC (rev 23256)
@@ -135,7 +135,7 @@
case 'return':
// 確認ページへ移動
- SC_Response_Ex::sendRedirect(CART_URLPATH);
+ SC_Response_Ex::sendRedirect(CART_URL);
SC_Response_Ex::actionExit();
break;
変更: branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php 2013-10-28 00:17:34 UTC (rev 23256)
@@ -110,14 +110,14 @@
$arrOrderTemp = $objPurchase->getOrderTemp($this->tpl_uniqid);
// 正常に受注情報が格納されていない場合はカート画面へ戻す
if (SC_Utils_Ex::isBlank($arrOrderTemp)) {
- SC_Response_Ex::sendRedirect(CART_URLPATH);
+ SC_Response_Ex::sendRedirect(CART_URL);
SC_Response_Ex::actionExit();
}
// カート内商品の妥当性チェック
$this->tpl_message = $objCartSess->checkProducts($cart_key);
if (strlen($this->tpl_message) >= 1) {
- SC_Response_Ex::sendRedirect(CART_URLPATH);
+ SC_Response_Ex::sendRedirect(CART_URL);
SC_Response_Ex::actionExit();
}
@@ -195,7 +195,7 @@
$url = MULTIPLE_URLPATH . '?from=multiple';
} elseif ($objCustomer->isLoginSuccess(true)) {
if ($this->cartKey == PRODUCT_TYPE_DOWNLOAD) {
- $url = CART_URLPATH;
+ $url = CART_URL;
} else {
$url = DELIV_URLPATH;
}
変更: branches/version-2_13-dev/data/class/sessionfactory/SC_SessionFactory_UseRequest.php
===================================================================
--- branches/version-2_13-dev/data/class/sessionfactory/SC_SessionFactory_UseRequest.php 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/class/sessionfactory/SC_SessionFactory_UseRequest.php 2013-10-28 00:17:34 UTC (rev 23256)
@@ -226,7 +226,7 @@
header('Location: ' . $objMobile->gfAddSessionId());
} else {
// GET 以外の場合はトップページへリダイレクトする。
- header('Location: ' . TOP_URLPATH . '?' . SID);
+ header('Location: ' . TOP_URL . '?' . SID);
}
exit;
}
変更: branches/version-2_13-dev/data/mtb_constants_init.php
===================================================================
--- branches/version-2_13-dev/data/mtb_constants_init.php 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/data/mtb_constants_init.php 2013-10-28 00:17:34 UTC (rev 23256)
@@ -275,9 +275,9 @@
/** 会員登録ページTOP */
define('ENTRY_URL', HTTPS_URL . "entry/" . DIR_INDEX_PATH);
/** サイトトップ */
-define('TOP_URLPATH', ROOT_URLPATH . DIR_INDEX_PATH);
+define('TOP_URL', HTTP_URL . DIR_INDEX_PATH);
/** カートトップ */
-define('CART_URLPATH', ROOT_URLPATH . "cart/" . DIR_INDEX_PATH);
+define('CART_URL', HTTP_URL . "cart/" . DIR_INDEX_PATH);
/** お届け先設定 */
define('DELIV_URLPATH', ROOT_URLPATH . "shopping/deliv.php");
/** 複数お届け先設定 */
変更: branches/version-2_13-dev/html/install/sql/insert_data.sql
===================================================================
--- branches/version-2_13-dev/html/install/sql/insert_data.sql 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/html/install/sql/insert_data.sql 2013-10-28 00:17:34 UTC (rev 23256)
@@ -1161,8 +1161,8 @@
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SEPA_CATNAVI', '" > "', 235, 'カテゴリ区切り文字');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SHOPPING_URL', 'HTTPS_URL . "shopping/" . DIR_INDEX_PATH', 237, '会員情報入力');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ENTRY_URL', 'HTTPS_URL . "entry/" . DIR_INDEX_PATH', 238, '会員登録ページTOP');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TOP_URLPATH', 'ROOT_URLPATH . DIR_INDEX_PATH', 239, 'サイトトップ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('CART_URLPATH', 'ROOT_URLPATH . "cart/" . DIR_INDEX_PATH', 240, 'カートトップ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TOP_URL', 'HTTP_URL . DIR_INDEX_PATH', 239, 'サイトトップ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('CART_URL', 'HTTP_URL . "cart/" . DIR_INDEX_PATH', 240, 'カートトップ');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DELIV_URLPATH', 'ROOT_URLPATH . "shopping/deliv.php"', 241, 'お届け先設定');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MULTIPLE_URLPATH', 'ROOT_URLPATH . "shopping/multiple.php"', 242, '複数お届け先設定');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SHOPPING_CONFIRM_URLPATH', 'ROOT_URLPATH . "shopping/confirm.php"', 244, '購入確認ページ');
変更: branches/version-2_13-dev/test/class/page/LC_Page_Test.php
===================================================================
--- branches/version-2_13-dev/test/class/page/LC_Page_Test.php 2013-10-27 10:13:05 UTC (rev 23255)
+++ branches/version-2_13-dev/test/class/page/LC_Page_Test.php 2013-10-28 00:17:34 UTC (rev 23256)
@@ -50,7 +50,7 @@
function testSendRedirect()
{
$objPage = new LC_Page();
- $result = $objPage->sendRedirect(HTTP_URL);
+ $result = $objPage->sendRedirect(TOP_URL);
$this->assertEquals(true, empty($result));
}
Svn-src-all メーリングリストの案内