diff --git a/.gitignore b/.gitignore index 289195005..4bc4f406c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,12 @@ +<<<<<<< HEAD dbconfig.php log .htaccess data +======= +/.htaccess +data/ +>>>>>>> g5 test config.php sirgle @@ -11,9 +16,16 @@ skin/latest/basic2 rankiss* thumb.lib.php test.php +<<<<<<< HEAD g4s_tree +======= +>>>>>>> g5 itzimara* nemoluv* cheditor* *.key +<<<<<<< HEAD g5_tree +======= +*.sh +>>>>>>> g5 diff --git a/LICENSE.txt b/LICENSE.txt index 9aba762af..e337cb205 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ 소프트웨어 제품은 저작권법 및 국제저작권 협약을 비롯하여, 기타 지적재산권법 및 협약의 보호를 받습니다. -프로그램 명칭 : 그누보드4S (GNUBoard 4 Second Edition) +프로그램 명칭 : 그누보드5 ( GNU Board 5 ) 저작자 : (주)에스아이알소프트 http://sir.co.kr diff --git a/adm/board_form.php b/adm/board_form.php index 63349a35b..2f1cc8315 100644 --- a/adm/board_form.php +++ b/adm/board_form.php @@ -123,7 +123,6 @@ if ($w == '') { $board['bo_include_head'] = '_head.php'; $board['bo_include_tail'] = '_tail.php'; $board['bo_show_menu'] = true; - $board['bo_use_cert'] = 'none'; } else if ($w == 'u') { diff --git a/adm/board_form_update.php b/adm/board_form_update.php index 64f7f00f0..7e55c0759 100644 --- a/adm/board_form_update.php +++ b/adm/board_form_update.php @@ -175,7 +175,7 @@ if ($w == '') { // 글수 조정 /* 엔피씨님의 팁으로 교체합니다. 130308 - http://sir.co.kr/bbs/board.php?bo_table=g4_tiptech&wr_id=27207 + http://sir.co.kr/bbs/board.php?bo_table=g5_tiptech&wr_id=27207 */ if (isset($_POST['proc_count'])) { // 원글을 얻습니다. diff --git a/adm/board_list.php b/adm/board_list.php index 2e0ba427c..6c367dab3 100644 --- a/adm/board_list.php +++ b/adm/board_list.php @@ -53,7 +53,7 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌 $g5['title'] = '게시판관리'; include_once('./admin.head.php'); -$colspan = 15; +$colspan = 16; ?>
@@ -172,7 +172,7 @@ $colspan = 15; - + diff --git a/adm/mail_preview.php b/adm/mail_preview.php index 7f24f978f..110d3bae2 100644 --- a/adm/mail_preview.php +++ b/adm/mail_preview.php @@ -15,7 +15,7 @@ $content = $se['ma_content'] . "

- +

diff --git a/adm/poll_list.php b/adm/poll_list.php index 9555f531e..b1a65b8e8 100644 --- a/adm/poll_list.php +++ b/adm/poll_list.php @@ -51,7 +51,7 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌 $g5['title'] = '투표관리'; include_once('./admin.head.php'); -$colspan = 6; +$colspan = 7; ?> diff --git a/bbs/logout.php b/bbs/logout.php index e15f02898..7aa5f34b9 100644 --- a/bbs/logout.php +++ b/bbs/logout.php @@ -2,8 +2,8 @@ include_once('./_common.php'); // 이호경님 제안 코드 -session_unset(); // 모든 세션변수를 언레지스터 시켜줌 -session_destroy(); // 세션해제함 +session_unset(); // 모든 세션변수를 언레지스터 시켜줌 +session_destroy(); // 세션해제함 // 자동로그인 해제 -------------------------------- set_cookie('ck_mb_id', '', 0); @@ -16,10 +16,7 @@ if ($url) { alert('url에 도메인을 지정할 수 없습니다.'); } - if($url == 'shop') - $link = G5_SHOP_URL; - else - $link = $url; + $link = $url; } else if ($bo_table) { $link = G5_BBS_URL.'/board.php?bo_table='.$bo_table; } else { diff --git a/common.php b/common.php index d818a23c3..cc0d8879a 100644 --- a/common.php +++ b/common.php @@ -64,7 +64,7 @@ $group = array(); $g5 = array(); -function g4_path() +function g5_path() { $result['path'] = str_replace('\\', '/', dirname(__FILE__)); $tilde_remove = preg_replace('/^\/\~[^\/]+(.*)$/', '$1', $_SERVER['SCRIPT_NAME']); @@ -77,7 +77,7 @@ function g4_path() return $result; } -$g5_path = g4_path(); +$g5_path = g5_path(); include_once($g5_path['path'].'/config.php'); // 설정 파일 @@ -103,7 +103,7 @@ if (file_exists($dbconfig_file)) { -오류! 그누보드4s 설치하기 +오류! <?php echo G5_VERSION ?> 설치하기