From 6f1c63d28f8b5d68517bc2b702cf529d85c670b6 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Sun, 20 Sep 2009 15:24:42 +0000 Subject: [PATCH] =?UTF-8?q?merge=20r18118=20=E3=83=BB=E5=8F=96=E5=BE=97?= =?UTF-8?q?=E5=85=83:=20version-2=5F4=20=20=20*=20/html/upload/csv/=20?= =?UTF-8?q?=E3=82=92=E5=89=8A=E9=99=A4=20=20=20*=20=E7=A9=BA=E3=83=87?= =?UTF-8?q?=E3=82=A3=E3=83=AC=E3=82=AF=E3=83=88=E3=83=AA=E7=94=A8=E3=81=AE?= =?UTF-8?q?=E3=83=80=E3=83=9F=E3=83=BC=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=82=92=E9=85=8D=E7=BD=AE=20=E3=80=90=E5=8F=96=E5=BE=97?= =?UTF-8?q?=E5=85=83=E3=81=AE=E3=83=AD=E3=82=B0=E3=83=A1=E3=83=83=E3=82=BB?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=80=91=20=20=20*=20#459=20=E3=82=A2?= =?UTF-8?q?=E3=83=83=E3=83=97=E3=83=AD=E3=83=BC=E3=83=89=E3=81=97=E3=81=9F?= =?UTF-8?q?csv=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AB=E3=82=A2?= =?UTF-8?q?=E3=82=AF=E3=82=BB=E3=82=B9=E3=81=A7=E3=81=8D=E3=82=8B=E4=B8=8D?= =?UTF-8?q?=E5=85=B7=E5=90=88=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/mtb_constants_init.php | 2 +- data/upload/csv/dummy | 0 html/install/index.php | 9 +++++---- html/install/sql/insert_data.sql | 2 +- setup.sh | 1 + 5 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 data/upload/csv/dummy diff --git a/data/mtb_constants_init.php b/data/mtb_constants_init.php index 2b4d144c395..c10262e3992 100644 --- 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 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/html/install/index.php b/html/install/index.php index fa2f202b5ae..ad64c13e905 100644 --- 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 index de7eee6d59b..865f600f058 100644 --- 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 index 2ce4e85d20f..976a46f3d94 100755 --- 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."