From 76c1bde1198e0e7e74fbe7d2b460c23a1d2604a3 Mon Sep 17 00:00:00 2001 From: thisgun Date: Wed, 4 Dec 2019 19:55:12 +0900 Subject: [PATCH 1/4] =?UTF-8?q?hook=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EB=B0=8F=20php=207.2=20=EB=B2=84=EC=A0=84?= =?UTF-8?q?=EC=97=90=20=EC=9D=BC=EC=96=B4=EB=82=98=EB=8A=94=20=EC=B5=9C?= =?UTF-8?q?=EC=8B=A0=EA=B8=80=20count=20=EC=98=A4=EB=A5=98=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 --- bbs/delete_comment.php | 2 +- bbs/new_delete.php | 14 +++++++------- mobile/skin/latest/basic/latest.skin.php | 2 +- mobile/skin/latest/comment/latest.skin.php | 6 +++--- mobile/skin/latest/notice/latest.skin.php | 5 +++-- skin/latest/basic/latest.skin.php | 5 +++-- skin/latest/notice/latest.skin.php | 5 +++-- skin/latest/pic_block/latest.skin.php | 5 +++-- skin/latest/pic_list/latest.skin.php | 5 +++-- .../basic/mobile/skin/latest/basic/latest.skin.php | 2 +- .../mobile/skin/latest/comment/latest.skin.php | 6 +++--- .../mobile/skin/latest/notice/latest.skin.php | 5 +++-- theme/basic/skin/latest/basic/latest.skin.php | 5 +++-- theme/basic/skin/latest/notice/latest.skin.php | 5 +++-- theme/basic/skin/latest/pic_block/latest.skin.php | 5 +++-- theme/basic/skin/latest/pic_list/latest.skin.php | 5 +++-- 16 files changed, 46 insertions(+), 36 deletions(-) diff --git a/bbs/delete_comment.php b/bbs/delete_comment.php index 76d9df224..44a6c1387 100644 --- a/bbs/delete_comment.php +++ b/bbs/delete_comment.php @@ -88,5 +88,5 @@ delete_cache_latest($bo_table); run_event('bbs_delete_comment', $comment_id, $board); -goto_url(G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&wr_id='.$write['wr_parent'].'&page='.$page. $qstr); +goto_url(short_url_clean(G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&wr_id='.$write['wr_parent'].'&page='.$page. $qstr)); ?> diff --git a/bbs/new_delete.php b/bbs/new_delete.php index 8148f502d..035653915 100644 --- a/bbs/new_delete.php +++ b/bbs/new_delete.php @@ -8,24 +8,25 @@ if ($is_admin != 'super') $board = array(); $save_bo_table = array(); +$save_wr_id = array(); for($i=0;$i$value) { delete_cache_latest($value); } -run_event('bbs_new_delete', $chk_bn_id, $save_bo_table); +run_event('bbs_new_delete', $chk_bn_id, $save_bo_table, $save_wr_id); goto_url("new.php?sfl=$sfl&stx=$stx&page=$page"); ?> \ No newline at end of file diff --git a/mobile/skin/latest/basic/latest.skin.php b/mobile/skin/latest/basic/latest.skin.php index 5d3d5bb07..b7fbbd5e0 100644 --- a/mobile/skin/latest/basic/latest.skin.php +++ b/mobile/skin/latest/basic/latest.skin.php @@ -10,7 +10,7 @@ add_stylesheet('', 0); $thumb_width = 138; $thumb_height = 80; -$list_count = count($list); +$list_count = (is_array($list) && $list) ? count($list) : 0; $divisor_count = 4; $start_page_num = $list_count ? '1' : '0'; $is_show_next_prev = ($list_count > 4) ? 1 : 0; diff --git a/mobile/skin/latest/comment/latest.skin.php b/mobile/skin/latest/comment/latest.skin.php index c34727592..961c48b0c 100644 --- a/mobile/skin/latest/comment/latest.skin.php +++ b/mobile/skin/latest/comment/latest.skin.php @@ -3,14 +3,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 add_stylesheet('', 0); +$list_count = (is_array($list) && $list) ? count($list) : 0; ?>

최신댓글

  • @@ -24,7 +24,7 @@ add_stylesheet('', 게시물이 없습니다.
  • '.PHP_EOL; ?>
diff --git a/mobile/skin/latest/notice/latest.skin.php b/mobile/skin/latest/notice/latest.skin.php index eb0c06605..c59f74c6a 100644 --- a/mobile/skin/latest/notice/latest.skin.php +++ b/mobile/skin/latest/notice/latest.skin.php @@ -4,12 +4,13 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 add_stylesheet('', 0); add_javascript('', 10); +$list_count = (is_array($list) && $list) ? count($list) : 0; ?>

    - +
  • "; @@ -35,7 +36,7 @@ add_javascript('', 10); ?>
  • - +
  • 게시물이 없습니다.
diff --git a/skin/latest/basic/latest.skin.php b/skin/latest/basic/latest.skin.php index eb2b00e1e..78b3fc128 100644 --- a/skin/latest/basic/latest.skin.php +++ b/skin/latest/basic/latest.skin.php @@ -3,12 +3,13 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 add_stylesheet('', 0); +$list_count = (is_array($list) && $list) ? count($list) : 0; ?>

    - +
  • 비밀글 "; @@ -40,7 +41,7 @@ add_stylesheet('',
- +
  • 게시물이 없습니다.
  • diff --git a/skin/latest/notice/latest.skin.php b/skin/latest/notice/latest.skin.php index eb0c06605..c59f74c6a 100644 --- a/skin/latest/notice/latest.skin.php +++ b/skin/latest/notice/latest.skin.php @@ -4,12 +4,13 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 add_stylesheet('', 0); add_javascript('', 10); +$list_count = (is_array($list) && $list) ? count($list) : 0; ?>

      - +
    • "; @@ -35,7 +36,7 @@ add_javascript('', 10); ?>
    • - +
    • 게시물이 없습니다.
    diff --git a/skin/latest/pic_block/latest.skin.php b/skin/latest/pic_block/latest.skin.php index c19ef5c08..791e2b48b 100644 --- a/skin/latest/pic_block/latest.skin.php +++ b/skin/latest/pic_block/latest.skin.php @@ -6,13 +6,14 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php'); add_stylesheet('', 0); $thumb_width = 210; $thumb_height = 150; +$list_count = (is_array($list) && $list) ? count($list) : 0; ?>

      - +
    • 게시물이 없습니다.
    diff --git a/skin/latest/pic_list/latest.skin.php b/skin/latest/pic_list/latest.skin.php index 57dcec5bb..1a8a08ed4 100644 --- a/skin/latest/pic_list/latest.skin.php +++ b/skin/latest/pic_list/latest.skin.php @@ -6,13 +6,14 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php'); add_stylesheet('', 0); $thumb_width = 297; $thumb_height = 212; +$list_count = (is_array($list) && $list) ? count($list) : 0; ?>

      - +
    • 게시물이 없습니다.
    diff --git a/theme/basic/mobile/skin/latest/basic/latest.skin.php b/theme/basic/mobile/skin/latest/basic/latest.skin.php index 5d3d5bb07..b7fbbd5e0 100644 --- a/theme/basic/mobile/skin/latest/basic/latest.skin.php +++ b/theme/basic/mobile/skin/latest/basic/latest.skin.php @@ -10,7 +10,7 @@ add_stylesheet('', 0); $thumb_width = 138; $thumb_height = 80; -$list_count = count($list); +$list_count = (is_array($list) && $list) ? count($list) : 0; $divisor_count = 4; $start_page_num = $list_count ? '1' : '0'; $is_show_next_prev = ($list_count > 4) ? 1 : 0; diff --git a/theme/basic/mobile/skin/latest/comment/latest.skin.php b/theme/basic/mobile/skin/latest/comment/latest.skin.php index c34727592..961c48b0c 100644 --- a/theme/basic/mobile/skin/latest/comment/latest.skin.php +++ b/theme/basic/mobile/skin/latest/comment/latest.skin.php @@ -3,14 +3,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 add_stylesheet('', 0); +$list_count = (is_array($list) && $list) ? count($list) : 0; ?>

    최신댓글

    • @@ -24,7 +24,7 @@ add_stylesheet('', 게시물이 없습니다.
    • '.PHP_EOL; ?>
    diff --git a/theme/basic/mobile/skin/latest/notice/latest.skin.php b/theme/basic/mobile/skin/latest/notice/latest.skin.php index eb0c06605..c59f74c6a 100644 --- a/theme/basic/mobile/skin/latest/notice/latest.skin.php +++ b/theme/basic/mobile/skin/latest/notice/latest.skin.php @@ -4,12 +4,13 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 add_stylesheet('', 0); add_javascript('', 10); +$list_count = (is_array($list) && $list) ? count($list) : 0; ?>

      - +
    • "; @@ -35,7 +36,7 @@ add_javascript('', 10); ?>
    • - +
    • 게시물이 없습니다.
    diff --git a/theme/basic/skin/latest/basic/latest.skin.php b/theme/basic/skin/latest/basic/latest.skin.php index eb2b00e1e..78b3fc128 100644 --- a/theme/basic/skin/latest/basic/latest.skin.php +++ b/theme/basic/skin/latest/basic/latest.skin.php @@ -3,12 +3,13 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 add_stylesheet('', 0); +$list_count = (is_array($list) && $list) ? count($list) : 0; ?>

      - +
    • 비밀글 "; @@ -40,7 +41,7 @@ add_stylesheet('',
    - +
  • 게시물이 없습니다.
  • diff --git a/theme/basic/skin/latest/notice/latest.skin.php b/theme/basic/skin/latest/notice/latest.skin.php index eb0c06605..c59f74c6a 100644 --- a/theme/basic/skin/latest/notice/latest.skin.php +++ b/theme/basic/skin/latest/notice/latest.skin.php @@ -4,12 +4,13 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 add_stylesheet('', 0); add_javascript('', 10); +$list_count = (is_array($list) && $list) ? count($list) : 0; ?>

      - +
    • "; @@ -35,7 +36,7 @@ add_javascript('', 10); ?>
    • - +
    • 게시물이 없습니다.
    diff --git a/theme/basic/skin/latest/pic_block/latest.skin.php b/theme/basic/skin/latest/pic_block/latest.skin.php index c19ef5c08..791e2b48b 100644 --- a/theme/basic/skin/latest/pic_block/latest.skin.php +++ b/theme/basic/skin/latest/pic_block/latest.skin.php @@ -6,13 +6,14 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php'); add_stylesheet('', 0); $thumb_width = 210; $thumb_height = 150; +$list_count = (is_array($list) && $list) ? count($list) : 0; ?>

      - +
    • 게시물이 없습니다.
    diff --git a/theme/basic/skin/latest/pic_list/latest.skin.php b/theme/basic/skin/latest/pic_list/latest.skin.php index 57dcec5bb..1a8a08ed4 100644 --- a/theme/basic/skin/latest/pic_list/latest.skin.php +++ b/theme/basic/skin/latest/pic_list/latest.skin.php @@ -6,13 +6,14 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php'); add_stylesheet('', 0); $thumb_width = 297; $thumb_height = 212; +$list_count = (is_array($list) && $list) ? count($list) : 0; ?>

      - +
    • 게시물이 없습니다.
    From f68ba794ecb0abdb2a5035540aace09830c07a44 Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 9 Dec 2019 14:42:05 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EA=B7=B8=EB=A3=B9=20=EB=A7=81=ED=81=AC?= =?UTF-8?q?=EC=97=90=20=EC=9E=98=EB=AA=BB=EB=90=9C=20=EC=A7=A7=EC=9D=80=20?= =?UTF-8?q?=EC=A3=BC=EC=86=8C=EA=B0=80=20=EC=A0=81=EC=9A=A9=EB=90=9C=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/boardgroup_list.php | 2 +- adm/boardgroupmember_form.php | 2 +- adm/menu_form_search.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adm/boardgroup_list.php b/adm/boardgroup_list.php index 8e7c5feeb..a688e650d 100644 --- a/adm/boardgroup_list.php +++ b/adm/boardgroup_list.php @@ -127,7 +127,7 @@ $colspan = 10; - + diff --git a/adm/boardgroupmember_form.php b/adm/boardgroupmember_form.php index ac934a5e3..7a8c2d11d 100644 --- a/adm/boardgroupmember_form.php +++ b/adm/boardgroupmember_form.php @@ -85,7 +85,7 @@ $colspan = 4; - + diff --git a/adm/menu_form_search.php b/adm/menu_form_search.php index 304bc1609..497ee3ee1 100644 --- a/adm/menu_form_search.php +++ b/adm/menu_form_search.php @@ -52,7 +52,7 @@ if($sql) { Date: Mon, 9 Dec 2019 14:52:25 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=ED=9A=8C=EC=9B=90=20=EC=AA=BD=EC=A7=80=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=95=20=EC=BD=94=EB=93=9C=20css=20?= =?UTF-8?q?=EB=B0=8F=20=EC=8A=A4=ED=82=A8=EC=BD=94=EB=93=9C=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 --- mobile/skin/member/basic/memo.skin.php | 2 +- skin/member/basic/style.css | 1 + theme/basic/mobile/skin/member/basic/memo.skin.php | 2 +- theme/basic/skin/member/basic/style.css | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mobile/skin/member/basic/memo.skin.php b/mobile/skin/member/basic/memo.skin.php index 2a397d9c7..c3289850d 100644 --- a/mobile/skin/member/basic/memo.skin.php +++ b/mobile/skin/member/basic/memo.skin.php @@ -35,7 +35,7 @@ add_stylesheet('',
    - + 삭제 diff --git a/skin/member/basic/style.css b/skin/member/basic/style.css index 1b5666278..efc404d34 100644 --- a/skin/member/basic/style.css +++ b/skin/member/basic/style.css @@ -231,6 +231,7 @@ #memo_list .memo_datetime {font-size:0.92em;color:#888d92} #memo_list .memo_del {position:absolute;right:15px;top:15px;padding:10px;color:#c7c9cb;font-size:1.4em} #memo_list .memo_cnt {margin-top:5px;font-weight:normal;display:inline-block;font-size:1.2em} +#memo_list .pg_wrap {margin-top:10px;width:100%;float:inherit;text-align:center} #memo_view_contents {margin-bottom:20px;border-top:1px solid #ececec;border-bottom:1px solid #ececec} #memo_view_contents h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} diff --git a/theme/basic/mobile/skin/member/basic/memo.skin.php b/theme/basic/mobile/skin/member/basic/memo.skin.php index 2a397d9c7..c3289850d 100644 --- a/theme/basic/mobile/skin/member/basic/memo.skin.php +++ b/theme/basic/mobile/skin/member/basic/memo.skin.php @@ -35,7 +35,7 @@ add_stylesheet('',
    - + 삭제 diff --git a/theme/basic/skin/member/basic/style.css b/theme/basic/skin/member/basic/style.css index 39a474a98..e297c9b96 100644 --- a/theme/basic/skin/member/basic/style.css +++ b/theme/basic/skin/member/basic/style.css @@ -231,6 +231,7 @@ #memo_list .memo_datetime {font-size:0.92em;color:#888d92} #memo_list .memo_del {position:absolute;right:15px;top:15px;padding:10px;color:#c7c9cb;font-size:1.4em} #memo_list .memo_cnt {margin-top:5px;font-weight:normal;display:inline-block;font-size:1.2em} +#memo_list .pg_wrap {margin-top:10px;width:100%;float:inherit;text-align:center} #memo_view_contents {margin-bottom:20px;border-top:1px solid #ececec;border-bottom:1px solid #ececec} #memo_view_contents h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} From 0e2dbb6145e8484e781a6f026bd607b86998806d Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 9 Dec 2019 14:53:43 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EB=B2=84=EC=A0=84=205.4.1.2=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 --- config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.php b/config.php index 8b854086d..f27b5c38d 100644 --- a/config.php +++ b/config.php @@ -5,7 +5,7 @@ ********************/ define('G5_VERSION', '그누보드5'); -define('G5_GNUBOARD_VER', '5.4.1.1'); +define('G5_GNUBOARD_VER', '5.4.1.2'); // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음 define('_GNUBOARD_', true);