From 513ba881083ef151ca73593817ecd5998f32f802 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 7 Feb 2013 11:24:50 +0900 Subject: [PATCH] =?UTF-8?q?=5FPATH,=20=5FURL=201=EB=8B=A8=EA=B3=84=20?= =?UTF-8?q?=EB=94=94=EB=A0=89=ED=86=A0=EB=A6=AC=EA=B9=8C=EC=A7=80=EB=A7=8C?= =?UTF-8?q?=20=EC=84=A0=EC=96=B8=ED=95=98=EA=B3=A0=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- bbs/ckeditor/upload.php | 4 ++-- bbs/gcaptcha/gcaptcha.lib.php | 8 ++++---- config.php | 29 +---------------------------- lib/latest.lib.php | 2 +- 5 files changed, 9 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index 9294dfdb5..2e1973cf7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ data -config.user.php +config.php test.php diff --git a/bbs/ckeditor/upload.php b/bbs/ckeditor/upload.php index 6d8780857..091246f60 100644 --- a/bbs/ckeditor/upload.php +++ b/bbs/ckeditor/upload.php @@ -3,8 +3,8 @@ include_once("../../common.php"); $ym = date('ym', G4_SERVER_TIME); -$data_dir = G4_EDITOR_PATH.'/'.$ym; -$data_url = G4_EDITOR_URL.'/'.$ym; +$data_dir = G4_DATA_PATH.'/editor/'.$ym; +$data_url = G4_DATA_URL.'/editor/'.$ym; @mkdir($data_dir, 0707); @chmod($data_dir, 0707); diff --git a/bbs/gcaptcha/gcaptcha.lib.php b/bbs/gcaptcha/gcaptcha.lib.php index 1f2ca7534..5b78ea892 100644 --- a/bbs/gcaptcha/gcaptcha.lib.php +++ b/bbs/gcaptcha/gcaptcha.lib.php @@ -122,7 +122,7 @@ class gcaptcha $this->captcha_filename = $this->get_captcha_filename(); - imagepng($im, G4_CACHE_PATH.'/'.$this->captcha_filename.'.png', 0, NULL); + imagepng($im, G4_DATA_PATH.'/cache/'.$this->captcha_filename.'.png', 0, NULL); imagedestroy($im); $this->make_wav($this->captcha_filename.'.wav'); @@ -144,7 +144,7 @@ class gcaptcha $wavs[] = $file; } - $wav_filepath = G4_CACHE_PATH.'/'.$captcha_filename; + $wav_filepath = G4_DATA_PATH.'/cache/'.$captcha_filename; $fp = fopen($wav_filepath, 'w+'); fwrite($fp, join_wavs($wavs)); fclose($fp); @@ -172,8 +172,8 @@ function captcha_html($class="captcha") $obj = new gcaptcha(); $obj->run(); - $png_file_url = G4_CACHE_URL.'/'.$obj->captcha_filename.'.png'; - $wav_file_url = G4_CACHE_URL.'/'.$obj->captcha_filename.'.wav'; + $png_file_url = G4_DATA_URL.'/cache/'.$obj->captcha_filename.'.png'; + $wav_file_url = G4_DATA_URL.'/cache/'.$obj->captcha_filename.'.wav'; $html .= PHP_EOL.''; $html .= PHP_EOL.''; diff --git a/config.php b/config.php index 283ab6613..ab2af5da5 100644 --- a/config.php +++ b/config.php @@ -26,7 +26,7 @@ if (PHP_VERSION >= '5.3.0') { 입력예) https://www.domain.com:443/gnuboard4s */ define('G4_DOMAIN', 'http://tmp.sir.co.kr/g4s'); -define('G4_HTTPS_DOMAIN', 'http://https-gnuboard4s-tmp.sir.co.kr/g4s'); // http://https-gnuboard4s-tmp.sir.co.kr +define('G4_HTTPS_DOMAIN', 'http://https-gnuboard4s-tmp.sir.co.kr/g4s'); /* www.sir.co.kr 과 sir.co.kr 도메인은 서로 다른 도메인으로 인식합니다. 쿠키를 공유하려면 .sir.co.kr 과 같이 입력하세요. @@ -45,9 +45,6 @@ define('G4_LIB_DIR', 'lib'); define('G4_SKIN_DIR', 'skin'); define('G4_GCAPTCHA_DIR', 'gcaptcha'); define('G4_CKEDITOR_DIR', 'ckeditor'); -define('G4_EDITOR_DIR', 'editor'); -define('G4_CACHE_DIR', 'cache'); -define('G4_FILE_DIR', 'file'); // URL 은 브라우저상에서의 경로 (도메인으로 부터의) if (G4_DOMAIN) { @@ -64,9 +61,6 @@ define('G4_JS_URL', G4_URL.'/'.G4_JS_DIR); define('G4_SKIN_URL', G4_URL.'/'.G4_SKIN_DIR); define('G4_GCAPTCHA_URL', G4_BBS_URL.'/'.G4_GCAPTCHA_DIR); define('G4_CKEDITOR_URL', G4_BBS_URL.'/'.G4_CKEDITOR_DIR); // CKEDITOR 의 라이브러리 경로 -define('G4_EDITOR_URL', G4_DATA_URL.'/'.G4_EDITOR_DIR); // CKEDITOR 에서 업로드한 파일이 저장되는 경로 -define('G4_CACHE_URL', G4_DATA_URL.'/'.G4_CACHE_DIR); -define('G4_FILE_URL', G4_DATA_URL.'/'.G4_FILE_DIR); // PATH 는 서버상에서의 절대경로 define('G4_PATH', $g4_path['path']); @@ -78,9 +72,6 @@ define('G4_LIB_PATH', G4_PATH.'/'.G4_LIB_DIR); define('G4_SKIN_PATH', G4_PATH.'/'.G4_SKIN_DIR); define('G4_GCAPTCHA_PATH', G4_BBS_PATH.'/'.G4_GCAPTCHA_DIR); define('G4_CKEDITOR_PATH', G4_BBS_PATH.'/'.G4_CKEDITOR_DIR); -define('G4_CACHE_PATH', G4_DATA_PATH.'/'.G4_CACHE_DIR); -define('G4_EDITOR_PATH', G4_DATA_PATH.'/'.G4_EDITOR_DIR); -define('G4_FILE_PATH', G4_DATA_PATH.'/'.G4_FILE_DIR); //============================================================================== @@ -104,25 +95,7 @@ define('G4_SPECIAL', 64); // 특수문자 // 모바일 인지 결정 $_SERVER['HTTP_USER_AGENT'] define('G4_MOBILE_AGENT', 'phone|samsung|lgtel|mobile|skt|nokia|blackberry|android|sony'); - -// 자주 사용하는 값 -// 서버의 시간과 실제 사용하는 시간이 틀린 경우 수정하세요. -// 하루는 86400 초입니다. 1시간은 3600초 -// 6시간이 빠른 경우 time() + (3600 * 6); -// 6시간이 느린 경우 time() - (3600 * 6); -/* -$g4['server_time'] = time(); -$g4['time_ymd'] = date("Y-m-d", $g4['server_time']); -$g4['time_his'] = date("H:i:s", $g4['server_time']); -$g4['time_ymdhis'] = date("Y-m-d H:i:s", $g4['server_time']); -*/ - -// -// 기타 -// - // 게시판에서 링크의 기본갯수를 말합니다. // 필드를 추가하면 이 숫자를 필드수에 맞게 늘려주십시오. -//$g4['link_count'] = 2; define('G4_LINK_COUNT', 2); ?> diff --git a/lib/latest.lib.php b/lib/latest.lib.php index 328a12fb1..48a702892 100644 --- a/lib/latest.lib.php +++ b/lib/latest.lib.php @@ -10,7 +10,7 @@ function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40) $latest_skin_path = G4_SKIN_PATH.'/latest/'.$skin_dir; $latest_skin_url = G4_SKIN_URL.'/latest/'.$skin_dir; - $cache_file = G4_CACHE_PATH."/latest-{$bo_table}-{$skin_dir}-{$rows}-{$subject_len}.php"; + $cache_file = G4_DATA_PATH."/cache/latest-{$bo_table}-{$skin_dir}-{$rows}-{$subject_len}.php"; //if (!file_exists($cache_file)) { if (1) { $list = array();