[Svn-src-all:914] [version-2_5-dev 19802] #834(パラメータの定数名に「URL」を含むにもかかわらず、パスのみのものがある) 一部改修

Seasoft admin ＠ mail.ec-cube.net
2010年 12月 31日 (金) 10:46:43 JST 

Subversion committed to /home/svn/open 19802
http://svn.ec-cube.net/open_trac/changeset/19802
┌────────────────────────────┐
│更新者　:  Seasoft                                      │
│更新日時:  2010-12-31 10:46:42 +0900 (金, 31 12月 2010)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#834(パラメータの定数名に「URL」を含むにもかかわらず、パスのみのものがある) 一部改修

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_5-dev/data/Smarty/templates/admin/admin_popup_header.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/basis/index.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/basis/subnavi.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/contents/recomend_search.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/contents/subnavi.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/customer/search_customer.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/customer/subnavi.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/home.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/login_frame.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/mail/subnavi.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/main_frame.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/order/product_select.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/order/subnavi.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/log.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/subnavi.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/plugin/index.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/plugin/install.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/plugin/subnavi.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/plugin/uninstall.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/products/category.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/products/class.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/products/confirm.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/products/index.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/products/product.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/products/product_rank.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/products/product_select.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/products/subnavi.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/system/subnavi.tpl
U   branches/version-2_5-dev/data/Smarty/templates/admin/total/subnavi.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/best5.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/guide.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/login.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/news.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/search_products.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/frontparts/form_personal_input.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/header.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/mail_templates/customer_mail.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/mypage/delivery.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/mypage/favorite.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/mypage/index.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/mypage/login.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/popup_header.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/rss/index.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/rss/products.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/shopping/confirm.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/shopping/deliv.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/shopping/index.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/shopping/nonmember_input.tpl
U   branches/version-2_5-dev/data/Smarty/templates/default/site_frame.tpl
U   branches/version-2_5-dev/data/Smarty/templates/mobile/frontparts/bloc/category.tpl
U   branches/version-2_5-dev/data/Smarty/templates/mobile/index.tpl
U   branches/version-2_5-dev/data/Smarty/templates/mobile/mail_templates/customer_mail.tpl
U   branches/version-2_5-dev/data/Smarty/templates/mobile/mypage/login.tpl
U   branches/version-2_5-dev/data/Smarty/templates/mobile/products/category_list.tpl
U   branches/version-2_5-dev/data/Smarty/templates/mobile/products/search.tpl
U   branches/version-2_5-dev/data/Smarty/templates/mobile/regist/complete.tpl
U   branches/version-2_5-dev/data/Smarty/templates/mobile/shopping/index.tpl
U   branches/version-2_5-dev/data/Smarty/templates/sphone/cart/index.tpl
U   branches/version-2_5-dev/data/Smarty/templates/sphone/footer.tpl
U   branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/bloc/best5.tpl
U   branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl
U   branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/bloc/login.tpl
U   branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/bloc/news.tpl
U   branches/version-2_5-dev/data/Smarty/templates/sphone/index.tpl
U   branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/delivery.tpl
U   branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/favorite.tpl
U   branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/history.tpl
U   branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/index.tpl
U   branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/login.tpl
U   branches/version-2_5-dev/data/Smarty/templates/sphone/products/detail.tpl
U   branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/confirm.tpl
U   branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/deliv.tpl
U   branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/index.tpl
U   branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/nonmember_input.tpl
U   branches/version-2_5-dev/data/Smarty/templates/sphone/site_frame.tpl
U   branches/version-2_5-dev/data/Smarty/templates/sphone/site_main.tpl
U   branches/version-2_5-dev/data/app_initial.php
U   branches/version-2_5-dev/data/class/SC_Fpdf.php
U   branches/version-2_5-dev/data/class/SC_Initial.php
U   branches/version-2_5-dev/data/class/SC_MobileImage.php
U   branches/version-2_5-dev/data/class/SC_MobileKaraMail.php
U   branches/version-2_5-dev/data/class/SC_Response.php
U   branches/version-2_5-dev/data/class/SC_SmartphoneUserAgent.php
U   branches/version-2_5-dev/data/class/SC_View.php
U   branches/version-2_5-dev/data/class/batch/SC_Batch_Update.php
U   branches/version-2_5-dev/data/class/graph/SC_GraphBase.php
U   branches/version-2_5-dev/data/class/helper/SC_Helper_Mobile.php
U   branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php
U   branches/version-2_5-dev/data/class/helper/SC_Helper_Plugin.php
U   branches/version-2_5-dev/data/class/module/SC_Module.php
U   branches/version-2_5-dev/data/class/pages/LC_Page.php
U   branches/version-2_5-dev/data/class/pages/LC_Page_Redirect.php
U   branches/version-2_5-dev/data/class/pages/LC_Page_ResizeImage.php
U   branches/version-2_5-dev/data/class/pages/LC_Page_Sitemap.php
U   branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Home.php
U   branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Logout.php
U   branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php
U   branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php
U   branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php
U   branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php
U   branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php
U   branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php
U   branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Sendmail.php
U   branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php
U   branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php
U   branches/version-2_5-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php
U   branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php
U   branches/version-2_5-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php
U   branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php
U   branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php
U   branches/version-2_5-dev/data/class/pages/tb/LC_Page_TrackBack.php
U   branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_Base.php
U   branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php
U   branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php
U   branches/version-2_5-dev/data/class/session/sessionfactory/SC_SessionFactory_UseRequest.php
U   branches/version-2_5-dev/data/class/util/SC_Utils.php
U   branches/version-2_5-dev/data/mtb_constants_init.php
U   branches/version-2_5-dev/data/plugin/bingo/SC_Plugin_bingo.php
U   branches/version-2_5-dev/data/require_base.php
U   branches/version-2_5-dev/data/require_classes.php
U   branches/version-2_5-dev/data/require_safe.php
U   branches/version-2_5-dev/html/admin/require.php
U   branches/version-2_5-dev/html/handle_error.php
U   branches/version-2_5-dev/html/install/index.php
U   branches/version-2_5-dev/html/install/sql/insert_data.sql
U   branches/version-2_5-dev/html/install/templates/install_frame.tpl
U   branches/version-2_5-dev/html/mobile/require.php
U   branches/version-2_5-dev/html/require.php
U   branches/version-2_5-dev/html/sphone/require.php
U   branches/version-2_5-dev/html/user_data/packages/admin/js/ownersstore.js.php
U   branches/version-2_5-dev/html/user_data/plugins/recommend/tpl/bloc.tpl
U   branches/version-2_5-dev/test/class/page/LC_Page_Test.php

変更: branches/version-2_5-dev/data/Smarty/templates/admin/admin_popup_header.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/admin_popup_header.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/admin_popup_header.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -29,12 +29,12 @@
 <meta http-equiv="content-script-type" content="text/javascript" />
 <meta http-equiv="content-style-type" content="text/css" />
 <link rel="stylesheet" href="<!--{$TPL_DIR}-->css/admin_contents.css" type="text/css" media="all" />
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/navi.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/win_op.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/site.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/jquery-1.4.2.min.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/navi.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/win_op.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/site.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/jquery-1.4.2.min.js"></script>
 <script type="text/javascript" src="<!--{$TPL_DIR}-->js/admin.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/css.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/css.js"></script>
 <script type="text/javascript">//<![CDATA[
     <!--{$tpl_javascript}-->
     $(function(){

変更: branches/version-2_5-dev/data/Smarty/templates/admin/basis/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/index.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/index.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -21,9 +21,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 *}-->
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/jquery.fancybox/jquery.mousewheel-3.0.4.pack.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/jquery.fancybox/jquery.fancybox-1.3.4.pack.js"></script>
-<link rel="stylesheet" href="<!--{$smarty.const.URL_DIR}-->js/jquery.fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/jquery.fancybox/jquery.mousewheel-3.0.4.pack.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/jquery.fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<link rel="stylesheet" href="<!--{$smarty.const.URL_PATH}-->js/jquery.fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
 <script type="text/javascript">//<![CDATA[
 $(function() {
     var geocoder = new google.maps.Geocoder();

変更: branches/version-2_5-dev/data/Smarty/templates/admin/basis/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/subnavi.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/subnavi.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -22,15 +22,15 @@
  */
 *}-->
 <ul class="level1">
-<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-basis-index"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->basis/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>SHOPマスタ</span></a></li>
-<li<!--{if $tpl_subno == 'tradelaw'}--> class="on"<!--{/if}--> id="navi-basis-tradelaw"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->basis/tradelaw.php"><span>特定商取引法</span></a></li>
-<li<!--{if $tpl_subno == 'delivery'}--> class="on"<!--{/if}--> id="navi-basis-delivery"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->basis/delivery.php"><span>配送設定</span></a></li>
-<li<!--{if $tpl_subno == 'payment'}--> class="on"<!--{/if}--> id="navi-basis-payment"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->basis/payment.php"><span>支払方法設定</span></a></li>
-<li<!--{if $tpl_subno == 'point'}--> class="on"<!--{/if}--> id="navi-basis-point"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->basis/point.php"><span>ポイント設定</span></a></li>
-<li<!--{if $tpl_subno == 'mail'}--> class="on"<!--{/if}--> id="navi-basis-mail"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->basis/mail.php"><span>メール設定</span></a></li>
-<li<!--{if $tpl_subno == 'seo'}--> class="on"<!--{/if}--> id="navi-basis-seo"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->basis/seo.php"><span>SEO管理</span></a></li>
-<li<!--{if $tpl_subno == 'kiyaku'}--> class="on"<!--{/if}--> id="navi-basis-kiyaku"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->basis/kiyaku.php"><span>会員規約設定</span></a></li>
-<li<!--{if $tpl_subno == 'zip_install'}--> class="on"<!--{/if}--> id="navi-basis-zip"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->basis/zip_install.php"><span>郵便番号DB登録</span></a></li>
-<li<!--{if $tpl_subno == 'control'}--> class="on"<!--{/if}--> id="navi-basis-control"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->basis/control.php"><span>サイト管理設定</span></a></li>
-<li<!--{if $tpl_subno == 'holiday'}--> class="on"<!--{/if}--> id="navi-basis-holiday"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->basis/holiday.php"><span>定休日管理</span></a></li>
+<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-basis-index"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->basis/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>SHOPマスタ</span></a></li>
+<li<!--{if $tpl_subno == 'tradelaw'}--> class="on"<!--{/if}--> id="navi-basis-tradelaw"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->basis/tradelaw.php"><span>特定商取引法</span></a></li>
+<li<!--{if $tpl_subno == 'delivery'}--> class="on"<!--{/if}--> id="navi-basis-delivery"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->basis/delivery.php"><span>配送設定</span></a></li>
+<li<!--{if $tpl_subno == 'payment'}--> class="on"<!--{/if}--> id="navi-basis-payment"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->basis/payment.php"><span>支払方法設定</span></a></li>
+<li<!--{if $tpl_subno == 'point'}--> class="on"<!--{/if}--> id="navi-basis-point"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->basis/point.php"><span>ポイント設定</span></a></li>
+<li<!--{if $tpl_subno == 'mail'}--> class="on"<!--{/if}--> id="navi-basis-mail"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->basis/mail.php"><span>メール設定</span></a></li>
+<li<!--{if $tpl_subno == 'seo'}--> class="on"<!--{/if}--> id="navi-basis-seo"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->basis/seo.php"><span>SEO管理</span></a></li>
+<li<!--{if $tpl_subno == 'kiyaku'}--> class="on"<!--{/if}--> id="navi-basis-kiyaku"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->basis/kiyaku.php"><span>会員規約設定</span></a></li>
+<li<!--{if $tpl_subno == 'zip_install'}--> class="on"<!--{/if}--> id="navi-basis-zip"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->basis/zip_install.php"><span>郵便番号DB登録</span></a></li>
+<li<!--{if $tpl_subno == 'control'}--> class="on"<!--{/if}--> id="navi-basis-control"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->basis/control.php"><span>サイト管理設定</span></a></li>
+<li<!--{if $tpl_subno == 'holiday'}--> class="on"<!--{/if}--> id="navi-basis-holiday"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->basis/holiday.php"><span>定休日管理</span></a></li>
 </ul>

変更: branches/version-2_5-dev/data/Smarty/templates/admin/contents/recomend_search.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/recomend_search.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/recomend_search.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -76,7 +76,7 @@
     <!--▼商品<!--{$smarty.section.cnt.iteration}-->-->
     <tr>
       <td class="center">
-        <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|h}-->&width=65&height=65" alt="" />
+        <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|h}-->&width=65&height=65" alt="" />
       </td>
       <td><!--{$arrProducts[cnt].product_code|default:"-"|h}--></td>
       <td><!--{$arrProducts[cnt].name|h}--></td>

変更: branches/version-2_5-dev/data/Smarty/templates/admin/contents/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/subnavi.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/subnavi.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -22,16 +22,16 @@
  */
 *}-->
 <ul class="level1">
-<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-contents-index"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->contents/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>新着情報管理</span></a></li>
-<li<!--{if $tpl_subno == 'recommend'}--> class="on"<!--{/if}--> id="navi-contents-recommend"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->contents/recommend.php"><span>おすすめ商品管理</span></a></li>
-<li<!--{if $tpl_subno == 'file'}--> class="on"<!--{/if}--> id="navi-contents-file"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->contents/file_manager.php"><span>ファイル管理</span></a></li>
-<li<!--{if $tpl_subno == 'csv'}--> class="on"<!--{/if}--> id="navi-contents-csv"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php"><span>CSV出力項目設定</span></a>
+<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-contents-index"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>新着情報管理</span></a></li>
+<li<!--{if $tpl_subno == 'recommend'}--> class="on"<!--{/if}--> id="navi-contents-recommend"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/recommend.php"><span>おすすめ商品管理</span></a></li>
+<li<!--{if $tpl_subno == 'file'}--> class="on"<!--{/if}--> id="navi-contents-file"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/file_manager.php"><span>ファイル管理</span></a></li>
+<li<!--{if $tpl_subno == 'csv'}--> class="on"<!--{/if}--> id="navi-contents-csv"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php"><span>CSV出力項目設定</span></a>
   <ul id="navi-csv-sub" class="level2">
-  <li<!--{if $tpl_subno_csv == 'product'}--> class="on"<!--{/if}--> id="navi-csv-product"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php?tpl_subno_csv=product"><span>商品管理</span></a></li>
-  <li<!--{if $tpl_subno_csv == 'customer'}--> class="on"<!--{/if}--> id="navi-csv-customer"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php?tpl_subno_csv=customer"><span>顧客管理</span></a></li>
-  <li<!--{if $tpl_subno_csv == 'order'}--> class="on"<!--{/if}--> id="navi-csv-order"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php?tpl_subno_csv=order"><span>受注管理</span></a></li>
-  <li<!--{if $tpl_subno_csv == 'category'}--> class="on"<!--{/if}--> id="navi-csv-category"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php?tpl_subno_csv=category"><span>カテゴリ</span></a></li>
-  <li<!--{if $tpl_subno_csv == 'csv_sql'}--> class="on"<!--{/if}--> id="navi-csv-sql"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv_sql.php"><span>高度な設定</span></a></li>
+  <li<!--{if $tpl_subno_csv == 'product'}--> class="on"<!--{/if}--> id="navi-csv-product"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php?tpl_subno_csv=product"><span>商品管理</span></a></li>
+  <li<!--{if $tpl_subno_csv == 'customer'}--> class="on"<!--{/if}--> id="navi-csv-customer"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php?tpl_subno_csv=customer"><span>顧客管理</span></a></li>
+  <li<!--{if $tpl_subno_csv == 'order'}--> class="on"<!--{/if}--> id="navi-csv-order"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php?tpl_subno_csv=order"><span>受注管理</span></a></li>
+  <li<!--{if $tpl_subno_csv == 'category'}--> class="on"<!--{/if}--> id="navi-csv-category"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php?tpl_subno_csv=category"><span>カテゴリ</span></a></li>
+  <li<!--{if $tpl_subno_csv == 'csv_sql'}--> class="on"<!--{/if}--> id="navi-csv-sql"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv_sql.php"><span>高度な設定</span></a></li>
   </ul>
 </li>
 </ul>

変更: branches/version-2_5-dev/data/Smarty/templates/admin/customer/search_customer.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/search_customer.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/search_customer.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -28,8 +28,8 @@
 <meta http-equiv="content-script-type" content="text/javascript">
 <meta http-equiv="content-style-type" content="text/css">
 <link rel="stylesheet" href="<!--{$TPL_DIR}-->css/admin_contents.css" type="text/css" media="all" />
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/css.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/navi.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/css.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/navi.js"></script>
 <script type="text/javascript" src="<!--{$TPL_DIR}-->js/admin.js"></script>
 <script type="text/javascript">
 <!--
@@ -52,7 +52,7 @@
 <body bgcolor="#ffffff" text="#494E5F" link="#006699" vlink="#006699" alink="#006699" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
 <!--{$GLOBAL_ERR}-->
 <noscript>
-<link rel="stylesheet" href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->css/common.css" type="text/css" >
+<link rel="stylesheet" href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->css/common.css" type="text/css" >
 </noscript>
 
 <!--▼CONTENTS-->

変更: branches/version-2_5-dev/data/Smarty/templates/admin/customer/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/subnavi.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/subnavi.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -22,5 +22,5 @@
  */
 *}-->
 <ul class="level1">
-<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-customer-index"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->customer/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>顧客マスタ</span></a></li>
+<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-customer-index"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->customer/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>顧客マスタ</span></a></li>
 </ul>

変更: branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -11,8 +11,8 @@
 
 </script>
 
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/ui.core.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/ui.sortable.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/ui.core.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/ui.sortable.js"></script>
 <script type="text/javascript" src="<!--{$TPL_DIR}-->js/layout_design.js"></script>
 
 

変更: branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -73,7 +73,7 @@
      <th>URL</th>
      <td>
    <!--{if $arrPageData.edit_flg == 2}-->
-      <!--{$smarty.const.SITE_URL|h}--><!--{$arrPageData.url|h}-->
+      <!--{$smarty.const.HTTP_URL|h}--><!--{$arrPageData.url|h}-->
       <input type="hidden" name="url" value="<!--{$arrPageData.filename|h}-->" />
     <!--{else}-->
       <!--{$user_URL|h}--><input type="text" name="url" value="<!--{$arrPageData.directory|h}--><!--{$arrPageData.filename|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{if $arrErr.url != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}--> ime-mode: disabled;" size="40" class="box40" />.php<span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>

変更: branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -24,35 +24,35 @@
 <ul class="level1">
   <li><a><span>PC</span></a>
     <ul class="level2">
-      <li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>レイアウト設定</span></a></li>
-      <li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/main_edit.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ページ詳細設定</span></a></li>
-      <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ブロック設定</span></a></li>
-      <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ヘッダー/フッター設定</span></a></li>
-      <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>CSS設定</span></a></li>
-      <li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/template.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>テンプレート設定</span></a></li>
-      <li<!--{if $tpl_subno == 'up_down'}--> class="on"<!--{/if}--> id="navi-design-add"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/up_down.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>テンプレート追加</span></a></li>
+      <li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>レイアウト設定</span></a></li>
+      <li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/main_edit.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ページ詳細設定</span></a></li>
+      <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ブロック設定</span></a></li>
+      <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ヘッダー/フッター設定</span></a></li>
+      <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>CSS設定</span></a></li>
+      <li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/template.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>テンプレート設定</span></a></li>
+      <li<!--{if $tpl_subno == 'up_down'}--> class="on"<!--{/if}--> id="navi-design-add"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/up_down.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>テンプレート追加</span></a></li>
     </ul>
   </li>
   <li><a><span>モバイル</span></a>
     <ul class="level2">
-      <li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>レイアウト設定</span></a></li>
-      <li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/main_edit.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ページ詳細設定</span></a></li>
-      <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ブロック設定</span></a></li>
-      <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ヘッダー/フッター設定</span></a></li>
-      <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>CSS設定</span></a></li>
-      <li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/template.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>テンプレート設定</span></a></li>
-      <li<!--{if $tpl_subno == 'up_down'}--> class="on"<!--{/if}--> id="navi-design-add"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/up_down.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>テンプレート追加</span></a></li>
+      <li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>レイアウト設定</span></a></li>
+      <li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/main_edit.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ページ詳細設定</span></a></li>
+      <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ブロック設定</span></a></li>
+      <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ヘッダー/フッター設定</span></a></li>
+      <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>CSS設定</span></a></li>
+      <li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/template.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>テンプレート設定</span></a></li>
+      <li<!--{if $tpl_subno == 'up_down'}--> class="on"<!--{/if}--> id="navi-design-add"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/up_down.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>テンプレート追加</span></a></li>
     </ul>
   </li>
   <li><a><span>スマートフォン</span></a>
     <ul class="level2">
-      <li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>レイアウト設定</span></a></li>
-      <li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/main_edit.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>ページ詳細設定</span></a></li>
-      <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>ブロック設定</span></a></li>
-      <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>ヘッダー/フッター設定</span></a></li>
-      <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>CSS設定</span></a></li>
-      <li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/template.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>テンプレート設定</span></a></li>
-      <li<!--{if $tpl_subno == 'up_down'}--> class="on"<!--{/if}--> id="navi-design-add"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/up_down.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>テンプレート追加</span></a></li>
+      <li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>レイアウト設定</span></a></li>
+      <li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/main_edit.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>ページ詳細設定</span></a></li>
+      <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>ブロック設定</span></a></li>
+      <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>ヘッダー/フッター設定</span></a></li>
+      <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>CSS設定</span></a></li>
+      <li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/template.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>テンプレート設定</span></a></li>
+      <li<!--{if $tpl_subno == 'up_down'}--> class="on"<!--{/if}--> id="navi-design-add"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/up_down.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>テンプレート追加</span></a></li>
     </ul>
   </li>
 </ul>

変更: branches/version-2_5-dev/data/Smarty/templates/admin/home.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/home.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/home.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -57,7 +57,7 @@
                 </tr>
                 <tr>
                     <th>詳細</td>
-                    <td><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->system/system.php">システム設定＞システム情報</a></td>
+                    <td><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->system/system.php">システム設定＞システム情報</a></td>
                 </tr>
             </table>
             <!--{* システム情報ここまで *}-->

変更: branches/version-2_5-dev/data/Smarty/templates/admin/login_frame.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/login_frame.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/login_frame.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -28,8 +28,8 @@
 <meta http-equiv="content-script-type" content="text/javascript">
 <meta http-equiv="content-style-type" content="text/css">
 <link rel="stylesheet" href="<!--{$TPL_DIR}-->css/admin_contents.css" type="text/css" media="all" />
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/navi.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/jquery-1.4.2.min.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/navi.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/jquery-1.4.2.min.js"></script>
 <title>管理機能</title>
 </head>
 

変更: branches/version-2_5-dev/data/Smarty/templates/admin/mail/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/subnavi.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/subnavi.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -22,7 +22,7 @@
  */
 *}-->
 <ul class="level1">
-<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-mail-index"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->mail/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>配信内容設定</span></a></li>
-<li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-mail-template"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->mail/template.php"><span>テンプレート設定</span></a></li>
-<li<!--{if $tpl_subno == 'history'}--> class="on"<!--{/if}--> id="navi-mail-history"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->mail/history.php"><span>配信履歴</span></a></li>
+<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-mail-index"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->mail/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>配信内容設定</span></a></li>
+<li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-mail-template"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->mail/template.php"><span>テンプレート設定</span></a></li>
+<li<!--{if $tpl_subno == 'history'}--> class="on"<!--{/if}--> id="navi-mail-history"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->mail/history.php"><span>配信履歴</span></a></li>
 </ul>

変更: branches/version-2_5-dev/data/Smarty/templates/admin/main_frame.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/main_frame.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/main_frame.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -35,12 +35,12 @@
     google.load("maps", "3", {other_params:'sensor=false'});
 //]]>
 </script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/navi.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/win_op.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/site.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/jquery-1.4.2.min.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/navi.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/win_op.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/site.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/jquery-1.4.2.min.js"></script>
 <script type="text/javascript" src="<!--{$TPL_DIR}-->js/admin.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/css.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/css.js"></script>
 <script type="text/javascript" src="<!--{$TPL_DIR}-->js/file_manager.js"></script>
 <title><!--{$smarty.const.ADMIN_TITLE}--></title>
 <script type="text/javascript">//<![CDATA[
@@ -68,10 +68,10 @@
 
 <!--{* ▼HEADER *}-->
 <div id="header">
-  <div id="logo"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->home.php"><img src="<!--{$TPL_DIR}-->img/header/logo.jpg" width="230" height="50" alt="EC CUBE" /></a></div>
+  <div id="logo"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->home.php"><img src="<!--{$TPL_DIR}-->img/header/logo.jpg" width="230" height="50" alt="EC CUBE" /></a></div>
   <ul id="sites">
     <li><a href="<!--{$smarty.const.URL_HOME}-->"><span>MAIN PAGE</span></a></li>
-    <li><a href="<!--{$smarty.const.SITE_URL}--><!--{$smarty.const.DIR_INDEX_URL}-->" target="_blank"><span>SITE CHECK</span></a></li>
+    <li><a href="<!--{$smarty.const.HTTP_URL}--><!--{$smarty.const.DIR_INDEX_URL}-->" target="_blank"><span>SITE CHECK</span></a></li>
   </ul>
   <p>
     WELCOME!&nbsp;<span><!--{* ログイン名 *}--><!--{$smarty.session.login_name|h}--></span>&nbsp;様&nbsp;

変更: branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -24,7 +24,7 @@
 <script type="text/javascript">
 <!--
     function fnEdit(customer_id) {
-        document.form1.action = '<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->customer/edit.php';
+        document.form1.action = '<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->customer/edit.php';
         document.form1.mode.value = "edit"
         document.form1['edit_customer_id'].value = customer_id;
         document.form1.submit();
@@ -138,7 +138,7 @@
     <!--{/foreach}-->
     <h2>お客様情報
         <!--{if $tpl_mode == 'add'}-->
-            <a class="btn-normal" href="javascript:;" name="address_input" onclick="fnOpenWindow('<!--{$smarty.const.SITE_URL}--><!--{$smarty.const.ADMIN_DIR}-->customer/search_customer.php','search','500','650'); return false;">顧客検索</a>
+            <a class="btn-normal" href="javascript:;" name="address_input" onclick="fnOpenWindow('<!--{$smarty.const.HTTP_URL}--><!--{$smarty.const.ADMIN_DIR}-->customer/search_customer.php','search','500','650'); return false;">顧客検索</a>
         <!--{/if}-->
     </h2>
     <table class="form">
@@ -309,7 +309,7 @@
     <h2 id="order_products">
         <a name="order_products">受注商品情報</a>
         <a class="btn-normal" href="javascript:;" name="cheek" onclick="fnModeSubmit('cheek','anchor_key','order_products');">計算結果の確認</a>
-        <a class="btn-normal" href="javascript:;" name="add_product" onclick="win03('<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php<!--{if $tpl_order_id}-->?order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '500', '500'); ">商品の追加</a>
+        <a class="btn-normal" href="javascript:;" name="add_product" onclick="win03('<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php<!--{if $tpl_order_id}-->?order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '500', '500'); ">商品の追加</a>
     </h2>
     <!--{if $arrErr.product_id || $arrErr.quantity || $arrErr.price}-->
         <span class="attention"><!--{$arrErr.product_id}--></span>
@@ -338,7 +338,7 @@
                 <input type="hidden" name="classcategory_name1[<!--{$key}-->]" value="<!--{$arrForm.classcategory_name1.value[$key]}-->" id="classcategory_name1_<!--{$key}-->" />
                 <input type="hidden" name="classcategory_name2[<!--{$key}-->]" value="<!--{$arrForm.classcategory_name2.value[$key]}-->" id="classcategory_name2_<!--{$key}-->" />
                 <br />
-                <a class="btn-normal" href="javascript:;" name="change" onclick="win03('<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?no=<!--{$key}--><!--{if $tpl_order_id}-->&order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '500', '500');">変更</a>
+                <a class="btn-normal" href="javascript:;" name="change" onclick="win03('<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?no=<!--{$key}--><!--{if $tpl_order_id}-->&order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '500', '500');">変更</a>
                 <!--{if $product_count > 1}-->
                     <a class="btn-normal" href="javascript:;" name="delete" onclick="fnSetFormVal('form1', 'delete_no', <!--{$key}-->); fnModeSubmit('delete_product','anchor_key','order_products');">削除</a>
                 <!--{/if}-->

変更: branches/version-2_5-dev/data/Smarty/templates/admin/order/product_select.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/product_select.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/product_select.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -172,7 +172,7 @@
                 <!--{assign var=status value="`$arrProducts[cnt].status`"}-->
                 <tr style="background:<!--{$arrPRODUCTSTATUS_COLOR[$status]}-->;">
                     <td class="center">
-                        <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|h}-->&width=65&height=65" alt="<!--{$arrRecommend[$recommend_no].name|h}-->" />
+                        <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|h}-->&width=65&height=65" alt="<!--{$arrRecommend[$recommend_no].name|h}-->" />
                     </td>    
                     <td>
                         <!--{assign var=codemin value=`$arrProducts[cnt].product_code_min`}-->

変更: branches/version-2_5-dev/data/Smarty/templates/admin/order/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/subnavi.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/subnavi.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -24,11 +24,11 @@
 <ul class="level1">
     <li id="navi-order-index"
         class="<!--{if $tpl_mainno == 'order' && $tpl_subno == 'index'}-->on<!--{/if}-->"
-    ><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->order/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>受注管理</span></a></li>
+    ><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->order/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>受注管理</span></a></li>
     <li id="navi-order-add"
         class="<!--{if $tpl_mainno == 'order' && $tpl_subno == 'add'}-->on<!--{/if}-->"
-    ><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->order/edit.php?mode=add"><span>新規受注入力</span></a></li>
+    ><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->order/edit.php?mode=add"><span>新規受注入力</span></a></li>
     <li id="navi-order-status"
         class="<!--{if $tpl_mainno == 'order' && $tpl_subno == 'status'}-->on<!--{/if}-->"
-    ><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->order/status.php"><span>ステータス管理</span></a></li>
+    ><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->order/status.php"><span>ステータス管理</span></a></li>
 </ul>

変更: branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/log.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/log.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/log.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -40,7 +40,7 @@
       <td><!--{if $log.error_flg}-->失敗<!--{else}-->成功<!--{/if}--></td>
       <td class="left"><!--{$log.update_date|sfDispDBDate|h}--></td>
       <td>
-          <a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->ownersstore/log.php?mode=detail&amp;log_id=<!--{$log.log_id}-->">
+          <a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->ownersstore/log.php?mode=detail&amp;log_id=<!--{$log.log_id}-->">
           詳細</a>
       </td>
       <!--{*<td><!--{$log.log_id}--></td>*}-->

変更: branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/subnavi.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/subnavi.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -23,9 +23,9 @@
 *}-->
 <ul class="level1">
     <li id="navi-ownersstore-index" class="<!--{if $tpl_subno == 'index'}-->on<!--{/if}-->">
-        <a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->ownersstore/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>購入商品一覧</span></a></li>
+        <a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->ownersstore/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>購入商品一覧</span></a></li>
     <li id="navi-ownersstore-settings" class="<!--{if $tpl_subno == 'settings'}-->on<!--{/if}-->">
-        <a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->ownersstore/settings.php"><span>認証キー設定</span></a></li>
+        <a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->ownersstore/settings.php"><span>認証キー設定</span></a></li>
     <li id="navi-ownersstore-log" class="<!--{if $tpl_subno == 'log'}-->on<!--{/if}-->">
-        <a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->ownersstore/log.php"><span>ログ管理</span></a></li>
+        <a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->ownersstore/log.php"><span>ログ管理</span></a></li>
 </ul>

変更: branches/version-2_5-dev/data/Smarty/templates/admin/plugin/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/plugin/index.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/plugin/index.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -40,7 +40,7 @@
                 <td><!--{$plugin.path|h}--></td>
                 <td><!--{$plugin.info.version|h}--></td>
                 <td><!--{$plugin.info.auther|h}--></td>
-                <td><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->plugin/uninstall.php?path=<!--{$plugin.path|h}-->">アンインストール</a></td>
+                <td><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->plugin/uninstall.php?path=<!--{$plugin.path|h}-->">アンインストール</a></td>
             </tr>
             <!--{if $smarty.foreach.installedPlugin.last}-->
                 </table>
@@ -66,7 +66,7 @@
                 <td><!--{$plugin.path|h}--></td>
                 <td><!--{$plugin.info.version|h}--></td>
                 <td><!--{$plugin.info.auther|h}--></td>
-                <td><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->plugin/install.php?path=<!--{$plugin.path|h}-->">インストール</a></td>
+                <td><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->plugin/install.php?path=<!--{$plugin.path|h}-->">インストール</a></td>
             </tr>
             <!--{if $smarty.foreach.installablePlugin.last}-->
                 </table>

変更: branches/version-2_5-dev/data/Smarty/templates/admin/plugin/install.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/plugin/install.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/plugin/install.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -25,6 +25,6 @@
     <div class="contents-main">
         <h2>結果</h2>
         <div><!--{$tpl_result|h|nl2br}--></div>
-        <div><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->plugin/<!--{$smarty.const.DIR_INDEX_URL}-->">→ プラグイン管理へ</a><div>
+        <div><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->plugin/<!--{$smarty.const.DIR_INDEX_URL}-->">→ プラグイン管理へ</a><div>
     </div>
 </form>

変更: branches/version-2_5-dev/data/Smarty/templates/admin/plugin/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/plugin/subnavi.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/plugin/subnavi.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -22,7 +22,7 @@
  */
 *}-->
 <ul class="level1">
-    <li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-plugin-index"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->plugin/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>プラグイン管理</span></a></li>
+    <li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-plugin-index"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->plugin/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>プラグイン管理</span></a></li>
     <!--{foreach from=$smarty.env.pluginsXml->plugin item="plugin"}-->
         <li<!--{if $tpl_subno == $plugin->path}--> class="on"<!--{/if}--> id="navi-plugin-<!--{$plugin->path|h}-->"><a href="<!--{$smarty.const.PLUGIN_URL}--><!--{$plugin->path|h}-->/<!--{$smarty.const.ADMIN_DIR}--><!--{$smarty.const.DIR_INDEX_URL}-->"><span><!--{$plugin->name|h}--></span></a></li>
     <!--{/foreach}-->

変更: branches/version-2_5-dev/data/Smarty/templates/admin/plugin/uninstall.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/plugin/uninstall.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/plugin/uninstall.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -25,6 +25,6 @@
     <div class="contents-main">
         <h2>結果</h2>
         <div><!--{$tpl_result|h|nl2br}--></div>
-        <div><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->plugin/<!--{$smarty.const.DIR_INDEX_URL}-->">→ プラグイン管理へ</a><div>
+        <div><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->plugin/<!--{$smarty.const.DIR_INDEX_URL}-->">→ プラグイン管理へ</a><div>
     </div>
 </form>

変更: branches/version-2_5-dev/data/Smarty/templates/admin/products/category.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/category.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/category.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -21,7 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 *}-->
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/jquery.tablednd.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/jquery.tablednd.js"></script>
 <form name="form1" id="form1" method="post" action="?" enctype="multipart/form-data">
 <input type="hidden" name="mode" value="edit" />
 <input type="hidden" name="parent_category_id" value="<!--{$arrForm.parent_category_id}-->">
@@ -53,13 +53,13 @@
       <!--{if $arrTree[cnt].level != $smarty.const.LEVEL_MAX}-->
         <a href="?" onclick="fnModeSubmit('tree', 'parent_category_id', <!--{$arrTree[cnt].category_id}-->); return false;">
         <!--{if $arrForm.parent_category_id == $arrTree[cnt].category_id}-->
-          <img src="<!--{$smarty.const.URL_DIR}-->misc/openf.gif">
+          <img src="<!--{$smarty.const.URL_PATH}-->misc/openf.gif">
         <!--{else}-->
-          <img src="<!--{$smarty.const.URL_DIR}-->misc/closef.gif">
+          <img src="<!--{$smarty.const.URL_PATH}-->misc/closef.gif">
         <!--{/if}-->
         <!--{$disp_name|sfCutString:20|h}--></a><br />
       <!--{else}-->
-        <img src="<!--{$smarty.const.URL_DIR}-->misc/closef.gif">
+        <img src="<!--{$smarty.const.URL_PATH}-->misc/closef.gif">
         <!--{$disp_name|sfCutString:20|h}--></a><br />
       <!--{/if}-->
 

変更: branches/version-2_5-dev/data/Smarty/templates/admin/products/class.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/class.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/class.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -54,7 +54,7 @@
     <tr style="background:<!--{if $tpl_class_id != $arrClass[cnt].class_id}-->#ffffff<!--{else}--><!--{$smarty.const.SELECT_RGB}--><!--{/if}-->;">
       <!--{assign var=class_id value=$arrClass[cnt].class_id}-->
       <td><!--{* 規格名 *}--><!--{$arrClass[cnt].name|h}--> (<!--{$arrClassCatCount[$class_id]|default:0}-->)</td>
-      <td align="center"><a href="<!--{$smarty.const.URL_DIR}-->" onclick="fnClassCatPage(<!--{$arrClass[cnt].class_id}-->); return false;">分類登録</a></td>
+      <td align="center"><a href="<!--{$smarty.const.URL_PATH}-->" onclick="fnClassCatPage(<!--{$arrClass[cnt].class_id}-->); return false;">分類登録</a></td>
       <td align="center">
       <!--{if $tpl_class_id != $arrClass[cnt].class_id}-->
       <a href="?" onclick="fnModeSubmit('pre_edit', 'class_id', <!--{$arrClass[cnt].class_id}-->); return false;">編集</a>

変更: branches/version-2_5-dev/data/Smarty/templates/admin/products/confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/confirm.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/confirm.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -268,7 +268,7 @@
     <tr>
       <th>関連商品(<!--{$smarty.section.cnt.iteration}-->)<br />
       <!--{if $arrRecommend[$recommend_no].product_id|strlen >= 1}-->
-        <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrRecommend[$recommend_no].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[$recommend_no].name|h}-->">
+        <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$arrRecommend[$recommend_no].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[$recommend_no].name|h}-->">
       <!--{/if}-->
       </th>
       <td>

変更: branches/version-2_5-dev/data/Smarty/templates/admin/products/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/index.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/index.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -206,7 +206,7 @@
     <tr style="background:<!--{$arrPRODUCTSTATUS_COLOR[$status]}-->;">
       <td class="id" rowspan="2"><!--{$arrProducts[cnt].product_id}--></td>
       <td class="thumbnail" rowspan="2">
-      <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65">
+      <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65">
       </td>
       <td rowspan="2"><!--{$arrProducts[cnt].product_code_min|h}-->
         <!--{if $arrProducts[cnt].product_code_min != $arrProducts[cnt].product_code_max}-->
@@ -232,13 +232,13 @@
       <!--{* 表示 *}-->
       <!--{assign var=key value=$arrProducts[cnt].status}-->
       <td class="menu" rowspan="2"><!--{$arrDISP[$key]}--></td>
-      <td class="menu" rowspan="2"><span class="icon_edit"><a href="<!--{$smarty.const.URL_DIR}-->" onclick="fnChangeAction('./product.php'); fnModeSubmit('pre_edit', 'product_id', <!--{$arrProducts[cnt].product_id}-->); return false;" >編集</a></span></td>
-      <td class="menu" rowspan="2"><span class="icon_confirm"><a href="<!--{$smarty.const.SITE_URL|sfTrimURL}-->/products/detail.php?product_id=<!--{$arrProducts[cnt].product_id}-->&amp;admin=on" target="_blank">確認</a></span></td>
+      <td class="menu" rowspan="2"><span class="icon_edit"><a href="<!--{$smarty.const.URL_PATH}-->" onclick="fnChangeAction('./product.php'); fnModeSubmit('pre_edit', 'product_id', <!--{$arrProducts[cnt].product_id}-->); return false;" >編集</a></span></td>
+      <td class="menu" rowspan="2"><span class="icon_confirm"><a href="<!--{$smarty.const.HTTP_URL|sfTrimURL}-->/products/detail.php?product_id=<!--{$arrProducts[cnt].product_id}-->&amp;admin=on" target="_blank">確認</a></span></td>
       <!--{if $smarty.const.OPTION_CLASS_REGIST == 1}-->
-      <td class="menu" rowspan="2"><span class="icon_class"><a href="<!--{$smarty.const.URL_DIR}-->" onclick="fnChangeAction('./product_class.php'); fnModeSubmit('pre_edit', 'product_id', <!--{$arrProducts[cnt].product_id}-->); return false;" >規格</a></span></td>
+      <td class="menu" rowspan="2"><span class="icon_class"><a href="<!--{$smarty.const.URL_PATH}-->" onclick="fnChangeAction('./product_class.php'); fnModeSubmit('pre_edit', 'product_id', <!--{$arrProducts[cnt].product_id}-->); return false;" >規格</a></span></td>
       <!--{/if}-->
-      <td class="menu" rowspan="2"><span class="icon_delete"><a href="<!--{$smarty.const.URL_DIR}-->" onclick="fnSetFormValue('category_id', '<!--{$arrProducts[cnt].category_id}-->'); fnModeSubmit('delete', 'product_id', <!--{$arrProducts[cnt].product_id}-->); return false;">削除</a></span></td>
-      <td class="menu" rowspan="2"><span class="icon_copy"><a href="<!--{$smarty.const.URL_DIR}-->" onclick="fnChangeAction('./product.php'); fnModeSubmit('copy', 'product_id', <!--{$arrProducts[cnt].product_id}-->); return false;" >複製</a></span></td>
+      <td class="menu" rowspan="2"><span class="icon_delete"><a href="<!--{$smarty.const.URL_PATH}-->" onclick="fnSetFormValue('category_id', '<!--{$arrProducts[cnt].category_id}-->'); fnModeSubmit('delete', 'product_id', <!--{$arrProducts[cnt].product_id}-->); return false;">削除</a></span></td>
+      <td class="menu" rowspan="2"><span class="icon_copy"><a href="<!--{$smarty.const.URL_PATH}-->" onclick="fnChangeAction('./product.php'); fnModeSubmit('copy', 'product_id', <!--{$arrProducts[cnt].product_id}-->); return false;" >複製</a></span></td>
     </tr>
     <tr style="background:<!--{$arrPRODUCTSTATUS_COLOR[$status]}-->;">
       <td>
@@ -252,7 +252,7 @@
 
         <!--{* URL *}-->
         <div id="disp_url<!--{$smarty.section.cnt.iteration}-->" style="display:none">
-        <!--{$smarty.const.SITE_URL|sfTrimURL}-->/products/detail.php?product_id=<!--{$arrProducts[cnt].product_id}-->
+        <!--{$smarty.const.HTTP_URL|sfTrimURL}-->/products/detail.php?product_id=<!--{$arrProducts[cnt].product_id}-->
         </div>
       </td>
     </tr>

変更: branches/version-2_5-dev/data/Smarty/templates/admin/products/product.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/product.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/product.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -407,7 +407,7 @@
       <!--{assign var=anckey value="recommend_no`$smarty.section.cnt.iteration`"}-->
       <th>関連商品(<!--{$smarty.section.cnt.iteration}-->)<br />
         <!--{if $arrRecommend[$recommend_no].product_id}-->
-          <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrRecommend[$recommend_no].main_list_image|sfNoImageMainList|h}-->&width=65&height=65" alt="<!--{$arrRecommend[$recommend_no].name|h}-->" />
+          <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$arrRecommend[$recommend_no].main_list_image|sfNoImageMainList|h}-->&width=65&height=65" alt="<!--{$arrRecommend[$recommend_no].name|h}-->" />
         <!--{/if}-->
       </th>
       <td>

変更: branches/version-2_5-dev/data/Smarty/templates/admin/products/product_rank.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/product_rank.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/product_rank.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -48,9 +48,9 @@
       <!--{assign var=disp_name value="`$arrTree[cnt].category_id`.`$arrTree[cnt].category_name`"}-->
       <a href="?" onclick="fnModeSubmit('tree', 'parent_category_id', <!--{$arrTree[cnt].category_id}-->); return false">
       <!--{if $arrForm.parent_category_id == $arrTree[cnt].category_id}-->
-        <img src="<!--{$smarty.const.URL_DIR}-->misc/openf.gif">
+        <img src="<!--{$smarty.const.URL_PATH}-->misc/openf.gif">
       <!--{else}-->
-        <img src="<!--{$smarty.const.URL_DIR}-->misc/closef.gif">
+        <img src="<!--{$smarty.const.URL_PATH}-->misc/closef.gif">
       <!--{/if}-->
       <!--{$disp_name|sfCutString:20|h}-->(<!--{$arrTree[cnt].product_count|default:0}-->)</a>
     <br />          
@@ -99,7 +99,7 @@
           <td><!--{from_to from=$arrProductsList[cnt].product_code_min to=$arrProductsList[cnt].product_code_max separator="〜<br />"}--></td>
           <td align="center">
             <!--{* 商品画像 *}-->
-            <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrProductsList[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrProducts[cnt].name|h}-->">
+            <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$arrProductsList[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrProducts[cnt].name|h}-->">
           </td>
           <td align="center">
             <!--{$arrProductsList[cnt].name|h}-->

変更: branches/version-2_5-dev/data/Smarty/templates/admin/products/product_select.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/product_select.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/product_select.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -83,7 +83,7 @@
             <!--{assign var=status value="`$arrProducts[cnt].status`"}-->
             <tr style="background:<!--{$arrPRODUCTSTATUS_COLOR[$status]}-->;">
                 <td align="center">
-                    <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[$recommend_no].name|h}-->" />
+                    <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[$recommend_no].name|h}-->" />
                 </td>
                 <td><!--{$arrProducts[cnt].product_code|default:"-"|h}--></td>
                 <td><!--{$arrProducts[cnt].name|h}--></td>

変更: branches/version-2_5-dev/data/Smarty/templates/admin/products/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/subnavi.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/subnavi.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -22,14 +22,14 @@
  */
 *}-->
 <ul class="level1">
-<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-products-index"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->products/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>商品マスタ</span></a></li>
-<li<!--{if $tpl_subno == 'product'}--> class="on"<!--{/if}--> id="navi-products-product"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->products/product.php"><span>商品登録</span></a></li>
-<li<!--{if $tpl_subno == 'upload_csv'}--> class="on"<!--{/if}--> id="navi-products-uploadcsv"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->products/upload_csv.php"><span>商品登録CSV</span></a></li>
-<li<!--{if $tpl_subno == 'class'}--> class="on"<!--{/if}--> id="navi-products-class"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->products/class.php"><span>規格管理</span></a></li>
-<li<!--{if $tpl_subno == 'category'}--> class="on"<!--{/if}--> id="navi-products-category"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->products/category.php"><span>カテゴリ管理</span></a></li>
-<li<!--{if $tpl_subno == 'upload_csv_category'}--> class="on"<!--{/if}--> id="navi-products-upload-csv-category"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->products/upload_csv_category.php"><span>カテゴリ登録CSV</span></a></li>
-<li<!--{if $tpl_subno == 'maker'}--> class="on"<!--{/if}--> id="navi-products-maker"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->products/maker.php"><span>メーカー管理</span></a></li>
-<li<!--{if $tpl_subno == 'product_rank'}--> class="on"<!--{/if}--> id="navi-products-rank"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->products/product_rank.php"><span>商品並び替え</span></a></li>
-<li<!--{if $tpl_subno == 'review'}--> class="on"<!--{/if}--> id="navi-products-review"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->products/review.php"><span>レビュー管理</span></a></li>
-<li<!--{if $tpl_subno == 'trackback'}--> class="on"<!--{/if}--> id="navi-products-trackback"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->products/trackback.php"><span>トラックバック管理</span></a></li>
+<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-products-index"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->products/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>商品マスタ</span></a></li>
+<li<!--{if $tpl_subno == 'product'}--> class="on"<!--{/if}--> id="navi-products-product"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->products/product.php"><span>商品登録</span></a></li>
+<li<!--{if $tpl_subno == 'upload_csv'}--> class="on"<!--{/if}--> id="navi-products-uploadcsv"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->products/upload_csv.php"><span>商品登録CSV</span></a></li>
+<li<!--{if $tpl_subno == 'class'}--> class="on"<!--{/if}--> id="navi-products-class"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->products/class.php"><span>規格管理</span></a></li>
+<li<!--{if $tpl_subno == 'category'}--> class="on"<!--{/if}--> id="navi-products-category"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->products/category.php"><span>カテゴリ管理</span></a></li>
+<li<!--{if $tpl_subno == 'upload_csv_category'}--> class="on"<!--{/if}--> id="navi-products-upload-csv-category"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->products/upload_csv_category.php"><span>カテゴリ登録CSV</span></a></li>
+<li<!--{if $tpl_subno == 'maker'}--> class="on"<!--{/if}--> id="navi-products-maker"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->products/maker.php"><span>メーカー管理</span></a></li>
+<li<!--{if $tpl_subno == 'product_rank'}--> class="on"<!--{/if}--> id="navi-products-rank"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->products/product_rank.php"><span>商品並び替え</span></a></li>
+<li<!--{if $tpl_subno == 'review'}--> class="on"<!--{/if}--> id="navi-products-review"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->products/review.php"><span>レビュー管理</span></a></li>
+<li<!--{if $tpl_subno == 'trackback'}--> class="on"<!--{/if}--> id="navi-products-trackback"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->products/trackback.php"><span>トラックバック管理</span></a></li>
 </ul>

変更: branches/version-2_5-dev/data/Smarty/templates/admin/system/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/system/subnavi.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/system/subnavi.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -22,12 +22,12 @@
  */
 *}-->
 <ul class="level1">
-<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-system-index"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->system/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>メンバー管理</span></a></li>
-<li<!--{if $tpl_subno == 'bkup'}--> class="on"<!--{/if}--> id="navi-system-bkup"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->system/bkup.php"><span>バックアップ管理</span></a></li>
-<li<!--{if $tpl_subno == 'parameter'}--> class="on"<!--{/if}--> id="navi-system-parameter"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->system/parameter.php"><span>パラメータ設定</span></a></li>
-<li<!--{if $tpl_subno == 'masterdata'}--> class="on"<!--{/if}--> id="navi-system-masterdata"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->system/masterdata.php"><span>マスタデータ管理</span></a></li>
-<li<!--{if $tpl_subno == 'system'}--> class="on"<!--{/if}--> id="navi-system-system"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->system/system.php"><span>システム情報</span></a></li>
-<li<!--{if $tpl_subno == 'plugin'}--> class="on"<!--{/if}--> id="navi-system-plugin"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->system/plugin.php"><span>プラグイン管理</span></a></li>
-<li<!--{if $tpl_mainno == 'system' && $tpl_subno == 'log'}--> class="on"<!--{/if}--> id="navi-system-log"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->system/log.php"><span>EC-CUBE ログ表示</span></a></li>
-<li<!--{if $tpl_mainno == 'system' && $tpl_subno == 'editdb'}--> class="on"<!--{/if}--> id="navi-system-editdb"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->system/editdb.php"><span>高度なデータベース管理</span></a></li>
+<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-system-index"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->system/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>メンバー管理</span></a></li>
+<li<!--{if $tpl_subno == 'bkup'}--> class="on"<!--{/if}--> id="navi-system-bkup"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->system/bkup.php"><span>バックアップ管理</span></a></li>
+<li<!--{if $tpl_subno == 'parameter'}--> class="on"<!--{/if}--> id="navi-system-parameter"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->system/parameter.php"><span>パラメータ設定</span></a></li>
+<li<!--{if $tpl_subno == 'masterdata'}--> class="on"<!--{/if}--> id="navi-system-masterdata"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->system/masterdata.php"><span>マスタデータ管理</span></a></li>
+<li<!--{if $tpl_subno == 'system'}--> class="on"<!--{/if}--> id="navi-system-system"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->system/system.php"><span>システム情報</span></a></li>
+<li<!--{if $tpl_subno == 'plugin'}--> class="on"<!--{/if}--> id="navi-system-plugin"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->system/plugin.php"><span>プラグイン管理</span></a></li>
+<li<!--{if $tpl_mainno == 'system' && $tpl_subno == 'log'}--> class="on"<!--{/if}--> id="navi-system-log"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->system/log.php"><span>EC-CUBE ログ表示</span></a></li>
+<li<!--{if $tpl_mainno == 'system' && $tpl_subno == 'editdb'}--> class="on"<!--{/if}--> id="navi-system-editdb"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->system/editdb.php"><span>高度なデータベース管理</span></a></li>
 </ul>

変更: branches/version-2_5-dev/data/Smarty/templates/admin/total/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/total/subnavi.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/total/subnavi.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -24,17 +24,17 @@
 <ul class="level1">
     <li id="navi-total-term"
         class="<!--{if ($tpl_mainno == 'total' && ($arrForm.page.value == 'term' || $arrForm.page.value == ''))}-->on<!--{/if}-->"
-    ><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=term"><span>期間別集計</span></a></li>
+    ><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=term"><span>期間別集計</span></a></li>
     <li id="navi-total-products"
         class="<!--{if ($tpl_mainno == 'total' && $arrForm.page.value == 'products')}-->on<!--{/if}-->"
-    ><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=products"><span>商品別集計</span></a></li>
+    ><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=products"><span>商品別集計</span></a></li>
     <li id="navi-total-age"
         class="<!--{if ($tpl_mainno == 'total' && $arrForm.page.value == 'age')}-->on<!--{/if}-->"
-    ><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=age"><span>年代別集計</span></a></li>
+    ><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=age"><span>年代別集計</span></a></li>
     <li id="navi-total-job"
         class="<!--{if ($tpl_mainno == 'total' && $arrForm.page.value == 'job')}-->on<!--{/if}-->"
-    ><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=job"><span>職業別集計</span></a></li>
+    ><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=job"><span>職業別集計</span></a></li>
     <li id="navi-total-member"
         class="<!--{if ($tpl_mainno == 'total' && $arrForm.page.value == 'member')}-->on<!--{/if}-->"
-    ><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=member"><span>会員別集計</span></a></li>
+    ><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=member"><span>会員別集計</span></a></li>
 </ul>

変更: branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -19,9 +19,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/jquery.fancybox/jquery.mousewheel-3.0.4.pack.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/jquery.fancybox/jquery.fancybox-1.3.4.pack.js"></script>
-<link rel="stylesheet" href="<!--{$smarty.const.URL_DIR}-->js/jquery.fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/jquery.fancybox/jquery.mousewheel-3.0.4.pack.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/jquery.fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<link rel="stylesheet" href="<!--{$smarty.const.URL_PATH}-->js/jquery.fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
 <script type="text/javascript">//<![CDATA[
     $(document).ready(function() {
         $("a.expansion").fancybox({
@@ -101,7 +101,7 @@
                                 target="_blank"
                             <!--{/if}-->
                         >
-                            <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|h}-->" /></a>
+                            <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|h}-->" /></a>
                         </td>
                         <td><!--{* 商品名 *}--><strong><!--{$item.productsClass.name|h}--></strong><br />
                             <!--{if $item.productsClass.classcategory_name1 != ""}-->

変更: branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/best5.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/best5.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/best5.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -28,7 +28,7 @@
         <div class="recomendleft">
 
             <a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$arrBestProducts[cnt].product_id|u}-->">
-                <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrBestProducts[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=48&amp;height=48" alt="<!--{$arrBestProducts[cnt].name|h}-->" /></a>
+                <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$arrBestProducts[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=48&amp;height=48" alt="<!--{$arrBestProducts[cnt].name|h}-->" /></a>
 
             <h3>
                 <a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$arrBestProducts[cnt].product_id|u}-->"><!--{$arrBestProducts[cnt].name|h}--></a>
@@ -49,7 +49,7 @@
             <!--{if $arrBestProducts[$cnt2]|count > 0}-->
 
             <a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$arrBestProducts[$cnt2].product_id|u}-->">
-                <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrBestProducts[$cnt2].main_list_image|sfNoImageMainList|h}-->&amp;width=48&amp;height=48" alt="<!--{$arrBestProducts[$cnt2].name|h}-->" /></a>
+                <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$arrBestProducts[$cnt2].main_list_image|sfNoImageMainList|h}-->&amp;width=48&amp;height=48" alt="<!--{$arrBestProducts[$cnt2].name|h}-->" /></a>
 
             <h3>
             <a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$arrBestProducts[$cnt2].product_id|u}-->"><!--{$arrBestProducts[$cnt2].name|h}--></a>

変更: branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -43,7 +43,7 @@
                     <!--{/section}-->
                     </li>
                 <!--{/if}-->
-            <li class="level<!--{$level}--><!--{if in_array($arrTree[cnt].category_id, $tpl_category_id) }--> onmark<!--{/if}-->"><a href="<!--{$smarty.const.URL_DIR}-->products/list.php?category_id=<!--{$arrTree[cnt].category_id}-->"<!--{if in_array($arrTree[cnt].category_id, $tpl_category_id) }--> class="onlink"<!--{/if}-->><!--{$arrTree[cnt].category_name|h}-->(<!--{$arrTree[cnt].product_count|default:0}-->)</a>
+            <li class="level<!--{$level}--><!--{if in_array($arrTree[cnt].category_id, $tpl_category_id) }--> onmark<!--{/if}-->"><a href="<!--{$smarty.const.URL_PATH}-->products/list.php?category_id=<!--{$arrTree[cnt].category_id}-->"<!--{if in_array($arrTree[cnt].category_id, $tpl_category_id) }--> class="onlink"<!--{/if}-->><!--{$arrTree[cnt].category_name|h}-->(<!--{$arrTree[cnt].product_count|default:0}-->)</a>
             <!--{if $firstdone == 0}--><!--{assign var=firstdone value=1}--><!--{/if}-->
             <!--{assign var=preLev value=`$level`}-->
             <!--{/if}-->

変更: branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/guide.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/guide.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/guide.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -24,15 +24,15 @@
         <!--{strip}-->
         <ul class="button_like">
         <li>
-            <a href="<!--{$smarty.const.URL_DIR}-->abouts/<!--{$smarty.const.DIR_INDEX_URL}-->"
+            <a href="<!--{$smarty.const.URL_PATH}-->abouts/<!--{$smarty.const.DIR_INDEX_URL}-->"
                 class="<!--{if $tpl_page_category == "abouts"}--> selected<!--{/if}-->"
             >当サイトについて</a></li>
         <li>
-            <a href="<!--{$smarty.const.SSL_URL}-->contact/<!--{$smarty.const.DIR_INDEX_URL}-->"
+            <a href="<!--{$smarty.const.HTTPS_URL}-->contact/<!--{$smarty.const.DIR_INDEX_URL}-->"
                 class="<!--{if $tpl_page_category == "contact"}--> selected<!--{/if}-->"
             >お問い合わせ</a></li>
         <li>
-            <a href="<!--{$smarty.const.URL_DIR}-->order/<!--{$smarty.const.DIR_INDEX_URL}-->"
+            <a href="<!--{$smarty.const.URL_PATH}-->order/<!--{$smarty.const.DIR_INDEX_URL}-->"
                 class="<!--{if $tpl_page_category == "order"}--> selected<!--{/if}-->"
             >特定商取引に関する法律</a></li>
         </ul>

変更: branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/login.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/login.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/login.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -23,7 +23,7 @@
     <h2><img src="<!--{$TPL_DIR}-->img/icon/ico_block_login.gif" width="20" height="20" alt="*" class="title_icon" />
         ログイン</h2>
     <div id="loginarea" class="bloc_body">
-        <form name="login_form" id="login_form" method="post" action="<!--{$smarty.const.SSL_URL}-->frontparts/login_check.php" onsubmit="return fnCheckLogin('login_form')">
+        <form name="login_form" id="login_form" method="post" action="<!--{$smarty.const.HTTPS_URL}-->frontparts/login_check.php" onsubmit="return fnCheckLogin('login_form')">
             <input type="hidden" name="mode" value="login" />
             <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
             <input type="hidden" name="url" value="<!--{$smarty.server.PHP_SELF|h}-->" />
@@ -47,7 +47,7 @@
                 <p><img src="<!--{$TPL_DIR}-->img/icon/ico_password.gif" width="40" height="22" alt="パスワード" /><input type="password" name="login_pass" class="box96" /></p>
             </div>
                 <p class="mini">
-                    <a href="<!--{$smarty.const.SSL_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="win01('<!--{$smarty.const.SSL_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->','forget','600','400'); return false;" target="_blank">パスワードを忘れた方はこちら</a>
+                    <a href="<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="win01('<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->','forget','600','400'); return false;" target="_blank">パスワードを忘れた方はこちら</a>
                 </p>
                 <p class="mini">
                     <input type="checkbox" name="login_memory" id="login_memory" value="1" <!--{$tpl_login_memory|sfGetChecked:1}--> />

変更: branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/news.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/news.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/news.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -23,7 +23,7 @@
     <h2><img src="<!--{$TPL_DIR}-->img/icon/ico_block_news.gif" width="27" height="20" alt="*" class="title_icon" />
         新着情報</h2>
     <div class="bloc_body">
-        <p>☆★☆ 新着情報は<a href="<!--{$smarty.const.URL_DIR}-->rss/<!--{$smarty.const.DIR_INDEX_URL}-->" target="_blank">RSS</a>で配信しています。★☆★</p>
+        <p>☆★☆ 新着情報は<a href="<!--{$smarty.const.URL_PATH}-->rss/<!--{$smarty.const.DIR_INDEX_URL}-->" target="_blank">RSS</a>で配信しています。★☆★</p>
 
         <!--{section name=data loop=$arrNews}-->
             <!--{assign var="date_array" value="-"|explode:$arrNews[data].news_date_disp}-->

変更: branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/search_products.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/search_products.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/search_products.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -24,7 +24,7 @@
         検索条件</h2>
     <div id="searcharea" class="bloc_body">
         <!--検索フォーム-->
-        <form name="search_form" id="search_form" method="get" action="<!--{$smarty.const.URL_DIR}-->products/list.php">
+        <form name="search_form" id="search_form" method="get" action="<!--{$smarty.const.URL_PATH}-->products/list.php">
 
             <p class="mini">商品カテゴリから選ぶ
                 <input type="hidden" name="mode" value="search" />

変更: branches/version-2_5-dev/data/Smarty/templates/default/frontparts/form_personal_input.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/frontparts/form_personal_input.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/form_personal_input.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -58,7 +58,7 @@
     <!--{/if}-->
     〒&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1]|h}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" size="6" class="box60" />&nbsp;-&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2]|h}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;" size="6" class="box60" />&nbsp;
     <a href="http://search.post.japanpost.jp/zipcode/" target="_blank"><span class="fs12">郵便番号検索</span></a>
-    <p class="zipimg"><a href="<!--{$smarty.const.URL_DIR}-->input_zip.php" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', '<!--{$key1}-->', '<!--{$key2}-->', '<!--{$key3}-->', '<!--{$key4}-->'); return false;" target="_blank"><img src="<!--{$TPL_DIR}-->img/button/btn_address_input.gif" width="86" height="20" alt="住所自動入力" /></a>
+    <p class="zipimg"><a href="<!--{$smarty.const.URL_PATH}-->input_zip.php" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', '<!--{$key1}-->', '<!--{$key2}-->', '<!--{$key3}-->', '<!--{$key4}-->'); return false;" target="_blank"><img src="<!--{$TPL_DIR}-->img/button/btn_address_input.gif" width="86" height="20" alt="住所自動入力" /></a>
     <span class="mini">&nbsp;郵便番号を入力後、クリックしてください。</span></p>
   </td>
 </tr>

変更: branches/version-2_5-dev/data/Smarty/templates/default/header.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/header.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/header.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -45,13 +45,13 @@
   <div id="information">
     <ul>
       <li>
-        <a href="<!--{$smarty.const.SSL_URL}-->mypage/login.php"
+        <a href="<!--{$smarty.const.HTTPS_URL}-->mypage/login.php"
            onmouseover="chgImg('<!--{$TPL_DIR}-->img/common/btn_header_mypage_on.gif','mypage');"
            onmouseout="chgImg('<!--{$TPL_DIR}-->img/common/btn_header_mypage.gif','mypage');">
           <img src="<!--{$TPL_DIR}-->img/common/btn_header_mypage.gif" width="95" height="20" alt="MYページ" name="mypage" id="mypage" /></a>
       </li>
       <li>
-        <a href="<!--{$smarty.const.URL_DIR}-->entry/kiyaku.php"
+        <a href="<!--{$smarty.const.URL_PATH}-->entry/kiyaku.php"
            onmouseover="chgImg('<!--{$TPL_DIR}-->img/common/btn_header_entry_on.gif','entry');"
            onmouseout="chgImg('<!--{$TPL_DIR}-->img/common/btn_header_entry.gif','entry');">
           <img src="<!--{$TPL_DIR}-->img/common/btn_header_entry.gif" width="95" height="20" alt="会員登録" name="entry" id="entry" /></a>

変更: branches/version-2_5-dev/data/Smarty/templates/default/mail_templates/customer_mail.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/mail_templates/customer_mail.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/mail_templates/customer_mail.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -44,7 +44,7 @@
 本会員登録を完了するには下記URLにアクセスしてください。
 ※入力されたお客様の情報はSSL暗号化通信により保護されます。
 
-<!--{$smarty.const.SSL_URL}-->regist/<!--{$smarty.const.DIR_INDEX_URL}-->?mode=regist&id=<!--{$uniqid}--><!--{$etc_value}-->
+<!--{$smarty.const.HTTPS_URL}-->regist/<!--{$smarty.const.DIR_INDEX_URL}-->?mode=regist&id=<!--{$uniqid}--><!--{$etc_value}-->
 
 上記URLにて本会員登録が完了いたしましたら改めてご登録内容ご確認
 メールをお送り致します。

変更: branches/version-2_5-dev/data/Smarty/templates/default/mypage/delivery.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/mypage/delivery.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/delivery.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -34,7 +34,7 @@
           <!--{* 退会時非表示 *}-->
           <!--{if $tpl_login}-->
             <p class="addbtn">
-                <a href="<!--{$smarty.const.URL_DIR}-->mypage/delivery_addr.php" onclick="win03('./delivery_addr.php','delivadd','600','640'); return false;" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_add_address_on.gif','newadress');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_add_address.gif','newadress');" target="_blank"><img src="<!--{$TPL_DIR}-->img/button/btn_add_address.gif" width="160" height="22" alt="新しいお届け先を追加" border="0" name="newadress" /></a>
+                <a href="<!--{$smarty.const.URL_PATH}-->mypage/delivery_addr.php" onclick="win03('./delivery_addr.php','delivadd','600','640'); return false;" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_add_address_on.gif','newadress');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_add_address.gif','newadress');" target="_blank"><img src="<!--{$TPL_DIR}-->img/button/btn_add_address.gif" width="160" height="22" alt="新しいお届け先を追加" border="0" name="newadress" /></a>
             </p>
           <!--{/if}-->
         <!--{/if}-->

変更: branches/version-2_5-dev/data/Smarty/templates/default/mypage/favorite.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/mypage/favorite.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/favorite.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -58,7 +58,7 @@
       <!--{assign var=product_id value="`$arrFavorite[cnt].product_id`"}-->
       <tr>
        <td><a href="javascript:fnModeSubmit('delete_favorite','product_id','<!--{$product_id|h}-->');">削除</a></td>
-       <td><a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$product_id|u}-->"><img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrFavorite[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65"></a></td>
+       <td><a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$product_id|u}-->"><img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$arrFavorite[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65"></a></td>
        <td><a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$product_id|u}-->"><!--{$arrFavorite[cnt].name}--></a></td>
        <td class="right sale_price">
         <span class="price">

変更: branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -60,7 +60,7 @@
                     <td>
                     <!--{ if $orderDetail.product_type_id == PRODUCT_TYPE_DOWNLOAD}-->
                         <!--{ if $orderDetail.price == "0" || ( $orderDetail.status >= "4" && $orderDetail.effective == "1" )}-->
-                            <a target="_self" href="<!--{$smarty.const.URL_DIR}-->mypage/download.php?order_id=<!--{$arrDisp.order_id}-->&product_id=<!--{$orderDetail.product_id}-->&product_class_id=<!--{$orderDetail.product_class_id}-->">ダウンロード</a>
+                            <a target="_self" href="<!--{$smarty.const.URL_PATH}-->mypage/download.php?order_id=<!--{$arrDisp.order_id}-->&product_id=<!--{$orderDetail.product_id}-->&product_class_id=<!--{$orderDetail.product_class_id}-->">ダウンロード</a>
                         <!--{ elseif $orderDetail.payment_date == "" || $orderDetail.status < "4"}-->
                             ダウンロード商品<BR />（入金確認中）
                         <!--{ elseif $orderDetail.effective != "1"}-->

変更: branches/version-2_5-dev/data/Smarty/templates/default/mypage/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/mypage/index.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/index.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -59,7 +59,7 @@
        <!--{assign var=payment_id value="`$arrOrder[cnt].payment_id`"}-->
        <td><!--{$arrPayment[$payment_id]|h}--></td>
        <td class="pricetd"><!--{$arrOrder[cnt].payment_total|number_format}-->円</td>
-       <td class="centertd"><a href="<!--{$smarty.const.URL_DIR}-->mypage/history.php?order_id=<!--{$arrOrder[cnt].order_id}-->">詳細</a></td>
+       <td class="centertd"><a href="<!--{$smarty.const.URL_PATH}-->mypage/history.php?order_id=<!--{$arrOrder[cnt].order_id}-->">詳細</a></td>
      </tr>
      <!--{/section}-->
     </table>

変更: branches/version-2_5-dev/data/Smarty/templates/default/mypage/login.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/mypage/login.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/login.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -56,8 +56,8 @@
       <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_login_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_login.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_login.gif" alt="ログイン" name="log" id="log" class="box140" />
      </div>
      <p class="inputtext02">
-       パスワードを忘れた方は<a href="<!--{$smarty.const.SSL_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="win01('<!--{$smarty.const.SSL_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->','forget','600','460'); return false;" target="_blank">こちら</a>からパスワードの再発行を行ってください。<br />
-      メールアドレスを忘れた方は、お手数ですが、<a href="<!--{$smarty.const.URL_DIR}-->contact/<!--{$smarty.const.DIR_INDEX_URL}-->">お問い合わせページ</a>からお問い合わせください。
+       パスワードを忘れた方は<a href="<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="win01('<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->','forget','600','460'); return false;" target="_blank">こちら</a>からパスワードの再発行を行ってください。<br />
+      メールアドレスを忘れた方は、お手数ですが、<a href="<!--{$smarty.const.URL_PATH}-->contact/<!--{$smarty.const.DIR_INDEX_URL}-->">お問い合わせページ</a>からお問い合わせください。
      </p>
   </div>
   <div class="loginarea">
@@ -68,7 +68,7 @@
       また、ログインするだけで、毎回お名前や住所などを入力することなくスムーズにお買い物をお楽しみいただけます。
     </p>
     <div class="inputbox02">
-      <a href="<!--{$smarty.const.URL_DIR}-->entry/kiyaku.php" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry_on.gif','b_gotoentry');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry.gif','b_gotoentry');">
+      <a href="<!--{$smarty.const.URL_PATH}-->entry/kiyaku.php" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry_on.gif','b_gotoentry');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry.gif','b_gotoentry');">
         <img src="<!--{$TPL_DIR}-->img/button/btn_entry.gif" width="130" height="30" alt="会員登録をする" border="0" name="b_gotoentry" /></a>
     </div>
   </div>

変更: branches/version-2_5-dev/data/Smarty/templates/default/popup_header.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/popup_header.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/popup_header.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -25,12 +25,12 @@
 <meta http-equiv="Content-Type" content="text/html; charset=<!--{$smarty.const.CHAR_CODE}-->" />
 <meta http-equiv="Content-Script-Type" content="text/javascript" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
-<link rel="stylesheet" href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.USER_DIR}-->css/common.css" type="text/css" media="all" />
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/css.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/navi.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/win_op.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/site.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/jquery-1.4.2.min.js"></script>
+<link rel="stylesheet" href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.USER_DIR}-->css/common.css" type="text/css" media="all" />
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/css.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/navi.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/win_op.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/site.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/jquery-1.4.2.min.js"></script>
 <title><!--{$arrSiteInfo.shop_name}-->/<!--{$subtitle|h}--></title>
 <script type="text/javascript">//<![CDATA[
     <!--{$tpl_javascript}-->

変更: branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/jquery.facebox/facebox.js"></script>
-<link rel="stylesheet" type="text/css" href="<!--{$smarty.const.URL_DIR}-->js/jquery.facebox/facebox.css" media="screen" />
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/jquery.facebox/facebox.js"></script>
+<link rel="stylesheet" type="text/css" href="<!--{$smarty.const.URL_PATH}-->js/jquery.facebox/facebox.css" media="screen" />
 <script type="text/javascript">//<![CDATA[
 // 規格2に選択肢を割り当てる。
 function fnSetClassCategories(form, classcat_id2_selected) {
@@ -153,8 +153,8 @@
 }
 $(document).ready(function() {
     $('a.expansion').facebox({
-        loadingImage : '<!--{$smarty.const.URL_DIR}-->js/jquery.facebox/loading.gif',
-        closeImage   : '<!--{$smarty.const.URL_DIR}-->js/jquery.facebox/closelabel.png'
+        loadingImage : '<!--{$smarty.const.URL_PATH}-->js/jquery.facebox/loading.gif',
+        closeImage   : '<!--{$smarty.const.URL_PATH}-->js/jquery.facebox/closelabel.png'
     });
 });
 //]]>
@@ -289,7 +289,7 @@
                 <!--{section name=r loop=$arrRelativeCat}-->
                 <p>
                     <!--{section name=s loop=$arrRelativeCat[r]}-->
-                    <a href="<!--{$smarty.const.URL_DIR}-->products/list.php?category_id=<!--{$arrRelativeCat[r][s].category_id}-->"><!--{$arrRelativeCat[r][s].category_name}--></a>
+                    <a href="<!--{$smarty.const.URL_PATH}-->products/list.php?category_id=<!--{$arrRelativeCat[r][s].category_id}-->"><!--{$arrRelativeCat[r][s].category_name}--></a>
                     <!--{if !$smarty.section.s.last}--><!--{$smarty.const.SEPA_CATNAVI}--><!--{/if}-->
                     <!--{/section}-->
                 </p>
@@ -492,7 +492,7 @@
                 <div class="whoboughtleft">
 
                     <a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$arrRecommend[cnt].product_id|u}-->">
-                        <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrRecommend[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[cnt].name|h}-->" /></a>
+                        <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$arrRecommend[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[cnt].name|h}-->" /></a>
 
                     <!--{assign var=price02_min value=`$arrRecommend[cnt].price02_min`}-->
                     <!--{assign var=price02_max value=`$arrRecommend[cnt].price02_max`}-->
@@ -517,7 +517,7 @@
                 <div class="whoboughtright">
 
                     <a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$arrRecommend[cnt].product_id|u}-->">
-                        <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrRecommend[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[cnt].name|h}-->" /></a>
+                        <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$arrRecommend[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[cnt].name|h}-->" /></a>
 
                     <!--{assign var=price02_min value=`$arrRecommend[cnt].price02_min`}-->
                     <!--{assign var=price02_max value=`$arrRecommend[cnt].price02_max`}-->

変更: branches/version-2_5-dev/data/Smarty/templates/default/rss/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/rss/index.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/rss/index.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -23,7 +23,7 @@
 <rss version="2.0">
     <channel>
         <title><!--{$site_title|sf_mb_convert_encoding:$encode|h}--></title>
-        <link><!--{$smarty.const.SITE_URL}--></link>
+        <link><!--{$smarty.const.HTTP_URL}--></link>
         <description><!--{$description|sf_mb_convert_encoding:$encode|h}--></description>
         <language>ja</language>
         <managingEditor><!--{$email|h}--></managingEditor>
@@ -36,7 +36,7 @@
         <!--{section name=cnt loop=$arrNews}-->
             <item>
                 <!--{if $arrNews[cnt].news_url == '' }-->
-                    <link><!--{$smarty.const.SITE_URL}--></link>
+                    <link><!--{$smarty.const.HTTP_URL}--></link>
                 <!--{else}-->
                     <link><!--{$arrNews[cnt].news_url|h}--></link>
                 <!--{/if}-->

変更: branches/version-2_5-dev/data/Smarty/templates/default/rss/products.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/rss/products.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/rss/products.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -27,14 +27,14 @@
 <title><!--{$title|sf_mb_convert_encoding:$encode}--></title>
 <shop_name><!--{$arrSiteInfo.shop_name|sf_mb_convert_encoding:$encode}--></shop_name>
 <shop_kana><!--{$arrSiteInfo.shop_kana|sf_mb_convert_encoding:$encode}--></shop_kana>
-<site_url><!--{$smarty.const.SITE_URL}--></site_url>
+<site_url><!--{$smarty.const.HTTP_URL}--></site_url>
 <description><!--{section name=cnt loop=$arrProduct}--><!--{$arrProduct[cnt].product_id|sf_mb_convert_encoding:$encode}-->,<!--{/section}--></description>
 <language>ja</language>
 <docs>http://backend.userland.com/rss</docs>
 <!--{section name=cnt loop=$arrProduct}-->
 	<!--{* １つのitem要素を出力する *}-->
 	<item>
-		<link><!--{$smarty.const.SITE_URL}-->rss/product.php?product_id=<!--{$arrProduct[cnt].product_id}--></link>
+		<link><!--{$smarty.const.HTTP_URL}-->rss/product.php?product_id=<!--{$arrProduct[cnt].product_id}--></link>
 		<!--{foreach key=key item=item from=$arrProductKeys}-->
 			<<!--{$item}-->><!--{$arrProduct[cnt][$item]|h|sf_mb_convert_encoding:$encode}--></<!--{$item}-->>
 		<!--{/foreach}-->

変更: branches/version-2_5-dev/data/Smarty/templates/default/shopping/confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/shopping/confirm.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/shopping/confirm.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -19,9 +19,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/jquery.fancybox/jquery.mousewheel-3.0.4.pack.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/jquery.fancybox/jquery.fancybox-1.3.4.pack.js"></script>
-<link rel="stylesheet" href="<!--{$smarty.const.URL_DIR}-->js/jquery.fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/jquery.fancybox/jquery.mousewheel-3.0.4.pack.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/jquery.fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<link rel="stylesheet" href="<!--{$smarty.const.URL_PATH}-->js/jquery.fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
 <script type="text/javascript">//<![CDATA[
     var send = true;
 
@@ -80,7 +80,7 @@
                                 target="_blank"
                             <!--{/if}-->
                         >
-                            <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|h}-->" /></a>
+                            <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|h}-->" /></a>
                     </td>
                     <td>
                         <ul>

変更: branches/version-2_5-dev/data/Smarty/templates/default/shopping/deliv.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/shopping/deliv.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/shopping/deliv.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -35,7 +35,7 @@
 
         <!--{if $tpl_addrmax < $smarty.const.DELIV_ADDR_MAX}-->
             <p class="addbtn">
-                <a href="<!--{$smarty.const.URL_DIR}-->mypage/delivery_addr.php" onclick="win02('<!--{$smarty.const.URL_DIR}-->mypage/delivery_addr.php?page=<!--{$smarty.server.PHP_SELF|h}-->','new_deiv','600','640'); return false;" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_add_address_on.gif','addition');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_add_address.gif','addition');"><img src="<!--{$TPL_DIR}-->img/button/btn_add_address.gif" width="160" height="22" alt="新しいお届け先を追加する" name="addition" id="addition" /></a>
+                <a href="<!--{$smarty.const.URL_PATH}-->mypage/delivery_addr.php" onclick="win02('<!--{$smarty.const.URL_PATH}-->mypage/delivery_addr.php?page=<!--{$smarty.server.PHP_SELF|h}-->','new_deiv','600','640'); return false;" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_add_address_on.gif','addition');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_add_address.gif','addition');"><img src="<!--{$TPL_DIR}-->img/button/btn_add_address.gif" width="160" height="22" alt="新しいお届け先を追加する" name="addition" id="addition" /></a>
             </p>
         <!--{/if}-->
         <form name="form1" id="form1" method="post" action="?">
@@ -78,7 +78,7 @@
                     </td>
                     <td class="centertd">
                         <!--{if !$smarty.section.cnt.first}-->
-                            <a href="<!--{$smarty.const.URL_DIR}-->mypage/delivery_addr.php" onclick="win02('<!--{$smarty.const.URL_DIR}-->mypage/delivery_addr.php?page=<!--{$smarty.server.PHP_SELF|h}-->&amp;other_deliv_id=<!--{$arrAddr[cnt].other_deliv_id}-->','new_deiv','600','640'); return false;">変更</a>
+                            <a href="<!--{$smarty.const.URL_PATH}-->mypage/delivery_addr.php" onclick="win02('<!--{$smarty.const.URL_PATH}-->mypage/delivery_addr.php?page=<!--{$smarty.server.PHP_SELF|h}-->&amp;other_deliv_id=<!--{$arrAddr[cnt].other_deliv_id}-->','new_deiv','600','640'); return false;">変更</a>
                         <!--{/if}-->
                     </td>
                     <td class="centertd">

変更: branches/version-2_5-dev/data/Smarty/templates/default/shopping/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/shopping/index.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/shopping/index.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -52,8 +52,8 @@
       <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_login_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_login.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_login.gif" alt="ログイン" name="log" id="log" class="box140" />
      </div>
      <p class="inputtext02">
-       パスワードを忘れた方は<a href="<!--{$smarty.const.SSL_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="win01('<!--{$smarty.const.SSL_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->','forget','600','460'); return false;" target="_blank">こちら</a>からパスワードの再発行を行ってください。<br />
-      メールアドレスを忘れた方は、お手数ですが、<a href="<!--{$smarty.const.URL_DIR}-->contact/<!--{$smarty.const.DIR_INDEX_URL}-->">お問い合わせページ</a>からお問い合わせください。
+       パスワードを忘れた方は<a href="<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="win01('<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->','forget','600','460'); return false;" target="_blank">こちら</a>からパスワードの再発行を行ってください。<br />
+      メールアドレスを忘れた方は、お手数ですが、<a href="<!--{$smarty.const.URL_PATH}-->contact/<!--{$smarty.const.DIR_INDEX_URL}-->">お問い合わせページ</a>からお問い合わせください。
      </p>
    </div>
     </form>
@@ -68,7 +68,7 @@
       また、ログインするだけで、毎回お名前や住所などを入力することなくスムーズにお買い物をお楽しみいただけます。
     </p>
     <div class="inputbox02">
-      <a href="<!--{$smarty.const.URL_DIR}-->entry/kiyaku.php" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry_on.gif','b_gotoentry');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry.gif','b_gotoentry');">
+      <a href="<!--{$smarty.const.URL_PATH}-->entry/kiyaku.php" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry_on.gif','b_gotoentry');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry.gif','b_gotoentry');">
         <img src="<!--{$TPL_DIR}-->img/button/btn_entry.gif" width="130" height="30" alt="会員登録をする" border="0" name="b_gotoentry" /></a>
       <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_buystep_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_buystep.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_buystep.gif" class="box130"  alt="購入手続きへ" name="buystep" id="buystep" />
     </div>

変更: branches/version-2_5-dev/data/Smarty/templates/default/shopping/nonmember_input.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/shopping/nonmember_input.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/shopping/nonmember_input.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -61,7 +61,7 @@
             <p>〒&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;"  size="6" class="box60" />&nbsp;-&nbsp;  <input type="text"  name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;"  size="6" class="box60" />　
               <a href="http://search.post.japanpost.jp/zipcode/" target="_blank"><span class="fs12">郵便番号検索</span></a></p>
 
-            <p class="zipimg"><a href="<!--{$smarty.const.URL_DIR}-->address/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'order_zip01', 'order_zip02', 'order_pref', 'order_addr01'); return false;" target="_blank"><img src="<!--{$TPL_DIR}-->img/button/btn_address_input.gif" width="86" height="20" alt="住所自動入力" /></a>
+            <p class="zipimg"><a href="<!--{$smarty.const.URL_PATH}-->address/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'order_zip01', 'order_zip02', 'order_pref', 'order_addr01'); return false;" target="_blank"><img src="<!--{$TPL_DIR}-->img/button/btn_address_input.gif" width="86" height="20" alt="住所自動入力" /></a>
                <span class="mini">&nbsp;郵便番号を入力後、クリックしてください。</span></p>
           </td>
         </tr>
@@ -200,7 +200,7 @@
             <p>〒&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;"  size="6" class="box60" />&nbsp;-&nbsp;  <input type="text"  name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;"  size="6" class="box60" />　
               <a href="http://search.post.japanpost.jp/zipcode/" target="_blank"><span class="fs12">郵便番号検索</span></a></p>
 
-            <p class="zipimg"><a href="<!--{$smarty.const.URL_DIR}-->address/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'deliv_zip01', 'deliv_zip02', 'deliv_pref', 'deliv_addr01'); return false;" target="_blank"><img src="<!--{$TPL_DIR}-->img/button/btn_address_input.gif" width="86" height="20" alt="住所自動入力" /></a>
+            <p class="zipimg"><a href="<!--{$smarty.const.URL_PATH}-->address/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'deliv_zip01', 'deliv_zip02', 'deliv_pref', 'deliv_addr01'); return false;" target="_blank"><img src="<!--{$TPL_DIR}-->img/button/btn_address_input.gif" width="86" height="20" alt="住所自動入力" /></a>
               <span class="mini">&nbsp;郵便番号を入力後、クリックしてください。</span></p>
           </td>
         </tr>

変更: branches/version-2_5-dev/data/Smarty/templates/default/site_frame.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/site_frame.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/default/site_frame.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -26,17 +26,17 @@
 <meta http-equiv="Content-Script-Type" content="text/javascript" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <link rel="stylesheet" href="<!--{$TPL_DIR}-->css/import.css" type="text/css" media="all" />
-<link rel="alternate" type="application/rss+xml" title="RSS" href="<!--{$smarty.const.SITE_URL}-->rss/<!--{$smarty.const.DIR_INDEX_URL}-->" />
+<link rel="alternate" type="application/rss+xml" title="RSS" href="<!--{$smarty.const.HTTP_URL}-->rss/<!--{$smarty.const.DIR_INDEX_URL}-->" />
 <script type="text/javascript" src="http://www.google.com/jsapi?key=xxx"></script>
 <script type="text/javascript">//<![CDATA[
     google.load("maps", "3", {other_params:'sensor=false'});
 //]]>
 </script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/css.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/navi.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/win_op.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/site.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/jquery-1.4.2.min.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/css.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/navi.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/win_op.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/site.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/jquery-1.4.2.min.js"></script>
 <title><!--{$arrSiteInfo.shop_name|h}--><!--{if $tpl_subtitle|strlen >= 1}--> / <!--{$tpl_subtitle|h}--><!--{elseif $tpl_title|strlen >= 1}--> / <!--{$tpl_title|h}--><!--{/if}--></title>
 <!--{if $arrPageLayout.author|strlen >= 1}-->
     <meta name="author" content="<!--{$arrPageLayout.author|h}-->" />

変更: branches/version-2_5-dev/data/Smarty/templates/mobile/frontparts/bloc/category.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/mobile/frontparts/bloc/category.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/mobile/frontparts/bloc/category.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -25,9 +25,9 @@
 <!--{section name=cnt loop=$arrCat}-->
 <!--{assign var=disp_name value="`$arrCat[cnt].category_name`"}-->
 <!--{if $arrCat[cnt].has_children}-->
-<!--{assign var=path value="`$smarty.const.MOBILE_URL_DIR`products/category_list.php"}-->
+<!--{assign var=path value="`$smarty.const.MOBILE_URL_PATH`products/category_list.php"}-->
 <!--{else}-->
-<!--{assign var=path value="`$smarty.const.MOBILE_URL_DIR`products/list.php"}-->
+<!--{assign var=path value="`$smarty.const.MOBILE_URL_PATH`products/list.php"}-->
 <!--{/if}-->
 　<font color="<!--{cycle values="#000000,#880000,#8888ff,#88ff88,#ff0000"}-->">■</font><a href="<!--{$path}-->?category_id=<!--{$arrCat[cnt].category_id}-->"><!--{$disp_name|sfCutString:20|h}--></a><br>
 <!--{/section}-->

変更: branches/version-2_5-dev/data/Smarty/templates/mobile/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/mobile/index.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/mobile/index.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -28,14 +28,14 @@
 <br>
 
 <!-- ▼新着情報 ここから -->
-<!--{include_php file=`$smarty.const.MOBILE_HTML_PATH`frontparts/bloc/news.php}-->
+<!--{include_php file=`$smarty.const.MOBILE_HTML_FILE_PATH`frontparts/bloc/news.php}-->
 <!-- ▲新着情報 ここまで -->
 
 <br>
 
 <!-- ▼ピックアップ商品 ここから -->
 <hr>
-<!--{include_php file=`$smarty.const.MOBILE_HTML_PATH`frontparts/bloc/best5.php}-->
+<!--{include_php file=`$smarty.const.MOBILE_HTML_FILE_PATH`frontparts/bloc/best5.php}-->
 <hr>
 <!-- ▲ピックアップ商品 ここまで -->
 
@@ -43,7 +43,7 @@
 
 <!-- ▼メニュー ここから -->
 <!--{1|numeric_emoji}-->商品カテゴリ<br>
-<!--{include_php file=`$smarty.const.MOBILE_HTML_PATH`frontparts/bloc/category.php}-->
+<!--{include_php file=`$smarty.const.MOBILE_HTML_FILE_PATH`frontparts/bloc/category.php}-->
 <a href="products/search.php" accesskey="2"><!--{2|numeric_emoji}-->商品検索</a><br>
 <!--{if $isLogin eq true}-->
 <a href="mypage/refusal.php" accesskey="3"><!--{3|numeric_emoji}-->会員退会</a><br>

変更: branches/version-2_5-dev/data/Smarty/templates/mobile/mail_templates/customer_mail.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/mobile/mail_templates/customer_mail.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/mobile/mail_templates/customer_mail.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -32,6 +32,6 @@
 現在は仮登録の状態です。
 　　　~~~~~~
 本会員登録を完了するには下記URLにアクセスしてください。
-<!--{$smarty.const.MOBILE_SSL_URL}-->regist/<!--{$smarty.const.DIR_INDEX_URL}-->?mode=regist&id=<!--{$uniqid}--><!--{$etc_value}-->
+<!--{$smarty.const.MOBILE_HTTPS_URL}-->regist/<!--{$smarty.const.DIR_INDEX_URL}-->?mode=regist&id=<!--{$uniqid}--><!--{$etc_value}-->
 
 上記URLにて本会員登録が完了いたしましたら改めてご登録内容ご確認メールをお送り致します。

変更: branches/version-2_5-dev/data/Smarty/templates/mobile/mypage/login.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/mobile/mypage/login.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/mobile/mypage/login.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -40,7 +40,7 @@
 	<!--{assign var=key value="login_pass"}--><font color="#FF0000"><!--{$arrErr[$key]}--></font>
 	<input type="password" name="<!--{$key}-->" size="40" istyle="3"><br>
 	<center><input type="submit" value="送信" name="log"></center><br>
-	<a href="<!--{$smarty.const.MOBILE_URL_DIR}-->forgot/<!--{$smarty.const.DIR_INDEX_URL}-->">パスワードをお忘れの方はこちら</a><br>
+	<a href="<!--{$smarty.const.MOBILE_URL_PATH}-->forgot/<!--{$smarty.const.DIR_INDEX_URL}-->">パスワードをお忘れの方はこちら</a><br>
 </form>
 <!--▲CONTENTS-->
 

変更: branches/version-2_5-dev/data/Smarty/templates/mobile/products/category_list.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/mobile/products/category_list.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/mobile/products/category_list.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -27,9 +27,9 @@
 
 <!--{foreach from=$arrChildren key=i item=arrChild}-->
 <!--{if $arrChild.has_children}-->
-<!--{assign var=path value="`$smarty.const.MOBILE_URL_DIR`products/category_list.php"}-->
+<!--{assign var=path value="`$smarty.const.MOBILE_URL_PATH`products/category_list.php"}-->
 <!--{else}-->
-<!--{assign var=path value="`$smarty.const.MOBILE_URL_DIR`products/list.php"}-->
+<!--{assign var=path value="`$smarty.const.MOBILE_URL_PATH`products/list.php"}-->
 <!--{/if}-->
 <!--{if $i+1<9}-->
 <a href="<!--{$path}-->?category_id=<!--{$arrChild.category_id}-->" accesskey="<!--{$i+1}-->"><!--{$i+1|numeric_emoji}--><!--{$arrChild.category_name|h}-->(<!--{$arrChild.product_count}-->)</a><br>

変更: branches/version-2_5-dev/data/Smarty/templates/mobile/products/search.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/mobile/products/search.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/mobile/products/search.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -27,7 +27,7 @@
 
 お探しの商品名・型番を入力してください。<br>
 
-<form method="get" action="<!--{$smarty.const.MOBILE_URL_DIR}-->products/list.php">
+<form method="get" action="<!--{$smarty.const.MOBILE_URL_PATH}-->products/list.php">
 <center>
 <input type="hidden" name="mode" value="search">
 <input type="text" name="name" size="18" maxlength="50" value="<!--{$smarty.get.name|h}-->"><br>

変更: branches/version-2_5-dev/data/Smarty/templates/mobile/regist/complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/mobile/regist/complete.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/mobile/regist/complete.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -41,7 +41,7 @@
 <br>
 
 <!--{if !$tpl_cart_empty}-->
-<a href="<!--{$smarty.const.MOBILE_URL_DIR}-->shopping/deliv.php">ご注文手続きへ進む</a><br>
+<a href="<!--{$smarty.const.MOBILE_URL_PATH}-->shopping/deliv.php">ご注文手続きへ進む</a><br>
 <!--{/if}-->
 
 <a href="<!--{$smarty.const.MOBILE_URL_SITE_TOP}-->" accesskey="0"><!--{0|numeric_emoji}-->TOPページに戻る</a><br>

変更: branches/version-2_5-dev/data/Smarty/templates/mobile/shopping/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/mobile/shopping/index.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/mobile/shopping/index.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -29,7 +29,7 @@
 <!--▼会員登録がお済みでないお客様-->
 ■初めてご注文の方<br>
 (新規ご登録)<br>
-<form name="member_form" id="member_form" method="post" action="<!--{$smarty.const.MOBILE_URL_DIR}-->entry/kiyaku.php">
+<form name="member_form" id="member_form" method="post" action="<!--{$smarty.const.MOBILE_URL_PATH}-->entry/kiyaku.php">
 	<div align="center"><input type="submit" value="新規登録"></div><br>
 </form>
 <!--▲まだ会員登録されていないお客様-->
@@ -53,7 +53,7 @@
 	<!--{assign var=key value="login_pass"}--><font color="#FF0000"><!--{$arrErr[$key]}--></font>
 	<input type="password" name="<!--{$key}-->" size="40" istyle="3"><br>
 	<center><input type="submit" value="送信" name="log"></center><br>
-	<a href="<!--{$smarty.const.MOBILE_URL_DIR}-->forgot/<!--{$smarty.const.DIR_INDEX_URL}-->">パスワードをお忘れの方はこちら</a><br>
+	<a href="<!--{$smarty.const.MOBILE_URL_PATH}-->forgot/<!--{$smarty.const.DIR_INDEX_URL}-->">パスワードをお忘れの方はこちら</a><br>
 </form>
 <!--▲会員登録がお済のお客様-->
 <!--▲MAIN ONTENTS-->

変更: branches/version-2_5-dev/data/Smarty/templates/sphone/cart/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/cart/index.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/cart/index.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -98,7 +98,7 @@
                                 target="_blank"
                             <!--{/if}-->
                         >
-                            <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&amp;width=40&amp;height=40" alt="<!--{$item.productsClass.name|h}-->" /></a><br />
+                            <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&amp;width=40&amp;height=40" alt="<!--{$item.productsClass.name|h}-->" /></a><br />
 <a href="?" onclick="fnModeSubmit('delete', 'cart_no', '<!--{$item.cart_no}-->'); return false;">削除</a>
                         </td>
                         <td><!--{* 商品名 *}--><strong><!--{$item.productsClass.name|h}--></strong><br />

変更: branches/version-2_5-dev/data/Smarty/templates/sphone/footer.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/footer.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/footer.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -31,13 +31,13 @@
 <div id="footer-info">
 <ul id="footer-menu">
 <li>
-<a href="<!--{$smarty.const.SMARTPHONE_SSL_URL|sfTrimURL}-->/cart/index.php">かごを見る</a>
+<a href="<!--{$smarty.const.SMARTPHONE_HTTPS_URL|sfTrimURL}-->/cart/index.php">かごを見る</a>
 </li>
 <li>
-<a href="<!--{$smarty.const.SMARTPHONE_SSL_URL|sfTrimURL}-->/mypage/login.php">マイページ</a>
+<a href="<!--{$smarty.const.SMARTPHONE_HTTPS_URL|sfTrimURL}-->/mypage/login.php">マイページ</a>
 </li>
 <li>
-<a href="<!--{$smarty.const.SMARTPHONE_SSL_URL|sfTrimURL}-->/entry/kiyaku.php">会員登録</a>
+<a href="<!--{$smarty.const.SMARTPHONE_HTTPS_URL|sfTrimURL}-->/entry/kiyaku.php">会員登録</a>
 </li>
 
 <!--{php}-->
@@ -47,16 +47,16 @@
 <!--{/php}-->
 <!--{if $isTop ne 1}-->
 <li>
-<a href="<!--{$smarty.const.SMARTPHONE_SITE_URL|sfTrimURL}-->">TOPページへ</a>
+<a href="<!--{$smarty.const.SMARTPHONE_HTTP_URL|sfTrimURL}-->">TOPページへ</a>
 </li>
 <!--{/if}-->
 
 </ul>
 <ul id="footer-navi">
-<li><a href="<!--{$smarty.const.SMARTPHONE_SITE_URL}-->contact/index.php">お問合せ</a></li>
-<li><a href="<!--{$smarty.const.SMARTPHONE_SITE_URL}-->guide/privacy.php">プライバシーポリシー</a></li>
-<li class="end"><a href="<!--{$smarty.const.SMARTPHONE_SITE_URL}-->abouts/index.php">店舗情報</a></li>
-<li class="end"><a href="<!--{$smarty.const.SMARTPHONE_SITE_URL}-->order/index.php">特定商取引法に基づく表記</a></li>
+<li><a href="<!--{$smarty.const.SMARTPHONE_HTTP_URL}-->contact/index.php">お問合せ</a></li>
+<li><a href="<!--{$smarty.const.SMARTPHONE_HTTP_URL}-->guide/privacy.php">プライバシーポリシー</a></li>
+<li class="end"><a href="<!--{$smarty.const.SMARTPHONE_HTTP_URL}-->abouts/index.php">店舗情報</a></li>
+<li class="end"><a href="<!--{$smarty.const.SMARTPHONE_HTTP_URL}-->order/index.php">特定商取引法に基づく表記</a></li>
 </ul>
 
 <div id="copyright">(C) <!--{$arrSiteInfo.shop_name|h}-->.</div>

変更: branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/bloc/best5.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/bloc/best5.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/bloc/best5.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -28,7 +28,7 @@
         <div class="recomendleft">
 
             <a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$arrBestProducts[cnt].product_id|u}-->">
-                <img src="<!--{$smarty.const.SMARTPHONE_URL_DIR}-->resize_image.php?image=<!--{$arrBestProducts[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=80&amp;height=80" alt="<!--{$arrBestProducts[cnt].name|h}-->" /></a>
+                <img src="<!--{$smarty.const.SMARTPHONE_URL_PATH}-->resize_image.php?image=<!--{$arrBestProducts[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=80&amp;height=80" alt="<!--{$arrBestProducts[cnt].name|h}-->" /></a>
             
             <div class="recomendrightblock">
                 <h3>
@@ -50,7 +50,7 @@
         <!--{if $arrBestProducts[$cnt2]|count > 0}-->
         <div class="recomendright">
             <a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$arrBestProducts[$cnt2].product_id|u}-->">
-                <img src="<!--{$smarty.const.SMARTPHONE_URL_DIR}-->resize_image.php?image=<!--{$arrBestProducts[$cnt2].main_list_image|sfNoImageMainList|h}-->&amp;width=80&amp;height=80" alt="<!--{$arrBestProducts[$cnt2].name|h}-->" /></a>
+                <img src="<!--{$smarty.const.SMARTPHONE_URL_PATH}-->resize_image.php?image=<!--{$arrBestProducts[$cnt2].main_list_image|sfNoImageMainList|h}-->&amp;width=80&amp;height=80" alt="<!--{$arrBestProducts[$cnt2].name|h}-->" /></a>
 
             <div class="recomendrightblock">
                 <h3>

変更: branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -48,7 +48,7 @@
             </li>
           <!--{/if}-->
           
-          <li class="level<!--{$level}--><!--{if in_array($arrTree[cnt].category_id, $tpl_category_id) }--> onmark<!--{/if}-->"><span class="category_header"></span><span class="category_body"><a href="<!--{$smarty.const.SMARTPHONE_URL_DIR}-->products/list.php?category_id=<!--{$arrTree[cnt].category_id}-->"<!--{if in_array($arrTree[cnt].category_id, $tpl_category_id) }--> class="onlink"<!--{/if}-->><!--{$arrTree[cnt].category_name|h}-->(<!--{$arrTree[cnt].product_count|default:0}-->)</a></span>
+          <li class="level<!--{$level}--><!--{if in_array($arrTree[cnt].category_id, $tpl_category_id) }--> onmark<!--{/if}-->"><span class="category_header"></span><span class="category_body"><a href="<!--{$smarty.const.SMARTPHONE_URL_PATH}-->products/list.php?category_id=<!--{$arrTree[cnt].category_id}-->"<!--{if in_array($arrTree[cnt].category_id, $tpl_category_id) }--> class="onlink"<!--{/if}-->><!--{$arrTree[cnt].category_name|h}-->(<!--{$arrTree[cnt].product_count|default:0}-->)</a></span>
             <!--{if $firstdone == 0}--><!--{assign var=firstdone value=1}--><!--{/if}-->
             <!--{assign var=preLev value=`$level`}-->
             <!--{/if}-->

変更: branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/bloc/login.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/bloc/login.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/bloc/login.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -23,10 +23,10 @@
 <div id="block-login" class="block-side">
   <div class="create-box">
     <!--{if $tpl_login}-->
-      <a href="<!--{$smarty.const.SMARTPHONE_SSL_URL|sfTrimURL}-->/mypage/login.php" class="spbtn">マイページ</a>
+      <a href="<!--{$smarty.const.SMARTPHONE_HTTPS_URL|sfTrimURL}-->/mypage/login.php" class="spbtn">マイページ</a>
     <!--{else}-->
-      <a href="<!--{$smarty.const.SMARTPHONE_SSL_URL|sfTrimURL}-->/entry/kiyaku.php" class="spbtn">会員登録</a>
-      <a href="<!--{$smarty.const.SMARTPHONE_SSL_URL|sfTrimURL}-->/mypage/login.php" class="spbtn">ログイン</a>
+      <a href="<!--{$smarty.const.SMARTPHONE_HTTPS_URL|sfTrimURL}-->/entry/kiyaku.php" class="spbtn">会員登録</a>
+      <a href="<!--{$smarty.const.SMARTPHONE_HTTPS_URL|sfTrimURL}-->/mypage/login.php" class="spbtn">ログイン</a>
     <!--{/if}-->
     <!--ログインフォーム-->
   </div>

変更: branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/bloc/news.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/bloc/news.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/bloc/news.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -19,7 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
-<!--{assign var=mypage value="`$smarty.const.SMARTPHONE_URL_DIR`mypage/index.php"}-->
+<!--{assign var=mypage value="`$smarty.const.SMARTPHONE_URL_PATH`mypage/index.php"}-->
 <!--{if $smarty.server.PHP_SELF != $mypage}-->
 
 <!--{if $arrNews}-->

変更: branches/version-2_5-dev/data/Smarty/templates/sphone/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/index.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/index.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -24,7 +24,7 @@
 <!--{* ▼ロゴ ここから *}-->
 <div id="header">
 <h1>
-    <a href="<!--{$smarty.const.SMARTPHONE_SSL_URL}-->">
+    <a href="<!--{$smarty.const.SMARTPHONE_HTTPS_URL}-->">
       <em><!--{$arrSiteInfo.shop_name|h}-->/<!--{$tpl_title|h}--></em></a>
   </h1>
 </div>
@@ -35,7 +35,7 @@
 
 <!--{* 検索 *}-->
 <div id="searchbar">
-<form method="get" action="<!--{$smarty.const.SMARTPHONE_SITE_URL}-->products/list.php">
+<form method="get" action="<!--{$smarty.const.SMARTPHONE_HTTP_URL}-->products/list.php">
 <input type="text" name="name" maxlength="50" value="<!--{$smarty.get.name|h}-->" placeholder="商品検索" ><input type="submit" name="search" value="検索">
 </form>
 <!--{* searchmenu *}--></div>
@@ -43,13 +43,13 @@
 <!--{* topbox *}--></div>
 
 <!--{* 新着情報 *}-->
-<!--{include_php file=`$smarty.const.SMARTPHONE_HTML_PATH`/frontparts/bloc/news.php}-->
+<!--{include_php file=`$smarty.const.SMARTPHONE_HTML_FILE_PATH`/frontparts/bloc/news.php}-->
 
 <!--{* ログイン *}-->
-<!--{include_php file=`$smarty.const.SMARTPHONE_HTML_PATH`/frontparts/bloc/login.php}-->
+<!--{include_php file=`$smarty.const.SMARTPHONE_HTML_FILE_PATH`/frontparts/bloc/login.php}-->
 
 <!--{* おすすめ商品 *}-->
-<!--{include_php file=`$smarty.const.SMARTPHONE_HTML_PATH`/frontparts/bloc/best5.php}-->
+<!--{include_php file=`$smarty.const.SMARTPHONE_HTML_FILE_PATH`/frontparts/bloc/best5.php}-->
 
 <!-- ▼メニュー ここから -->
-<!--{include_php file=`$smarty.const.SMARTPHONE_HTML_PATH`/frontparts/bloc/category.php}-->
+<!--{include_php file=`$smarty.const.SMARTPHONE_HTML_FILE_PATH`/frontparts/bloc/category.php}-->

変更: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/delivery.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/delivery.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/delivery.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -34,7 +34,7 @@
           <!--{* 退会時非表示 *}-->
           <!--{if $tpl_login}-->
             <p class="addbtn">
-                <a href="<!--{$smarty.const.URL_DIR}-->mypage/delivery_addr.php" onclick="win03('./delivery_addr.php','delivadd','600','640'); return false;" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_add_address_on.gif','newadress');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_add_address.gif','newadress');" target="_blank"><img src="<!--{$TPL_DIR}-->img/button/btn_add_address.gif" width="160" height="22" alt="新しいお届け先を追加" border="0" name="newadress" /></a>
+                <a href="<!--{$smarty.const.URL_PATH}-->mypage/delivery_addr.php" onclick="win03('./delivery_addr.php','delivadd','600','640'); return false;" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_add_address_on.gif','newadress');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_add_address.gif','newadress');" target="_blank"><img src="<!--{$TPL_DIR}-->img/button/btn_add_address.gif" width="160" height="22" alt="新しいお届け先を追加" border="0" name="newadress" /></a>
             </p>
           <!--{/if}-->
         <!--{/if}-->

変更: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/favorite.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/favorite.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/favorite.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -58,7 +58,7 @@
       <!--{assign var=product_id value="`$arrFavorite[cnt].product_id`"}-->
       <tr>
        <td><a href="javascript:fnModeSubmit('delete_favorite','product_id','<!--{$product_id|h}-->');">削除</a></td>
-       <td><a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$product_id|u}-->"><img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrFavorite[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65"></a></td>
+       <td><a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$product_id|u}-->"><img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$arrFavorite[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65"></a></td>
        <td><a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$product_id|u}-->"><!--{$arrFavorite[cnt].name}--></a></td>
        <td class="right sale_price">
         <span class="price">

変更: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/history.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/history.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/history.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -60,7 +60,7 @@
                     <td>
                     <!--{ if $orderDetail.product_type_id == PRODUCT_TYPE_DOWNLOAD}-->
                         <!--{ if $orderDetail.price == "0" || ( $orderDetail.status >= "4" && $orderDetail.effective == "1" )}-->
-                            <a target="_self" href="<!--{$smarty.const.URL_DIR}-->mypage/download.php?order_id=<!--{$arrDisp.order_id}-->&product_id=<!--{$orderDetail.product_id}-->&product_class_id=<!--{$orderDetail.product_class_id}-->">ダウンロード</a>
+                            <a target="_self" href="<!--{$smarty.const.URL_PATH}-->mypage/download.php?order_id=<!--{$arrDisp.order_id}-->&product_id=<!--{$orderDetail.product_id}-->&product_class_id=<!--{$orderDetail.product_class_id}-->">ダウンロード</a>
                         <!--{ elseif $orderDetail.payment_date == "" || $orderDetail.status < "4"}-->
                             ダウンロード商品<BR />（入金確認中）
                         <!--{ elseif $orderDetail.effective != "1"}-->

変更: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/index.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/index.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -59,7 +59,7 @@
        <!--{assign var=payment_id value="`$arrOrder[cnt].payment_id`"}-->
        <td><!--{$arrPayment[$payment_id]|h}--></td>
        <td class="pricetd"><!--{$arrOrder[cnt].payment_total|number_format}-->円</td>
-       <td class="centertd"><a href="<!--{$smarty.const.URL_DIR}-->mypage/history.php?order_id=<!--{$arrOrder[cnt].order_id}-->">詳細</a></td>
+       <td class="centertd"><a href="<!--{$smarty.const.URL_PATH}-->mypage/history.php?order_id=<!--{$arrOrder[cnt].order_id}-->">詳細</a></td>
      </tr>
      <!--{/section}-->
     </table>

変更: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/login.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/login.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/login.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -56,8 +56,8 @@
       <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_login_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_login.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_login.gif" alt="ログイン" name="log" id="log" class="box140" />
      </div>
      <p class="inputtext02">
-       パスワードを忘れた方は<a href="<!--{$smarty.const.SSL_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="win01('<!--{$smarty.const.SSL_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->','forget','600','460'); return false;" target="_blank">こちら</a>からパスワードの再発行を行ってください。<br />
-      メールアドレスを忘れた方は、お手数ですが、<a href="<!--{$smarty.const.URL_DIR}-->contact/<!--{$smarty.const.DIR_INDEX_URL}-->">お問い合わせページ</a>からお問い合わせください。
+       パスワードを忘れた方は<a href="<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="win01('<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->','forget','600','460'); return false;" target="_blank">こちら</a>からパスワードの再発行を行ってください。<br />
+      メールアドレスを忘れた方は、お手数ですが、<a href="<!--{$smarty.const.URL_PATH}-->contact/<!--{$smarty.const.DIR_INDEX_URL}-->">お問い合わせページ</a>からお問い合わせください。
      </p>
   </div>
   <div class="loginarea">
@@ -68,7 +68,7 @@
       また、ログインするだけで、毎回お名前や住所などを入力することなくスムーズにお買い物をお楽しみいただけます。
     </p>
     <div class="inputbox02">
-      <a href="<!--{$smarty.const.URL_DIR}-->entry/kiyaku.php" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry_on.gif','b_gotoentry');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry.gif','b_gotoentry');">
+      <a href="<!--{$smarty.const.URL_PATH}-->entry/kiyaku.php" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry_on.gif','b_gotoentry');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry.gif','b_gotoentry');">
         <img src="<!--{$TPL_DIR}-->img/button/btn_entry.gif" width="130" height="30" alt="会員登録をする" border="0" name="b_gotoentry" /></a>
     </div>
   </div>

変更: branches/version-2_5-dev/data/Smarty/templates/sphone/products/detail.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/products/detail.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/products/detail.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -19,9 +19,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/jquery.fancybox/jquery.mousewheel-3.0.4.pack.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/jquery.fancybox/jquery.fancybox-1.3.4.pack.js"></script>
-<link rel="stylesheet" href="<!--{$smarty.const.URL_DIR}-->js/jquery.fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/jquery.fancybox/jquery.mousewheel-3.0.4.pack.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/jquery.fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<link rel="stylesheet" href="<!--{$smarty.const.URL_PATH}-->js/jquery.fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
 <script type="text/javascript">//<![CDATA[
 // 規格2に選択肢を割り当てる。
 function fnSetClassCategories(form, classcat_id2_selected) {
@@ -317,7 +317,7 @@
                         <!--{section name=r loop=$arrRelativeCat}-->
                         <p>
                             <!--{section name=s loop=$arrRelativeCat[r]}-->
-                            <a href="<!--{$smarty.const.SMARTPHONE_URL_DIR}-->products/list.php?category_id=<!--{$arrRelativeCat[r][s].category_id}-->"><!--{$arrRelativeCat[r][s].category_name}--></a>
+                            <a href="<!--{$smarty.const.SMARTPHONE_URL_PATH}-->products/list.php?category_id=<!--{$arrRelativeCat[r][s].category_id}-->"><!--{$arrRelativeCat[r][s].category_name}--></a>
                             <!--{if !$smarty.section.s.last}--><!--{$smarty.const.SEPA_CATNAVI}--><!--{/if}-->
                             <!--{/section}-->
                         </p>
@@ -480,7 +480,7 @@
                 <div class="whoboughtleft">
 
                     <a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$arrRecommend[cnt].product_id|u}-->">
-                        <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrRecommend[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[cnt].name|h}-->" /></a>
+                        <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$arrRecommend[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[cnt].name|h}-->" /></a>
 
                     <div class="whoboughtrightblock">
                         <!--{assign var=price02_min value=`$arrRecommend[cnt].price02_min`}-->
@@ -507,7 +507,7 @@
                 <div class="whoboughtright">
 
                     <a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$arrRecommend[cnt].product_id|u}-->">
-                        <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrRecommend[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[cnt].name|h}-->" /></a>
+                        <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$arrRecommend[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[cnt].name|h}-->" /></a>
 
                     <div class="whoboughtrightblock">
                         <!--{assign var=price02_min value=`$arrRecommend[cnt].price02_min`}-->

変更: branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/confirm.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/confirm.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -80,7 +80,7 @@
                                 target="_blank"
                             <!--{/if}-->
                         >
-                            <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|h}-->" /></a>
+                            <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|h}-->" /></a>
                     </td>
                     <td>
                         <ul>

変更: branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/deliv.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/deliv.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/deliv.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -35,7 +35,7 @@
 
         <!--{if $tpl_addrmax < $smarty.const.DELIV_ADDR_MAX}-->
             <p class="addbtn">
-                <a href="<!--{$smarty.const.URL_DIR}-->mypage/delivery_addr.php" onclick="win02('<!--{$smarty.const.URL_DIR}-->mypage/delivery_addr.php?page=<!--{$smarty.server.PHP_SELF|h}-->','new_deiv','600','640'); return false;" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_add_address_on.gif','addition');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_add_address.gif','addition');"><img src="<!--{$TPL_DIR}-->img/button/btn_add_address.gif" width="160" height="22" alt="新しいお届け先を追加する" name="addition" id="addition" /></a>
+                <a href="<!--{$smarty.const.URL_PATH}-->mypage/delivery_addr.php" onclick="win02('<!--{$smarty.const.URL_PATH}-->mypage/delivery_addr.php?page=<!--{$smarty.server.PHP_SELF|h}-->','new_deiv','600','640'); return false;" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_add_address_on.gif','addition');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_add_address.gif','addition');"><img src="<!--{$TPL_DIR}-->img/button/btn_add_address.gif" width="160" height="22" alt="新しいお届け先を追加する" name="addition" id="addition" /></a>
             </p>
         <!--{/if}-->
         <form name="form1" id="form1" method="post" action="?">
@@ -78,7 +78,7 @@
                     </td>
                     <td class="centertd">
                         <!--{if !$smarty.section.cnt.first}-->
-                            <a href="<!--{$smarty.const.URL_DIR}-->mypage/delivery_addr.php" onclick="win02('<!--{$smarty.const.URL_DIR}-->mypage/delivery_addr.php?page=<!--{$smarty.server.PHP_SELF|h}-->&amp;other_deliv_id=<!--{$arrAddr[cnt].other_deliv_id}-->','new_deiv','600','640'); return false;">変更</a>
+                            <a href="<!--{$smarty.const.URL_PATH}-->mypage/delivery_addr.php" onclick="win02('<!--{$smarty.const.URL_PATH}-->mypage/delivery_addr.php?page=<!--{$smarty.server.PHP_SELF|h}-->&amp;other_deliv_id=<!--{$arrAddr[cnt].other_deliv_id}-->','new_deiv','600','640'); return false;">変更</a>
                         <!--{/if}-->
                     </td>
                     <td class="centertd">

変更: branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/index.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/index.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -52,8 +52,8 @@
       <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_login_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_login.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_login.gif" alt="ログイン" name="log" id="log" class="box140" />
      </div>
      <p class="inputtext02">
-       パスワードを忘れた方は<a href="<!--{$smarty.const.SSL_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="win01('<!--{$smarty.const.SSL_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->','forget','600','460'); return false;" target="_blank">こちら</a>からパスワードの再発行を行ってください。<br />
-      メールアドレスを忘れた方は、お手数ですが、<a href="<!--{$smarty.const.URL_DIR}-->contact/<!--{$smarty.const.DIR_INDEX_URL}-->">お問い合わせページ</a>からお問い合わせください。
+       パスワードを忘れた方は<a href="<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="win01('<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->','forget','600','460'); return false;" target="_blank">こちら</a>からパスワードの再発行を行ってください。<br />
+      メールアドレスを忘れた方は、お手数ですが、<a href="<!--{$smarty.const.URL_PATH}-->contact/<!--{$smarty.const.DIR_INDEX_URL}-->">お問い合わせページ</a>からお問い合わせください。
      </p>
    </div>
     </form>
@@ -68,7 +68,7 @@
       また、ログインするだけで、毎回お名前や住所などを入力することなくスムーズにお買い物をお楽しみいただけます。
     </p>
     <div class="inputbox02">
-      <a href="<!--{$smarty.const.URL_DIR}-->entry/kiyaku.php" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry_on.gif','b_gotoentry');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry.gif','b_gotoentry');">
+      <a href="<!--{$smarty.const.URL_PATH}-->entry/kiyaku.php" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry_on.gif','b_gotoentry');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry.gif','b_gotoentry');">
         <img src="<!--{$TPL_DIR}-->img/button/btn_entry.gif" width="130" height="30" alt="会員登録をする" border="0" name="b_gotoentry" /></a>
       <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_buystep_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_buystep.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_buystep.gif" class="box130"  alt="購入手続きへ" name="buystep" id="buystep" />
     </div>

変更: branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/nonmember_input.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/nonmember_input.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/nonmember_input.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -61,7 +61,7 @@
             <p>〒&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->"  size="6" class="box60" />&nbsp;-&nbsp;  <input type="text"  name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"  size="6" class="box60" />　
               <a href="http://search.post.japanpost.jp/zipcode/" target="_blank"><span class="fs12">郵便番号検索</span></a></p>
 
-            <p class="zipimg"><a href="<!--{$smarty.const.URL_DIR}-->address/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'order_zip01', 'order_zip02', 'order_pref', 'order_addr01'); return false;" target="_blank"><img src="<!--{$TPL_DIR}-->img/button/btn_address_input.gif" width="86" height="20" alt="住所自動入力" /></a>
+            <p class="zipimg"><a href="<!--{$smarty.const.URL_PATH}-->address/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'order_zip01', 'order_zip02', 'order_pref', 'order_addr01'); return false;" target="_blank"><img src="<!--{$TPL_DIR}-->img/button/btn_address_input.gif" width="86" height="20" alt="住所自動入力" /></a>
                <span class="mini">&nbsp;郵便番号を入力後、クリックしてください。</span></p>
           </td>
         </tr>
@@ -200,7 +200,7 @@
             <p>〒&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->"  size="6" class="box60" />&nbsp;-&nbsp;  <input type="text"  name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"  size="6" class="box60" />　
               <a href="http://search.post.japanpost.jp/zipcode/" target="_blank"><span class="fs12">郵便番号検索</span></a></p>
 
-            <p class="zipimg"><a href="<!--{$smarty.const.URL_DIR}-->address/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'deliv_zip01', 'deliv_zip02', 'deliv_pref', 'deliv_addr01'); return false;" target="_blank"><img src="<!--{$TPL_DIR}-->img/button/btn_address_input.gif" width="86" height="20" alt="住所自動入力" /></a>
+            <p class="zipimg"><a href="<!--{$smarty.const.URL_PATH}-->address/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'deliv_zip01', 'deliv_zip02', 'deliv_pref', 'deliv_addr01'); return false;" target="_blank"><img src="<!--{$TPL_DIR}-->img/button/btn_address_input.gif" width="86" height="20" alt="住所自動入力" /></a>
               <span class="mini">&nbsp;郵便番号を入力後、クリックしてください。</span></p>
           </td>
         </tr>

変更: branches/version-2_5-dev/data/Smarty/templates/sphone/site_frame.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/site_frame.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/site_frame.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -32,10 +32,10 @@
 <!--{* 共通CSS *}-->
 <link rel="stylesheet" media="only screen" href="<!--{$TPL_DIR}-->css/import.css" type="text/css" />
 
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/navi.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/win_op.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/site.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/jquery-1.4.2.min.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/navi.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/win_op.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/site.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/jquery-1.4.2.min.js"></script>
 <script type="text/javascript" src="<!--{$TPL_DIR}-->js/barbutton.js"></script>
 <script type="text/javascript" src="<!--{$TPL_DIR}-->js/category.js"></script>
 <script type="text/javascript" src="<!--{$TPL_DIR}-->js/news.js"></script>
@@ -51,7 +51,7 @@
     <meta name="keywords" content="<!--{$arrPageLayout.keyword|h}-->" />
 <!--{/if}-->
 <!--{* iPhone用アイコン画像 *}-->
-<link rel="apple-touch-icon" href="<!--{$smarty.const.SMARTPHONE_URL_DIR}-->sphone/apple-touch-icon.png" />
+<link rel="apple-touch-icon" href="<!--{$smarty.const.SMARTPHONE_URL_PATH}-->sphone/apple-touch-icon.png" />
 
 <script type="text/javascript">//<![CDATA[
     <!--{$tpl_javascript}-->

変更: branches/version-2_5-dev/data/Smarty/templates/sphone/site_main.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/site_main.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/site_main.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -44,7 +44,7 @@
 <!--{else}-->
 <script type="text/javascript" language="JavaScript">
 //<![CDATA[
-setTopButton("<!--{$smarty.const.SMARTPHONE_SSL_URL}-->");
+setTopButton("<!--{$smarty.const.SMARTPHONE_HTTPS_URL}-->");
 //]]>
 <!--{/if}-->
 </script>

変更: branches/version-2_5-dev/data/app_initial.php
===================================================================
--- branches/version-2_5-dev/data/app_initial.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/app_initial.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -23,17 +23,17 @@
 
 if (!defined("CLASS_PATH")) {
     /** クラスパス */
-    define("CLASS_PATH", DATA_PATH . "class/");
+    define("CLASS_PATH", DATA_FILE_PATH . "class/");
 }
 
 if (!defined("CLASS_EX_PATH")) {
     /** クラスパス */
-    define("CLASS_EX_PATH", DATA_PATH . "class_extends/");
+    define("CLASS_EX_PATH", DATA_FILE_PATH . "class_extends/");
 }
 
 if (!defined("CACHE_PATH")) {
     /** キャッシュ生成ディレクトリ */
-    define("CACHE_PATH", DATA_PATH . "cache/");
+    define("CACHE_PATH", DATA_FILE_PATH . "cache/");
 }
 
 require_once(CLASS_EX_PATH . "SC_Initial_Ex.php");

変更: branches/version-2_5-dev/data/class/SC_Fpdf.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_Fpdf.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/SC_Fpdf.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -27,8 +27,8 @@
  *----------------------------------------------------------------------
  */
 
-require(DATA_PATH . 'module/fpdf/fpdf.php');
-require(DATA_PATH . 'module/fpdf/japanese.php');
+require(DATA_FILE_PATH . 'module/fpdf/fpdf.php');
+require(DATA_FILE_PATH . 'module/fpdf/japanese.php');
 define('PDF_TEMPLATE_DIR', TEMPLATE_ADMIN_DIR . 'pdf/');
 
 class SC_Fpdf {

変更: branches/version-2_5-dev/data/class/SC_Initial.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_Initial.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/SC_Initial.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -74,16 +74,16 @@
 
         if (defined('ECCUBE_INSTALL')) {
             define('MOBILE_DIR', 'mobile/');
-            define('MOBILE_HTML_PATH', HTML_PATH . MOBILE_DIR);
-            define('MOBILE_SITE_URL', SITE_URL . MOBILE_DIR);
-            define('MOBILE_SSL_URL', SSL_URL . MOBILE_DIR);
-            define('MOBILE_URL_DIR', URL_DIR . MOBILE_DIR);
+            define('MOBILE_HTML_FILE_PATH', HTML_FILE_PATH . MOBILE_DIR);
+            define('MOBILE_HTTP_URL', HTTP_URL . MOBILE_DIR);
+            define('MOBILE_HTTPS_URL', HTTPS_URL . MOBILE_DIR);
+            define('MOBILE_URL_PATH', URL_PATH . MOBILE_DIR);
 
             define('SMARTPHONE_DIR', 'sphone/');
-            define('SMARTPHONE_HTML_PATH', HTML_PATH . SMARTPHONE_DIR);
-            define('SMARTPHONE_SITE_URL', SITE_URL . SMARTPHONE_DIR);
-            define('SMARTPHONE_SSL_URL', SSL_URL . SMARTPHONE_DIR);
-            define('SMARTPHONE_URL_DIR', URL_DIR . SMARTPHONE_DIR);
+            define('SMARTPHONE_HTML_FILE_PATH', HTML_FILE_PATH . SMARTPHONE_DIR);
+            define('SMARTPHONE_HTTP_URL', HTTP_URL . SMARTPHONE_DIR);
+            define('SMARTPHONE_HTTPS_URL', HTTPS_URL . SMARTPHONE_DIR);
+            define('SMARTPHONE_URL_PATH', URL_PATH . SMARTPHONE_DIR);
 
             define('ADMIN_DIR', 'admin/');
         }
@@ -228,7 +228,7 @@
      * @return void
      */
     function createCacheDir() {
-        if (defined("HTML_PATH")) {
+        if (defined("HTML_FILE_PATH")) {
             umask(0);
             if (!file_exists(COMPILE_DIR)) {
                 mkdir(COMPILE_DIR);

変更: branches/version-2_5-dev/data/class/SC_MobileImage.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_MobileImage.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/SC_MobileImage.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -91,7 +91,7 @@
             // HTML中のIMGタグを変換後のファイルパスに置換する
             foreach ($images[1] as $key => $path) {
                 $realpath = html_entity_decode($path, ENT_QUOTES);
-                $realpath = preg_replace('|^' . URL_DIR . '|', HTML_PATH, $realpath);
+                $realpath = preg_replace('|^' . URL_PATH . '|', HTML_FILE_PATH, $realpath);
                 $converted = $imageConverter->execute($realpath);
                 if (isset($converted['outputImageName'])) {
                     $buffer = str_replace($path, MOBILE_IMAGE_URL . '/' . $converted['outputImageName'], $buffer);

変更: branches/version-2_5-dev/data/class/SC_MobileKaraMail.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_MobileKaraMail.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/SC_MobileKaraMail.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -56,7 +56,7 @@
             return;
         }
 
-        require_once DATA_PATH . '/module/Mail/mimeDecode.php';
+        require_once DATA_FILE_PATH . '/module/Mail/mimeDecode.php';
 
         $fp = fopen('php://stdin', 'r');
 

変更: branches/version-2_5-dev/data/class/SC_Response.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_Response.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/SC_Response.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -131,8 +131,8 @@
     }
 
     function sendRedirect($location) {
-        if (preg_match("/(" . preg_quote(SITE_URL, '/')
-                          . "|" . preg_quote(SSL_URL, '/') . ")/", $location)) {
+        if (preg_match("/(" . preg_quote(HTTP_URL, '/')
+                          . "|" . preg_quote(HTTPS_URL, '/') . ")/", $location)) {
 
             $netURL = new Net_URL($location);
             $arrQueryString = $netURL->querystring;

変更: branches/version-2_5-dev/data/class/SC_SmartphoneUserAgent.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_SmartphoneUserAgent.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/SC_SmartphoneUserAgent.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -85,12 +85,12 @@
 
 
         $url = SC_Utils_Ex::sfIsHTTPS()
-            ? SMARTPHONE_SSL_URL
-            : SMARTPHONE_SITE_URL
+            ? SMARTPHONE_HTTPS_URL
+            : SMARTPHONE_HTTP_URL
         ;
 
         // XXX サニタイズ必要？
-        $url .= (preg_match('|^' . URL_DIR . '(.*)$|', $_SERVER['REQUEST_URI'], $matches))
+        $url .= (preg_match('|^' . URL_PATH . '(.*)$|', $_SERVER['REQUEST_URI'], $matches))
             ? $matches[1]
             : ''
         ;

変更: branches/version-2_5-dev/data/class/SC_View.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_View.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/SC_View.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -200,8 +200,8 @@
         parent::SC_View(false);
         $this->_smarty->template_dir = TEMPLATE_ADMIN_DIR;
         $this->_smarty->compile_dir = COMPILE_ADMIN_DIR;
-        $this->assign('TPL_DIR_DEFAULT', URL_DIR . USER_DIR . USER_PACKAGE_DIR . DEFAULT_TEMPLATE_NAME . '/');
-        $this->assign('TPL_DIR', URL_DIR . USER_DIR . USER_PACKAGE_DIR . ADMIN_DIR);
+        $this->assign('TPL_DIR_DEFAULT', URL_PATH . USER_DIR . USER_PACKAGE_DIR . DEFAULT_TEMPLATE_NAME . '/');
+        $this->assign('TPL_DIR', URL_PATH . USER_DIR . USER_PACKAGE_DIR . ADMIN_DIR);
         $this->initpath();
     }
 }

変更: branches/version-2_5-dev/data/class/batch/SC_Batch_Update.php
===================================================================
--- branches/version-2_5-dev/data/class/batch/SC_Batch_Update.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/batch/SC_Batch_Update.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -55,7 +55,7 @@
         $msg = '';
         $oldMask = umask(0);
         $bkupDistInfoArray = array(); //バックアップファイル用のdistinfoファイル内容
-        $bkupPath = DATA_PATH . 'downloads/backup/update_' . time() . '/';
+        $bkupPath = DATA_FILE_PATH . 'downloads/backup/update_' . time() . '/';
         $bkupPathFile = $bkupPath . 'files/';
         $this->mkdir_p($bkupPathFile . 'dummy');
 
@@ -218,13 +218,13 @@
     function mkdir_p($path){
         $path = dirname($path);
         
-        // HTML_PATH/DATA_PATHの判別
-        if (preg_match("@\Q".HTML_PATH."\E@", $path) > 0) {
-            $dir = str_replace("\\", "/", HTML_PATH);
-            $path = preg_replace("@\Q".HTML_PATH."\E@", "", $path);
-        } elseif (preg_match("@\Q".DATA_PATH."\E@", $path) > 0) {
-            $dir = str_replace("\\", "/", DATA_PATH);
-            $path = preg_replace("@\Q".DATA_PATH."\E@", "", $path);
+        // HTML_FILE_PATH/DATA_FILE_PATHの判別
+        if (preg_match("@\Q".HTML_FILE_PATH."\E@", $path) > 0) {
+            $dir = str_replace("\\", "/", HTML_FILE_PATH);
+            $path = preg_replace("@\Q".HTML_FILE_PATH."\E@", "", $path);
+        } elseif (preg_match("@\Q".DATA_FILE_PATH."\E@", $path) > 0) {
+            $dir = str_replace("\\", "/", DATA_FILE_PATH);
+            $path = preg_replace("@\Q".DATA_FILE_PATH."\E@", "", $path);
         } else {
             $dir = "";
         }
@@ -251,7 +251,7 @@
     }
 
     function printLog($msg) {
-        GC_Utils::gfPrintLog($msg, DATA_PATH . 'logs/ownersstore_batch_update.log');
+        GC_Utils::gfPrintLog($msg, DATA_FILE_PATH . 'logs/ownersstore_batch_update.log');
     }
 }
 ?>

変更: branches/version-2_5-dev/data/class/graph/SC_GraphBase.php
===================================================================
--- branches/version-2_5-dev/data/class/graph/SC_GraphBase.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/graph/SC_GraphBase.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -22,7 +22,7 @@
  */
 
 /** TTFフォントファイル */
-define("FONT_PATH", DATA_PATH . "fonts/wlmaru20044.ttf");
+define("FONT_PATH", DATA_FILE_PATH . "fonts/wlmaru20044.ttf");
 
 /** フォントサイズ */
 define("FONT_SIZE", 8);

変更: branches/version-2_5-dev/data/class/helper/SC_Helper_Mobile.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Mobile.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Mobile.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -42,7 +42,7 @@
      */
     function lfMobileCheckCompatibility() {
         if (!SC_MobileUserAgent::isSupported()) {
-            header('Location: ' . URL_DIR . 'mobile/unsupported/' . DIR_INDEX_URL);
+            header('Location: ' . URL_PATH . 'mobile/unsupported/' . DIR_INDEX_URL);
             exit;
         }
     }
@@ -85,7 +85,7 @@
      *                     取得できなかった場合は null を返す。
      */
     function lfMobileGetExtSessionId() {
-        if (!preg_match('|^' . URL_DIR . '(.*)$|', $_SERVER['SCRIPT_NAME'], $matches)) {
+        if (!preg_match('|^' . URL_PATH . '(.*)$|', $_SERVER['SCRIPT_NAME'], $matches)) {
             return null;
         }
 
@@ -405,7 +405,7 @@
         $objQuery->delete('dtb_mobile_kara_mail', 'token = ?', array($token));
 
         list($session_id, $next_url, $email) = $arrRow;
-        $objURL = new Net_URL(MOBILE_SITE_URL . $next_url);
+        $objURL = new Net_URL(MOBILE_HTTP_URL . $next_url);
         $objURL->addQueryString(session_name(), $session_id);
         $url = $objURL->getURL();
 

変更: branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -50,7 +50,7 @@
 
         // 現在のURLの取得
         if ($preview === false) {
-            $url = preg_replace('|^' . preg_quote(URL_DIR) . '|', '', $url);
+            $url = preg_replace('|^' . preg_quote(URL_PATH) . '|', '', $url);
 
             // URLを元にページデザインを取得
             $arrPageData = $this->lfGetPageData("device_type_id = ? AND url = ? AND page_id <> 0" , array($device_type_id, $url));
@@ -136,7 +136,7 @@
                 // 指定された箇所と同じデータだけを取得する
                 if ($target_id == $val['target_id'] ) {
                     if ($val['php_path'] != '') {
-                        $arrNavi[$key]['php_path'] = HTML_PATH . $val['php_path'];
+                        $arrNavi[$key]['php_path'] = HTML_FILE_PATH . $val['php_path'];
                     } else {
                         $arrNavi[$key]['tpl_path'] = $this->getTemplatePath($device_type_id) . BLOC_DIR . $val['tpl_path'];
                     }
@@ -201,8 +201,8 @@
      */
     function lfDelFile($arrData) {
         // ファイルディレクトリ取得
-        $del_php = HTML_PATH . $arrData['php_dir'] . $arrData['filename'] . ".php";
-        $del_tpl = HTML_PATH . $arrData['tpl_dir'] . $arrData['filename'] . ".tpl";
+        $del_php = HTML_FILE_PATH . $arrData['php_dir'] . $arrData['filename'] . ".php";
+        $del_tpl = HTML_FILE_PATH . $arrData['tpl_dir'] . $arrData['filename'] . ".tpl";
 
         // phpファイルの削除
         if (file_exists($del_php)) {
@@ -247,13 +247,13 @@
         switch ($device_type_id) {
         case DEVICE_TYPE_MOBILE:
             $dir = MOBILE_TEMPLATE_DIR;
-            $userPath = HTML_PATH . MOBILE_DIR . USER_DIR;
+            $userPath = HTML_FILE_PATH . MOBILE_DIR . USER_DIR;
             $templateName = MOBILE_TEMPLATE_NAME;
             break;
 
         case DEVICE_TYPE_SMARTPHONE:
             $dir = SMARTPHONE_TEMPLATE_DIR;
-            $userPath = HTML_PATH . SMARTPHONE_DIR . USER_DIR;
+            $userPath = HTML_FILE_PATH . SMARTPHONE_DIR . USER_DIR;
             $templateName = SMARTPHONE_TEMPLATE_NAME;
             break;
 
@@ -278,11 +278,11 @@
     function getUserPath($device_type_id = DEVICE_TYPE_PC) {
         switch ($device_type_id) {
         case DEVICE_TYPE_MOBILE:
-            return HTML_PATH . MOBILE_DIR . USER_DIR;
+            return HTML_FILE_PATH . MOBILE_DIR . USER_DIR;
             break;
 
         case DEVICE_TYPE_SMARTPHONE:
-            return HTML_PATH . SMARTPHONE_DIR . USER_DIR;
+            return HTML_FILE_PATH . SMARTPHONE_DIR . USER_DIR;
             break;
 
         case DEVICE_TYPE_PC:
@@ -304,18 +304,18 @@
     function getUserDir($device_type_id = DEVICE_TYPE_PC, $hasPackage = false) {
         switch ($device_type_id) {
         case DEVICE_TYPE_MOBILE:
-            $userDir = URL_DIR . MOBILE_DIR . USER_DIR;
+            $userDir = URL_PATH . MOBILE_DIR . USER_DIR;
             $templateName = MOBILE_TEMPLATE_NAME;
             break;
 
         case DEVICE_TYPE_SMARTPHONE:
-            $userDir = URL_DIR . SMARTPHONE_DIR . USER_DIR;
+            $userDir = URL_PATH . SMARTPHONE_DIR . USER_DIR;
             $templateName = SMARTPHONE_TEMPLATE_NAME;
             break;
 
         case DEVICE_TYPE_PC:
         default:
-            $userDir = URL_DIR . USER_DIR;
+            $userDir = URL_PATH . USER_DIR;
             $templateName = TEMPLATE_NAME;
         }
         if ($hasPackage) {

変更: branches/version-2_5-dev/data/class/helper/SC_Helper_Plugin.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Plugin.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Plugin.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -49,7 +49,7 @@
             // プラグインのディレクトリ内の設定ファイルを参照する
             $plugin_name = $plugins['name'];
             $plugin_class_name = $plugins['class_name'];
-            require_once DATA_PATH."plugin/{$plugin_name}/{$plugin_class_name}.php";
+            require_once DATA_FILE_PATH."plugin/{$plugin_name}/{$plugin_class_name}.php";
 
             $code_str = "\$is_enable = {$plugin_class_name}::is_enable(\$class_name);";
             eval($code_str);
@@ -112,7 +112,7 @@
     }
 
     function getFilesystemPlugins(){
-        $plugin_dir = DATA_PATH."/plugin/";
+        $plugin_dir = DATA_FILE_PATH."/plugin/";
         if($dh = opendir($plugin_dir)){
             while(($file = readdir($dh) !== false)){
                 if(is_dir($plugin_dir."/".$file)){

変更: branches/version-2_5-dev/data/class/module/SC_Module.php
===================================================================
--- branches/version-2_5-dev/data/class/module/SC_Module.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/module/SC_Module.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -250,7 +250,7 @@
      * @param string $suffix
      */
     function log($msg, $data = null, $suffix = '') {
-        $path = DATA_PATH . 'logs/' . $this->getCode() . "$suffix.log";
+        $path = DATA_FILE_PATH . 'logs/' . $this->getCode() . "$suffix.log";
         GC_Utils::gfPrintLog($msg, $path);
 
         if (!is_null($data)) {

変更: branches/version-2_5-dev/data/class/pages/LC_Page.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/LC_Page.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/LC_Page.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -22,7 +22,7 @@
  */
 
 // {{{ requires
-require_once(DATA_PATH . 'module/Net/URL.php');
+require_once(DATA_FILE_PATH . 'module/Net/URL.php');
 
 /**
  * Web Page を制御する基底クラス
@@ -185,12 +185,12 @@
     /**
      * 指定の URL へリダイレクトする.
      *
-     * リダイレクト先 URL に SITE_URL 及び SSL_URL を含むかチェックし,
+     * リダイレクト先 URL に HTTP_URL 及び HTTPS_URL を含むかチェックし,
      * LC_Page::getToken() の値を URLパラメータで自動的に付与する.
      *
      * @param string $url リダイレクト先 URL
      * @param boolean $isMobile モバイル用にセッションIDを付与する場合 true
-     * @return void|boolean $url に SITE_URL 及び, SSL_URL を含まない場合 false,
+     * @return void|boolean $url に HTTP_URL 及び, HTTPS_URL を含まない場合 false,
      *                       正常に遷移可能な場合は, $url の ロケーションヘッダを出力する.
      * @see Net_URL
      */
@@ -198,8 +198,8 @@
 echo "SC_Response.php::sendRedirect()に移行してね。";
 exit;
 
-        if (preg_match("/(" . preg_quote(SITE_URL, '/')
-                          . "|" . preg_quote(SSL_URL, '/') . ")/", $url)) {
+        if (preg_match("/(" . preg_quote(HTTP_URL, '/')
+                          . "|" . preg_quote(HTTPS_URL, '/') . ")/", $url)) {
 
             $netURL = new Net_URL($url);
             if (!empty($_SERVER['QUERY_STRING'])) {
@@ -291,7 +291,7 @@
      * 以下の順序で 引数 $path から URL を取得する.
      * 1. realpath($path) で $path の 絶対パスを取得
      * 2. $_SERVER['DOCUMENT_ROOT'] と一致する文字列を削除
-     * 3. $useSSL の値に応じて, SITE_URL 又は, SSL_URL を付与する.
+     * 3. $useSSL の値に応じて, HTTP_URL 又は, HTTPS_URL を付与する.
      *
      * 返り値に, QUERY_STRING を含めたい場合は, key => value 形式
      * の配列を $param へ渡す.
@@ -299,8 +299,8 @@
      * @access protected
      * @param string $path 結果を取得するためのパス
      * @param array $param URL に付与するパラメータの配列
-     * @param mixed $useSSL 結果に SSL_URL を使用する場合 true,
-     *                         SITE_URL を使用する場合 false,
+     * @param mixed $useSSL 結果に HTTPS_URL を使用する場合 true,
+     *                         HTTP_URL を使用する場合 false,
      *                         デフォルト "escape" 現在のスキーマを使用
      * @return string $path の存在する http(s):// から始まる絶対パス
      * @see Net_URL
@@ -310,14 +310,14 @@
 
         // スキーマを定義
         if ($useSSL === true) {
-            $url = SSL_URL . $rootPath;
+            $url = HTTPS_URL . $rootPath;
         } elseif ($useSSL === false){
-            $url = SITE_URL . $rootPath;
+            $url = HTTP_URL . $rootPath;
         } elseif ($useSSL == "escape") {
             if (SC_Utils_Ex::sfIsHTTPS()) {
-                $url = SSL_URL . $rootPath;
+                $url = HTTPS_URL . $rootPath;
             } else {
-                $url = SITE_URL . $rootPath;
+                $url = HTTP_URL . $rootPath;
             }
         } else {
             die("[BUG] Illegal Parametor of \$useSSL ");
@@ -341,7 +341,7 @@
     function getRootPath($path) {
         // Windowsの場合は, ディレクトリの区切り文字を\から/に変換する
         $path = str_replace('\\', '/', $path);
-        $htmlPath = str_replace('\\', '/', HTML_PATH);
+        $htmlPath = str_replace('\\', '/', HTML_FILE_PATH);
         
         // PHP 5.1 対策 ( http://xoops.ec-cube.net/modules/newbb/viewtopic.php?topic_id=4277&forum=9 )
         if (strlen($path) == 0) {
@@ -350,7 +350,7 @@
         
         // $path が / で始まっている場合
         if (substr($path, 0, 1) == '/') {
-            $realPath = realpath($htmlPath . substr_replace($path, '', 0, strlen(URL_DIR)));
+            $realPath = realpath($htmlPath . substr_replace($path, '', 0, strlen(URL_PATH)));
         // 相対パスの場合
         } else {
             $realPath = realpath($path);
@@ -362,7 +362,7 @@
             $realPath .= '/';
         }
         
-        // HTML_PATH を削除した文字列を取得.
+        // HTML_FILE_PATH を削除した文字列を取得.
         $rootPath = str_replace($htmlPath, '', $realPath);
         $rootPath = ltrim($rootPath, '/');
 

変更: branches/version-2_5-dev/data/class/pages/LC_Page_Redirect.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/LC_Page_Redirect.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/LC_Page_Redirect.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -80,7 +80,7 @@
         if (isset($next_url) && $next_url !== false) {
             $this->sendRedirect($next_url);
         } else {
-            $this->sendRedirect(MOBILE_SITE_URL, true);
+            $this->sendRedirect(MOBILE_HTTP_URL, true);
         }
     }
 

変更: branches/version-2_5-dev/data/class/pages/LC_Page_ResizeImage.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/LC_Page_ResizeImage.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/LC_Page_ResizeImage.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -23,7 +23,7 @@
 
 // {{{ requires
 require_once(CLASS_PATH . "pages/LC_Page.php");
-require_once(DATA_PATH . "module/gdthumb.php");
+require_once(DATA_FILE_PATH . "module/gdthumb.php");
 
 /**
  * リサイズイメージ のページクラス.

変更: branches/version-2_5-dev/data/class/pages/LC_Page_Sitemap.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/LC_Page_Sitemap.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/LC_Page_Sitemap.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -76,9 +76,9 @@
         
         $this->staticURL = array();
         
-        $this->staticURL[] = SITE_URL . 'rss/' . DIR_INDEX_URL;
+        $this->staticURL[] = HTTP_URL . 'rss/' . DIR_INDEX_URL;
         if (USE_MOBILE !== false) {
-            $this->staticURL[] = MOBILE_SITE_URL;
+            $this->staticURL[] = MOBILE_HTTP_URL;
         }
     }
 
@@ -224,12 +224,12 @@
         foreach ($result as $row) {
             // :TODO: カテゴリの最終更新日を取得できるようにする
             
-            $page["url"] = SITE_URL . 'products/list.php?category_id=' . $row['category_id'];
+            $page["url"] = HTTP_URL . 'products/list.php?category_id=' . $row['category_id'];
             $arrRet[] = $page;
             
             // モバイルサイト
             if (USE_MOBILE !== false) {
-                $page["url"] = MOBILE_SITE_URL . 'products/list.php?category_id=' . $row['category_id'];
+                $page["url"] = MOBILE_HTTP_URL . 'products/list.php?category_id=' . $row['category_id'];
                 $arrRet[] = $page;
             }
         }
@@ -251,12 +251,12 @@
             
             $page["update_date"] = $row['update_date'];
             
-            $page["url"] = SITE_URL . substr(DETAIL_P_HTML, strlen(URL_DIR)) . $row['product_id'];
+            $page["url"] = HTTP_URL . substr(DETAIL_P_HTML, strlen(URL_PATH)) . $row['product_id'];
             $arrRet[] = $page;
             
             // モバイルサイト
             if (USE_MOBILE !== false) {
-                $page["url"] = SITE_URL . substr(MOBILE_DETAIL_P_HTML, strlen(URL_DIR)) . $row['product_id'];
+                $page["url"] = HTTP_URL . substr(MOBILE_DETAIL_P_HTML, strlen(URL_PATH)) . $row['product_id'];
                 $arrRet[] = $page;
             }
         }
@@ -304,11 +304,11 @@
 
         $pageData = $objQuery->getAll($sql, $arrVal);
         
-        // URL にプロトコルの記載が無い場合、SITE_URL を前置する。
+        // URL にプロトコルの記載が無い場合、HTTP_URL を前置する。
         foreach (array_keys($pageData) as $key) {
             $page =& $pageData[$key];
             if (!preg_match('|^https?://|i', $page['url'])) {
-                $page['url'] = SITE_URL . $page['url'];
+                $page['url'] = HTTP_URL . $page['url'];
             }
             $page['url'] = preg_replace('|/' . preg_quote(DIR_INDEX_FILE) . '$|', '/' . DIR_INDEX_URL, $page['url']);
         }

変更: branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Home.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Home.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Home.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -24,7 +24,7 @@
 
 // {{{ requires
 require_once CLASS_PATH . "pages/admin/LC_Page_Admin.php";
-require_once DATA_PATH . 'module/Request.php';
+require_once DATA_FILE_PATH . 'module/Request.php';
 
 /**
  * 管理画面ホーム のページクラス.
@@ -246,7 +246,7 @@
         // XXX インストール時に問い合わせて送信可否設定を行うように設定すべきか。
         // XXX (URLは強制送信すべきではないと思うが)バージョンは強制送信すべきか。
         if (UPDATE_SEND_SITE_INFO === true) {
-            $query = '?site_url=' . SITE_URL . '&eccube_version=' . ECCUBE_VERSION;
+            $query = '?site_url=' . HTTP_URL . '&eccube_version=' . ECCUBE_VERSION;
         }
 
         $url = UPDATE_HTTP . $query;

変更: branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Logout.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Logout.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Logout.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -54,7 +54,7 @@
         $objSess = new SC_Session();
         $objSess->logout();
 
-        $this->objDisplay->redirect($this->getLocation(URL_DIR . ADMIN_DIR . DIR_INDEX_URL));
+        $this->objDisplay->redirect($this->getLocation(URL_PATH . ADMIN_DIR . DIR_INDEX_URL));
     }
 
     /**

変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -31,10 +31,10 @@
 define("IMAGE_MAX", 680);
 
 /** 郵便番号CSV ファイルのパス */
-define("ZIP_CSV_FILE_PATH", DATA_PATH . "downloads/KEN_ALL.CSV");
+define("ZIP_CSV_FILE_PATH", DATA_FILE_PATH . "downloads/KEN_ALL.CSV");
 
 /** UTF-8 変換済みの郵便番号CSV ファイルのパス */
-define("ZIP_CSV_UTF8_FILE_PATH", DATA_PATH . "downloads/KEN_ALL_utf-8.CSV");
+define("ZIP_CSV_UTF8_FILE_PATH", DATA_FILE_PATH . "downloads/KEN_ALL_utf-8.CSV");
 
 /**
  * 郵便番号DB登録 のページクラス.

変更: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -213,7 +213,7 @@
 
                 $_SESSION['preview'] = "ON";
 
-                $this->objDisplay->redirect($this->getLocation(URL_DIR . "preview/" . DIR_INDEX_URL, array("filename" => $arrPageData[0]["filename"])));
+                $this->objDisplay->redirect($this->getLocation(URL_PATH . "preview/" . DIR_INDEX_URL, array("filename" => $arrPageData[0]["filename"])));
                 exit;
 
             } else {

変更: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -215,7 +215,7 @@
             }
         }
         $_SESSION['preview'] = "ON";
-        $this->objDisplay->redirect($this->getLocation(URL_DIR . "preview/" . DIR_INDEX_URL, array("filename" => $arrPageData[0]["filename"])));
+        $this->objDisplay->redirect($this->getLocation(URL_PATH . "preview/" . DIR_INDEX_URL, array("filename" => $arrPageData[0]["filename"])));
     }
 
     /**
@@ -311,7 +311,7 @@
         // ベースデータの場合には変更しない。
         if (!$this->objLayout->lfCheckBaseData($arrData['page_id'], $device_type_id)) {
             $arrUpdData['page_name']    = $arrData['page_name'] ;
-            $arrUpdData['url']          = preg_replace('|^' . preg_quote(URL_DIR) . '|', '',
+            $arrUpdData['url']          = preg_replace('|^' . preg_quote(URL_PATH) . '|', '',
                                                        $this->objLayout->getUserDir($device_type_id) . $arrData['url'] . '.php');
             $arrUpdData['php_dir']      = dirname($arrUpdData['url']);
             if ($arrUpdData['php_dir'] == '.') {

変更: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -23,7 +23,7 @@
 
   // {{{ requires
 require_once(CLASS_PATH . "pages/admin/LC_Page_Admin.php");
-require_once(DATA_PATH . "module/Tar.php");
+require_once(DATA_FILE_PATH . "module/Tar.php");
 require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_FileManager_Ex.php");
 
 /**
@@ -291,7 +291,7 @@
         $templates_dir = SMARTY_TEMPLATES_DIR. $template_code. "/";
         SC_Utils_Ex::sfDelFile($templates_dir);
         // コンパイル削除
-        $templates_c_dir = DATA_PATH. "Smarty/templates_c/". $template_code. "/";
+        $templates_c_dir = DATA_FILE_PATH. "Smarty/templates_c/". $template_code. "/";
         SC_Utils_Ex::sfDelFile($templates_c_dir);
         // ユーザーデータ削除
         $user_dir = USER_TEMPLATE_PATH. $template_code. "/";
@@ -332,10 +332,10 @@
 
         // キャンペーン実行PHPをコピー
         $ret = $objFileManager->sfCreateFile(CAMPAIGN_PATH . $file);
-        copy(HTML_PATH . CAMPAIGN_TEMPLATE_DIR . "index.php", CAMPAIGN_PATH . $file . "/index.php");
-        copy(HTML_PATH . CAMPAIGN_TEMPLATE_DIR . "application.php", CAMPAIGN_PATH . $file . "/application.php");
-        copy(HTML_PATH . CAMPAIGN_TEMPLATE_DIR . "complete.php", CAMPAIGN_PATH . $file . "/complete.php");
-        copy(HTML_PATH . CAMPAIGN_TEMPLATE_DIR . "entry.php", CAMPAIGN_PATH . $file . "/entry.php");
+        copy(HTML_FILE_PATH . CAMPAIGN_TEMPLATE_DIR . "index.php", CAMPAIGN_PATH . $file . "/index.php");
+        copy(HTML_FILE_PATH . CAMPAIGN_TEMPLATE_DIR . "application.php", CAMPAIGN_PATH . $file . "/application.php");
+        copy(HTML_FILE_PATH . CAMPAIGN_TEMPLATE_DIR . "complete.php", CAMPAIGN_PATH . $file . "/complete.php");
+        copy(HTML_FILE_PATH . CAMPAIGN_TEMPLATE_DIR . "entry.php", CAMPAIGN_PATH . $file . "/entry.php");
 
         // デフォルトテンプレート作成(キャンペーン中)
         $header = $this->lfGetFileContents($default_active_dir."header.tpl");

変更: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -23,7 +23,7 @@
 
 // {{{ requires
 require_once(CLASS_PATH . "pages/admin/LC_Page_Admin.php");
-require_once(DATA_PATH. "module/Tar.php");
+require_once(DATA_FILE_PATH. "module/Tar.php");
 require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_FileManager_Ex.php");
 
 /**
@@ -233,7 +233,7 @@
 	function lfAddTemplates($objForm, $objUpFile) {
 	    $template_code = $objForm->getValue('template_code');
 	    $template_dir = SMARTY_TEMPLATES_DIR . $template_code;
-	    $compile_dir  = DATA_PATH . "Smarty/templates_c/" . $template_code;
+	    $compile_dir  = DATA_FILE_PATH . "Smarty/templates_c/" . $template_code;
 	    // フォルダ作成
 	    if(!file_exists($template_dir)) {
 	    	mkdir($template_dir);

変更: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -363,9 +363,9 @@
                     $sendId = $this->lfRegistData($objQuery, $this->list_data);
                     if (MELMAGA_SEND) {
                         if (MELMAGA_BATCH_MODE) {
-                            $this->objDisplay->redirect($this->getLocation(URL_DIR . ADMIN_DIR . 'mail/history.php'));
+                            $this->objDisplay->redirect($this->getLocation(URL_PATH . ADMIN_DIR . 'mail/history.php'));
                         } else {
-                            $this->objDisplay->redirect($this->getLocation(URL_DIR . ADMIN_DIR . 'mail/sendmail.php', array('mode' => 'now', 'send_id' => $sendId)));
+                            $this->objDisplay->redirect($this->getLocation(URL_PATH . ADMIN_DIR . 'mail/sendmail.php', array('mode' => 'now', 'send_id' => $sendId)));
                         }
                         exit;
                     } else {

変更: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Sendmail.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Sendmail.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Sendmail.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -177,7 +177,7 @@
             }
         }
         if ($_GET['mode'] == 'now') {
-            $this->objDisplay->redirect($this->getLocation(URL_DIR . ADMIN_DIR . 'mail/history.php'));
+            $this->objDisplay->redirect($this->getLocation(URL_PATH . ADMIN_DIR . 'mail/history.php'));
         }
         echo "complete\n";
     }

変更: branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -23,7 +23,7 @@
 
 // {{{ requires
 require_once(CLASS_PATH . "pages/admin/LC_Page_Admin.php");
-require_once(DATA_PATH. "module/Tar.php");
+require_once(DATA_FILE_PATH. "module/Tar.php");
 /**
  * バックアップ のページクラス.
  *
@@ -49,7 +49,7 @@
         $this->tpl_subno = 'bkup';
         $this->tpl_subtitle = 'バックアップ管理';
 
-        $this->bkup_dir = DATA_PATH . "downloads/backup/";
+        $this->bkup_dir = DATA_FILE_PATH . "downloads/backup/";
         $this->bkup_ext = '.tar.gz';
 
     }

変更: branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -87,26 +87,26 @@
             // PHP INFOを表示
             case 'install':
                 $name = $this->objForm->getValue('plugin_name');
-                require_once(DATA_PATH.'/plugin/'.$name.'/'.$name.'.php');
+                require_once(DATA_FILE_PATH.'/plugin/'.$name.'/'.$name.'.php');
                 $plugin = new $name();
                 $plugin->install();
                 break;
             case 'uninstall':
                 $name = $this->objForm->getValue('plugin_name');
-                require_once(DATA_PATH.'/plugin/'.$name.'/'.$name.'.php');
+                require_once(DATA_FILE_PATH.'/plugin/'.$name.'/'.$name.'.php');
                 $plugin = new $name();
                 $plugin->uninstall();
                 break;
             case 'enable':
                 $name = $this->objForm->getValue('plugin_name');
-                require_once(DATA_PATH.'/plugin/'.$name.'/'.$name.'.php');
+                require_once(DATA_FILE_PATH.'/plugin/'.$name.'/'.$name.'.php');
                 $plugin = new $name();
                 $plugin->enable();
                 
                 break;
             case 'disable':
               $name = $this->objForm->getValue('plugin_name');
-                require_once(DATA_PATH.'/'.$name.'/'.$name.'.php');
+                require_once(DATA_FILE_PATH.'/'.$name.'/'.$name.'.php');
                 $plugin = new $name();
                 $plugin->disable();
                 break;
@@ -135,7 +135,7 @@
 
     function getPluginOnFilesystem($existsPlugins){
 
-        $dir = DATA_PATH."plugin/";
+        $dir = DATA_FILE_PATH."plugin/";
         $arrPlugins = array();
         if($dh =  opendir($dir)){
             while(($file = readdir($dh)) !== false){

変更: branches/version-2_5-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -52,7 +52,7 @@
         $this->tpl_mainpage = 'total/index.tpl';
         $this->tpl_subnavi = 'total/subnavi.tpl';
         $this->tpl_graphsubtitle = 'total/subtitle.tpl';
-        $this->tpl_titleimage = URL_DIR.'img/title/title_sale.jpg';
+        $this->tpl_titleimage = URL_PATH.'img/title/title_sale.jpg';
         $this->tpl_mainno = 'total';
 
         $masterData = new SC_DB_MasterData_Ex();

変更: branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -170,7 +170,7 @@
         $objDb = new SC_Helper_DB_Ex();
         $CONF = $objDb->sfGetBasisData();
 
-        $ssl_url  = rtrim(SSL_URL,"/");
+        $ssl_url  = rtrim(HTTPS_URL,"/");
         $ssl_url .= $_SERVER['PHP_SELF'];
 
         // 規約ページからの遷移でなければエラー画面へ遷移する
@@ -577,7 +577,7 @@
                         $param = array("mode" => "regist",
                                        "id" => $this->uniqid,
                                        session_name() => session_id());
-                        $this->objDisplay->redirect($this->getLocation(MOBILE_URL_DIR . "regist/" . DIR_INDEX_URL, $param));
+                        $this->objDisplay->redirect($this->getLocation(MOBILE_URL_PATH . "regist/" . DIR_INDEX_URL, $param));
                         exit;
                     }
 

変更: branches/version-2_5-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -105,7 +105,7 @@
 
             if(count($arrErr) == 0) {
                 if($objCustomer->getCustomerDataFromEmailPass($arrForm['login_pass'], $arrForm['login_email'], true)) {
-                    $this->objDisplay->redirect($this->getLocation(URL_DIR, array(), false));
+                    $this->objDisplay->redirect($this->getLocation(URL_PATH, array(), false));
                     exit;
                 } else {
                     $arrForm['login_email'] = strtolower($arrForm['login_email']);
@@ -131,9 +131,9 @@
             $mypage_url_search = strpos('.'.$_POST['url'], "mypage");
             //マイページログイン中はログイン画面へ移行
             if ($mypage_url_search == 2){
-                $this->objDisplay->redirect($this->getLocation(URL_DIR . "mypage/login.php", array(), false));
+                $this->objDisplay->redirect($this->getLocation(URL_PATH . "mypage/login.php", array(), false));
             }else{
-                $this->objDisplay->redirect($this->getLocation(URL_DIR, array(), false));
+                $this->objDisplay->redirect($this->getLocation(URL_PATH, array(), false));
             }
             exit;
             break;

変更: branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -23,7 +23,7 @@
 
 // {{{ requires
 $current_dir = realpath(dirname(__FILE__));
-define('CALENDAR_ROOT', DATA_PATH.'module/Calendar'.DIRECTORY_SEPARATOR);
+define('CALENDAR_ROOT', DATA_FILE_PATH.'module/Calendar'.DIRECTORY_SEPARATOR);
 require_once($current_dir . "/../../../../module/Calendar/Month/Weekdays.php");
 require_once(CLASS_PATH . "pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php");
 

変更: branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -197,7 +197,7 @@
                         $objCartSess->saveCurrentCart($objSiteSess->getUniqId());
 
                         $this->objDisplay->redirect($this->getLocation(
-                            URL_DIR . USER_DIR . 'gmopg_oneclick_confirm.php', array(), true));
+                            URL_PATH . USER_DIR . 'gmopg_oneclick_confirm.php', array(), true));
                         exit;
                     }
 

変更: branches/version-2_5-dev/data/class/pages/tb/LC_Page_TrackBack.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/tb/LC_Page_TrackBack.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/tb/LC_Page_TrackBack.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -121,7 +121,7 @@
             $arrData["excerpt"] = trim(mb_convert_encoding($_GET["excerpt"], $afterEncode, $beforeEncode));
         }
 
-        $log_path = DATA_PATH . "logs/tb_result.log";
+        $log_path = DATA_FILE_PATH . "logs/tb_result.log";
         GC_Utils_Ex::gfPrintLog("request data start -----", $log_path);
         foreach($arrData as $key => $val) {
             GC_Utils_Ex::gfPrintLog( "\t" . $key . " => " . $val, $log_path);
@@ -218,7 +218,7 @@
     function lfEntryTrackBack($arrData, &$objQuery) {
 
         // ログ
-        $log_path = DATA_PATH . "logs/tb_result.log";
+        $log_path = DATA_FILE_PATH . "logs/tb_result.log";
 
         // スパムフィルター
         if ($this->lfSpamFilter($arrData)) {
@@ -308,7 +308,7 @@
             print("<channel>");
             print("<title>" . $retProduct[0]["name"] . "</title>");
             print("<link>");
-            print(SITE_URL . substr(DETAIL_P_HTML, strlen(URL_DIR)) . $product_id);
+            print(HTTP_URL . substr(DETAIL_P_HTML, strlen(URL_PATH)) . $product_id);
             print("</link>");
             print("<description>");
             print($retProduct[0]["main_comment"]);

変更: branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_Base.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_Base.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_Base.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -3,7 +3,7 @@
 require_once CLASS_PATH . 'pages/LC_Page.php';
 require_once CLASS_PATH . 'pages/upgrade/helper/LC_Upgrade_Helper_Log.php';
 require_once CLASS_PATH . 'pages/upgrade/helper/LC_Upgrade_Helper_Json.php';
-require_once DATA_PATH . 'module/Request.php';
+require_once DATA_FILE_PATH . 'module/Request.php';
 
 /**
  * オーナーズストアページクラスの基底クラス.

変更: branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -23,7 +23,7 @@
 
 // {{{ requires
 require_once CLASS_PATH . 'pages/upgrade/LC_Page_Upgrade_Base.php';
-require_once DATA_PATH . 'module/Tar.php';
+require_once DATA_FILE_PATH . 'module/Tar.php';
 
 /**
  * オーナーズストアからダウンロードデータを取得する.
@@ -111,7 +111,7 @@
         switch($mode) {
         case 'patch_download':
             $arrPostData = array(
-                'eccube_url' => SITE_URL,
+                'eccube_url' => HTTP_URL,
                 'public_key' => sha1($public_key . $sha1_key),
                 'sha1_key'   => $sha1_key,
                 'patch_code' => 'latest'
@@ -119,7 +119,7 @@
             break;
         default:
             $arrPostData = array(
-                'eccube_url' => SITE_URL,
+                'eccube_url' => HTTP_URL,
                 'public_key' => sha1($public_key . $sha1_key),
                 'sha1_key'   => $sha1_key,
                 'product_id' => $this->objForm->getValue('product_id')
@@ -163,7 +163,7 @@
         if ($objRet->status === OSTORE_STATUS_SUCCESS) {
             $objLog->log('* save file start');
             $time = time();
-            $dir  = DATA_PATH . 'downloads/tmp/';
+            $dir  = DATA_FILE_PATH . 'downloads/tmp/';
             $filename = $time . '.tar.gz';
 
             $data = base64_decode($objRet->data->dl_file);
@@ -297,7 +297,7 @@
      */
     function notifyDownload($mode, $arrCookies) {
         $arrPOSTParams = array(
-            'eccube_url' => SITE_URL
+            'eccube_url' => HTTP_URL
         );
         $objReq = $this->request($mode . '_commit', $arrPOSTParams, $arrCookies);
         return $objReq;
@@ -381,7 +381,7 @@
      * LC_Update_Updater::execute()で処理を実行する.
      */
     function fileExecute($productCode) {
-        $file = DATA_PATH . 'downloads/update/' . $productCode . '_update.php';
+        $file = DATA_FILE_PATH . 'downloads/update/' . $productCode . '_update.php';
         if (file_exists($file)) {
             @include_once $file;
             if (class_exists('LC_Update_Updater')) {

変更: branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -80,7 +80,7 @@
         // リクエストを開始
         $objLog->log('* http request start');
         $arrPostData = array(
-            'eccube_url' => SITE_URL,
+            'eccube_url' => HTTP_URL,
             'public_key' => sha1($public_key . $sha1_key),
             'sha1_key'   => $sha1_key
         );
@@ -134,7 +134,7 @@
             if (!$objView->_smarty->template_exists($template)) {
                 $objLog->log('* template not exist, use default template');
                 // デフォルトテンプレートを使用
-                $template = DATA_PATH . 'Smarty/templates/default/admin/' . $template;
+                $template = DATA_FILE_PATH . 'Smarty/templates/default/admin/' . $template;
             }
 
             $html = $objView->fetch('ownersstore/products_list.tpl');

変更: branches/version-2_5-dev/data/class/session/sessionfactory/SC_SessionFactory_UseRequest.php
===================================================================
--- branches/version-2_5-dev/data/class/session/sessionfactory/SC_SessionFactory_UseRequest.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/session/sessionfactory/SC_SessionFactory_UseRequest.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -78,7 +78,7 @@
      *                     取得できなかった場合は null を返す。
      */
     function getExtSessionId() {
-        if (!preg_match('|^' . URL_DIR . '(.*)$|', $_SERVER['SCRIPT_NAME'], $matches)) {
+        if (!preg_match('|^' . URL_PATH . '(.*)$|', $_SERVER['SCRIPT_NAME'], $matches)) {
             return null;
         }
 

変更: branches/version-2_5-dev/data/class/util/SC_Utils.php
===================================================================
--- branches/version-2_5-dev/data/class/util/SC_Utils.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/class/util/SC_Utils.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -85,7 +85,7 @@
                 exit;
             }
         }
-        $path = HTML_PATH . "install/index.php";
+        $path = HTML_FILE_PATH . "install/index.php";
         if(file_exists($path)) {
             SC_Utils::sfErrorHeader("&gt;&gt; /install/index.phpは、インストール完了後にファイルを削除してください。");
         }
@@ -241,7 +241,7 @@
             // TODO 警告表示させる？
             // sfErrorHeader('>> referrerが無効になっています。');
         } else {
-            $domain  = SC_Utils::sfIsHTTPS() ? SSL_URL : SITE_URL;
+            $domain  = SC_Utils::sfIsHTTPS() ? HTTPS_URL : HTTP_URL;
             $pattern = sprintf('|^%s.*|', $domain);
             $referer = $_SERVER['HTTP_REFERER'];
 
@@ -452,9 +452,9 @@
      */
     function sfReload($get = "") {
         if ($_SERVER["SERVER_PORT"] == "443" ){
-            $url = ereg_replace(URL_DIR . "$", "", SSL_URL);
+            $url = ereg_replace(URL_PATH . "$", "", HTTPS_URL);
         } else {
-            $url = ereg_replace(URL_DIR . "$", "", SITE_URL);
+            $url = ereg_replace(URL_PATH . "$", "", HTTP_URL);
         }
 
         if($get != "") {
@@ -1515,7 +1515,7 @@
 
     // 指定したURLに対してPOSTでデータを送信する
     function sfSendPostData($url, $arrData, $arrOkCode = array()){
-        require_once(DATA_PATH . "module/Request.php");
+        require_once(DATA_FILE_PATH . "module/Request.php");
 
         // 送信インスタンス生成
         $req = new HTTP_Request($url);

変更: branches/version-2_5-dev/data/mtb_constants_init.php
===================================================================
--- branches/version-2_5-dev/data/mtb_constants_init.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/mtb_constants_init.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -6,13 +6,13 @@
 /** ユーザファイル保存先 */
 define('USER_DIR', "user_data/");
 /** ユーザファイル保存先 */
-define('USER_PATH', HTML_PATH . USER_DIR);
+define('USER_PATH', HTML_FILE_PATH . USER_DIR);
 /** ユーザインクルードファイル保存先 */
 define('USER_INC_PATH', USER_PATH . "include/");
 /** 郵便番号専用DB */
 define('ZIP_DSN', DEFAULT_DSN);
 /** ユーザー作成ページ等 */
-define('USER_URL', SITE_URL . USER_DIR);
+define('USER_URL', HTTP_URL . USER_DIR);
 /** 認証用 magic */
 define('AUTH_MAGIC', "31eafcbd7a81d7b401a7fdc12bba047c02d1fae6");
 /** テンプレートファイル保存先 */
@@ -22,7 +22,7 @@
 /** テンプレートファイル保存先 */
 define('USER_TEMPLATE_PATH', USER_PATH . USER_PACKAGE_DIR);
 /** テンプレートファイル一時保存先 */
-define('TEMPLATE_TEMP_DIR', HTML_PATH . "upload/temp_template/");
+define('TEMPLATE_TEMP_DIR', HTML_FILE_PATH . "upload/temp_template/");
 /** ユーザー作成画面のデフォルトPHPファイル */
 define('USER_DEF_PHP', USER_PATH . "__default.php");
 /** その他画面のデフォルトページレイアウト */
@@ -30,11 +30,11 @@
 /** ダウンロードモジュール保存ディレクトリ */
 define('MODULE_DIR', "downloads/module/");
 /** ダウンロードモジュール保存ディレクトリ */
-define('MODULE_PATH', DATA_PATH . MODULE_DIR);
+define('MODULE_PATH', DATA_FILE_PATH . MODULE_DIR);
 /** DBセッションの有効期限(秒) */
 define('MAX_LIFETIME', 7200);
 /** マスタデータキャッシュディレクトリ */
-define('MASTER_DATA_DIR', DATA_PATH . "cache/");
+define('MASTER_DATA_DIR', DATA_FILE_PATH . "cache/");
 /** アップデート管理用ファイル格納場所 */
 define('UPDATE_HTTP', "http://sv01.ec-cube.net/info/index.php");
 /** アップデート管理用CSV1行辺りの最大文字数 */
@@ -64,17 +64,17 @@
 /** 一般サイトエラー */
 define('FAVORITE_ERROR', 13);
 /** フォントのパス */
-define('TTF_DIR', DATA_PATH . "fonts/");
+define('TTF_DIR', DATA_FILE_PATH . "fonts/");
 /** グラフ格納ディレクトリ */
-define('GRAPH_DIR', HTML_PATH . "upload/graph_image/");
+define('GRAPH_DIR', HTML_FILE_PATH . "upload/graph_image/");
 /** グラフURL */
-define('GRAPH_URL', URL_DIR . "upload/graph_image/");
+define('GRAPH_URL', URL_PATH . "upload/graph_image/");
 /** 円グラフ最大表示数 */
 define('GRAPH_PIE_MAX', 10);
 /** グラフのラベルの文字数 */
 define('GRAPH_LABEL_MAX', 40);
 /** PDF格納ディレクトリ */
-define('PDF_DIR', DATA_PATH . "pdf/");
+define('PDF_DIR', DATA_FILE_PATH . "pdf/");
 /** 何歳まで集計の対象とするか */
 define('BAT_ORDER_AGE', 70);
 /** 商品集計で何位まで表示するか */
@@ -222,57 +222,57 @@
 /** 価格名称 */
 define('SALE_PRICE_TITLE', "販売価格");
 /** ログファイル */
-define('LOG_PATH', DATA_PATH . "logs/site.log");
+define('LOG_PATH', DATA_FILE_PATH . "logs/site.log");
 /** 会員ログイン ログファイル */
-define('CUSTOMER_LOG_PATH', DATA_PATH . "logs/customer.log");
+define('CUSTOMER_LOG_PATH', DATA_FILE_PATH . "logs/customer.log");
 /** 画像一時保存 */
-define('IMAGE_TEMP_DIR', HTML_PATH . "upload/temp_image/");
+define('IMAGE_TEMP_DIR', HTML_FILE_PATH . "upload/temp_image/");
 /** 画像保存先 */
-define('IMAGE_SAVE_DIR', HTML_PATH . "upload/save_image/");
+define('IMAGE_SAVE_DIR', HTML_FILE_PATH . "upload/save_image/");
 /** 画像一時保存URL */
-define('IMAGE_TEMP_URL', URL_DIR . "upload/temp_image/");
+define('IMAGE_TEMP_URL', URL_PATH . "upload/temp_image/");
 /** 画像保存先URL */
-define('IMAGE_SAVE_URL', URL_DIR . "upload/save_image/");
+define('IMAGE_SAVE_URL', URL_PATH . "upload/save_image/");
 /** RSS用画像一時保存URL */
-define('IMAGE_TEMP_URL_RSS', SITE_URL . "upload/temp_image/");
+define('IMAGE_TEMP_URL_RSS', HTTP_URL . "upload/temp_image/");
 /** RSS用画像保存先URL */
-define('IMAGE_SAVE_URL_RSS', SITE_URL . "upload/save_image/");
+define('IMAGE_SAVE_URL_RSS', HTTP_URL . "upload/save_image/");
 /** エンコードCSVの一時保存先 */
-define('CSV_TEMP_DIR', DATA_PATH . "upload/csv/");
+define('CSV_TEMP_DIR', DATA_FILE_PATH . "upload/csv/");
 /** 画像がない場合に表示 */
 define('NO_IMAGE_URL', TPL_DIR . "img/picture/img_blank.gif");
 /** 画像がない場合に表示 */
 define('NO_IMAGE_DIR', USER_PACKAGE_DIR . "img/picture/img_blank.gif");
 /** システム管理トップ */
-define('URL_SYSTEM_TOP', URL_DIR . ADMIN_DIR . "system/" . DIR_INDEX_URL);
+define('URL_SYSTEM_TOP', URL_PATH . ADMIN_DIR . "system/" . DIR_INDEX_URL);
 /** 規格登録 */
-define('URL_CLASS_REGIST', URL_DIR . ADMIN_DIR . "products/class.php");
+define('URL_CLASS_REGIST', URL_PATH . ADMIN_DIR . "products/class.php");
 /** 郵便番号入力 */
-define('URL_INPUT_ZIP', URL_DIR . "input_zip.php");
+define('URL_INPUT_ZIP', URL_PATH . "input_zip.php");
 /** 配送業者登録 */
-define('URL_DELIVERY_TOP', URL_DIR . ADMIN_DIR . "basis/delivery.php");
+define('URL_DELIVERY_TOP', URL_PATH . ADMIN_DIR . "basis/delivery.php");
 /** 支払い方法登録 */
-define('URL_PAYMENT_TOP', URL_DIR . ADMIN_DIR . "basis/payment.php");
+define('URL_PAYMENT_TOP', URL_PATH . ADMIN_DIR . "basis/payment.php");
 /** サイト管理情報登録 */
-define('URL_CONTROL_TOP', URL_DIR . ADMIN_DIR . "basis/control.php");
+define('URL_CONTROL_TOP', URL_PATH . ADMIN_DIR . "basis/control.php");
 /** ホーム */
-define('URL_HOME', URL_DIR . ADMIN_DIR . "home.php");
+define('URL_HOME', URL_PATH . ADMIN_DIR . "home.php");
 /** ログインページ */
-define('URL_LOGIN', URL_DIR . ADMIN_DIR . "" . DIR_INDEX_URL);
+define('URL_LOGIN', URL_PATH . ADMIN_DIR . "" . DIR_INDEX_URL);
 /** 商品検索ページ */
-define('URL_SEARCH_TOP', URL_DIR . ADMIN_DIR . "products/" . DIR_INDEX_URL);
+define('URL_SEARCH_TOP', URL_PATH . ADMIN_DIR . "products/" . DIR_INDEX_URL);
 /** 注文編集ページ */
-define('URL_ORDER_EDIT', URL_DIR . ADMIN_DIR . "order/edit.php");
+define('URL_ORDER_EDIT', URL_PATH . ADMIN_DIR . "order/edit.php");
 /** 注文編集ページ */
-define('URL_SEARCH_ORDER', URL_DIR . ADMIN_DIR . "order/" . DIR_INDEX_URL);
+define('URL_SEARCH_ORDER', URL_PATH . ADMIN_DIR . "order/" . DIR_INDEX_URL);
 /** 注文編集ページ */
-define('URL_ORDER_MAIL', URL_DIR . ADMIN_DIR . "order/mail.php");
+define('URL_ORDER_MAIL', URL_PATH . ADMIN_DIR . "order/mail.php");
 /** ログアウトページ */
-define('URL_LOGOUT', URL_DIR . ADMIN_DIR . "logout.php");
+define('URL_LOGOUT', URL_PATH . ADMIN_DIR . "logout.php");
 /** システム管理CSV出力ページ */
-define('URL_SYSTEM_CSV', URL_DIR . ADMIN_DIR . "system/member_csv.php");
+define('URL_SYSTEM_CSV', URL_PATH . ADMIN_DIR . "system/member_csv.php");
 /** 管理機能用CSS保管ディレクトリ */
-define('URL_ADMIN_CSS', URL_DIR . ADMIN_DIR . "css/");
+define('URL_ADMIN_CSS', URL_PATH . ADMIN_DIR . "css/");
 /** アクセス成功 */
 define('SUCCESS', 0);
 /** メンバー管理ページ表示行数 */
@@ -339,35 +339,35 @@
 /** カテゴリ区切り文字 */
 define('SEPA_CATLIST', " | ");
 /** 会員情報入力 */
-define('URL_SHOP_TOP', SSL_URL . "shopping/" . DIR_INDEX_URL);
+define('URL_SHOP_TOP', HTTPS_URL . "shopping/" . DIR_INDEX_URL);
 /** 会員登録ページTOP */
-define('URL_ENTRY_TOP', SSL_URL . "entry/" . DIR_INDEX_URL);
+define('URL_ENTRY_TOP', HTTPS_URL . "entry/" . DIR_INDEX_URL);
 /** サイトトップ */
-define('URL_SITE_TOP', URL_DIR . DIR_INDEX_URL);
+define('URL_SITE_TOP', URL_PATH . DIR_INDEX_URL);
 /** カートトップ */
-define('URL_CART_TOP', URL_DIR . "cart/" . DIR_INDEX_URL);
+define('URL_CART_TOP', URL_PATH . "cart/" . DIR_INDEX_URL);
 /** お届け先設定 */
-define('URL_DELIV_TOP', URL_DIR . "shopping/deliv.php");
+define('URL_DELIV_TOP', URL_PATH . "shopping/deliv.php");
 /** Myページトップ */
-define('URL_MYPAGE_TOP', SSL_URL . "mypage/login.php");
+define('URL_MYPAGE_TOP', HTTPS_URL . "mypage/login.php");
 /** 購入確認ページ */
-define('URL_SHOP_CONFIRM', URL_DIR . "shopping/confirm.php");
+define('URL_SHOP_CONFIRM', URL_PATH . "shopping/confirm.php");
 /** お支払い方法選択ページ */
-define('URL_SHOP_PAYMENT', URL_DIR . "shopping/payment.php");
+define('URL_SHOP_PAYMENT', URL_PATH . "shopping/payment.php");
 /** 購入完了画面 */
-define('URL_SHOP_COMPLETE', URL_DIR . "shopping/complete.php");
+define('URL_SHOP_COMPLETE', URL_PATH . "shopping/complete.php");
 /** カード決済画面 */
-define('URL_SHOP_CREDIT', URL_DIR . "shopping/card.php");
+define('URL_SHOP_CREDIT', URL_PATH . "shopping/card.php");
 /** ローン決済画面 */
-define('URL_SHOP_LOAN', URL_DIR . "shopping/loan.php");
+define('URL_SHOP_LOAN', URL_PATH . "shopping/loan.php");
 /** コンビニ決済画面 */
-define('URL_SHOP_CONVENIENCE', URL_DIR . "shopping/convenience.php");
+define('URL_SHOP_CONVENIENCE', URL_PATH . "shopping/convenience.php");
 /** モジュール追加用画面 */
-define('URL_SHOP_MODULE', URL_DIR . "shopping/load_payment_module.php");
+define('URL_SHOP_MODULE', URL_PATH . "shopping/load_payment_module.php");
 /** 商品詳細(HTML出力) */
-define('DETAIL_P_HTML', URL_DIR . "products/detail.php?product_id=");
+define('DETAIL_P_HTML', URL_PATH . "products/detail.php?product_id=");
 /** マイページお届け先URL */
-define('MYPAGE_DELIVADDR_URL', URL_DIR . "mypage/delivery.php");
+define('MYPAGE_DELIVADDR_URL', URL_PATH . "mypage/delivery.php");
 /** メールアドレス種別 */
 define('MAIL_TYPE_PC', 1);
 /** メールアドレス種別 */
@@ -417,7 +417,7 @@
 /** フロント最大表示数 */
 define('TRACKBACK_VIEW_MAX', 10);
 /** トラックバック先URL */
-define('TRACKBACK_TO_URL', SITE_URL . "tb/" . DIR_INDEX_URL . "?pid=");
+define('TRACKBACK_TO_URL', HTTP_URL . "tb/" . DIR_INDEX_URL . "?pid=");
 /** サイト管理 トラックバック */
 define('SITE_CONTROL_TRACKBACK', 1);
 /** サイト管理 アフィリエイト */
@@ -445,17 +445,17 @@
 /** スマートフォンテンプレート名 */
 define('SMARTPHONE_TEMPLATE_NAME', "sphone");
 /** SMARTYテンプレート */
-define('SMARTY_TEMPLATES_DIR',  DATA_PATH . "Smarty/templates/");
+define('SMARTY_TEMPLATES_DIR',  DATA_FILE_PATH . "Smarty/templates/");
 /** SMARTYテンプレート */
-define('TPL_DIR', URL_DIR . USER_DIR . USER_PACKAGE_DIR . TEMPLATE_NAME . "/");
+define('TPL_DIR', URL_PATH . USER_DIR . USER_PACKAGE_DIR . TEMPLATE_NAME . "/");
 /** SMARTYテンプレート */
 define('TEMPLATE_DIR', SMARTY_TEMPLATES_DIR . TEMPLATE_NAME . "/");
 /** SMARTYテンプレート(管理機能) */
 define('TEMPLATE_ADMIN_DIR', SMARTY_TEMPLATES_DIR . "admin/");
 /** SMARTYコンパイル */
-define('COMPILE_DIR', DATA_PATH . "Smarty/templates_c/" . TEMPLATE_NAME . "/");
+define('COMPILE_DIR', DATA_FILE_PATH . "Smarty/templates_c/" . TEMPLATE_NAME . "/");
 /** SMARTYコンパイル(管理機能) */
-define('COMPILE_ADMIN_DIR', DATA_PATH . "Smarty/templates_c/admin/");
+define('COMPILE_ADMIN_DIR', DATA_FILE_PATH . "Smarty/templates_c/admin/");
 /** SMARTYテンプレート(FTP許可) */
 define('TEMPLATE_FTP_DIR', USER_PATH . USER_PACKAGE_DIR . TEMPLATE_NAME . "/");
 /** SMARTYコンパイル(FTP許可) */
@@ -469,11 +469,11 @@
 /** SMARTYテンプレート(mobile) */
 define('MOBILE_TEMPLATE_DIR', SMARTY_TEMPLATES_DIR . MOBILE_TEMPLATE_NAME . "/");
 /** SMARTYコンパイル(mobile) */
-define('MOBILE_COMPILE_DIR', DATA_PATH . "Smarty/templates_c/" . MOBILE_TEMPLATE_NAME . "/");
+define('MOBILE_COMPILE_DIR', DATA_FILE_PATH . "Smarty/templates_c/" . MOBILE_TEMPLATE_NAME . "/");
 /** SMARTYテンプレート(smart phone) */
 define('SMARTPHONE_TEMPLATE_DIR', SMARTY_TEMPLATES_DIR . SMARTPHONE_TEMPLATE_NAME . "/");
 /** SMARTYコンパイル(smart phone) */
-define('SMARTPHONE_COMPILE_DIR', DATA_PATH . "Smarty/templates_c/" . SMARTPHONE_TEMPLATE_NAME . "/");
+define('SMARTPHONE_COMPILE_DIR', DATA_FILE_PATH . "Smarty/templates_c/" . SMARTPHONE_TEMPLATE_NAME . "/");
 /** モバイルサイトのセッションの存続時間 (秒) */
 define('MOBILE_SESSION_LIFETIME', 1800);
 /** 空メール機能を使用するかどうか(true:送信する、false:送信しない) */
@@ -485,25 +485,25 @@
 /** 空メール受け付けアドレスのドメイン部分 */
 define('MOBILE_KARA_MAIL_ADDRESS_DOMAIN', "");
 /** 携帯電話向け変換画像保存ディレクトリ */
-define('MOBILE_IMAGE_DIR', HTML_PATH . "upload/mobile_image");
+define('MOBILE_IMAGE_DIR', HTML_FILE_PATH . "upload/mobile_image");
 /** 携帯電話向け変換画像保存ディレクトリ */
-define('MOBILE_IMAGE_URL', URL_DIR . "upload/mobile_image");
+define('MOBILE_IMAGE_URL', URL_PATH . "upload/mobile_image");
 /** モバイルURL */
-define('MOBILE_URL_SITE_TOP', MOBILE_URL_DIR . DIR_INDEX_URL);
+define('MOBILE_URL_SITE_TOP', MOBILE_URL_PATH . DIR_INDEX_URL);
 /** カートトップ */
-define('MOBILE_URL_CART_TOP', MOBILE_URL_DIR . "cart/" . DIR_INDEX_URL);
+define('MOBILE_URL_CART_TOP', MOBILE_URL_PATH . "cart/" . DIR_INDEX_URL);
 /** 会員情報入力 */
-define('MOBILE_URL_SHOP_TOP', MOBILE_SSL_URL . "shopping/" . DIR_INDEX_URL);
+define('MOBILE_URL_SHOP_TOP', MOBILE_HTTPS_URL . "shopping/" . DIR_INDEX_URL);
 /** 購入確認ページ */
-define('MOBILE_URL_SHOP_CONFIRM', MOBILE_URL_DIR . "shopping/confirm.php");
+define('MOBILE_URL_SHOP_CONFIRM', MOBILE_URL_PATH . "shopping/confirm.php");
 /** お支払い方法選択ページ */
-define('MOBILE_URL_SHOP_PAYMENT', MOBILE_URL_DIR . "shopping/payment.php");
+define('MOBILE_URL_SHOP_PAYMENT', MOBILE_URL_PATH . "shopping/payment.php");
 /** 商品詳細(HTML出力) */
-define('MOBILE_DETAIL_P_HTML', MOBILE_URL_DIR . "products/detail.php?product_id=");
+define('MOBILE_DETAIL_P_HTML', MOBILE_URL_PATH . "products/detail.php?product_id=");
 /** 購入完了画面 */
-define('MOBILE_URL_SHOP_COMPLETE', MOBILE_URL_DIR . "shopping/complete.php");
+define('MOBILE_URL_SHOP_COMPLETE', MOBILE_URL_PATH . "shopping/complete.php");
 /** モジュール追加用画面 */
-define('MOBILE_URL_SHOP_MODULE', MOBILE_URL_DIR . "shopping/load_payment_module.php");
+define('MOBILE_URL_SHOP_MODULE', MOBILE_URL_PATH . "shopping/load_payment_module.php");
 /** セッション維持方法：useCookie|useRequest */
 define('SESSION_KEEP_METHOD', "useCookie");
 /** セッションの存続時間 (秒) */
@@ -513,7 +513,7 @@
 /** オーナーズストアURL */
 define('OSTORE_SSLURL', "https://store.ec-cube.net/");
 /** オーナーズストアログパス */
-define('OSTORE_LOG_PATH', DATA_PATH . "logs/ownersstore.log");
+define('OSTORE_LOG_PATH', DATA_FILE_PATH . "logs/ownersstore.log");
 /** オーナーズストア通信ステータス */
 define('OSTORE_STATUS_ERROR', "ERROR");
 /** オーナーズストア通信ステータス */
@@ -569,9 +569,9 @@
 /** ダウンロード販売機能 ファイルサイズ制限(KB) */
 define('DOWN_SIZE', 50000);
 /** ダウンロード販売機能 ファイル一時保存 */
-define('DOWN_TEMP_DIR', DATA_PATH . "download/temp/");
+define('DOWN_TEMP_DIR', DATA_FILE_PATH . "download/temp/");
 /** ダウンロード販売機能 ファイル保存先 */
-define('DOWN_SAVE_DIR', DATA_PATH . "download/save/");
+define('DOWN_SAVE_DIR', DATA_FILE_PATH . "download/save/");
 /** ダウンロード販売機能 ファイル存在エラー */
 define('DOWNFILE_NOT_FOUND', 22);
 /** ダウンロード販売機能 ダウンロード可能日数桁数 */

変更: branches/version-2_5-dev/data/plugin/bingo/SC_Plugin_bingo.php
===================================================================
--- branches/version-2_5-dev/data/plugin/bingo/SC_Plugin_bingo.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/plugin/bingo/SC_Plugin_bingo.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -74,9 +74,9 @@
                 $is_bingo = $_SESSION['plugin_bingo']['is_bingo'];
                 if ($is_bingo) {
                     if (SC_Utils_Ex::sfIsMobileSite()) {
-                        $objPage->tpl_mainpage = DATA_PATH . 'plugin/' . $this->plugin_name . '/templates/mobile/shopping/complete.tpl';
+                        $objPage->tpl_mainpage = DATA_FILE_PATH . 'plugin/' . $this->plugin_name . '/templates/mobile/shopping/complete.tpl';
                     } else {
-                        $objPage->tpl_mainpage = DATA_PATH . 'plugin/' . $this->plugin_name . '/templates/shopping/complete.tpl';
+                        $objPage->tpl_mainpage = DATA_FILE_PATH . 'plugin/' . $this->plugin_name . '/templates/shopping/complete.tpl';
                     }
                 }
                 break;

変更: branches/version-2_5-dev/data/require_base.php
===================================================================
--- branches/version-2_5-dev/data/require_base.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/require_base.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -21,15 +21,15 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-if (!defined("DATA_PATH")) {
-    define("DATA_PATH", HTML_PATH . HTML2DATA_DIR);
+if (!defined("DATA_FILE_PATH")) {
+    define("DATA_FILE_PATH", HTML_FILE_PATH . HTML2DATA_DIR);
 }
 
 // アプリケーション初期化処理
-require_once(DATA_PATH . "app_initial.php");
+require_once(DATA_FILE_PATH . "app_initial.php");
 
 // 各種クラス読み込み
-require_once(DATA_PATH . "require_classes.php");
+require_once(DATA_FILE_PATH . "require_classes.php");
 
 // インストール中で無い場合、
 if (!SC_Utils_Ex::sfIsInstallFunction()) {
@@ -46,6 +46,6 @@
     $sessionFactory->initSession();
 
     // プラグインを読み込む
-    //require_once(DATA_PATH . 'require_plugin.php');
+    //require_once(DATA_FILE_PATH . 'require_plugin.php');
 }
 ?>

変更: branches/version-2_5-dev/data/require_classes.php
===================================================================
--- branches/version-2_5-dev/data/require_classes.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/require_classes.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-require_once(DATA_PATH . "module/Services/JSON.php");
-require_once DATA_PATH . 'module/Compat/Compat.php';
+require_once(DATA_FILE_PATH . "module/Services/JSON.php");
+require_once DATA_FILE_PATH . 'module/Compat/Compat.php';
 require_once(CLASS_EX_PATH . "util_extends/GC_Utils_Ex.php");
 require_once(CLASS_EX_PATH . "util_extends/SC_Utils_Ex.php");
 require_once(CLASS_EX_PATH . "db_extends/SC_DB_MasterData_Ex.php");

変更: branches/version-2_5-dev/data/require_safe.php
===================================================================
--- branches/version-2_5-dev/data/require_safe.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/data/require_safe.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -28,15 +28,15 @@
  */
 
 // rtrim は PHP バージョン依存対策
-define("HTML_PATH", rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/'), '/\\') . '/');
+define("HTML_FILE_PATH", rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/'), '/\\') . '/');
 
-if (!defined("DATA_PATH")) {
-    define("DATA_PATH", HTML_PATH . HTML2DATA_DIR);
+if (!defined("DATA_FILE_PATH")) {
+    define("DATA_FILE_PATH", HTML_FILE_PATH . HTML2DATA_DIR);
 }
 
 // アプリケーションの初期化処理
-require_once(DATA_PATH . "app_initial.php");
+require_once(DATA_FILE_PATH . "app_initial.php");
 
 // 各種クラス読み込み
-require_once(DATA_PATH . "require_classes.php");
+require_once(DATA_FILE_PATH . "require_classes.php");
 ?>

変更: branches/version-2_5-dev/html/admin/require.php
===================================================================
--- branches/version-2_5-dev/html/admin/require.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/html/admin/require.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -22,13 +22,13 @@
  */
 
 // rtrim は PHP バージョン依存対策
-define('HTML_PATH', rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/../'), '/\\') . '/');
+define('HTML_FILE_PATH', rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/../'), '/\\') . '/');
 define('ADMIN_FUNCTION', true);
 
-require_once HTML_PATH . 'define.php';
-require_once HTML_PATH . 'handle_error.php';
+require_once HTML_FILE_PATH . 'define.php';
+require_once HTML_FILE_PATH . 'handle_error.php';
 
-require_once HTML_PATH . HTML2DATA_DIR . 'require_base.php';
+require_once HTML_FILE_PATH . HTML2DATA_DIR . 'require_base.php';
 
 ob_start();
 ?>

変更: branches/version-2_5-dev/html/handle_error.php
===================================================================
--- branches/version-2_5-dev/html/handle_error.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/html/handle_error.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -44,7 +44,7 @@
         error_log("FATAL Error: $matches[3]:$matches[4] $matches[2]\n", 3,
                   realpath(dirname(__FILE__) . "/" . HTML2DATA_DIR . "logs/site.log"));
         if (DEBUG_MODE !== true) {
-            $url = SITE_URL . "error.php";
+            $url = HTTP_URL . "error.php";
             if (defined('ADMIN_FUNCTION') && ADMIN_FUNCTION) {
                 $url .= "?admin";
             }

変更: branches/version-2_5-dev/html/install/index.php
===================================================================
--- branches/version-2_5-dev/html/install/index.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/html/install/index.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -22,15 +22,15 @@
  */
 // ▼require.php 相当
 // rtrim は PHP バージョン依存対策
-define('HTML_PATH', rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/../'), '/\\') . '/');
+define('HTML_FILE_PATH', rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/../'), '/\\') . '/');
 
-require_once HTML_PATH . 'define.php';
+require_once HTML_FILE_PATH . 'define.php';
 define('INSTALL_FUNCTION', true);
-require_once HTML_PATH . HTML2DATA_DIR . 'require_base.php';
+require_once HTML_FILE_PATH . HTML2DATA_DIR . 'require_base.php';
 // ▲require.php 相当
 
 $INSTALL_DIR = realpath(dirname( __FILE__));
-require_once(DATA_PATH . "module/Request.php");
+require_once(DATA_FILE_PATH . "module/Request.php");
 
 define("INSTALL_LOG", "./temp/install.log");
 ini_set("max_execution_time", 300);
@@ -388,15 +388,15 @@
 
     // プログラムで書込みされるファイル・ディレクトリ
     $arrWriteFile = array(
-        DATA_PATH . "install.php",
+        DATA_FILE_PATH . "install.php",
         USER_PATH,
-        HTML_PATH . "upload",
-        DATA_PATH . "cache/",
-        DATA_PATH . "class/",
-        DATA_PATH . "Smarty/",
-        DATA_PATH . "logs/",
-        DATA_PATH . "downloads/",
-        DATA_PATH . "upload/",
+        HTML_FILE_PATH . "upload",
+        DATA_FILE_PATH . "cache/",
+        DATA_FILE_PATH . "class/",
+        DATA_FILE_PATH . "Smarty/",
+        DATA_FILE_PATH . "logs/",
+        DATA_FILE_PATH . "downloads/",
+        DATA_FILE_PATH . "upload/",
     );
 
     $mess = "";
@@ -456,35 +456,35 @@
     else {
         $objPage->tpl_mode = 'step0';
         umask(0);
-        $path = HTML_PATH . "upload/temp_template";
+        $path = HTML_FILE_PATH . "upload/temp_template";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = HTML_PATH . "upload/save_image";
+        $path = HTML_FILE_PATH . "upload/save_image";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = HTML_PATH . "upload/temp_image";
+        $path = HTML_FILE_PATH . "upload/temp_image";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = HTML_PATH . "upload/graph_image";
+        $path = HTML_FILE_PATH . "upload/graph_image";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = HTML_PATH . "upload/mobile_image";
+        $path = HTML_FILE_PATH . "upload/mobile_image";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = DATA_PATH . "downloads/module";
+        $path = DATA_FILE_PATH . "downloads/module";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = DATA_PATH . "downloads/update";
+        $path = DATA_FILE_PATH . "downloads/update";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = DATA_PATH . "upload/csv";
+        $path = DATA_FILE_PATH . "upload/csv";
         if(!file_exists($path)) {
             mkdir($path);
         }
@@ -512,7 +512,7 @@
     $objPage->tpl_mode = 'step0_1';
     // ファイルコピー
     $objPage->copy_mess = SC_Utils_Ex::sfCopyDir("./user_data/", USER_PATH, $objPage->copy_mess);
-    $objPage->copy_mess = SC_Utils_Ex::sfCopyDir("./save_image/", HTML_PATH . "upload/save_image/", $objPage->copy_mess);
+    $objPage->copy_mess = SC_Utils_Ex::sfCopyDir("./save_image/", HTML_FILE_PATH . "upload/save_image/", $objPage->copy_mess);
     return $objPage;
 }
 
@@ -619,15 +619,15 @@
 function lfInitWebParam($objWebParam) {
     global $objDb;
 
-    if(defined('SITE_URL')) {
-        $normal_url = SITE_URL;
+    if(defined('HTTP_URL')) {
+        $normal_url = HTTP_URL;
     } else {
         $dir = ereg_replace("install/.*$", "", $_SERVER['REQUEST_URI']);
         $normal_url = "http://" . $_SERVER['HTTP_HOST'] . $dir;
     }
 
-    if(defined('SSL_URL')) {
-        $secure_url = SSL_URL;
+    if(defined('HTTPS_URL')) {
+        $secure_url = HTTPS_URL;
     } else {
         $dir = ereg_replace("install/.*$", "", $_SERVER['REQUEST_URI']);
         $secure_url = "http://" . $_SERVER['HTTP_HOST'] . $dir;
@@ -899,14 +899,14 @@
     // ディレクトリの取得
     $url_dir = ereg_replace("^https?://[a-zA-Z0-9_:~=&\?\.\-]+", "", $normal_url);
 
-    $filepath = DATA_PATH . "install.php";
+    $filepath = DATA_FILE_PATH . "install.php";
 
     $config_data =
     "<?php\n".
     "    define ('ECCUBE_INSTALL', 'ON');\n" .
-    "    define ('SITE_URL', '" . $normal_url . "');\n" .
-    "    define ('SSL_URL', '" . $secure_url . "');\n" .
-    "    define ('URL_DIR', '" . $url_dir . "');\n" .
+    "    define ('HTTP_URL', '" . $normal_url . "');\n" .
+    "    define ('HTTPS_URL', '" . $secure_url . "');\n" .
+    "    define ('URL_PATH', '" . $url_dir . "');\n" .
     "    define ('DOMAIN_NAME', '" . $objWebParam->getValue('domain') . "');\n" .
     "    define ('DB_TYPE', '" . $objDBParam->getValue('db_type') . "');\n" .
     "    define ('DB_USER', '" . $objDBParam->getValue('db_user') . "');\n" .

変更: branches/version-2_5-dev/html/install/sql/insert_data.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/insert_data.sql	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/html/install/sql/insert_data.sql	2010-12-31 01:46:42 UTC (rev 19802)
@@ -1038,21 +1038,21 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SAMPLE_ADDRESS1', '"市区町村名 (例：千代田区神田神保町)"', 1, 'フロント表示関連');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SAMPLE_ADDRESS2', '"番地・ビル名 (例：1-3-5)"', 2, 'フロント表示関連');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('USER_DIR', '"user_data/"', 3, 'ユーザファイル保存先');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('USER_PATH', 'HTML_PATH . USER_DIR', 4, 'ユーザファイル保存先');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('USER_PATH', 'HTML_FILE_PATH . USER_DIR', 4, 'ユーザファイル保存先');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('USER_INC_PATH', 'USER_PATH . "include/"', 5, 'ユーザインクルードファイル保存先');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ZIP_DSN', 'DEFAULT_DSN', 8, '郵便番号専用DB');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('USER_URL', 'SITE_URL . USER_DIR', 9, 'ユーザー作成ページ等');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('USER_URL', 'HTTP_URL . USER_DIR', 9, 'ユーザー作成ページ等');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('AUTH_MAGIC', '"31eafcbd7a81d7b401a7fdc12bba047c02d1fae6"', 10, '認証用 magic');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('USER_TEMPLATE_DIR', '"templates/"', 16, 'テンプレートファイル保存先');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('USER_PACKAGE_DIR', '"packages/"', 17, 'テンプレートファイル保存先');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('USER_TEMPLATE_PATH', 'USER_PATH . USER_PACKAGE_DIR', 18, 'テンプレートファイル保存先');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TEMPLATE_TEMP_DIR', 'HTML_PATH . "upload/temp_template/"', 19, 'テンプレートファイル一時保存先');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TEMPLATE_TEMP_DIR', 'HTML_FILE_PATH . "upload/temp_template/"', 19, 'テンプレートファイル一時保存先');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('USER_DEF_PHP', 'USER_PATH . "__default.php"', 20, 'ユーザー作成画面のデフォルトPHPファイル');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DEF_LAYOUT', '"products/list.php"', 21, 'その他画面のデフォルトページレイアウト');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MODULE_DIR', '"downloads/module/"', 22, 'ダウンロードモジュール保存ディレクトリ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MODULE_PATH', 'DATA_PATH . MODULE_DIR', 23, 'ダウンロードモジュール保存ディレクトリ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MODULE_PATH', 'DATA_FILE_PATH . MODULE_DIR', 23, 'ダウンロードモジュール保存ディレクトリ');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MAX_LIFETIME', '7200', 26, 'DBセッションの有効期限(秒)');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MASTER_DATA_DIR', 'DATA_PATH . "cache/"', 27, 'マスタデータキャッシュディレクトリ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MASTER_DATA_DIR', 'DATA_FILE_PATH . "cache/"', 27, 'マスタデータキャッシュディレクトリ');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('UPDATE_HTTP', '"http://sv01.ec-cube.net/info/index.php"', 28, 'アップデート管理用ファイル格納場所');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('UPDATE_CSV_LINE_MAX', '4096', 29, 'アップデート管理用CSV1行辺りの最大文字数');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('UPDATE_CSV_COL_MAX', '13', 30, 'アップデート管理用CSVカラム数');
@@ -1067,12 +1067,12 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('LOAD_BATCH_PASS', '3600', 44, 'バッチを実行する最短の間隔(秒)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('CLOSE_DAY', '31', 45, '締め日の指定(末日の場合は、31を指定してください。)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('FAVORITE_ERROR', '13', 46, '一般サイトエラー');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TTF_DIR', 'DATA_PATH . "fonts/"', 48, 'フォントのパス');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('GRAPH_DIR', 'HTML_PATH . "upload/graph_image/"', 49, 'グラフ格納ディレクトリ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('GRAPH_URL', 'URL_DIR . "upload/graph_image/"', 50, 'グラフURL');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TTF_DIR', 'DATA_FILE_PATH . "fonts/"', 48, 'フォントのパス');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('GRAPH_DIR', 'HTML_FILE_PATH . "upload/graph_image/"', 49, 'グラフ格納ディレクトリ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('GRAPH_URL', 'URL_PATH . "upload/graph_image/"', 50, 'グラフURL');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('GRAPH_PIE_MAX', '10', 51, '円グラフ最大表示数');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('GRAPH_LABEL_MAX', '40', 52, 'グラフのラベルの文字数');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PDF_DIR', 'DATA_PATH . "pdf/"', 53, 'PDF格納ディレクトリ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PDF_DIR', 'DATA_FILE_PATH . "pdf/"', 53, 'PDF格納ディレクトリ');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('BAT_ORDER_AGE', '70', 54, '何歳まで集計の対象とするか');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PRODUCTS_TOTAL_MAX', '15', 55, '商品集計で何位まで表示するか');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DEFAULT_PRODUCT_DISP', '2', 56, '1:公開 2:非公開');
@@ -1146,32 +1146,32 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('START_BIRTH_YEAR', '1901', 139, '生年月日選択開始年');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('NORMAL_PRICE_TITLE', '"通常価格"', 140, '価格名称');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SALE_PRICE_TITLE', '"販売価格"', 141, '価格名称');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('LOG_PATH', 'DATA_PATH . "logs/site.log"', 142, 'ログファイル');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('CUSTOMER_LOG_PATH', 'DATA_PATH . "logs/customer.log"', 143, '会員ログイン ログファイル');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_TEMP_DIR', 'HTML_PATH . "upload/temp_image/"', 150, '画像一時保存');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_SAVE_DIR', 'HTML_PATH . "upload/save_image/"', 151, '画像保存先');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_TEMP_URL', 'URL_DIR . "upload/temp_image/"', 152, '画像一時保存URL');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_SAVE_URL', 'URL_DIR . "upload/save_image/"', 153, '画像保存先URL');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_TEMP_URL_RSS', 'SITE_URL . "upload/temp_image/"', 154, 'RSS用画像一時保存URL');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_SAVE_URL_RSS', 'SITE_URL . "upload/save_image/"', 155, 'RSS用画像保存先URL');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('CSV_TEMP_DIR', 'DATA_PATH . "upload/csv/"', 156, 'エンコードCSVの一時保存先');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('LOG_PATH', 'DATA_FILE_PATH . "logs/site.log"', 142, 'ログファイル');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('CUSTOMER_LOG_PATH', 'DATA_FILE_PATH . "logs/customer.log"', 143, '会員ログイン ログファイル');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_TEMP_DIR', 'HTML_FILE_PATH . "upload/temp_image/"', 150, '画像一時保存');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_SAVE_DIR', 'HTML_FILE_PATH . "upload/save_image/"', 151, '画像保存先');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_TEMP_URL', 'URL_PATH . "upload/temp_image/"', 152, '画像一時保存URL');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_SAVE_URL', 'URL_PATH . "upload/save_image/"', 153, '画像保存先URL');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_TEMP_URL_RSS', 'HTTP_URL . "upload/temp_image/"', 154, 'RSS用画像一時保存URL');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_SAVE_URL_RSS', 'HTTP_URL . "upload/save_image/"', 155, 'RSS用画像保存先URL');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('CSV_TEMP_DIR', 'DATA_FILE_PATH . "upload/csv/"', 156, 'エンコードCSVの一時保存先');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('NO_IMAGE_URL', 'TPL_DIR . "img/picture/img_blank.gif"', 157, '画像がない場合に表示');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('NO_IMAGE_DIR', 'USER_TEMPLATE_PATH . "img/picture/img_blank.gif"', 158, '画像がない場合に表示');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SYSTEM_TOP', 'URL_DIR . ADMIN_DIR . "system/" . DIR_INDEX_URL', 159, 'システム管理トップ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_CLASS_REGIST', 'URL_DIR . ADMIN_DIR . "products/class.php"', 160, '規格登録');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_INPUT_ZIP', 'URL_DIR . "input_zip.php"', 161, '郵便番号入力');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_DELIVERY_TOP', 'URL_DIR . ADMIN_DIR . "basis/delivery.php"', 162, '配送業者登録');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_PAYMENT_TOP', 'URL_DIR . ADMIN_DIR . "basis/payment.php"', 163, '支払い方法登録');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_CONTROL_TOP', 'URL_DIR . ADMIN_DIR . "basis/control.php"', 164, 'サイト管理情報登録');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_HOME', 'URL_DIR . ADMIN_DIR . "home.php"', 165, 'ホーム');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_LOGIN', 'URL_DIR . ADMIN_DIR . "" . DIR_INDEX_URL', 166, 'ログインページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SEARCH_TOP', 'URL_DIR . ADMIN_DIR . "products/" . DIR_INDEX_URL', 167, '商品検索ページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_ORDER_EDIT', 'URL_DIR . ADMIN_DIR . "order/edit.php"', 168, '注文編集ページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SEARCH_ORDER', 'URL_DIR . ADMIN_DIR . "order/" . DIR_INDEX_URL', 169, '注文編集ページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_ORDER_MAIL', 'URL_DIR . ADMIN_DIR . "order/mail.php"', 170, '注文編集ページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_LOGOUT', 'URL_DIR . ADMIN_DIR . "logout.php"', 171, 'ログアウトページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SYSTEM_CSV', 'URL_DIR . ADMIN_DIR . "system/member_csv.php"', 172, 'システム管理CSV出力ページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_ADMIN_CSS', 'URL_DIR . ADMIN_DIR . "css/"', 173, '管理機能用CSS保管ディレクトリ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SYSTEM_TOP', 'URL_PATH . ADMIN_DIR . "system/" . DIR_INDEX_URL', 159, 'システム管理トップ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_CLASS_REGIST', 'URL_PATH . ADMIN_DIR . "products/class.php"', 160, '規格登録');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_INPUT_ZIP', 'URL_PATH . "input_zip.php"', 161, '郵便番号入力');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_DELIVERY_TOP', 'URL_PATH . ADMIN_DIR . "basis/delivery.php"', 162, '配送業者登録');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_PAYMENT_TOP', 'URL_PATH . ADMIN_DIR . "basis/payment.php"', 163, '支払い方法登録');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_CONTROL_TOP', 'URL_PATH . ADMIN_DIR . "basis/control.php"', 164, 'サイト管理情報登録');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_HOME', 'URL_PATH . ADMIN_DIR . "home.php"', 165, 'ホーム');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_LOGIN', 'URL_PATH . ADMIN_DIR . "" . DIR_INDEX_URL', 166, 'ログインページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SEARCH_TOP', 'URL_PATH . ADMIN_DIR . "products/" . DIR_INDEX_URL', 167, '商品検索ページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_ORDER_EDIT', 'URL_PATH . ADMIN_DIR . "order/edit.php"', 168, '注文編集ページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SEARCH_ORDER', 'URL_PATH . ADMIN_DIR . "order/" . DIR_INDEX_URL', 169, '注文編集ページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_ORDER_MAIL', 'URL_PATH . ADMIN_DIR . "order/mail.php"', 170, '注文編集ページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_LOGOUT', 'URL_PATH . ADMIN_DIR . "logout.php"', 171, 'ログアウトページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SYSTEM_CSV', 'URL_PATH . ADMIN_DIR . "system/member_csv.php"', 172, 'システム管理CSV出力ページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_ADMIN_CSS', 'URL_PATH . ADMIN_DIR . "css/"', 173, '管理機能用CSS保管ディレクトリ');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SUCCESS', '0', 176, 'アクセス成功');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MEMBER_PMAX', '10', 182, 'メンバー管理ページ表示行数');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SEARCH_PMAX', '10', 183, '検索ページ表示行数');
@@ -1205,21 +1205,21 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('COOKIE_EXPIRE', '365', 212, 'クッキー保持期限(日)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SEPA_CATNAVI', '" > "', 235, 'カテゴリ区切り文字');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SEPA_CATLIST', '" | "', 236, 'カテゴリ区切り文字');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SHOP_TOP', 'SSL_URL . "shopping/" . DIR_INDEX_URL', 237, '会員情報入力');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_ENTRY_TOP', 'SSL_URL . "entry/" . DIR_INDEX_URL', 238, '会員登録ページTOP');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SITE_TOP', 'URL_DIR . DIR_INDEX_URL', 239, 'サイトトップ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_CART_TOP', 'URL_DIR . "cart/" . DIR_INDEX_URL', 240, 'カートトップ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_DELIV_TOP', 'URL_DIR . "shopping/deliv.php"', 241, 'お届け先設定');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_MYPAGE_TOP', 'SSL_URL . "mypage/login.php"', 242, 'Myページトップ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SHOP_CONFIRM', 'URL_DIR . "shopping/confirm.php"', 243, '購入確認ページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SHOP_PAYMENT', 'URL_DIR . "shopping/payment.php"', 244, 'お支払い方法選択ページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SHOP_COMPLETE', 'URL_DIR . "shopping/complete.php"', 245, '購入完了画面');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SHOP_CREDIT', 'URL_DIR . "shopping/card.php"', 246, 'カード決済画面');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SHOP_LOAN', 'URL_DIR . "shopping/loan.php"', 247, 'ローン決済画面');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SHOP_CONVENIENCE', 'URL_DIR . "shopping/convenience.php"', 248, 'コンビニ決済画面');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SHOP_MODULE', 'URL_DIR . "shopping/load_payment_module.php"', 249, 'モジュール追加用画面');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DETAIL_P_HTML', 'URL_DIR . "products/detail.php?product_id="', 253, '商品詳細(HTML出力)');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MYPAGE_DELIVADDR_URL', 'URL_DIR . "mypage/delivery.php"', 254, 'マイページお届け先URL');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SHOP_TOP', 'HTTPS_URL . "shopping/" . DIR_INDEX_URL', 237, '会員情報入力');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_ENTRY_TOP', 'HTTPS_URL . "entry/" . DIR_INDEX_URL', 238, '会員登録ページTOP');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SITE_TOP', 'URL_PATH . DIR_INDEX_URL', 239, 'サイトトップ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_CART_TOP', 'URL_PATH . "cart/" . DIR_INDEX_URL', 240, 'カートトップ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_DELIV_TOP', 'URL_PATH . "shopping/deliv.php"', 241, 'お届け先設定');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_MYPAGE_TOP', 'HTTPS_URL . "mypage/login.php"', 242, 'Myページトップ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SHOP_CONFIRM', 'URL_PATH . "shopping/confirm.php"', 243, '購入確認ページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SHOP_PAYMENT', 'URL_PATH . "shopping/payment.php"', 244, 'お支払い方法選択ページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SHOP_COMPLETE', 'URL_PATH . "shopping/complete.php"', 245, '購入完了画面');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SHOP_CREDIT', 'URL_PATH . "shopping/card.php"', 246, 'カード決済画面');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SHOP_LOAN', 'URL_PATH . "shopping/loan.php"', 247, 'ローン決済画面');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SHOP_CONVENIENCE', 'URL_PATH . "shopping/convenience.php"', 248, 'コンビニ決済画面');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SHOP_MODULE', 'URL_PATH . "shopping/load_payment_module.php"', 249, 'モジュール追加用画面');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DETAIL_P_HTML', 'URL_PATH . "products/detail.php?product_id="', 253, '商品詳細(HTML出力)');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MYPAGE_DELIVADDR_URL', 'URL_PATH . "mypage/delivery.php"', 254, 'マイページお届け先URL');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MAIL_TYPE_PC', '1', 255, 'メールアドレス種別');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MAIL_TYPE_MOBILE', '2', 256, 'メールアドレス種別');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ODERSTATUS_COMMIT', 'ORDER_DELIV', 263, '受注ステータス変更の際にポイント等を加算するステータス番号 (発送済み)');
@@ -1237,7 +1237,7 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TRACKBACK_STATUS_NOT_VIEW', '2', 279, 'トラックバック 非表示');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TRACKBACK_STATUS_SPAM', '3', 280, 'トラックバック スパム');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TRACKBACK_VIEW_MAX', '10', 281, 'フロント最大表示数');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TRACKBACK_TO_URL', 'SITE_URL . "tb/" . DIR_INDEX_URL . "?pid="', 282, 'トラックバック先URL');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TRACKBACK_TO_URL', 'HTTP_URL . "tb/" . DIR_INDEX_URL . "?pid="', 282, 'トラックバック先URL');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SITE_CONTROL_TRACKBACK', '1', 283, 'サイト管理 トラックバック');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SITE_CONTROL_AFFILIATE', '2', 284, 'サイト管理 アフィリエイト');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MAIL_BACKEND', '"smtp"', 285, 'Pear::Mail バックエンド:mail|smtp|sendmail');
@@ -1251,18 +1251,18 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TEMPLATE_NAME', '"default"', 301, 'テンプレート名');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_TEMPLATE_NAME', '"mobile"', 302, 'モバイルテンプレート名');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SMARTPHONE_TEMPLATE_NAME', '"sphone"', 303, 'スマートフォンテンプレート名');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SMARTY_TEMPLATES_DIR', ' DATA_PATH . "Smarty/templates/"', 304, 'SMARTYテンプレート');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SMARTY_TEMPLATES_DIR', ' DATA_FILE_PATH . "Smarty/templates/"', 304, 'SMARTYテンプレート');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TEMPLATE_DIR', 'SMARTY_TEMPLATES_DIR . TEMPLATE_NAME . "/"', 305, 'SMARTYテンプレート(PC)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TEMPLATE_ADMIN_DIR', 'SMARTY_TEMPLATES_DIR . "admin/"', 306, 'SMARTYテンプレート(管理機能)');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('COMPILE_DIR', 'DATA_PATH . "Smarty/templates_c/" . TEMPLATE_NAME . "/"', 307, 'SMARTYコンパイル');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('COMPILE_ADMIN_DIR', 'DATA_PATH . "Smarty/templates_c/admin/"', 308, 'SMARTYコンパイル(管理機能)');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('COMPILE_DIR', 'DATA_FILE_PATH . "Smarty/templates_c/" . TEMPLATE_NAME . "/"', 307, 'SMARTYコンパイル');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('COMPILE_ADMIN_DIR', 'DATA_FILE_PATH . "Smarty/templates_c/admin/"', 308, 'SMARTYコンパイル(管理機能)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TEMPLATE_FTP_DIR', 'USER_PATH . USER_PACKAGE_DIR . TEMPLATE_NAME . "/"', 309, 'SMARTYテンプレート(FTP許可)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('COMPILE_FTP_DIR', 'COMPILE_DIR . USER_DIR', 310, 'SMARTYコンパイル(FTP許可)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('BLOC_DIR', '"frontparts/bloc/"', 311, 'ブロックファイル保存先');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_TEMPLATE_DIR', 'SMARTY_TEMPLATES_DIR . MOBILE_TEMPLATE_NAME . "/"', 312, 'SMARTYテンプレート(mobile)');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_COMPILE_DIR', 'DATA_PATH . "Smarty/templates_c/" . MOBILE_TEMPLATE_NAME . "/"', 313, 'SMARTYコンパイル(mobile)');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_COMPILE_DIR', 'DATA_FILE_PATH . "Smarty/templates_c/" . MOBILE_TEMPLATE_NAME . "/"', 313, 'SMARTYコンパイル(mobile)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SMARTPHONE_TEMPLATE_DIR', 'SMARTY_TEMPLATES_DIR . SMARTPHONE_TEMPLATE_NAME . "/"', 314, 'SMARTYテンプレート(smart phone)');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SMARTPHONE_COMPILE_DIR', 'DATA_PATH . "Smarty/templates_c/" . SMARTPHONE_TEMPLATE_NAME . "/"', 315, 'SMARTYコンパイル(smartphone)');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SMARTPHONE_COMPILE_DIR', 'DATA_FILE_PATH . "Smarty/templates_c/" . SMARTPHONE_TEMPLATE_NAME . "/"', 315, 'SMARTYコンパイル(smartphone)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('BLOC_PATH', 'TEMPLATE_DIR . BLOC_DIR', 316, 'ブロックファイル保存先');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('RFC_COMPLIANT_EMAIL_CHECK', 'false', 401, 'EメールアドレスチェックをRFC準拠にするか(true:準拠する、false:準拠しない)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_SESSION_LIFETIME', '1800', 402, 'モバイルサイトのセッションの存続時間 (秒)');
@@ -1270,21 +1270,21 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_KARA_MAIL_ADDRESS_USER', '"eccube"', 404, '空メール受け付けアドレスのユーザー名部分');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_KARA_MAIL_ADDRESS_DELIMITER', '"+"', 405, '空メール受け付けアドレスのユーザー名とコマンドの間の区切り文字 qmail の場合は -');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_KARA_MAIL_ADDRESS_DOMAIN', '""', 406, '空メール受け付けアドレスのドメイン部分');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_IMAGE_DIR', 'HTML_PATH . "upload/mobile_image"', 408, '携帯電話向け変換画像保存ディレクトリ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_IMAGE_URL', 'URL_DIR . "upload/mobile_image"', 409, '携帯電話向け変換画像保存ディレクトリ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_URL_SITE_TOP', 'MOBILE_URL_DIR . DIR_INDEX_URL', 410, 'モバイルURL');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_URL_CART_TOP', 'MOBILE_URL_DIR . "cart/" . DIR_INDEX_URL', 411, 'カートトップ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_URL_SHOP_TOP', 'MOBILE_SSL_URL . "shopping/" . DIR_INDEX_URL', 412, '会員情報入力');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_URL_SHOP_CONFIRM', 'MOBILE_URL_DIR . "shopping/confirm.php"', 413, '購入確認ページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_URL_SHOP_PAYMENT', 'MOBILE_URL_DIR . "shopping/payment.php"', 414, 'お支払い方法選択ページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_DETAIL_P_HTML', 'MOBILE_URL_DIR . "products/detail.php?product_id="', 415, '商品詳細(HTML出力)');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_URL_SHOP_COMPLETE', 'MOBILE_URL_DIR . "shopping/complete.php"', 416, '購入完了画面');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_URL_SHOP_MODULE', 'MOBILE_URL_DIR . "shopping/load_payment_module.php"', 417, 'モジュール追加用画面');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_IMAGE_DIR', 'HTML_FILE_PATH . "upload/mobile_image"', 408, '携帯電話向け変換画像保存ディレクトリ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_IMAGE_URL', 'URL_PATH . "upload/mobile_image"', 409, '携帯電話向け変換画像保存ディレクトリ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_URL_SITE_TOP', 'MOBILE_URL_PATH . DIR_INDEX_URL', 410, 'モバイルURL');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_URL_CART_TOP', 'MOBILE_URL_PATH . "cart/" . DIR_INDEX_URL', 411, 'カートトップ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_URL_SHOP_TOP', 'MOBILE_HTTPS_URL . "shopping/" . DIR_INDEX_URL', 412, '会員情報入力');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_URL_SHOP_CONFIRM', 'MOBILE_URL_PATH . "shopping/confirm.php"', 413, '購入確認ページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_URL_SHOP_PAYMENT', 'MOBILE_URL_PATH . "shopping/payment.php"', 414, 'お支払い方法選択ページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_DETAIL_P_HTML', 'MOBILE_URL_PATH . "products/detail.php?product_id="', 415, '商品詳細(HTML出力)');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_URL_SHOP_COMPLETE', 'MOBILE_URL_PATH . "shopping/complete.php"', 416, '購入完了画面');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_URL_SHOP_MODULE', 'MOBILE_URL_PATH . "shopping/load_payment_module.php"', 417, 'モジュール追加用画面');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SESSION_KEEP_METHOD', '"useCookie"', 418, 'セッション維持方法：useCookie|useRequest');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SESSION_LIFETIME', '1800', 419, 'セッションの存続時間 (秒)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('OSTORE_URL', '"http://store.ec-cube.net/"', 500, 'オーナーズストアURL');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('OSTORE_SSLURL', '"https://store.ec-cube.net/"', 501, 'オーナーズストアURL');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('OSTORE_LOG_PATH', 'DATA_PATH . "logs/ownersstore.log"', 502, 'オーナーズストアログパス');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('OSTORE_LOG_PATH', 'DATA_FILE_PATH . "logs/ownersstore.log"', 502, 'オーナーズストアログパス');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('OSTORE_STATUS_ERROR', '"ERROR"', 503, 'オーナーズストア通信ステータス');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('OSTORE_STATUS_SUCCESS', '"SUCCESS"', 504, 'オーナーズストア通信ステータス');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('OSTORE_E_UNKNOWN', '"1000"', 505, 'オーナーズストア通信エラーコード');
@@ -1314,8 +1314,8 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DOWNLOAD_EXTENSION', '"zip,lzh,jpg,jpeg,gif,png,mp3,pdf,csv"', 701, 'ダウンロードファイル登録可能拡張子(カンマ区切り)"');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DOWN_SIZE', '50000', 702, 'ダウンロード販売ファイル用サイズ制限(KB)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DEFAULT_PRODUCT_DOWN', '1', 703, '1:実商品 2:ダウンロード');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DOWN_TEMP_DIR', 'DATA_PATH . "download/temp/"', 704, 'ダウンロードファイル一時保存');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DOWN_SAVE_DIR', 'DATA_PATH . "download/save/"', 705, 'ダウンロードファイル保存先');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DOWN_TEMP_DIR', 'DATA_FILE_PATH . "download/temp/"', 704, 'ダウンロードファイル一時保存');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DOWN_SAVE_DIR', 'DATA_FILE_PATH . "download/save/"', 705, 'ダウンロードファイル保存先');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DOWNFILE_NOT_FOUND', '22', 706, 'ダウンロードファイル存在エラー');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ONLINE_PAYMENT', '"1"', 707, 'ダウンロード販売機能用オンライン決済payment_id(カンマ区切り)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DOWNLOAD_BLOCK', '1024', 708, 'ダウンロード販売機能 ダウンロードファイル読み込みバイト(KB)');

変更: branches/version-2_5-dev/html/install/templates/install_frame.tpl
===================================================================
--- branches/version-2_5-dev/html/install/templates/install_frame.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/html/install/templates/install_frame.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -28,8 +28,8 @@
 <meta http-equiv="content-script-type" content="text/javascript">
 <meta http-equiv="content-style-type" content="text/css">
 <link rel="stylesheet" href="../admin/css/install.css" type="text/css" >
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/css.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/navi.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/css.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/navi.js"></script>
 <title>EC CUBE インストール画面</title>
 </head>
 

変更: branches/version-2_5-dev/html/mobile/require.php
===================================================================
--- branches/version-2_5-dev/html/mobile/require.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/html/mobile/require.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -22,12 +22,12 @@
  */
 
 // rtrim は PHP バージョン依存対策
-define("HTML_PATH", rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/../'), '/\\') . '/');
+define("HTML_FILE_PATH", rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/../'), '/\\') . '/');
 
-require_once HTML_PATH . 'handle_error.php';
-require_once HTML_PATH . 'define.php';
+require_once HTML_FILE_PATH . 'handle_error.php';
+require_once HTML_FILE_PATH . 'define.php';
 define('MOBILE_SITE', true);
-require_once HTML_PATH . HTML2DATA_DIR . 'require_base.php';
+require_once HTML_FILE_PATH . HTML2DATA_DIR . 'require_base.php';
 
 // モバイルサイトを利用しない設定の場合、落とす。
 if (USE_MOBILE === false) {

変更: branches/version-2_5-dev/html/require.php
===================================================================
--- branches/version-2_5-dev/html/require.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/html/require.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -22,12 +22,12 @@
  */
 
 // rtrim は PHP バージョン依存対策
-define("HTML_PATH", rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/'), '/\\') . '/');
+define("HTML_FILE_PATH", rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/'), '/\\') . '/');
 
-require_once HTML_PATH . 'define.php';
-require_once HTML_PATH . 'handle_error.php';
+require_once HTML_FILE_PATH . 'define.php';
+require_once HTML_FILE_PATH . 'handle_error.php';
 define('FRONT_FUNCTION_PC_SITE', true);
-require_once HTML_PATH . HTML2DATA_DIR . 'require_base.php';
+require_once HTML_FILE_PATH . HTML2DATA_DIR . 'require_base.php';
 
 // スマートフォンの場合、リダイレクト
 SC_SmartphoneUserAgent::sfAutoRedirectSmartphoneSite();

変更: branches/version-2_5-dev/html/sphone/require.php
===================================================================
--- branches/version-2_5-dev/html/sphone/require.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/html/sphone/require.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -22,12 +22,12 @@
  */
 
 // rtrim は PHP バージョン依存対策
-define("HTML_PATH", rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/../'), '/\\') . '/');
+define("HTML_FILE_PATH", rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/../'), '/\\') . '/');
 
-require_once HTML_PATH . 'handle_error.php';
-require_once HTML_PATH . 'define.php';
+require_once HTML_FILE_PATH . 'handle_error.php';
+require_once HTML_FILE_PATH . 'define.php';
 define('SMARTPHONE_SITE', true);
-require_once HTML_PATH . HTML2DATA_DIR . 'require_base.php';
+require_once HTML_FILE_PATH . HTML2DATA_DIR . 'require_base.php';
 
 // モバイルサイトを利用しない設定の場合、落とす。
 /*

変更: branches/version-2_5-dev/html/user_data/packages/admin/js/ownersstore.js.php
===================================================================
--- branches/version-2_5-dev/html/user_data/packages/admin/js/ownersstore.js.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/html/user_data/packages/admin/js/ownersstore.js.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -19,14 +19,14 @@
 
 (function() {
 // オーナーズストア通信スクリプトのパス
-var upgrade_url = '[%URL_DIR%]upgrade/<?php echo DIR_INDEX_URL; ?>';
+var upgrade_url = '[%URL_PATH%]upgrade/<?php echo DIR_INDEX_URL; ?>';
 
 // ロード中メッセージ(配信サーバと通信中です…)
 var loading_message = '\u30B5\u30FC\u30D0\u3068\u901A\u4FE1\u4E2D\u3067\u3059';
 
 // ロード中画像の先読み
 var loading_img = new Image();
-loading_img.src = '[%URL_DIR%]user_data/packages/default/img/ajax/loading.gif';
+loading_img.src = '[%URL_PATH%]user_data/packages/default/img/ajax/loading.gif';
 
 var OwnersStore = function() {}
 OwnersStore.prototype = {
@@ -176,5 +176,5 @@
 })();
 <?php
 header('Content-Type: application/x-javascript');
-echo str_replace('[%URL_DIR%]', URL_DIR, ob_get_clean());
+echo str_replace('[%URL_PATH%]', URL_PATH, ob_get_clean());
 ?>

変更: branches/version-2_5-dev/html/user_data/plugins/recommend/tpl/bloc.tpl
===================================================================
--- branches/version-2_5-dev/html/user_data/plugins/recommend/tpl/bloc.tpl	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/html/user_data/plugins/recommend/tpl/bloc.tpl	2010-12-31 01:46:42 UTC (rev 19802)
@@ -13,7 +13,7 @@
             <div class="whoboughtleft"><!--{* XXX whoboughtleft は本来左列用なので、動作に不具合があるかもしれない。 *}-->
                 
                 <a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$arrProduct.product_id}-->">
-                    <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrProduct.main_list_image|sfNoImageMainList|escape}-->&amp;width=65&amp;height=65" alt="<!--{$arrProduct.name|escape}-->" /></a>
+                    <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$arrProduct.main_list_image|sfNoImageMainList|escape}-->&amp;width=65&amp;height=65" alt="<!--{$arrProduct.name|escape}-->" /></a>
 
                 <!--{assign var=price02_min value=`$arrProduct.price02_min`}-->
                 <!--{assign var=price02_max value=`$arrProduct.price02_max`}-->

変更: branches/version-2_5-dev/test/class/page/LC_Page_Test.php
===================================================================
--- branches/version-2_5-dev/test/class/page/LC_Page_Test.php	2010-12-30 18:45:53 UTC (rev 19801)
+++ branches/version-2_5-dev/test/class/page/LC_Page_Test.php	2010-12-31 01:46:42 UTC (rev 19802)
@@ -48,7 +48,7 @@
     /*
     function testSendRedirect() {
         $objPage = new LC_Page();
-        $result = $objPage->sendRedirect(SITE_URL);
+        $result = $objPage->sendRedirect(HTTP_URL);
 
         $this->assertEquals(true, empty($result));
     }
@@ -142,7 +142,7 @@
         $_SERVER['DOCUMENT_ROOT'] = realpath(dirname(__FILE__) . "/../../../html");
         $url = $objPage->getLocation("/abouts/index.php");
 
-        $this->assertEquals(SITE_URL . "abouts/index.php", $url);
+        $this->assertEquals(HTTP_URL . "abouts/index.php", $url);
         unset($_SERVER['DOCUMENT_ROOT']);
     }
 
@@ -154,9 +154,9 @@
     function testGetLocationWithFullPath() {
         $objPage = new LC_Page();
         $_SERVER['DOCUMENT_ROOT'] = realpath(dirname(__FILE__) . "/../../../html");
-        $url = $objPage->getLocation(URL_DIR . 'abouts/index.php');
+        $url = $objPage->getLocation(URL_PATH . 'abouts/index.php');
 
-        $this->assertEquals(SITE_URL . "abouts/index.php", $url);
+        $this->assertEquals(HTTP_URL . "abouts/index.php", $url);
         unset($_SERVER['DOCUMENT_ROOT']);
     }
 
@@ -172,14 +172,14 @@
         $queryString = array("mode" => "update", "type" => "text");
         $url = $objPage->getLocation("/abouts/index.php", $queryString);
 
-        $this->assertEquals(SITE_URL . "abouts/index.php?mode=update&type=text", $url);
+        $this->assertEquals(HTTP_URL . "abouts/index.php?mode=update&type=text", $url);
         unset($_SERVER['DOCUMENT_ROOT']);
     }
 
     /**
      * LC_Page::getLocation() のテストケース.
      *
-     * SSL_URL 使用
+     * HTTPS_URL 使用
      */
     function testGetLocationUseSSL() {
         $objPage = new LC_Page();
@@ -188,7 +188,7 @@
         $queryString = array("mode" => "update", "type" => "text");
         $url = $objPage->getLocation("/abouts/index.php", $queryString, true);
 
-        $this->assertEquals(SSL_URL . "abouts/index.php?mode=update&type=text", $url);
+        $this->assertEquals(HTTPS_URL . "abouts/index.php?mode=update&type=text", $url);
         unset($_SERVER['DOCUMENT_ROOT']);
     }
 
@@ -205,7 +205,7 @@
         $url = $objPage->getLocation("/abouts/index.php", array(),
                                      false, $documentRoot);
 
-        $this->assertEquals(SITE_URL . "abouts/index.php", $url);
+        $this->assertEquals(HTTP_URL . "abouts/index.php", $url);
     }
 }
 ?>

Svn-src-all メーリングリストの案内