From e4d47cc7fdd08d46d9d5385c9545606a9869487c Mon Sep 17 00:00:00 2001 From: thisgun Date: Thu, 27 Dec 2018 18:20:02 +0900 Subject: [PATCH 01/25] =?UTF-8?q?=EB=82=B4=EC=9A=A9=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=A1=B0=EC=A0=88=20css=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/skin/content/basic/style.css | 1 + skin/content/basic/style.css | 2 +- theme/basic/mobile/skin/content/basic/style.css | 1 + theme/basic/skin/content/basic/style.css | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mobile/skin/content/basic/style.css b/mobile/skin/content/basic/style.css index 638229597..09a64624c 100644 --- a/mobile/skin/content/basic/style.css +++ b/mobile/skin/content/basic/style.css @@ -4,5 +4,6 @@ #ctt {margin:10px 0;padding:10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9} .ctt_admin {margin:0 5px;text-align:right} #ctt header h1 {position:absolute;font-size:0;line-height:0;overflow:hidden} +#ctt_himg img, #ctt_timg img, #ctt_con img {max-width:100%;height:auto} #ctt_con {padding:10px 0} .ctt_img {text-align:center} \ No newline at end of file diff --git a/skin/content/basic/style.css b/skin/content/basic/style.css index 806aee24a..225b60f1a 100644 --- a/skin/content/basic/style.css +++ b/skin/content/basic/style.css @@ -5,5 +5,5 @@ .ctt_admin {text-align:right} #ctt header h1 {position:absolute;font-size:0;line-height:0;overflow:hidden} #ctt_con {padding:10px 0;line-height:1.6em} -#ctt_con img{max-width:100%;height:auto} +#ctt_himg img, #ctt_timg img, #ctt_con img {max-width:100%;height:auto} .ctt_img {text-align:center} \ No newline at end of file diff --git a/theme/basic/mobile/skin/content/basic/style.css b/theme/basic/mobile/skin/content/basic/style.css index 638229597..09a64624c 100644 --- a/theme/basic/mobile/skin/content/basic/style.css +++ b/theme/basic/mobile/skin/content/basic/style.css @@ -4,5 +4,6 @@ #ctt {margin:10px 0;padding:10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9} .ctt_admin {margin:0 5px;text-align:right} #ctt header h1 {position:absolute;font-size:0;line-height:0;overflow:hidden} +#ctt_himg img, #ctt_timg img, #ctt_con img {max-width:100%;height:auto} #ctt_con {padding:10px 0} .ctt_img {text-align:center} \ No newline at end of file diff --git a/theme/basic/skin/content/basic/style.css b/theme/basic/skin/content/basic/style.css index 806aee24a..225b60f1a 100644 --- a/theme/basic/skin/content/basic/style.css +++ b/theme/basic/skin/content/basic/style.css @@ -5,5 +5,5 @@ .ctt_admin {text-align:right} #ctt header h1 {position:absolute;font-size:0;line-height:0;overflow:hidden} #ctt_con {padding:10px 0;line-height:1.6em} -#ctt_con img{max-width:100%;height:auto} +#ctt_himg img, #ctt_timg img, #ctt_con img {max-width:100%;height:auto} .ctt_img {text-align:center} \ No newline at end of file From 4366d204100768772c2639725f7aeae2b746d5e3 Mon Sep 17 00:00:00 2001 From: thisgun Date: Fri, 28 Dec 2018 10:45:22 +0900 Subject: [PATCH 02/25] =?UTF-8?q?=EC=9E=98=EB=AA=BB=EB=90=9C=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/admin.lib.php | 2 +- adm/board_copy_update.php | 96 +++++++++++++++++++-------------------- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/adm/admin.lib.php b/adm/admin.lib.php index d454f00d4..1200bb0fc 100644 --- a/adm/admin.lib.php +++ b/adm/admin.lib.php @@ -435,7 +435,7 @@ function admin_check_xss_params($params){ if ( empty($value) ) continue; if( is_array($value) ){ - admin_check_xss_params($params); + admin_check_xss_params($value); } else if ( preg_match('/<\s?[^\>]*\/?\s?>/i', $value) && (preg_match('/script.*?\/script/ius', $value) || preg_match('/onload=.*/ius', $value)) ){ alert('요청 쿼리에 잘못된 스크립트문장이 있습니다.\\nXSS 공격일수도 있습니다.'); die(); diff --git a/adm/board_copy_update.php b/adm/board_copy_update.php index fede12b88..19ca6729e 100644 --- a/adm/board_copy_update.php +++ b/adm/board_copy_update.php @@ -38,43 +38,43 @@ $sql = " insert into {$g5['board_table']} bo_subject = '$target_subject', bo_device = '{$board['bo_device']}', bo_admin = '{$board['bo_admin']}', - bo_list_level = '{$board[bo_list_level]}', - bo_read_level = '{$board[bo_read_level]}', - bo_write_level = '{$board[bo_write_level]}', - bo_reply_level = '{$board[bo_reply_level]}', - bo_comment_level = '{$board[bo_comment_level]}', - bo_upload_level = '{$board[bo_upload_level]}', - bo_download_level = '{$board[bo_download_level]}', - bo_html_level = '{$board[bo_html_level]}', - bo_link_level = '{$board[bo_link_level]}', - bo_count_modify = '{$board[bo_count_modify]}', - bo_count_delete = '{$board[bo_count_delete]}', - bo_read_point = '{$board[bo_read_point]}', - bo_write_point = '{$board[bo_write_point]}', - bo_comment_point = '{$board[bo_comment_point]}', - bo_download_point = '{$board[bo_download_point]}', - bo_use_category = '{$board[bo_use_category]}', + bo_list_level = '{$board['bo_list_level']}', + bo_read_level = '{$board['bo_read_level']}', + bo_write_level = '{$board['bo_write_level']}', + bo_reply_level = '{$board['bo_reply_level']}', + bo_comment_level = '{$board['bo_comment_level']}', + bo_upload_level = '{$board['bo_upload_level']}', + bo_download_level = '{$board['bo_download_level']}', + bo_html_level = '{$board['bo_html_level']}', + bo_link_level = '{$board['bo_link_level']}', + bo_count_modify = '{$board['bo_count_modify']}', + bo_count_delete = '{$board['bo_count_delete']}', + bo_read_point = '{$board['bo_read_point']}', + bo_write_point = '{$board['bo_write_point']}', + bo_comment_point = '{$board['bo_comment_point']}', + bo_download_point = '{$board['bo_download_point']}', + bo_use_category = '{$board['bo_use_category']}', bo_category_list = '{$board['bo_category_list']}', - bo_use_sideview = '{$board[bo_use_sideview]}', - bo_use_file_content = '{$board[bo_use_file_content]}', - bo_use_secret = '{$board[bo_use_secret]}', - bo_use_dhtml_editor = '{$board[bo_use_dhtml_editor]}', - bo_use_rss_view = '{$board[bo_use_rss_view]}', - bo_use_good = '{$board[bo_use_good]}', - bo_use_nogood = '{$board[bo_use_nogood]}', - bo_use_name = '{$board[bo_use_name]}', - bo_use_signature = '{$board[bo_use_signature]}', - bo_use_ip_view = '{$board[bo_use_ip_view]}', + bo_use_sideview = '{$board['bo_use_sideview']}', + bo_use_file_content = '{$board['bo_use_file_content']}', + bo_use_secret = '{$board['bo_use_secret']}', + bo_use_dhtml_editor = '{$board['bo_use_dhtml_editor']}', + bo_use_rss_view = '{$board['bo_use_rss_view']}', + bo_use_good = '{$board['bo_use_good']}', + bo_use_nogood = '{$board['bo_use_nogood']}', + bo_use_name = '{$board['bo_use_name']}', + bo_use_signature = '{$board['bo_use_signature']}', + bo_use_ip_view = '{$board['bo_use_ip_view']}', bo_use_list_view = '{$board['bo_use_list_view']}', - bo_use_list_content = '{$board[bo_use_list_content]}', - bo_table_width = '{$board[bo_table_width]}', - bo_subject_len = '{$board[bo_subject_len]}', - bo_mobile_subject_len = '{$board[bo_mobile_subject_len]}', - bo_page_rows = '{$board[bo_page_rows]}', - bo_mobile_page_rows = '{$board[bo_mobile_page_rows]}', - bo_new = '{$board[bo_new]}', - bo_hot = '{$board[bo_hot]}', - bo_image_width = '{$board[bo_image_width]}', + bo_use_list_content = '{$board['bo_use_list_content']}', + bo_table_width = '{$board['bo_table_width']}', + bo_subject_len = '{$board['bo_subject_len']}', + bo_mobile_subject_len = '{$board['bo_mobile_subject_len']}', + bo_page_rows = '{$board['bo_page_rows']}', + bo_mobile_page_rows = '{$board['bo_mobile_page_rows']}', + bo_new = '{$board['bo_new']}', + bo_hot = '{$board['bo_hot']}', + bo_image_width = '{$board['bo_image_width']}', bo_skin = '{$board['bo_skin']}', bo_mobile_skin = '{$board['bo_mobile_skin']}', bo_include_head = '{$board['bo_include_head']}', @@ -84,20 +84,20 @@ $sql = " insert into {$g5['board_table']} bo_mobile_content_head = '".addslashes($board['bo_mobile_content_head'])."', bo_mobile_content_tail = '".addslashes($board['bo_mobile_content_tail'])."', bo_insert_content = '".addslashes($board['bo_insert_content'])."', - bo_gallery_cols = '{$board[bo_gallery_cols]}', - bo_gallery_width = '{$board[bo_gallery_width]}', - bo_gallery_height = '{$board[bo_gallery_height]}', - bo_mobile_gallery_width = '{$board[bo_mobile_gallery_width]}', - bo_mobile_gallery_height = '{$board[bo_mobile_gallery_height]}', - bo_upload_size = '{$board[bo_upload_size]}', - bo_reply_order = '{$board[bo_reply_order]}', - bo_use_search = '{$board[bo_use_search]}', - bo_order = '{$board[bo_order]}', + bo_gallery_cols = '{$board['bo_gallery_cols']}', + bo_gallery_width = '{$board['bo_gallery_width']}', + bo_gallery_height = '{$board['bo_gallery_height']}', + bo_mobile_gallery_width = '{$board['bo_mobile_gallery_width']}', + bo_mobile_gallery_height = '{$board['bo_mobile_gallery_height']}', + bo_upload_size = '{$board['bo_upload_size']}', + bo_reply_order = '{$board['bo_reply_order']}', + bo_use_search = '{$board['bo_use_search']}', + bo_order = '{$board['bo_order']}', bo_notice = '{$board['bo_notice']}', - bo_upload_count = '{$board[bo_upload_count]}', - bo_use_email = '{$board[bo_use_email]}', - bo_use_cert = '{$board[bo_use_cert]}', - bo_use_sns = '{$board[bo_use_sns]}', + bo_upload_count = '{$board['bo_upload_count']}', + bo_use_email = '{$board['bo_use_email']}', + bo_use_cert = '{$board['bo_use_cert']}', + bo_use_sns = '{$board['bo_use_sns']}', bo_sort_field = '{$board['bo_sort_field']}', bo_1_subj = '".addslashes($board['bo_1_subj'])."', bo_2_subj = '".addslashes($board['bo_2_subj'])."', From 1d0f0bf50b77bde4922378045955891fb38f54a4 Mon Sep 17 00:00:00 2001 From: thisgun Date: Fri, 28 Dec 2018 11:01:27 +0900 Subject: [PATCH 03/25] =?UTF-8?q?5.3.2.3=20=EB=B2=84=EC=A0=84=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 e417624fd..c8b4d94db 100644 --- a/config.php +++ b/config.php @@ -5,7 +5,7 @@ ********************/ define('G5_VERSION', '그누보드5'); -define('G5_GNUBOARD_VER', '5.3.2.2'); +define('G5_GNUBOARD_VER', '5.3.2.3'); // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음 define('_GNUBOARD_', true); From 2e84d5fbf4409fc71e8d0028eb72ee9df45a99f1 Mon Sep 17 00:00:00 2001 From: thisgun Date: Fri, 4 Jan 2019 15:30:05 +0900 Subject: [PATCH 04/25] =?UTF-8?q?=ED=95=84=EC=9A=94=EC=97=86=EB=8A=94=20?= =?UTF-8?q?=EA=B5=AC=EB=AC=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/install_db.php | 6 +++--- theme/54/index.php | 14 -------------- theme/54/skin/latest/notice/style.css | 2 +- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/install/install_db.php b/install/install_db.php index 93bfcde1c..d8eadb22d 100644 --- a/install/install_db.php +++ b/install/install_db.php @@ -198,9 +198,9 @@ $sql = " insert into `{$table_prefix}member` sql_query($sql, true, $dblink); // 내용관리 생성 -sql_query(" insert into `{$table_prefix}content` set co_id = 'company', co_html = '1', co_subject = '회사소개', co_content= '

회사소개에 대한 내용을 입력하십시오.

' ", true, $dblink); -sql_query(" insert into `{$table_prefix}content` set co_id = 'privacy', co_html = '1', co_subject = '개인정보 처리방침', co_content= '

개인정보 처리방침에 대한 내용을 입력하십시오.

' ", true, $dblink); -sql_query(" insert into `{$table_prefix}content` set co_id = 'provision', co_html = '1', co_subject = '서비스 이용약관', co_content= '

서비스 이용약관에 대한 내용을 입력하십시오.

' ", true, $dblink); +sql_query(" insert into `{$table_prefix}content` set co_id = 'company', co_html = '1', co_subject = '회사소개', co_seo_title = '".generate_seo_title('회사소개')."', co_content= '

회사소개에 대한 내용을 입력하십시오.

' ", true, $dblink); +sql_query(" insert into `{$table_prefix}content` set co_id = 'privacy', co_html = '1', co_subject = '개인정보 처리방침', co_seo_title = '".generate_seo_title('개인정보 처리방침')."', co_content= '

개인정보 처리방침에 대한 내용을 입력하십시오.

' ", true, $dblink); +sql_query(" insert into `{$table_prefix}content` set co_id = 'provision', co_html = '1', co_subject = '서비스 이용약관', co_seo_title = '".generate_seo_title('서비스 이용약관')."', co_content= '

서비스 이용약관에 대한 내용을 입력하십시오.

' ", true, $dblink); // FAQ Master sql_query(" insert into `{$table_prefix}faq_master` set fm_id = '1', fm_subject = '자주하시는 질문' ", true, $dblink); diff --git a/theme/54/index.php b/theme/54/index.php index 6011c51aa..f3cd3fd13 100644 --- a/theme/54/index.php +++ b/theme/54/index.php @@ -19,20 +19,6 @@ include_once(G5_THEME_PATH.'/head.php'); // 테마의 스킨을 사용하려면 theme/basic 과 같이 지정 echo latest('theme/pic_list', 'free', 4, 23); ?> - - - -
diff --git a/theme/54/skin/latest/notice/style.css b/theme/54/skin/latest/notice/style.css index 4dd81f5ac..d255316a3 100644 --- a/theme/54/skin/latest/notice/style.css +++ b/theme/54/skin/latest/notice/style.css @@ -5,7 +5,7 @@ .notice h2 {margin-bottom:20px} .notice h2 a {font-size:1.2em;color:#fff} .notice li {text-overflow:ellipsis;overflow:hidden;white-space:nowrap;border-bottom:1px solid #343434} -.notice li a {color:#e3e3e3;padding:15px 0;display:inline-block} +.notice li a, .notice li.empty_li {color:#e3e3e3;padding:11px 0;display:inline-block} .notice li .lock_icon {display:inline-block;line-height:14px;width:16px;font-size:0.833em;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size: 12px;border:1px solid #a2c6ce;vertical-align:baseline} .notice li .new_icon {display:inline-block;line-height:16px;width:16px;font-size:0.833em;color:#ffff00;background:#6db142;text-align:center;margin-right:3px;border-radius:2px;vertical-align:baseline} .notice .cnt_cm {background:#5c85c1;color:#fff;font-size:11px;height:16px;line-height:16px;padding:0 5px;border-radius:3px;white-space:nowrap;margin-left:5px} From bfdb44324f2c2590228e4b41699fa56ec88af83c Mon Sep 17 00:00:00 2001 From: thisgun Date: Fri, 4 Jan 2019 17:46:02 +0900 Subject: [PATCH 05/25] =?UTF-8?q?=EC=9D=BC=EB=B6=80=20=EC=BD=94=EB=93=9C?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- theme/54/skin/board/basic/view.skin.php | 4 +- theme/54/skin/popular/basic/popular.skin.php | 47 +++++++++++++++++--- theme/54/skin/popular/basic/style.css | 5 ++- theme/54/skin/search/basic/search.skin.php | 2 +- 4 files changed, 46 insertions(+), 12 deletions(-) diff --git a/theme/54/skin/board/basic/view.skin.php b/theme/54/skin/board/basic/view.skin.php index 09ead2ffc..7e9bab2a3 100644 --- a/theme/54/skin/board/basic/view.skin.php +++ b/theme/54/skin/board/basic/view.skin.php @@ -45,8 +45,8 @@ add_stylesheet('', 0
  • 글쓰기
  • - -
      + +
      • 수정
      • 삭제
      • 복사
        • diff --git a/theme/54/skin/popular/basic/popular.skin.php b/theme/54/skin/popular/basic/popular.skin.php index 26c4ee7b9..bd1d1219a 100644 --- a/theme/54/skin/popular/basic/popular.skin.php +++ b/theme/54/skin/popular/basic/popular.skin.php @@ -3,7 +3,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 add_stylesheet('', 0); -add_javascript('', 10); +add_javascript('', 10); +add_stylesheet('', 10); ?> @@ -15,23 +16,55 @@ add_javascript('', 10); if( isset($list) && is_array($list) ){ for ($i=0; $i -
        • +
      + + + +
    • \ No newline at end of file diff --git a/theme/54/skin/popular/basic/style.css b/theme/54/skin/popular/basic/style.css index 26e931ad1..29d6ae6d0 100644 --- a/theme/54/skin/popular/basic/style.css +++ b/theme/54/skin/popular/basic/style.css @@ -11,5 +11,6 @@ #popular li:first-child {border-left:0} #popular li a:hover {text-decoration:underline} -#popular .bx-next {position:absolute;top:68%;right:0px;width:18px;height:18px;line-height:15px;text-align:center;border:1px solid #53555a;margin-top:-12px;color:#d3d2d2} -#popular .bx-prev {position:absolute;top:68%;right:17px;width:18px;height:18px;line-height:15px;text-align:center;border:1px solid #53555a;margin-top:-12px;color:#d3d2d2} +.popular_inner .popular_btns{display:none} +.popular_btns .pp-next {position:absolute;top:68%;right:0px;width:18px;height:18px;line-height:15px;text-align:center;border:1px solid #53555a;margin-top:-12px;color:#d3d2d2} +.popular_btns .pp-prev {position:absolute;top:68%;right:17px;width:18px;height:18px;line-height:15px;text-align:center;border:1px solid #53555a;margin-top:-12px;color:#d3d2d2} diff --git a/theme/54/skin/search/basic/search.skin.php b/theme/54/skin/search/basic/search.skin.php index aa19f6b90..008edf7e4 100644 --- a/theme/54/skin/search/basic/search.skin.php +++ b/theme/54/skin/search/basic/search.skin.php @@ -105,7 +105,7 @@ add_stylesheet('', $k=0; for ($idx=$table_index, $k=0; $idx -

    게시판 내 결과

    +

    게시판 내 결과

      Date: Fri, 4 Jan 2019 17:46:42 +0900 Subject: [PATCH 06/25] =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/board.php | 10 +++++----- bbs/delete.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bbs/board.php b/bbs/board.php index 5aa1836a8..05c0f8878 100644 --- a/bbs/board.php +++ b/bbs/board.php @@ -30,7 +30,7 @@ if (isset($wr_id) && $wr_id) { if (isset($group['gr_use_access']) && $group['gr_use_access']) { if ($is_guest) { $msg = "비회원은 이 게시판에 접근할 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오."; - alert($msg, './login.php?wr_id='.$wr_id.$qstr.'&url='.urlencode(get_pretty_url($bo_table, $wr_id, $qstr))); + alert($msg, G5_BBS_URL.'/login.php?wr_id='.$wr_id.$qstr.'&url='.urlencode(get_pretty_url($bo_table, $wr_id, $qstr))); } // 그룹관리자 이상이라면 통과 @@ -51,14 +51,14 @@ if (isset($wr_id) && $wr_id) { if ($is_member) alert('글을 읽을 권한이 없습니다.', G5_URL); else - alert('글을 읽을 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', './login.php?wr_id='.$wr_id.$qstr.'&url='.urlencode(get_pretty_url($bo_table, $wr_id, $qstr))); + alert('글을 읽을 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', G5_BBS_URL.'/login.php?wr_id='.$wr_id.$qstr.'&url='.urlencode(get_pretty_url($bo_table, $wr_id, $qstr))); } // 본인확인을 사용한다면 if ($config['cf_cert_use'] && !$is_admin) { // 인증된 회원만 가능 if ($board['bo_use_cert'] != '' && $is_guest) { - alert('이 게시판은 본인확인 하신 회원님만 글읽기가 가능합니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', './login.php?wr_id='.$wr_id.$qstr.'&url='.urlencode(get_pretty_url($bo_table, $wr_id, $qstr))); + alert('이 게시판은 본인확인 하신 회원님만 글읽기가 가능합니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', G5_BBS_URL.'/login.php?wr_id='.$wr_id.$qstr.'&url='.urlencode(get_pretty_url($bo_table, $wr_id, $qstr))); } if ($board['bo_use_cert'] == 'cert' && !$member['mb_certify']) { @@ -144,14 +144,14 @@ if (isset($wr_id) && $wr_id) { if ($member['mb_id']) alert('목록을 볼 권한이 없습니다.', G5_URL); else - alert('목록을 볼 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', './login.php?'.$qstr.'&url='.urlencode(G5_BBS_URL.'/board.php?bo_table='.$bo_table.($qstr?'&':''))); + alert('목록을 볼 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', G5_BBS_URL.'/login.php?'.$qstr.'&url='.urlencode(G5_BBS_URL.'/board.php?bo_table='.$bo_table.($qstr?'&':''))); } // 본인확인을 사용한다면 if ($config['cf_cert_use'] && !$is_admin) { // 인증된 회원만 가능 if ($board['bo_use_cert'] != '' && $is_guest) { - alert('이 게시판은 본인확인 하신 회원님만 글읽기가 가능합니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', './login.php?wr_id='.$wr_id.$qstr.'&url='.urlencode(get_pretty_url($bo_table, $wr_id, $qstr))); + alert('이 게시판은 본인확인 하신 회원님만 글읽기가 가능합니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', G5_BBS_URL.'/login.php?wr_id='.$wr_id.$qstr.'&url='.urlencode(get_pretty_url($bo_table, $wr_id, $qstr))); } if ($board['bo_use_cert'] == 'cert' && !$member['mb_certify']) { diff --git a/bbs/delete.php b/bbs/delete.php index c0a4d1d1c..3f279e4fb 100644 --- a/bbs/delete.php +++ b/bbs/delete.php @@ -30,7 +30,7 @@ else if ($is_admin == 'group') { // 그룹관리자 alert('자신의 글이 아니므로 삭제할 수 없습니다.'); } else { if ($write['mb_id']) - alert('로그인 후 삭제하세요.', './login.php?url='.urlencode(get_pretty_url($bo_table, $wr_id))); + alert('로그인 후 삭제하세요.', G5_BBS_URL.'/login.php?url='.urlencode(get_pretty_url($bo_table, $wr_id))); else if (!check_password($wr_password, $write['wr_password'])) alert('비밀번호가 틀리므로 삭제할 수 없습니다.'); } From 6a1f6c89f6615a662e65c8b3c9f173f6e720ff9e Mon Sep 17 00:00:00 2001 From: thisgun Date: Fri, 4 Jan 2019 18:45:56 +0900 Subject: [PATCH 07/25] =?UTF-8?q?=EC=98=A4=EB=B8=8C=EC=A0=9D=ED=8A=B8?= =?UTF-8?q?=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common.php | 2 +- lib/URI/obj.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common.php b/common.php index df742129b..67276a7f0 100644 --- a/common.php +++ b/common.php @@ -129,7 +129,7 @@ include_once(G5_LIB_PATH.'/get_data.lib.php'); // 데이타 가져오는 함 include_once(G5_LIB_PATH.'/uri.lib.php'); // URL 함수 파일 include_once(G5_LIB_PATH.'/cache.lib.php'); -$g5_object = new G5_object_store(); +$g5_object = new G5_object_cache(); //============================================================================== // 공통 diff --git a/lib/URI/obj.class.php b/lib/URI/obj.class.php index 8e606e1d3..b82ee39f9 100644 --- a/lib/URI/obj.class.php +++ b/lib/URI/obj.class.php @@ -1,7 +1,7 @@ Date: Mon, 7 Jan 2019 11:49:10 +0900 Subject: [PATCH 08/25] =?UTF-8?q?=EC=9E=98=EB=AA=BB=EB=90=9C=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/move_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbs/move_update.php b/bbs/move_update.php index fd48087fe..d956ff0d7 100644 --- a/bbs/move_update.php +++ b/bbs/move_update.php @@ -125,7 +125,7 @@ while ($row = sql_fetch_array($result)) // 제이프로님 코드제안 적용 $copy_file_name = ($bo_table !== $move_bo_table) ? $row3['bf_file'] : $row2['wr_id'].'_copy_'.$insert_id.'_'.$row3['bf_file']; @copy($src_dir.'/'.$row3['bf_file'], $dst_dir.'/'.$copy_file_name); - @chmod($dst_dir/$row3['bf_file'], G5_FILE_PERMISSION); + @chmod($dst_dir.'/'.$row3['bf_file'], G5_FILE_PERMISSION); } $sql = " insert into {$g5['board_file_table']} From 953e301096a7a091e37e1ae80b84631112bacf94 Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 7 Jan 2019 12:06:13 +0900 Subject: [PATCH 09/25] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=ED=8F=B4=EB=8D=94=20?= =?UTF-8?q?=EA=B2=80=EC=83=89=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/admin.lib.php | 41 +++++++++++++++++++++++++ plugin/lgxpay/lgdacom/XPayClient.php | 2 +- plugin/lgxpay/lgdacom/XPayClient4DB.php | 2 +- 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/adm/admin.lib.php b/adm/admin.lib.php index 1200bb0fc..ececd06ab 100644 --- a/adm/admin.lib.php +++ b/adm/admin.lib.php @@ -379,6 +379,47 @@ function get_sanitize_input($s, $is_html=false){ return $s; } +function check_log_folder($log_path){ + + if( is_writable($log_path) ){ + + // 아파치 서버인 경우 웹에서 해당 폴더 접근 막기 + $htaccess_file = $log_path.'/.htaccess'; + if ( !file_exists( $htaccess_file ) ) { + if ( $handle = @fopen( $htaccess_file, 'w' ) ) { + fwrite( $handle, 'Order deny,allow' . "\n" ); + fwrite( $handle, 'Deny from all' . "\n" ); + fclose( $handle ); + } + } + + // 아파치 서버인 경우 해당 디렉토리 파일 목록 안보이게 하기 + $index_file = $log_path . '/index.php'; + if ( !file_exists( $index_file ) ) { + if ( $handle = @fopen( $index_file, 'w' ) ) { + fwrite( $handle, '' ); + fclose( $handle ); + } + } + } + + // txt 파일과 log 파일을 조회하여 30일이 지난 파일은 삭제합니다. + $txt_files = glob($log_path.'/*.txt'); + $log_files = glob($log_path.'/*.log'); + + $del_files = array_merge($txt_files, $log_files); + + if( $del_files && is_array($del_files) ){ + foreach ($del_files as $del_file) { + $filetime = filemtime($del_file); + // 30일이 지난 파일을 삭제 + if($filetime && $filetime < (G5_SERVER_TIME - 2592000)) { + @unlink($del_file); + } + } + } +} + // POST로 넘어온 토큰과 세션에 저장된 토큰 비교 function check_admin_token() { diff --git a/plugin/lgxpay/lgdacom/XPayClient.php b/plugin/lgxpay/lgdacom/XPayClient.php index 177d0becc..600a9c908 100644 --- a/plugin/lgxpay/lgdacom/XPayClient.php +++ b/plugin/lgxpay/lgdacom/XPayClient.php @@ -143,7 +143,7 @@ class XPayClient // log_dir 재설정 $this->config["log_dir"] = $home_dir."/log"; - $this->log_file = $this->config["log_dir"] . "/log_" . date("Ymd") . ".log"; + $this->log_file = $this->config["log_dir"] . "/log_" . date("Ymd") . '_' . substr(md5(mt_rand()), 0, 12) . ".log"; // make log directory if does not exist if (!file_exists($this->config["log_dir"])) { mkdir($this->config["log_dir"], "0777", true); diff --git a/plugin/lgxpay/lgdacom/XPayClient4DB.php b/plugin/lgxpay/lgdacom/XPayClient4DB.php index c657d68ea..8f3eaefc0 100644 --- a/plugin/lgxpay/lgdacom/XPayClient4DB.php +++ b/plugin/lgxpay/lgdacom/XPayClient4DB.php @@ -141,7 +141,7 @@ class XPayClient $array3 = array($mid => $mertkey); $this->config = $array1 + $array2 + $array3; - $this->log_file = $this->config["log_dir"] . "/log_" . date("Ymd") . ".log"; + $this->log_file = $this->config["log_dir"] . "/log_" . date("Ymd") . '_' . substr(md5(mt_rand()), 0, 12) . ".log"; // make log directory if does not exist if (!file_exists($this->config["log_dir"])) { mkdir($this->config["log_dir"], "0777", true); From 1ba5bb09fc7f3c0971ed371eda168e8b52c1152e Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 7 Jan 2019 12:09:29 +0900 Subject: [PATCH 10/25] =?UTF-8?q?=EB=B3=B4=EC=95=88=EC=9D=84=20=EC=9C=84?= =?UTF-8?q?=ED=95=B4=20RAR=20Wrapper=20=EC=B0=A8=EB=8B=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index 3ecde78c9..4b2423f2c 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -3489,8 +3489,10 @@ function is_include_path_check($path='', $is_input='') { if( $path ){ if ($is_input){ + // 장태진 @jtjisgod 추가 + // 보안 목적 : rar wrapper 차단 - if( stripos($path, 'php:') !== false || stripos($path, 'zlib:') !== false || stripos($path, 'bzip2:') !== false || stripos($path, 'zip:') !== false || stripos($path, 'data:') !== false || stripos($path, 'phar:') !== false ){ + if( stripos($path, 'rar:') !== false || stripos($path, 'php:') !== false || stripos($path, 'zlib:') !== false || stripos($path, 'bzip2:') !== false || stripos($path, 'zip:') !== false || stripos($path, 'data:') !== false || stripos($path, 'phar:') !== false ){ return false; } From 4cc8284016941159ea0f0c4848c3a55982ebec2f Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 7 Jan 2019 14:13:03 +0900 Subject: [PATCH 11/25] =?UTF-8?q?KVE-2018-1827,=201828,=201829,=201830=20?= =?UTF-8?q?=EA=B7=B8=EB=88=84=EB=B3=B4=EB=93=9C/=EC=98=81=EC=B9=B4?= =?UTF-8?q?=ED=8A=B8=20=EB=8B=A4=EC=A4=91=20=EC=B7=A8=EC=95=BD=EC=A0=90=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/sms_admin/emoticon_move_update.php | 2 ++ adm/sms_admin/history_num.php | 4 ++++ adm/sms_admin/history_view.php | 4 ++++ adm/sms_admin/num_book_move.php | 4 ++-- adm/sms_admin/number_move_update.php | 2 ++ 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/adm/sms_admin/emoticon_move_update.php b/adm/sms_admin/emoticon_move_update.php index aa1227f6a..8fe03b539 100644 --- a/adm/sms_admin/emoticon_move_update.php +++ b/adm/sms_admin/emoticon_move_update.php @@ -6,6 +6,8 @@ auth_check($auth[$sub_menu], "r"); if(!count($_POST['chk_fg_no'])) alert('이모티콘을 이동할 그룹을 한개 이상 선택해 주십시오.', $url); +$fo_no_list = preg_replace('/[^a-zA-Z0-9\, ]/', '', $fo_no_list); + $sql = "select * from {$g5['sms5_form_table']} where fo_no in ($fo_no_list) order by fo_no desc "; $result = sql_query($sql); $save = array(); diff --git a/adm/sms_admin/history_num.php b/adm/sms_admin/history_num.php index 530cfcdcd..f53dfb407 100644 --- a/adm/sms_admin/history_num.php +++ b/adm/sms_admin/history_num.php @@ -16,6 +16,10 @@ if ($st && trim($sv)) else $sql_search = ""; +if( isset($st) && !in_array($st, array('hs_name', 'hs_hp', 'bk_no')) ){ + $st = ''; +} + $total_res = sql_fetch("select count(*) as cnt from {$g5['sms5_history_table']} where 1 $sql_search"); $total_count = $total_res['cnt']; diff --git a/adm/sms_admin/history_view.php b/adm/sms_admin/history_view.php index 2fd9d1b0c..498d7fe03 100644 --- a/adm/sms_admin/history_view.php +++ b/adm/sms_admin/history_view.php @@ -8,6 +8,10 @@ $colspan = 10; $st = isset($st) ? strip_tags($st) : ''; $ssv = isset($ssv) ? strip_tags($ssv) : ''; +if( $st && !in_array($st, array('hs_name', 'hs_hp', 'bk_no')) ){ + $st = ''; +} + auth_check($auth[$sub_menu], "r"); $g5['title'] = "문자전송 상세내역"; diff --git a/adm/sms_admin/num_book_move.php b/adm/sms_admin/num_book_move.php index 0097f9150..f69248d89 100644 --- a/adm/sms_admin/num_book_move.php +++ b/adm/sms_admin/num_book_move.php @@ -31,8 +31,8 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
      - - + +
      diff --git a/adm/sms_admin/number_move_update.php b/adm/sms_admin/number_move_update.php index ad24a7010..76ad32fcb 100644 --- a/adm/sms_admin/number_move_update.php +++ b/adm/sms_admin/number_move_update.php @@ -6,6 +6,8 @@ auth_check($auth[$sub_menu], "r"); if(!count($_POST['chk_bg_no'])) alert('번호를 '.$act.'할 그룹을 한개 이상 선택해 주십시오.', $url); +$bk_no_list = preg_replace('/[^a-zA-Z0-9\, ]/', '', $bk_no_list); + $sql = "select * from {$g5['sms5_book_table']} where bk_no in ($bk_no_list) order by bk_no desc "; $result = sql_query($sql); $save = array(); From 60387c8a9521e20075b3b90a2c957a9138dd7080 Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 7 Jan 2019 14:30:53 +0900 Subject: [PATCH 12/25] =?UTF-8?q?lg=20XpayClient=20=EB=A1=9C=EA=B7=B8=20?= =?UTF-8?q?=EA=B8=B0=EB=A1=9D=20=EB=82=A8=EC=A7=80=20=EC=95=8A=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/lgxpay/lgdacom/XPayClient.php | 4 ++++ plugin/lgxpay/lgdacom/XPayClient4DB.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/plugin/lgxpay/lgdacom/XPayClient.php b/plugin/lgxpay/lgdacom/XPayClient.php index 600a9c908..07543e50a 100644 --- a/plugin/lgxpay/lgdacom/XPayClient.php +++ b/plugin/lgxpay/lgdacom/XPayClient.php @@ -604,6 +604,10 @@ class XPayClient function Log($msg, $level=LGD_LOG_FATAL) { + if( !(defined('LGD_LOG_SAVE') && LGD_LOG_SAVE) ){ + return; + } + if ($level > $this->config["log_level"]) return; $err_msg = date("Y-m-d H:i:s")." [".$this->err_label[$level]."] [".$this->TX_ID."] ".$msg."\n"; diff --git a/plugin/lgxpay/lgdacom/XPayClient4DB.php b/plugin/lgxpay/lgdacom/XPayClient4DB.php index 8f3eaefc0..b330656b1 100644 --- a/plugin/lgxpay/lgdacom/XPayClient4DB.php +++ b/plugin/lgxpay/lgdacom/XPayClient4DB.php @@ -602,6 +602,10 @@ class XPayClient function Log($msg, $level=LGD_LOG_FATAL) { + if( !(defined('LGD_LOG_SAVE') && LGD_LOG_SAVE) ){ + return; + } + if ($level > $this->config["log_level"]) return; $err_msg = date("Y-m-d H:i:s")." [".$this->err_label[$level]."] [".$this->TX_ID."] ".$msg."\n"; From e069c00ecd56524f63127d557125d7f300cb7f89 Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 7 Jan 2019 14:32:35 +0900 Subject: [PATCH 13/25] =?UTF-8?q?=EB=B2=84=EC=A0=84=205.3.2.4=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=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 c8b4d94db..a7d518d18 100644 --- a/config.php +++ b/config.php @@ -5,7 +5,7 @@ ********************/ define('G5_VERSION', '그누보드5'); -define('G5_GNUBOARD_VER', '5.3.2.3'); +define('G5_GNUBOARD_VER', '5.3.2.4'); // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음 define('_GNUBOARD_', true); From 67353c508aa053f54c6d0c4333589f20a21a83b8 Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 7 Jan 2019 14:47:14 +0900 Subject: [PATCH 14/25] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EA=B2=8C?= =?UTF-8?q?=EC=8B=9C=ED=8C=90=20=EB=B3=B5=EC=82=AC=EC=8B=9C=20=EB=88=84?= =?UTF-8?q?=EB=9D=BD=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/board_copy_update.php | 1 + 1 file changed, 1 insertion(+) diff --git a/adm/board_copy_update.php b/adm/board_copy_update.php index 19ca6729e..f94af52a8 100644 --- a/adm/board_copy_update.php +++ b/adm/board_copy_update.php @@ -98,6 +98,7 @@ $sql = " insert into {$g5['board_table']} bo_use_email = '{$board['bo_use_email']}', bo_use_cert = '{$board['bo_use_cert']}', bo_use_sns = '{$board['bo_use_sns']}', + bo_use_captcha = '{$board['bo_use_captcha']}', bo_sort_field = '{$board['bo_sort_field']}', bo_1_subj = '".addslashes($board['bo_1_subj'])."', bo_2_subj = '".addslashes($board['bo_2_subj'])."', From 826a497e843b96073205604d8e1281065fb441c7 Mon Sep 17 00:00:00 2001 From: thisgun Date: Thu, 10 Jan 2019 20:58:58 +0900 Subject: [PATCH 15/25] =?UTF-8?q?=ED=99=98=EA=B2=BD=EC=84=A4=EC=A0=95?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=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 --- adm/config_form.php | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/adm/config_form.php b/adm/config_form.php index e4daee961..f08a9d94c 100644 --- a/adm/config_form.php +++ b/adm/config_form.php @@ -1436,16 +1436,29 @@ if($config['cf_cert_use']) { $log_path = G5_LGXPAY_PATH.'/lgdacom/log'; if(!is_dir($log_path)) { - echo ''.PHP_EOL; - } else { - if(!is_writable($log_path)) { + + if( is_writable(G5_LGXPAY_PATH.'/lgdacom/') ){ + // 디렉토리가 없다면 생성합니다. (퍼미션도 변경하구요.) + @mkdir($log_path, G5_DIR_PERMISSION); + @chmod($log_path, G5_DIR_PERMISSION); + } + + if(!is_dir($log_path)){ echo ''.PHP_EOL; } } + + if(is_dir($log_path) && is_writable($log_path)) { + if( function_exists('check_log_folder') ){ + check_log_folder($log_path); + } + } else if (is_dir($log_path)) { + echo ''.PHP_EOL; + } } } From 2a8a283a77525d9dac49ff1df307253adef09e6c Mon Sep 17 00:00:00 2001 From: leebokyung Date: Fri, 11 Jan 2019 14:57:42 +0900 Subject: [PATCH 16/25] =?UTF-8?q?=EA=B0=A4=EB=9F=AC=EB=A6=AC=20=EA=B8=80?= =?UTF-8?q?=EC=9E=90=ED=81=AC=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- theme/54/skin/board/gallery/style.css | 2 +- theme/54/skin/visit/basic/visit.skin.php | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/theme/54/skin/board/gallery/style.css b/theme/54/skin/board/gallery/style.css index 3daacff3f..acafbde6a 100644 --- a/theme/54/skin/board/gallery/style.css +++ b/theme/54/skin/board/gallery/style.css @@ -141,7 +141,7 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)} #bo_gall .bo_tit .hot_icon {display:inline-block;width:16px;line-height:16px;font-size:0.833em;color:#fff;background:#e52955;text-align:center;border-radius:2px;vertical-align:middle;margin-right:2px} #bo_gall .bo_tit .fa-lock {display:inline-block;line-height:16px;color:#999;text-align:center;vertical-align:middle} -#bo_gall .gall_info {line-height:1.5em;font-size:0.92em;line-height:20px} +#bo_gall .gall_info {line-height:1.5em;line-height:20px} #bo_gall .gall_info strong {display:inline-block;margin:0} #bo_gall .gall_info i {font-size:12px} #bo_gall .gall_info .gall_date, diff --git a/theme/54/skin/visit/basic/visit.skin.php b/theme/54/skin/visit/basic/visit.skin.php index b0e542d98..8d42edd72 100644 --- a/theme/54/skin/visit/basic/visit.skin.php +++ b/theme/54/skin/visit/basic/visit.skin.php @@ -11,14 +11,14 @@ add_stylesheet('', 0

      접속자집계

      -
      오늘
      -
      -
      어제
      -
      -
      최대
      -
      -
      전체
      -
      +
      오늘
      +
      +
      어제
      +
      +
      최대
      +
      +
      전체
      +
      관리자
      From 61c784eb5763abfbecd6e924b4837204509ccdb0 Mon Sep 17 00:00:00 2001 From: leebokyung Date: Fri, 11 Jan 2019 15:33:44 +0900 Subject: [PATCH 17/25] =?UTF-8?q?=EC=98=A4=EB=A5=98=EA=B2=80=EC=82=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- theme/54/css/default.css | 10 +++++----- theme/54/skin/board/basic/style.css | 2 +- theme/54/skin/member/basic/style.css | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/theme/54/css/default.css b/theme/54/css/default.css index c8489227e..2fcd528b5 100644 --- a/theme/54/css/default.css +++ b/theme/54/css/default.css @@ -114,7 +114,7 @@ border:1px solid #558ab7 !important; -o-transition:background-color 0.3s ease-out; transition:background-color 0.3s ease-out} -.gnb_1dli .bg {display:inline-block;width:10px;height:10px;overflow:hidden;background:url(../img/gnb_bg2.gif) no-repeat 50% 50%;text-indent:-999px} +.gnb_1dli .bg {display:inline-block;width:10px;height:10px;overflow:hidden;background:url('../img/gnb_bg2.gif') no-repeat 50% 50%;text-indent:-999px} .gnb_1da {display:inline-block;font-weight:bold;color:#080808;text-decoration:none} .gnb_2dli:first-child {border:0} .gnb_2dul {display:none;position:absolute;top:56px;min-width:140px;border:1px solid #e0e2e5;border-top:0;padding:0; @@ -150,7 +150,7 @@ box-shadow:0 2px 5px rgba(0,0,0,0.2)} #gnb_all .gnb_al_li .gnb_al_a {font-size:1.2em;display:block;position:relative;margin-bottom:10px;font-weight:bold;color:#3a8afd} #gnb_all .gnb_al_li li {line-height:2em} #gnb_all .gnb_al_li li a {color:#555} -#gnb_all_bg {display:none;background:#292929b8;width:100%;height:100%;position:fixed;left:0;top:0;z-index:999} +#gnb_all_bg {display:none;background:rgba(0,0,0,0.1);width:100%;height:100%;position:fixed;left:0;top:0;z-index:999} /* 중간 레이아웃 */ #wrapper {} @@ -158,7 +158,7 @@ box-shadow:0 2px 5px rgba(0,0,0,0.2)} #container_wr {z-index:5;margin:0 auto;height:100%;zoom:1} #aside {float:right;width:235px;padding:0;height:100%;margin:20px 0 20px 20px} -#container {/*background:pink;*/z-index:4;position:relative;float:left;min-height:500px;height:auto !important;margin:20px 0;height:500px;font-size:1em;width:930px;zoom:1} +#container {z-index:4;position:relative;float:left;min-height:500px;height:auto !important;margin:20px 0;height:500px;font-size:1em;width:930px;zoom:1} #container:after {display:block;visibility:hidden;clear:both;content:""} #container_title {font-size:1.333em;margin:0 auto;font-weight:bold} #container_title span {margin:0 auto 10px;display:block;line-height:30px} @@ -280,7 +280,7 @@ a.btn_admin,.btn_admin {display:inline-block;color:#d13f4a;text-decoration:none; /* 기본테이블 */ -.tbl_wrap table {width:100%;border-collapse:collapse;border-spacing:0 5px;border-top:1px solid #ececec;border-bottom:1px solid #ececec} +.tbl_wrap table {width:100%;border-collapse:collapse;border-spacing:0 5px;background:#fff;border-top:1px solid #ececec;border-bottom:1px solid #ececec} .tbl_wrap caption {padding:10px 0;font-weight:bold;text-align:left} .tbl_head01 {margin:0 0 10px} .tbl_head01 caption {padding:0;font-size:0;line-height:0;overflow:hidden} @@ -288,7 +288,7 @@ a.btn_admin,.btn_admin {display:inline-block;color:#d13f4a;text-decoration:none; .tbl_head01 thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */ .tbl_head01 tfoot th, .tbl_head01 tfoot td {padding:10px 0;border-top:1px solid #c1d1d5;border-bottom:1px solid #c1d1d5;background:#d7e0e2;text-align:center} .tbl_head01 tbody th {padding:8px 0;border-bottom:1px solid #e8e8e8} -.tbl_head01 td {color:#666;background:#fff;padding:10px 5px;border-top:1px solid #ecf0f1;line-height:1.4em;height:60px;word-break:break-all} +.tbl_head01 td {color:#666;padding:10px 5px;border-top:1px solid #ecf0f1;border-bottom:1px solid #ecf0f1;line-height:1.4em;height:60px;word-break:break-all} .tbl_head01 tbody tr:hover td {background:#fafafa} .tbl_head01 a:hover {text-decoration:underline} diff --git a/theme/54/skin/board/basic/style.css b/theme/54/skin/board/basic/style.css index 6efd316ca..91df8157e 100644 --- a/theme/54/skin/board/basic/style.css +++ b/theme/54/skin/board/basic/style.css @@ -88,7 +88,7 @@ #bo_list {position:relative;margin-bottom:20px} #bo_list:after {display:block;visibility:hidden;clear:both;content:""} #bo_list .td_board {width:120px;text-align:center} -#bo_list .td_chk {width:30px;text-align:center} +#bo_list .td_chk {width:30px;text-align:center;border-top:1px solid #ecf0f1;border-bottom:1px solid #ecf0f1} #bo_list .td_date {width:60px;text-align:center} #bo_list .td_datetime {width:60px;text-align:center} #bo_list .td_group {width:100px;text-align:center} diff --git a/theme/54/skin/member/basic/style.css b/theme/54/skin/member/basic/style.css index e24ec4c65..ad138948e 100644 --- a/theme/54/skin/member/basic/style.css +++ b/theme/54/skin/member/basic/style.css @@ -90,13 +90,13 @@ /* ### 기본 스타일 커스터마이징 끝 ### */ /* 회원가입 약관 */ -.register {width:570px;margin:0 auto} +.register {margin:0 auto} +.register:after {display:block;visibility:hidden;clear:both;content:""} .register .btn_confirm .btn_submit, .register .btn_confirm .btn_close {float:left;height:50px !important;width:49.5%;font-weight:bold;font-size:1.083em} .register .btn_confirm {text-align:left} .register .btn_confirm .btn_submit {margin-left:1%} - #fregister p {position:relative;text-align:center;color:#fff;height:50px;line-height:50px;font-size:1.1em;background:#f2838f;margin:0 0 10px;border-radius:5px;font-weight:bold} #fregister p:before {content:"";position:absolute;top:0;left:0;width:5px;height:50px;border-radius:5px 0 0 5px;background:#da4453} #fregister p i {font-size:1.2em;vertical-align:middle} From 266772d6dca6e43197d4651236056c90a9e45015 Mon Sep 17 00:00:00 2001 From: leebokyung Date: Fri, 11 Jan 2019 15:51:59 +0900 Subject: [PATCH 18/25] =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=ED=8C=9D?= =?UTF-8?q?=EC=97=85=20=EC=83=89=EC=83=81=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- theme/54/mobile/skin/member/basic/style.css | 4 ++-- theme/54/skin/member/basic/style.css | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/theme/54/mobile/skin/member/basic/style.css b/theme/54/mobile/skin/member/basic/style.css index 387ec3b61..9abd87738 100644 --- a/theme/54/mobile/skin/member/basic/style.css +++ b/theme/54/mobile/skin/member/basic/style.css @@ -278,7 +278,7 @@ #point .point_all li span {float:right;color:#485172;font-weight:bold} #point .point_all li:last-child {border-left:1px solid #d6e2f4} #point .point_all .full_li {width:100%;border-bottom:1px solid #d6e2f4;text-align:left} -#point .point_all .full_li span {color:#3a8afd;font-weight:bold;font-size:1.2em} +#point .point_all .full_li span {color:#000;font-weight:bold;font-size:1.2em} .point_list {margin-bottom:20px} .point_list li:first-child {border-top:1px solid #ececec} @@ -286,7 +286,7 @@ .point_list li:after {display:block;visibility:hidden;clear:both;content:""} .point_list .point_use {background:#f6f6f6} -.point_list .point_use .point_num {font-size:1.25em;color:#707071;font-weight:bold;float:right} +.point_list .point_use .point_num {font-size:1.25em;color:#ff4f76;font-weight:bold;float:right} .point_list .point_num {font-size:1.25em;color:#3a8afd;font-weight:bold;position:absolute;right:15px;top:25px} .point_list .point_top {line-height:15px;margin:0 0 5px} .point_list .point_top:after {display:block;visibility:hidden;clear:both;content:""} diff --git a/theme/54/skin/member/basic/style.css b/theme/54/skin/member/basic/style.css index ad138948e..4380c7333 100644 --- a/theme/54/skin/member/basic/style.css +++ b/theme/54/skin/member/basic/style.css @@ -288,7 +288,7 @@ #point .point_all li span {float:right;color:#485172;font-weight:bold} #point .point_all li:last-child {border-left:1px solid #d6e2f4} #point .point_all .full_li {width:100%;border-bottom:1px solid #d6e2f4;text-align:left} -#point .point_all .full_li span {color:#3a8afd;font-weight:bold;font-size:1.2em} +#point .point_all .full_li span {color:#000;font-weight:bold;font-size:1.2em} .point_list {} .point_list li:first-child {border-top:1px solid #ececec} @@ -296,7 +296,7 @@ .point_list li:after {display:block;visibility:hidden;clear:both;content:""} .point_list .point_use {background:#f6f6f6} -.point_list .point_use .point_num {font-size:1.25em;color:#707071;font-weight:bold;float:right} +.point_list .point_use .point_num {font-size:1.25em;color:#ff4f76;font-weight:bold;float:right} .point_list .point_num {font-size:1.25em;color:#3a8afd;font-weight:bold;position:absolute;right:15px;top:25px} .point_list .point_top {line-height:15px;margin:0 0 5px} .point_list .point_top:after {display:block;visibility:hidden;clear:both;content:""} From 579190c786d7788707525c69f0f5ef80e3bc6533 Mon Sep 17 00:00:00 2001 From: leebokyung Date: Fri, 11 Jan 2019 16:08:07 +0900 Subject: [PATCH 19/25] =?UTF-8?q?=EA=B3=B5=EC=A7=80=EA=B0=80=20=EC=97=86?= =?UTF-8?q?=EC=8A=B5=EB=8B=88=EB=8B=A4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- theme/54/skin/latest/notice/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/54/skin/latest/notice/style.css b/theme/54/skin/latest/notice/style.css index 4dd81f5ac..9376f0a83 100644 --- a/theme/54/skin/latest/notice/style.css +++ b/theme/54/skin/latest/notice/style.css @@ -9,4 +9,4 @@ .notice li .lock_icon {display:inline-block;line-height:14px;width:16px;font-size:0.833em;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size: 12px;border:1px solid #a2c6ce;vertical-align:baseline} .notice li .new_icon {display:inline-block;line-height:16px;width:16px;font-size:0.833em;color:#ffff00;background:#6db142;text-align:center;margin-right:3px;border-radius:2px;vertical-align:baseline} .notice .cnt_cm {background:#5c85c1;color:#fff;font-size:11px;height:16px;line-height:16px;padding:0 5px;border-radius:3px;white-space:nowrap;margin-left:5px} - +.notice li.empty_li {border-bottom:0;line-height:120px} From c5593c56be0b29beb2880dff674db2c10eaedf85 Mon Sep 17 00:00:00 2001 From: thisgun Date: Tue, 15 Jan 2019 15:32:48 +0900 Subject: [PATCH 20/25] =?UTF-8?q?=EC=B5=9C=EC=8B=A0=EA=B8=80=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/latest.lib.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/latest.lib.php b/lib/latest.lib.php index eb9d1c05f..3455977a1 100644 --- a/lib/latest.lib.php +++ b/lib/latest.lib.php @@ -1,5 +1,6 @@ '', 'bf_content'=>''); $list[$i]['bo_table'] = $bo_table; // 썸네일 추가 - if($options) { + if($options && is_string($options)) { $options_arr = explode(',', $options); $thumb_width = $options_arr[0]; $thumb_height = $options_arr[1]; From 2ce07e5ec9eaaf3a7c99d14eefc1f94daac1cc78 Mon Sep 17 00:00:00 2001 From: thisgun Date: Wed, 16 Jan 2019 14:46:39 +0900 Subject: [PATCH 21/25] =?UTF-8?q?=EC=9E=98=EB=AA=BB=EB=90=9C=20=EC=98=A4?= =?UTF-8?q?=ED=83=80=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/alert.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbs/alert.php b/bbs/alert.php index b1117d347..1d74ad4b4 100644 --- a/bbs/alert.php +++ b/bbs/alert.php @@ -68,7 +68,7 @@ history.back(); $value) { - $key = clean_xss_tags($url); + $key = clean_xss_tags($key); $value = clean_xss_tags($value); if(strlen($value) < 1) From ab5fb4815d7406e83dc84998f22e8ec511f6aa8b Mon Sep 17 00:00:00 2001 From: thisgun Date: Fri, 18 Jan 2019 11:34:31 +0900 Subject: [PATCH 22/25] =?UTF-8?q?KVE-2018-1968=20=EC=B7=A8=EC=95=BD?= =?UTF-8?q?=EC=A0=90=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.php b/common.php index 5ba0419cc..c24c56e07 100644 --- a/common.php +++ b/common.php @@ -122,7 +122,7 @@ $member = array(); $board = array(); $group = array(); $g5 = array(); - +$qaconfig = array(); //============================================================================== // 공통 From 6b67183ec5803c9da0c86c47603e9d2f5ec6f072 Mon Sep 17 00:00:00 2001 From: thisgun Date: Fri, 18 Jan 2019 11:58:56 +0900 Subject: [PATCH 23/25] =?UTF-8?q?=EC=AA=BD=EC=A7=80=20=EC=A0=80=EC=9E=A5?= =?UTF-8?q?=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/memo_form_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbs/memo_form_update.php b/bbs/memo_form_update.php index cc9f00abe..dbdcb65dc 100644 --- a/bbs/memo_form_update.php +++ b/bbs/memo_form_update.php @@ -60,7 +60,7 @@ for ($i=0; $i Date: Fri, 18 Jan 2019 16:57:24 +0900 Subject: [PATCH 24/25] =?UTF-8?q?=EB=B2=84=EC=A0=84=205.3.2.5=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 a7d518d18..87887e444 100644 --- a/config.php +++ b/config.php @@ -5,7 +5,7 @@ ********************/ define('G5_VERSION', '그누보드5'); -define('G5_GNUBOARD_VER', '5.3.2.4'); +define('G5_GNUBOARD_VER', '5.3.2.5'); // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음 define('_GNUBOARD_', true); From 172b3dba98f1b100653f341628289b53f5de35b4 Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 21 Jan 2019 14:09:52 +0900 Subject: [PATCH 25/25] =?UTF-8?q?=ED=85=8C=EB=A7=88=20=EB=A9=94=EB=89=B4?= =?UTF-8?q?=20=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- theme/54/css/default.css | 10 ++++++---- theme/54/head.php | 9 +++++---- theme/54/skin/board/basic/list.skin.php | 12 +++++++----- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/theme/54/css/default.css b/theme/54/css/default.css index 2fcd528b5..c0ece1a38 100644 --- a/theme/54/css/default.css +++ b/theme/54/css/default.css @@ -107,17 +107,19 @@ border:1px solid #558ab7 !important; #gnb .gnb_wrap {margin:0 auto;position:relative;z-index:10} #gnb #gnb_1dul {font-size:1.083em;padding:0;border-bottom:1px solid #e0e2e5;zoom:1} #gnb ul:after {display:block;visibility:hidden;clear:both;content:""} -#gnb .gnb_1dli {float:left;line-height:55px;padding:0 15px;position:relative} +#gnb .gnb_1dli {float:left;line-height:55px;padding:0px;position:relative} #gnb .gnb_1dli:hover > a {color:#3a8afd; -webkit-transition:background-color 2s ease-out; -moz-transition:background-color 0.3s ease-out; -o-transition:background-color 0.3s ease-out; transition:background-color 0.3s ease-out} -.gnb_1dli .bg {display:inline-block;width:10px;height:10px;overflow:hidden;background:url('../img/gnb_bg2.gif') no-repeat 50% 50%;text-indent:-999px} -.gnb_1da {display:inline-block;font-weight:bold;color:#080808;text-decoration:none} +.gnb_1dli .bg {position:absolute;top:24px;right:8px;display:inline-block;width:10px;height:10px;overflow:hidden;background:url('../img/gnb_bg2.gif') no-repeat 50% 50%;text-indent:-999px} +.gnb_1da {display:block;font-weight:bold;padding:0 15px;color:#080808;text-decoration:none} +.gnb_1dli.gnb_al_li_plus .gnb_1da{padding-right:25px} .gnb_2dli:first-child {border:0} -.gnb_2dul {display:none;position:absolute;top:56px;min-width:140px;border:1px solid #e0e2e5;border-top:0;padding:0; +.gnb_2dul {display:none;position:absolute;top:54px;min-width:140px;padding-top:2px} +.gnb_2dul .gnb_2dul_box {border:1px solid #e0e2e5;border-top:0;padding:0; -webkit-box-shadow:0px 1px 5px rgba(97, 97, 97, 0.2); -moz-box-shadow:0px 1px 5px rgba(97, 97, 97, 0.2); box-shadow:0px 1px 5px rgba(97, 97, 97, 0.2)} diff --git a/theme/54/head.php b/theme/54/head.php index ed3896e39..6ea95d57f 100644 --- a/theme/54/head.php +++ b/theme/54/head.php @@ -132,9 +132,10 @@ include_once(G5_LIB_PATH.'/popular.lib.php'); $i = 0; foreach( $menu_datas as $row ){ - if( empty($row) ) continue; + if( empty($row) ) continue; + $add_class = (isset($row['sub']) && $row['sub']) ? 'gnb_al_li_plus' : ''; ?> -
    • +
    • 하위분류
        '.PHP_EOL; + echo '하위분류
          '.PHP_EOL; ?>
          • 0) - echo '
        '.PHP_EOL; + echo '
      • '.PHP_EOL; ?> ', 0
    • 글쓰기
    • - +
      • - +