Changeset 19998 for branches/version-2_5-dev/html

Timestamp:

2011/01/20 04:03:25 (16 years ago)

Author:

Seasoft

Message:

#640(URL の index.php ハードコーディングを解消し省略・変更を考慮)

• IIS動作未確認

#834(パスに関わるパラメータ名が不適切)

• DIR_INDEX_URL -> DIR_INDEX_PATH

Location:

branches/version-2_5-dev/html

Files:

• define.php (modified) (1 diff)
• install/sql/insert_data.sql (modified) (5 diffs)
• install/templates/complete.tpl (modified) (2 diffs)
• install/templates/welcome.tpl (modified) (1 diff)
• user_data/packages/admin/js/ownersstore.js.php (modified) (1 diff)
• user_data/plugins/google_analytics/tpl/admin/index.tpl (modified) (1 diff)

branches/version-2_5-dev/html/define.php

@@ -9 +9 @@
  * DIR_INDEX_FILE にアクセスするときにファイル名を使用するか
  *
- * true: 使用する, false: 使用しない (初期値: IIS は true、それ以外は false)
+ * true: 使用する, false: 使用しない, null: 自動(IIS は true、それ以外は false)
  * ※ IIS は、POST 時にファイル名を使用しないと不具合が発生する。(http://support.microsoft.com/kb/247536/ja)
  */
-define('USE_FILENAME_DIR_INDEX',
-       empty($_SERVER['SERVER_SOFTWARE']) ? false : substr($_SERVER['SERVER_SOFTWARE'], 0, 13) == 'Microsoft-IIS');
+define('USE_FILENAME_DIR_INDEX', null);
 
 /*

branches/version-2_5-dev/html/install/sql/insert_data.sql

@@ -1142 +1142 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('CSV_TEMP_REALDIR', 'DATA_REALDIR . "upload/csv/"', 156, 'エンコードCSVの一時保存先');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('NO_IMAGE_REALDIR', 'USER_TEMPLATE_REALDIR . "img/picture/img_blank.gif"', 158, '画像がない場合に表示');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_SYSTEM_URLPATH', 'ROOT_URLPATH . ADMIN_DIR . "system/" . DIR_INDEX_URL', 159, 'システム管理トップ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_SYSTEM_URLPATH', 'ROOT_URLPATH . ADMIN_DIR . "system/" . DIR_INDEX_PATH', 159, 'システム管理トップ');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_CLASS_REGIST_URLPATH', 'ROOT_URLPATH . ADMIN_DIR . "products/class.php"', 160, '規格登録');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('INPUT_ZIP_URLPATH', 'ROOT_URLPATH . "input_zip.php"', 161, '郵便番号入力');
@@ -1148 +1148 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_PAYMENT_URLPATH', 'ROOT_URLPATH . ADMIN_DIR . "basis/payment.php"', 163, '支払い方法登録');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_HOME_URLPATH', 'ROOT_URLPATH . ADMIN_DIR . "home.php"', 165, 'ホーム');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_LOGIN_URLPATH', 'ROOT_URLPATH . ADMIN_DIR . DIR_INDEX_URL', 166, 'ログインページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_PRODUCTS_URLPATH', 'ROOT_URLPATH . ADMIN_DIR . "products/" . DIR_INDEX_URL', 167, '商品検索ページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_LOGIN_URLPATH', 'ROOT_URLPATH . ADMIN_DIR . DIR_INDEX_PATH', 166, 'ログインページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_PRODUCTS_URLPATH', 'ROOT_URLPATH . ADMIN_DIR . "products/" . DIR_INDEX_PATH', 167, '商品検索ページ');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_ORDER_EDIT_URLPATH', 'ROOT_URLPATH . ADMIN_DIR . "order/edit.php"', 168, '注文編集ページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_ORDER_URLPATH', 'ROOT_URLPATH . ADMIN_DIR . "order/" . DIR_INDEX_URL', 169, '注文編集ページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_ORDER_URLPATH', 'ROOT_URLPATH . ADMIN_DIR . "order/" . DIR_INDEX_PATH', 169, '注文編集ページ');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_ORDER_MAIL_URLPATH', 'ROOT_URLPATH . ADMIN_DIR . "order/mail.php"', 170, '注文編集ページ');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_LOGOUT_URLPATH', 'ROOT_URLPATH . ADMIN_DIR . "logout.php"', 171, 'ログアウトページ');
@@ -1187 +1187 @@
 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 ('SHOPPING_URL', 'HTTPS_URL . "shopping/" . DIR_INDEX_URL', 237, '会員情報入力');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ENTRY_URL', 'HTTPS_URL . "entry/" . DIR_INDEX_URL', 238, '会員登録ページTOP');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TOP_URLPATH', 'ROOT_URLPATH . DIR_INDEX_URL', 239, 'サイトトップ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('CART_URLPATH', 'ROOT_URLPATH . "cart/" . DIR_INDEX_URL', 240, 'カートトップ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SHOPPING_URL', 'HTTPS_URL . "shopping/" . DIR_INDEX_PATH', 237, '会員情報入力');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ENTRY_URL', 'HTTPS_URL . "entry/" . DIR_INDEX_PATH', 238, '会員登録ページTOP');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TOP_URLPATH', 'ROOT_URLPATH . DIR_INDEX_PATH', 239, 'サイトトップ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('CART_URLPATH', 'ROOT_URLPATH . "cart/" . DIR_INDEX_PATH', 240, 'カートトップ');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DELIV_URLPATH', 'ROOT_URLPATH . "shopping/deliv.php"', 241, 'お届け先設定');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MULTIPLE_URLPATH', 'ROOT_URLPATH . "shopping/multiple.php"', 242, '複数お届け先設定');
@@ -1217 +1217 @@
 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', 'HTTP_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_PATH . "?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, 'サイト管理 アフィリエイト');
@@ -1251 +1251 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_IMAGE_REALDIR', 'HTML_REALDIR . "upload/mobile_image/"', 408, '携帯電話向け変換画像保存ディレクトリ');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_IMAGE_URLPATH', 'ROOT_URLPATH . "upload/mobile_image/"', 409, '携帯電話向け変換画像保存ディレクトリ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_TOP_URLPATH', 'MOBILE_URLPATH . DIR_INDEX_URL', 410, 'モバイルURL');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_CART_URLPATH', 'MOBILE_URLPATH . "cart/" . DIR_INDEX_URL', 411, 'カートトップ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_SHOPPING_URL', 'MOBILE_HTTPS_URL . "shopping/" . DIR_INDEX_URL', 412, '会員情報入力');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_TOP_URLPATH', 'MOBILE_URLPATH . DIR_INDEX_PATH', 410, 'モバイルURL');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_CART_URLPATH', 'MOBILE_URLPATH . "cart/" . DIR_INDEX_PATH', 411, 'カートトップ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_SHOPPING_URL', 'MOBILE_HTTPS_URL . "shopping/" . DIR_INDEX_PATH', 412, '会員情報入力');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_SHOPPING_CONFIRM_URLPATH', 'MOBILE_URLPATH . "shopping/confirm.php"', 413, '購入確認ページ');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_SHOPPING_PAYMENT_URLPATH', 'MOBILE_URLPATH . "shopping/payment.php"', 414, 'お支払い方法選択ページ');

branches/version-2_5-dev/html/install/templates/complete.tpl

@@ -32 +32 @@
   </div>
   <div class="result-info02">
-        <p><a href="<!--{$tpl_sslurl}--><!--{$smarty.const.ADMIN_DIR}--><!--{$smarty.const.DIR_INDEX_URL}-->">管理画面</a>にログインできます。<br />
+        <p><a href="<!--{$tpl_sslurl}--><!--{$smarty.const.ADMIN_DIR}--><!--{$smarty.const.DIR_INDEX_PATH}-->">管理画面</a>にログインできます。<br />
         先ほど登録したID、パスワードを用いてログインしてください。</p>
   </div>
@@ -40 +40 @@
   <div class="btn-area">
     <ul>
-        <li><a class="btn-action" href="<!--{$tpl_sslurl}--><!--{$smarty.const.ADMIN_DIR}--><!--{$smarty.const.DIR_INDEX_URL}-->"><span class="btn-next">管理画面へログインする</span></a></li>
+        <li><a class="btn-action" href="<!--{$tpl_sslurl}--><!--{$smarty.const.ADMIN_DIR}--><!--{$smarty.const.DIR_INDEX_PATH}-->"><span class="btn-next">管理画面へログインする</span></a></li>
     </ul>
   </div>

branches/version-2_5-dev/html/install/templates/welcome.tpl

@@ -20 +20 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
-<form name="form1" id="form1" method="post" action="./<!--{$smarty.const.DIR_INDEX_URL}-->">
+<form name="form1" id="form1" method="post" action="./<!--{$smarty.const.DIR_INDEX_PATH}-->">
 <input type="hidden" name="mode" value="<!--{$tpl_mode}-->">
 <!--{foreach key=key item=item from=$arrHidden}-->

branches/version-2_5-dev/html/user_data/packages/admin/js/ownersstore.js.php

@@ -20 +20 @@
 (function() {
 // オーナーズストア通信スクリプトのパス
-var upgrade_url = '[%ROOT_URLPATH%]upgrade/<?php echo DIR_INDEX_URL; ?>';
+var upgrade_url = '[%ROOT_URLPATH%]upgrade/<?php echo DIR_INDEX_PATH; ?>';
 
 // ロード中メッセージ(配信サーバと通信中です…)

branches/version-2_5-dev/html/user_data/plugins/google_analytics/tpl/admin/index.tpl

@@ -1 @@
-<form method="post" action="index.php">
+<form method="post" action="?">
     <div id="system" class="contents-main">
         <table class="list">