Index: branches/version-2_5-dev/html/install/index.php
===================================================================
--- branches/version-2_5-dev/html/install/index.php	(revision 19802)
+++ branches/version-2_5-dev/html/install/index.php	(revision 19803)
@@ -390,5 +390,5 @@
     $arrWriteFile = array(
         DATA_FILE_PATH . "install.php",
-        USER_PATH,
+        USER_FILE_PATH,
         HTML_FILE_PATH . "upload",
         DATA_FILE_PATH . "cache/",
@@ -512,5 +512,5 @@
     $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("./user_data/", USER_FILE_PATH, $objPage->copy_mess);
     $objPage->copy_mess = SC_Utils_Ex::sfCopyDir("./save_image/", HTML_FILE_PATH . "upload/save_image/", $objPage->copy_mess);
     return $objPage;
Index: branches/version-2_5-dev/html/install/sql/insert_data.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/insert_data.sql	(revision 19802)
+++ branches/version-2_5-dev/html/install/sql/insert_data.sql	(revision 19803)
@@ -1039,6 +1039,6 @@
 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_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 ('USER_FILE_PATH', 'HTML_FILE_PATH . USER_DIR', 4, 'ユーザファイル保存先');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('USER_INC_PATH', 'USER_FILE_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', 'HTTP_URL . USER_DIR', 9, 'ユーザー作成ページ等');
@@ -1046,12 +1046,12 @@
 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_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 ('USER_TEMPLATE_PATH', 'USER_FILE_PATH . USER_PACKAGE_DIR', 18, 'テンプレートファイル保存先');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TEMPLATE_TEMP_FILE_PATH', 'HTML_FILE_PATH . "upload/temp_template/"', 19, 'テンプレートファイル一時保存先');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('USER_DEF_PHP', 'USER_FILE_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_FILE_PATH . MODULE_DIR', 23, 'ダウンロードモジュール保存ディレクトリ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MODULE_FILE_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_FILE_PATH . "cache/"', 27, 'マスタデータキャッシュディレクトリ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MASTER_DATA_FILE_PATH', '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行辺りの最大文字数');
@@ -1068,10 +1068,8 @@
 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_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_FILE_PATH', '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_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, '商品集計で何位まで表示するか');
@@ -1147,13 +1145,13 @@
 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_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 ('LOG_FILE', 'DATA_FILE_PATH . "logs/site.log"', 142, 'ログファイル');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('CUSTOMER_LOG_FILE', 'DATA_FILE_PATH . "logs/customer.log"', 143, '会員ログイン ログファイル');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_TEMP_FILE_PATH', 'HTML_FILE_PATH . "upload/temp_image/"', 150, '画像一時保存');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_SAVE_FILE_PATH', '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 ('CSV_TEMP_FILE_PATH', '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, '画像がない場合に表示');
@@ -1252,16 +1250,14 @@
 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_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 ('SMARTY_TEMPLATES_FILE_PATH', ' DATA_FILE_PATH . "Smarty/templates/"', 304, 'SMARTYテンプレート');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TEMPLATE_DIR', 'SMARTY_TEMPLATES_FILE_PATH . TEMPLATE_NAME . "/"', 305, 'SMARTYテンプレート(PC)');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TEMPLATE_ADMIN_FILE_PATH', 'SMARTY_TEMPLATES_FILE_PATH . "admin/"', 306, '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 ('COMPILE_ADMIN_FILE_PATH', 'DATA_FILE_PATH . "Smarty/templates_c/admin/"', 308, 'SMARTYコンパイル(管理機能)');
 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_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_FILE_PATH . "Smarty/templates_c/" . SMARTPHONE_TEMPLATE_NAME . "/"', 315, 'SMARTYコンパイル(smartphone)');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_TEMPLATE_DIR', 'SMARTY_TEMPLATES_FILE_PATH . MOBILE_TEMPLATE_NAME . "/"', 312, 'SMARTYテンプレート(mobile)');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MOBILE_COMPILE_FILE_PATH', '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_FILE_PATH . SMARTPHONE_TEMPLATE_NAME . "/"', 314, 'SMARTYテンプレート(smart phone)');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SMARTPHONE_COMPILE_FILE_PATH', '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:準拠しない)');
@@ -1271,6 +1267,6 @@
 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_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_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, 'カートトップ');
@@ -1285,5 +1281,5 @@
 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_FILE_PATH . "logs/ownersstore.log"', 502, 'オーナーズストアログパス');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('OSTORE_LOG_FILE', '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, 'オーナーズストア通信ステータス');
@@ -1309,5 +1305,5 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('IMAGE_RENAME', 'true', 525, '画像リネーム設定 (商品画像のみ) (true:リネームする、false:リネームしない)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PLUGIN_DIR', '"plugins/"', 600, 'プラグインディレクトリ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PLUGIN_PATH', 'USER_PATH . PLUGIN_DIR', 601, 'プラグイン保存先');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PLUGIN_PATH', 'USER_FILE_PATH . PLUGIN_DIR', 601, 'プラグイン保存先');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PLUGIN_URL', 'USER_URL . PLUGIN_DIR', 602, 'プラグイン URL');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DOWNLOAD_DAYS_LEN', '3', 700, '日数桁数');
@@ -1315,6 +1311,6 @@
 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_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 ('DOWN_TEMP_FILE_PATH', 'DATA_FILE_PATH . "download/temp/"', 704, 'ダウンロードファイル一時保存');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DOWN_SAVE_FILE_PATH', '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(カンマ区切り)');