Changeset 18296

Timestamp:

2009/09/21 00:24:42 (17 years ago)

Author:

Seasoft

Message:

merge r18118
・取得元: version-2_4

• /html/upload/csv/ を削除
• 空ディレクトリ用のダミーファイルを配置

【取得元のログメッセージ】

• #459 アップロードしたcsvファイルにアクセスできる不具合を修正

Location:

branches/comu-ver2

Files:

• data/mtb_constants_init.php (modified) (1 diff)
• data/upload (copied) (copied from branches/version-2_4/data/upload)
• data/upload/csv (copied) (copied from branches/version-2_4/data/upload/csv)
• data/upload/csv/dummy (added)
• html/install/index.php (modified) (3 diffs)
• html/install/sql/insert_data.sql (modified) (1 diff)
• html/upload/csv (deleted)
• setup.sh (modified) (1 diff)

branches/comu-ver2/data/mtb_constants_init.php

@@ -271 +271 @@
 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");

branches/comu-ver2/html/install/index.php

@@ -396 +396 @@
         DATA_PATH . "Smarty/",
         DATA_PATH . "logs/",
-        DATA_PATH . "downloads/"
+        DATA_PATH . "downloads/",
+        DATA_PATH . "upload/",
     );
 
@@ -471 +472 @@
             mkdir($path);
         }
-        $path = HTML_PATH . "upload/csv";
-        if(!file_exists($path)) {
-            mkdir($path);
-        }
         $path = DATA_PATH . "downloads/module";
         if(!file_exists($path)) {
@@ -480 +477 @@
         }
         $path = DATA_PATH . "downloads/update";
+        if(!file_exists($path)) {
+            mkdir($path);
+        }
+        $path = DATA_PATH . "upload/csv";
         if(!file_exists($path)) {
             mkdir($path);

branches/comu-ver2/html/install/sql/insert_data.sql

@@ -912 +912 @@
 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,'画像がない場合に表示');

branches/comu-ver2/setup.sh

@@ -30 +30 @@
 chmod -R 777 $WRK_DIR/data/logs
 chmod -R 777 $WRK_DIR/html/cp
+chmod -R 777 $WRK_DIR/data/upload
 
 echo "finished."