merge r18118

・取得元: version-2_4 * /html/upload/csv/ を削除 * 空ディレクトリ用のダミーファイルを配置【取得元のログメッセージ】 * EC-CUBE#459 アップロードしたcsvファイルにアクセスできる不具合を修正
seasoftjapan · Sep 20, 2009 · 6f1c63d · 6f1c63d
1 parent f9663b4
commit 6f1c63d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/data/mtb_constants_init.php b/data/mtb_constants_init.php
@@ -270,7 +270,7 @@
 /** RSS用画像保存先URL */
 define('IMAGE_SAVE_URL_RSS', SITE_URL . "upload/save_image/");
 /** エンコードCSVの一時保存先 */
-define('CSV_TEMP_DIR', HTML_PATH . "upload/csv/");
+define('CSV_TEMP_DIR', DATA_PATH . "upload/csv/");
 /** 画像がない場合に表示 */
 define('NO_IMAGE_URL', URL_DIR . "misc/blank.gif");
 /** 画像がない場合に表示 */

diff --git a/data/upload/csv/dummy b/data/upload/csv/dummy
diff --git a/html/install/index.php b/html/install/index.php
@@ -395,7 +395,8 @@ function lfDispStep0($objPage) {
         DATA_PATH . "class/",
         DATA_PATH . "Smarty/",
         DATA_PATH . "logs/",
-        DATA_PATH . "downloads/"
+        DATA_PATH . "downloads/",
+        DATA_PATH . "upload/",
     );
 
     $mess = "";
@@ -470,15 +471,15 @@ function lfDispStep0($objPage) {
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = HTML_PATH . "upload/csv";
+        $path = DATA_PATH . "downloads/module";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = DATA_PATH . "downloads/module";
+        $path = DATA_PATH . "downloads/update";
         if(!file_exists($path)) {
             mkdir($path);
         }
-        $path = DATA_PATH . "downloads/update";
+        $path = DATA_PATH . "upload/csv";
         if(!file_exists($path)) {
             mkdir($path);
         }

diff --git a/html/install/sql/insert_data.sql b/html/install/sql/insert_data.sql
@@ -911,7 +911,7 @@ INSERT INTO mtb_constants VALUES ('IMAGE_TEMP_URL','URL_DIR . "upload/temp_image
 INSERT INTO mtb_constants VALUES ('IMAGE_SAVE_URL','URL_DIR . "upload/save_image/"',153,'画像保存先URL');
 INSERT INTO mtb_constants VALUES ('IMAGE_TEMP_URL_RSS','SITE_URL . "upload/temp_image/"',154,'RSS用画像一時保存URL');
 INSERT INTO mtb_constants VALUES ('IMAGE_SAVE_URL_RSS','SITE_URL . "upload/save_image/"',155,'RSS用画像保存先URL');
-INSERT INTO mtb_constants VALUES ('CSV_TEMP_DIR','HTML_PATH . "upload/csv/"',156,'エンコードCSVの一時保存先');
+INSERT INTO mtb_constants VALUES ('CSV_TEMP_DIR','DATA_PATH . "upload/csv/"',156,'エンコードCSVの一時保存先');
 INSERT INTO mtb_constants VALUES ('NO_IMAGE_URL','URL_DIR . "misc/blank.gif"',157,'画像がない場合に表示');
 INSERT INTO mtb_constants VALUES ('NO_IMAGE_DIR','HTML_PATH . "misc/blank.gif"',158,'画像がない場合に表示');
 INSERT INTO mtb_constants VALUES ('URL_SYSTEM_TOP','URL_DIR . "admin/system/" . DIR_INDEX_URL',159,'システム管理トップ');

diff --git a/setup.sh b/setup.sh
@@ -29,5 +29,6 @@ chmod -R 777 $WRK_DIR/data/Smarty
 chmod -R 777 $WRK_DIR/data/class
 chmod -R 777 $WRK_DIR/data/logs
 chmod -R 777 $WRK_DIR/html/cp
+chmod -R 777 $WRK_DIR/data/upload
 
 echo "finished."