From 7d22399eac5177679959c3c7a18344b2294b7b49 Mon Sep 17 00:00:00 2001 From: kagla Date: Wed, 22 Dec 2021 11:05:18 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EB=B2=84=EC=A0=84=205.4.20=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.php b/version.php index 0cfde7b1f..d52b1eabd 100644 --- a/version.php +++ b/version.php @@ -2,7 +2,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 define('G5_VERSION', '그누보드5'); -define('G5_GNUBOARD_VER', '5.4.19'); +define('G5_GNUBOARD_VER', '5.4.20'); // 그누보드5.4.5.5 버전과 영카트5.4.5.5.1 버전을 합쳐서 그누보드5.4.6 버전에서 시작함 (kagla-210617) // G5_YOUNGCART_VER 이 상수를 사용하는 곳이 있으므로 주석 처리 해제함 // 그누보드5.4.6 이상 버전 부터는 영카트를 그누보드에 포함하여 배포하므로 영카트5의 버전은 의미가 없습니다. From 52f7eef288b4f4f79f106bf37ed48d04d1e673a3 Mon Sep 17 00:00:00 2001 From: projectSylas Date: Wed, 29 Dec 2021 11:37:29 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EA=B3=B5=EC=A7=80=EA=B8=80=EC=9D=B4=20?= =?UTF-8?q?=EC=97=86=EC=9D=84=EB=95=8C=20=EB=82=98=EC=98=A4=EB=8A=94=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20Trying=20to=20access=20array=20offset=20on?= =?UTF-8?q?=20value=20of=20type=20null=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbs/list.php b/bbs/list.php index 9a18a393b..208a51d45 100644 --- a/bbs/list.php +++ b/bbs/list.php @@ -96,7 +96,7 @@ if (!$is_search_bbs) { $row = sql_fetch(" select * from {$write_table} where wr_id = '{$arr_notice[$k]}' "); - if (!$row['wr_id']) continue; + if (!isset($row['wr_id']) || !$row['wr_id']) continue; $notice_array[] = $row['wr_id']; From 69b322144afd4f67b4c1df4d50320c0f7ad2ed99 Mon Sep 17 00:00:00 2001 From: projectSylas Date: Fri, 31 Dec 2021 11:40:06 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EA=B3=B5=EC=A7=80=EA=B8=80=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99=EC=8B=9C=20bo=5Fnotice=20=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EA=B8=80=EB=B2=88=ED=98=B8=EA=B0=80=20=EC=82=AC=EB=9D=BC?= =?UTF-8?q?=EC=A7=80=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20(ifelse=EB=8B=98,211231)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/move_update.php | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/bbs/move_update.php b/bbs/move_update.php index 097af6863..99265fb8c 100644 --- a/bbs/move_update.php +++ b/bbs/move_update.php @@ -247,7 +247,24 @@ if ($sw == 'move') sql_query(" delete from {$g5['board_new_table']} where bo_table = '$bo_table' and wr_id = '{$save[$i]['wr_id']}' "); sql_query(" delete from {$g5['board_file_table']} where bo_table = '$bo_table' and wr_id = '{$save[$i]['wr_id']}' "); } - sql_query(" update {$g5['board_table']} set bo_count_write = bo_count_write - '$save_count_write', bo_count_comment = bo_count_comment - '$save_count_comment' where bo_table = '$bo_table' "); + + // 공지사항이 이동되는 경우의 처리 begin + $arr = array(); + $sql = " select bo_notice from {$g5['board_table']} where bo_table = '{$bo_table}' "; + $row = sql_fetch($sql); + $arr_notice = explode(',', $row['bo_notice']); + for ($i=0; $i Date: Wed, 5 Jan 2022 16:29:56 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=97=90=EC=84=9C=20=EC=83=81=EB=8B=A8,=20=ED=95=98?= =?UTF-8?q?=EB=8B=A8=20=ED=8C=8C=EC=9D=BC=20=EA=B2=BD=EB=A1=9C=EB=A5=BC=20?= =?UTF-8?q?=EC=9E=85=EB=A0=A5=ED=95=98=EC=A7=80=20=EC=95=8A=EC=95=98?= =?UTF-8?q?=EB=8B=A4=EB=A9=B4=20=EA=B8=B0=EB=B3=B8=20=EC=83=81=EB=8B=A8,?= =?UTF-8?q?=20=ED=95=98=EB=8B=A8=20=ED=8C=8C=EC=9D=BC=EC=9D=84=20include?= =?UTF-8?q?=20=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20(=EC=9E=91=EC=9D=80=EB=B3=84=EB=8B=98,220105)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/board_head.php | 11 +++++++---- bbs/board_tail.php | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/bbs/board_head.php b/bbs/board_head.php index 2fb10c18c..2e93e3091 100644 --- a/bbs/board_head.php +++ b/bbs/board_head.php @@ -7,10 +7,13 @@ if (G5_IS_MOBILE) { include_once(G5_BBS_PATH.'/_head.php'); echo html_purifier(stripslashes($board['bo_mobile_content_head'])); } else { - if($board['bo_include_head'] && is_include_path_check($board['bo_include_head'])) { //파일경로 체크 - @include ($board['bo_include_head']); - } else { //파일경로가 올바르지 않으면 기본파일을 가져옴 - include_once(G5_BBS_PATH.'/_head.php'); + // 상단 파일 경로를 입력하지 않았다면 기본 상단 파일도 include 하지 않음 + if (trim($board['bo_include_head'])) { + if (is_include_path_check($board['bo_include_head'])) { //파일경로 체크 + @include ($board['bo_include_head']); + } else { //파일경로가 올바르지 않으면 기본파일을 가져옴 + include_once(G5_BBS_PATH.'/_head.php'); + } } echo html_purifier(stripslashes($board['bo_content_head'])); } \ No newline at end of file diff --git a/bbs/board_tail.php b/bbs/board_tail.php index 87385e9fe..06c975b6b 100644 --- a/bbs/board_tail.php +++ b/bbs/board_tail.php @@ -8,9 +8,12 @@ if (G5_IS_MOBILE) { include_once(G5_BBS_PATH.'/_tail.php'); } else { echo html_purifier(stripslashes($board['bo_content_tail'])); - if($board['bo_include_tail'] && is_include_path_check($board['bo_include_tail'])) { //파일경로 체크 - @include ($board['bo_include_tail']); - } else { //파일경로가 올바르지 않으면 기본파일을 가져옴 - include_once(G5_BBS_PATH.'/_tail.php'); + // 하단 파일 경로를 입력하지 않았다면 기본 하단 파일도 include 하지 않음 + if (trim($board['bo_include_tail'])) { + if (is_include_path_check($board['bo_include_tail'])) { //파일경로 체크 + @include ($board['bo_include_tail']); + } else { //파일경로가 올바르지 않으면 기본파일을 가져옴 + include_once(G5_BBS_PATH.'/_tail.php'); + } } } \ No newline at end of file