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

Timestamp:

2011/01/19 15:46:57 (11 years ago)

Author:

Seasoft

Message:

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

• パラメータ名の変更 URL_PATH → ROOT_URLPATH

Location:

branches/version-2_5-dev/html

Files:

• install/index.php (modified) (1 diff)
• install/sql/insert_data.sql (modified) (4 diffs)
• user_data/packages/admin/js/ownersstore.js.php (modified) (3 diffs)
• user_data/plugins/recommend/tpl/bloc.tpl (modified) (1 diff)

branches/version-2_5-dev/html/install/index.php

@@ -952 +952 @@
     "    define ('HTTP_URL', '" . $normal_url . "');\n" .
     "    define ('HTTPS_URL', '" . $secure_url . "');\n" .
-    "    define ('URL_PATH', '" . $url_dir . "');\n" .
+    "    define ('ROOT_URLPATH', '" . $url_dir . "');\n" .
     "    define ('DOMAIN_NAME', '" . $objWebParam->getValue('domain') . "');\n" .
     "    define ('DB_TYPE', '" . $objDBParam->getValue('db_type') . "');\n" .

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

@@ -1057 +1057 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('FAVORITE_ERROR', '13', 46, '一般サイトエラー');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('GRAPH_REALDIR', 'HTML_REALDIR . "upload/graph_image/"', 49, 'グラフ格納ディレクトリ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('GRAPH_URLPATH', 'URL_PATH . "upload/graph_image/"', 50, 'グラフURL');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('GRAPH_URLPATH', 'ROOT_URLPATH . "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, 'グラフのラベルの文字数');
@@ -1137 +1137 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_TEMP_REALDIR', 'HTML_REALDIR . "upload/temp_image/"', 150, '画像一時保存');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_SAVE_REALDIR', 'HTML_REALDIR . "upload/save_image/"', 151, '画像保存先');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_TEMP_URLPATH', 'URL_PATH . "upload/temp_image/"', 152, '画像一時保存URL');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_SAVE_URLPATH', 'URL_PATH . "upload/save_image/"', 153, '画像保存先URL');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_TEMP_URLPATH', 'ROOT_URLPATH . "upload/temp_image/"', 152, '画像一時保存URL');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_SAVE_URLPATH', 'ROOT_URLPATH . "upload/save_image/"', 153, '画像保存先URL');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_TEMP_RSS_URL', 'HTTP_URL . "upload/temp_image/"', 154, 'RSS用画像一時保存URL');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_SAVE_RSS_URL', 'HTTP_URL . "upload/save_image/"', 155, 'RSS用画像保存先URL');
 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_DIR', 'USER_TEMPLATE_REALDIR . "img/picture/img_blank.gif"', 158, '画像がない場合に表示');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_SYSTEM_URLPATH', 'URL_PATH . ADMIN_DIR . "system/" . DIR_INDEX_URL', 159, 'システム管理トップ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_CLASS_REGIST_URLPATH', 'URL_PATH . ADMIN_DIR . "products/class.php"', 160, '規格登録');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('INPUT_ZIP_URLPATH', 'URL_PATH . "input_zip.php"', 161, '郵便番号入力');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_DELIVERY_URLPATH', 'URL_PATH . ADMIN_DIR . "basis/delivery.php"', 162, '配送業者登録');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_PAYMENT_URLPATH', 'URL_PATH . ADMIN_DIR . "basis/payment.php"', 163, '支払い方法登録');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_HOME_URLPATH', 'URL_PATH . ADMIN_DIR . "home.php"', 165, 'ホーム');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_LOGIN_URLPATH', 'URL_PATH . ADMIN_DIR . DIR_INDEX_URL', 166, 'ログインページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_PRODUCTS_URLPATH', 'URL_PATH . ADMIN_DIR . "products/" . DIR_INDEX_URL', 167, '商品検索ページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_ORDER_EDIT_URLPATH', 'URL_PATH . ADMIN_DIR . "order/edit.php"', 168, '注文編集ページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_ORDER_URLPATH', 'URL_PATH . ADMIN_DIR . "order/" . DIR_INDEX_URL', 169, '注文編集ページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_ORDER_MAIL_URLPATH', 'URL_PATH . ADMIN_DIR . "order/mail.php"', 170, '注文編集ページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_LOGOUT_URLPATH', 'URL_PATH . ADMIN_DIR . "logout.php"', 171, 'ログアウトページ');
+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_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, '郵便番号入力');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_DELIVERY_URLPATH', 'ROOT_URLPATH . ADMIN_DIR . "basis/delivery.php"', 162, '配送業者登録');
+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_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_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, 'ログアウトページ');
 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, 'メンバー管理ページ表示行数');
@@ -1190 +1190 @@
 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', 'URL_PATH . DIR_INDEX_URL', 239, 'サイトトップ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('CART_URLPATH', 'URL_PATH . "cart/" . DIR_INDEX_URL', 240, 'カートトップ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DELIV_URLPATH', 'URL_PATH . "shopping/deliv.php"', 241, 'お届け先設定');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MULTIPLE_URLPATH', 'URL_PATH . "shopping/multiple.php"', 242, '複数お届け先設定');
+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 ('DELIV_URLPATH', 'ROOT_URLPATH . "shopping/deliv.php"', 241, 'お届け先設定');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MULTIPLE_URLPATH', 'ROOT_URLPATH . "shopping/multiple.php"', 242, '複数お届け先設定');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_MYPAGE_TOP', 'HTTPS_URL . "mypage/login.php"', 243, 'Myページトップ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SHOPPING_CONFIRM_URLPATH', 'URL_PATH . "shopping/confirm.php"', 244, '購入確認ページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SHOPPING_PAYMENT_URLPATH', 'URL_PATH . "shopping/payment.php"', 245, 'お支払い方法選択ページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SHOPPING_COMPLETE_URLPATH', 'URL_PATH . "shopping/complete.php"', 246, '購入完了画面');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SHOPPING_MODULE_URLPATH', 'URL_PATH . "shopping/load_payment_module.php"', 249, 'モジュール追加用画面');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('P_DETAIL_URLPATH', 'URL_PATH . "products/detail.php?product_id="', 253, '商品詳細(HTML出力)');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MYPAGE_DELIVADDR_URLPATH', 'URL_PATH . "mypage/delivery.php"', 254, 'マイページお届け先URL');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SHOPPING_CONFIRM_URLPATH', 'ROOT_URLPATH . "shopping/confirm.php"', 244, '購入確認ページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SHOPPING_PAYMENT_URLPATH', 'ROOT_URLPATH . "shopping/payment.php"', 245, 'お支払い方法選択ページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SHOPPING_COMPLETE_URLPATH', 'ROOT_URLPATH . "shopping/complete.php"', 246, '購入完了画面');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SHOPPING_MODULE_URLPATH', 'ROOT_URLPATH . "shopping/load_payment_module.php"', 249, 'モジュール追加用画面');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('P_DETAIL_URLPATH', 'ROOT_URLPATH . "products/detail.php?product_id="', 253, '商品詳細(HTML出力)');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MYPAGE_DELIVADDR_URLPATH', 'ROOT_URLPATH . "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, 'メールアドレス種別');
@@ -1252 +1252 @@
 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_REALDIR', 'HTML_REALDIR . "upload/mobile_image/"', 408, '携帯電話向け変換画像保存ディレクトリ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_IMAGE_URLPATH', 'URL_PATH . "upload/mobile_image/"', 409, '携帯電話向け変換画像保存ディレクトリ');
+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, 'カートトップ');

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

@@ -20 +20 @@
 (function() {
 // オーナーズストア通信スクリプトのパス
-var upgrade_url = '[%URL_PATH%]upgrade/<?php echo DIR_INDEX_URL; ?>';
+var upgrade_url = '[%ROOT_URLPATH%]upgrade/<?php echo DIR_INDEX_URL; ?>';
 
 // ロード中メッセージ(配信サーバと通信中です…)
@@ -27 +27 @@
 // ロード中画像の先読み
 var loading_img = new Image();
-loading_img.src = '[%URL_PATH%]user_data/packages/default/img/ajax/loading.gif';
+loading_img.src = '[%ROOT_URLPATH%]user_data/packages/default/img/ajax/loading.gif';
 
 var OwnersStore = function() {}
@@ -177 +177 @@
 <?php
 header('Content-Type: application/x-javascript');
-echo str_replace('[%URL_PATH%]', URL_PATH, ob_get_clean());
+echo str_replace('[%ROOT_URLPATH%]', ROOT_URLPATH, ob_get_clean());
 ?>

branches/version-2_5-dev/html/user_data/plugins/recommend/tpl/bloc.tpl

@@ -14 +14 @@
                 
                 <a href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrProduct.product_id}-->">
-                    <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>
+                    <img src="<!--{$smarty.const.ROOT_URLPATH}-->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`}-->