From 69c839ef0fdcdab8ae6ed85b1dfc8cafdbfc7a61 Mon Sep 17 00:00:00 2001 From: thisgun Date: Wed, 9 Sep 2020 11:02:35 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=EB=AA=A9=EB=A1=9D=EC=97=90=20=ED=88=B4=ED=8C=81=20?= =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/css/admin.css | 4 +++- adm/member_list.php | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/adm/css/admin.css b/adm/css/admin.css index 1f16bacdd..8d9e124c0 100644 --- a/adm/css/admin.css +++ b/adm/css/admin.css @@ -197,12 +197,14 @@ a.btn_submit{background:#ff4081;color:#fff} .btn_frmline{display:inline-block;background:#9eacc6;color:#fff;height:35px;border:0;border-radius:5px;padding:0 10px} a.btn_frmline{display:inline-block;background:#9eacc6;color:#fff;height:35px;line-height:33px;border-radius:5px;padding:0 10px;text-decoration:none !important} .btn_ov01{display:inline-block;line-height:30px;height:30px;font-size:0.92em;vertical-align:top} -.btn_ov01:after{display:block;visibility:hidden;clear :both;content:""} .btn_ov01 .ov_txt{float:left;background:#9eacc6;color:#fff;border-radius:5px 0 0 5px;padding:0 5px} .btn_ov01 .ov_num{float:left;background:#ededed;color:#666;border-radius:0 5px 5px 0;padding:0 5px} a.btn_ov02,a.ov_listall{display:inline-block;line-height:30px;height:30px;font-size:0.92em;background:#565e8c;color:#fff;vertical-align:top;border-radius:5px;padding:0 7px } a.btn_ov02:hover,a.ov_listall:hover{background:#3f51b5} +.local_ov01.local_ov [data-tooltip-text]:hover {position:relative} +.local_ov01.local_ov [data-tooltip-text]:hover:after{line-height:20px;background-color:#000;background-color:rgba(0,0,0,0.8);-webkit-box-shadow:0 0 3px 1px rgba(50,50,50,0.4);-moz-box-shadow:0 0 3px 1px rgba(50,50,50,0.4);box-shadow:0 0 3px 1px rgba(50,50,50,0.4);-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;color:#FFF;font-size:11px;content:attr(data-tooltip-text);white-space: pre;margin-bottom:10px;top:130%;left:0;padding:7px 12px;position:absolute;max-width:500px;word-wrap:break-word;z-index:9999} + /*form*/ .sound_only {display:inline-block !important;position:absolute;top:0;left:0;margin:0 !important;padding:0 !important;width:1px !important;height:1px !important;font-size:0;line-height:0;border:0 !important;overflow:hidden !important} .frm_input{height:35px;line-height:32px;border:1px solid #d5d5d5;} diff --git a/adm/member_list.php b/adm/member_list.php index be3aa7990..e8bcf4611 100644 --- a/adm/member_list.php +++ b/adm/member_list.php @@ -70,8 +70,8 @@ $colspan = 16;
총회원수 명 - 차단 명 - 탈퇴 명 + 차단 명 + 탈퇴 명
From 2f9bb483424db9dfc8ad4a2e565d17941ca3f613 Mon Sep 17 00:00:00 2001 From: thisgun Date: Thu, 24 Sep 2020 15:20:24 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=EC=B5=9C=EC=8B=A0=EA=B8=80=EA=B3=BC=20?= =?UTF-8?q?=EA=B0=81=20=EA=B2=8C=EC=8B=9C=EB=AC=BC=20=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=B6=9C=EB=A0=A5=20?= =?UTF-8?q?=ED=83=9C=EA=B7=B8=EC=97=90=20hook=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/qaview.php | 3 ++- lib/common.lib.php | 3 ++- lib/thumbnail.lib.php | 5 +++-- mobile/skin/board/gallery/list.skin.php | 2 +- mobile/skin/board/gallery/style.css | 2 +- mobile/skin/latest/basic/latest.skin.php | 2 +- mobile/skin/latest/basic/style.css | 2 +- skin/board/gallery/list.skin.php | 2 +- skin/board/gallery/style.css | 2 +- skin/latest/pic_block/latest.skin.php | 2 +- skin/latest/pic_block/style.css | 2 +- skin/latest/pic_list/latest.skin.php | 2 +- skin/latest/pic_list/style.css | 2 +- theme/basic/mobile/skin/board/gallery/list.skin.php | 2 +- theme/basic/mobile/skin/board/gallery/style.css | 2 +- theme/basic/mobile/skin/latest/basic/latest.skin.php | 2 +- theme/basic/mobile/skin/latest/basic/style.css | 2 +- theme/basic/skin/board/gallery/list.skin.php | 2 +- theme/basic/skin/board/gallery/style.css | 2 +- theme/basic/skin/latest/pic_block/latest.skin.php | 2 +- theme/basic/skin/latest/pic_block/style.css | 2 +- theme/basic/skin/latest/pic_list/latest.skin.php | 2 +- theme/basic/skin/latest/pic_list/style.css | 2 +- 23 files changed, 27 insertions(+), 24 deletions(-) diff --git a/bbs/qaview.php b/bbs/qaview.php index 1b5c38227..1bdbd48f3 100644 --- a/bbs/qaview.php +++ b/bbs/qaview.php @@ -155,7 +155,8 @@ if(is_file($skin_file)) { for ($i=1; $i<=2; $i++) { if(preg_match("/\.({$config['cf_image_extension']})$/i", $view['qa_file'.$i])) { - $view['img_file'][] = ''; + $attr_href = run_replace('thumb_view_image_href', G5_BBS_URL.'/view_image.php?fn='.urlencode('/'.G5_DATA_DIR.'/qa/'.$view['qa_file'.$i]), '/'.G5_DATA_DIR.'/qa/'.$view['qa_file'.$i], '', '', '', ''); + $view['img_file'][] = ''; $view['img_count']++; continue; } diff --git a/lib/common.lib.php b/lib/common.lib.php index 363da162c..5ea5bfa80 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1403,7 +1403,8 @@ function view_file_link($file, $width, $height, $content='') $attr = ''; if (preg_match("/\.({$config['cf_image_extension']})$/i", $file)) { - $img = ''; + $attr_href = run_replace('thumb_view_image_href', G5_BBS_URL.'/view_image.php?bo_table='.$board['bo_table'].'&fn='.urlencode($file), $file, $board['bo_table'], $width, $height, $content); + $img = ''; $img .= ''.$content.''; $img .= ''; diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php index d534edef1..5d190f507 100644 --- a/lib/thumbnail.lib.php +++ b/lib/thumbnail.lib.php @@ -198,11 +198,12 @@ function get_view_thumbnail($contents, $thumb_width=0) } else { $thumb_tag = ''.$alt.''; } - + // $img_tag에 editor 경로가 있으면 원본보기 링크 추가 if(strpos($img_tag, G5_DATA_DIR.'/'.G5_EDITOR_DIR) && preg_match("/\.({$config['cf_image_extension']})$/i", $filename)) { $imgurl = str_replace(G5_URL, "", $src); - $thumb_tag = ''.$thumb_tag.''; + $attr_href = run_replace('thumb_view_image_href', G5_BBS_URL.'/view_image.php?fn='.urlencode($imgurl), $filename, '', $width, $height, $alt); + $thumb_tag = ''.$thumb_tag.''; } $contents = str_replace($img_tag, $thumb_tag, $contents); diff --git a/mobile/skin/board/gallery/list.skin.php b/mobile/skin/board/gallery/list.skin.php index 843aa83c8..2a7ffb6fd 100644 --- a/mobile/skin/board/gallery/list.skin.php +++ b/mobile/skin/board/gallery/list.skin.php @@ -99,7 +99,7 @@ add_stylesheet('', 0 $img_content = ''; } - echo $img_content; + echo run_replace('thumb_image_tag', $img_content, $thumb); } ?> diff --git a/mobile/skin/board/gallery/style.css b/mobile/skin/board/gallery/style.css index 3b4ed8f56..a1a7762b2 100644 --- a/mobile/skin/board/gallery/style.css +++ b/mobile/skin/board/gallery/style.css @@ -158,7 +158,7 @@ #bo_gall .gall_li_wr {position:relative;} #bo_gall .gall_li_chk {display:inline-block;position:absolute;top:10px;left:10px} #bo_gall .gall_li:nth-child(2n+1) {clear:both} -#bo_gall .gall_li .gall_img img{width:100%;height:auto} +#bo_gall .gall_li .gall_img img, #bo_gall .gall_li .gall_img video{width:100%;height:auto} #bo_gall .gall_li .gall_img .no_img, #bo_gall .gall_li .gall_notice {display:block;background:#eaeaea;color:#d0d0d0;font-size:3em;text-align:center;padding:25% 0} diff --git a/mobile/skin/latest/basic/latest.skin.php b/mobile/skin/latest/basic/latest.skin.php index 591befd3b..434bbc945 100644 --- a/mobile/skin/latest/basic/latest.skin.php +++ b/mobile/skin/latest/basic/latest.skin.php @@ -38,7 +38,7 @@ $is_show_next_prev = ($list_count > 4) ? 1 : 0; //echo $list[$i]['icon_reply']." "; if( $img_content ){ - echo "".$img_content." "; + echo "".run_replace('thumb_image_tag', $img_content, $thumb)." "; } echo ""; diff --git a/mobile/skin/latest/basic/style.css b/mobile/skin/latest/basic/style.css index 0762c0372..b5730bdb2 100644 --- a/mobile/skin/latest/basic/style.css +++ b/mobile/skin/latest/basic/style.css @@ -9,7 +9,7 @@ .lt ul li:after {display:block;visibility:hidden;clear:both;content:""} .lt ul li:hover a.lt_tit {color:#3a8afd} .lt .lt_thumb {display:inline-block;float:left;margin-right:10px} -.lt .lt_thumb img {width:138px;height:auto;overflow:hidden} +.lt .lt_thumb img, .lt .lt_thumb video{width:138px;height:auto;overflow:hidden} .lt .lt_tit {display:block;font-size:1.2em;font-weight:bold;max-height:60px;overflow:hidden;padding-bottom:10px} .lt .lt_info {display:inline-block;position:relative;line-height:20px;color:#828282;font-size:0.925em;vertical-align:top} .lt .lt_date {color:#828282} diff --git a/skin/board/gallery/list.skin.php b/skin/board/gallery/list.skin.php index 8a50868fa..a7dea635f 100644 --- a/skin/board/gallery/list.skin.php +++ b/skin/board/gallery/list.skin.php @@ -120,7 +120,7 @@ add_stylesheet('', 0 $img_content = 'no image'; } - echo $img_content; + echo run_replace('thumb_image_tag', $img_content, $thumb); } ?> diff --git a/skin/board/gallery/style.css b/skin/board/gallery/style.css index c58c86801..e41dc44d1 100644 --- a/skin/board/gallery/style.css +++ b/skin/board/gallery/style.css @@ -126,7 +126,7 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)} #bo_gall .gall_href a:link, #bo_gall .gall_href a:focus, #bo_gall .gall_href a:hover {text-decoration:none} #bo_gall .gall_img {border-bottom:1px solid #eee;text-align:center;height:200px;max-height:200px;overflow:hidden} #bo_gall .gall_img a,#bo_gall .gall_img .no_image,#bo_gall .gall_img .is_notice {display:block} -#bo_gall .gall_img img {max-width:100%;height:auto !important} +#bo_gall .gall_img img, #bo_gall .gall_img video {max-width:100%;height:auto !important} #bo_gall .gall_img span {display:inline-block;background:#eaeaea;text-align:center;line-height:200px;text-transform:uppercase;font-weight:bold;font-size:1.25em;color:#777} #bo_gall .gall_text_href {margin:10px 0} diff --git a/skin/latest/pic_block/latest.skin.php b/skin/latest/pic_block/latest.skin.php index dcd824410..58b7f4519 100644 --- a/skin/latest/pic_block/latest.skin.php +++ b/skin/latest/pic_block/latest.skin.php @@ -25,7 +25,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0; $img_content = ''.$thumb['alt'].''; ?>
  • - + 비밀글 "; diff --git a/skin/latest/pic_block/style.css b/skin/latest/pic_block/style.css index a7c8601fe..b76196799 100644 --- a/skin/latest/pic_block/style.css +++ b/skin/latest/pic_block/style.css @@ -12,7 +12,7 @@ .pic_lt li {float:left;width:25%;padding:0 10px} .pic_lt li.gallery_li:nth-child(4n+1) {clear: both!important} .pic_lt li .lt_img {margin:5px 0;display:block} -.pic_lt li .lt_img img {width:100%;height:auto} +.pic_lt li .lt_img img, .pic_lt li .lt_img video {width:100%;height:auto} .pic_lt li a:hover {color:#a22121} .pic_lt li .fa-heart {color:#ff0000} .pic_lt li .fa-lock {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 #cbe3e8;vertical-align:middle} diff --git a/skin/latest/pic_list/latest.skin.php b/skin/latest/pic_list/latest.skin.php index 1a8a08ed4..50ad31951 100644 --- a/skin/latest/pic_list/latest.skin.php +++ b/skin/latest/pic_list/latest.skin.php @@ -27,7 +27,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0; $thumb['alt'] = '이미지가 없습니다.'; } $img_content = ''.$thumb['alt'].''; - $img_link_html = ''.$img_content.''; + $img_link_html = ''.run_replace('thumb_image_tag', $img_content, $thumb).''; } ?>
  • diff --git a/skin/latest/pic_list/style.css b/skin/latest/pic_list/style.css index 9c8db93f2..b263aa2f0 100644 --- a/skin/latest/pic_list/style.css +++ b/skin/latest/pic_list/style.css @@ -12,7 +12,7 @@ .pic_li_lt li {border-bottom:1px solid #e5ecee;margin-bottom:10px} .pic_li_lt li .lt_img {display:none} .pic_li_lt li:first-child .lt_img {display:block;margin:0 0 10px;display:block} -.pic_li_lt li:first-child .lt_img img {width:100%;height:auto} +.pic_li_lt li:first-child .lt_img img, .pic_li_lt li .lt_img video {width:100%;height:auto} .pic_li_lt li .pic_li_tit {font-weight:bold;font-size:1.2em;line-height:20px;vertical-align:middle} .pic_li_lt li .fa-heart {color:#ff0000} diff --git a/theme/basic/mobile/skin/board/gallery/list.skin.php b/theme/basic/mobile/skin/board/gallery/list.skin.php index 843aa83c8..2a7ffb6fd 100644 --- a/theme/basic/mobile/skin/board/gallery/list.skin.php +++ b/theme/basic/mobile/skin/board/gallery/list.skin.php @@ -99,7 +99,7 @@ add_stylesheet('', 0 $img_content = ''; } - echo $img_content; + echo run_replace('thumb_image_tag', $img_content, $thumb); } ?> diff --git a/theme/basic/mobile/skin/board/gallery/style.css b/theme/basic/mobile/skin/board/gallery/style.css index 3b4ed8f56..a1a7762b2 100644 --- a/theme/basic/mobile/skin/board/gallery/style.css +++ b/theme/basic/mobile/skin/board/gallery/style.css @@ -158,7 +158,7 @@ #bo_gall .gall_li_wr {position:relative;} #bo_gall .gall_li_chk {display:inline-block;position:absolute;top:10px;left:10px} #bo_gall .gall_li:nth-child(2n+1) {clear:both} -#bo_gall .gall_li .gall_img img{width:100%;height:auto} +#bo_gall .gall_li .gall_img img, #bo_gall .gall_li .gall_img video{width:100%;height:auto} #bo_gall .gall_li .gall_img .no_img, #bo_gall .gall_li .gall_notice {display:block;background:#eaeaea;color:#d0d0d0;font-size:3em;text-align:center;padding:25% 0} diff --git a/theme/basic/mobile/skin/latest/basic/latest.skin.php b/theme/basic/mobile/skin/latest/basic/latest.skin.php index 591befd3b..434bbc945 100644 --- a/theme/basic/mobile/skin/latest/basic/latest.skin.php +++ b/theme/basic/mobile/skin/latest/basic/latest.skin.php @@ -38,7 +38,7 @@ $is_show_next_prev = ($list_count > 4) ? 1 : 0; //echo $list[$i]['icon_reply']." "; if( $img_content ){ - echo "".$img_content." "; + echo "".run_replace('thumb_image_tag', $img_content, $thumb)." "; } echo ""; diff --git a/theme/basic/mobile/skin/latest/basic/style.css b/theme/basic/mobile/skin/latest/basic/style.css index 0762c0372..57c7e62f6 100644 --- a/theme/basic/mobile/skin/latest/basic/style.css +++ b/theme/basic/mobile/skin/latest/basic/style.css @@ -9,7 +9,7 @@ .lt ul li:after {display:block;visibility:hidden;clear:both;content:""} .lt ul li:hover a.lt_tit {color:#3a8afd} .lt .lt_thumb {display:inline-block;float:left;margin-right:10px} -.lt .lt_thumb img {width:138px;height:auto;overflow:hidden} +.lt .lt_thumb img, .lt .lt_thumb video {width:138px !important;height:auto;overflow:hidden} .lt .lt_tit {display:block;font-size:1.2em;font-weight:bold;max-height:60px;overflow:hidden;padding-bottom:10px} .lt .lt_info {display:inline-block;position:relative;line-height:20px;color:#828282;font-size:0.925em;vertical-align:top} .lt .lt_date {color:#828282} diff --git a/theme/basic/skin/board/gallery/list.skin.php b/theme/basic/skin/board/gallery/list.skin.php index 8a50868fa..a7dea635f 100644 --- a/theme/basic/skin/board/gallery/list.skin.php +++ b/theme/basic/skin/board/gallery/list.skin.php @@ -120,7 +120,7 @@ add_stylesheet('', 0 $img_content = 'no image'; } - echo $img_content; + echo run_replace('thumb_image_tag', $img_content, $thumb); } ?> diff --git a/theme/basic/skin/board/gallery/style.css b/theme/basic/skin/board/gallery/style.css index c58c86801..e41dc44d1 100644 --- a/theme/basic/skin/board/gallery/style.css +++ b/theme/basic/skin/board/gallery/style.css @@ -126,7 +126,7 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)} #bo_gall .gall_href a:link, #bo_gall .gall_href a:focus, #bo_gall .gall_href a:hover {text-decoration:none} #bo_gall .gall_img {border-bottom:1px solid #eee;text-align:center;height:200px;max-height:200px;overflow:hidden} #bo_gall .gall_img a,#bo_gall .gall_img .no_image,#bo_gall .gall_img .is_notice {display:block} -#bo_gall .gall_img img {max-width:100%;height:auto !important} +#bo_gall .gall_img img, #bo_gall .gall_img video {max-width:100%;height:auto !important} #bo_gall .gall_img span {display:inline-block;background:#eaeaea;text-align:center;line-height:200px;text-transform:uppercase;font-weight:bold;font-size:1.25em;color:#777} #bo_gall .gall_text_href {margin:10px 0} diff --git a/theme/basic/skin/latest/pic_block/latest.skin.php b/theme/basic/skin/latest/pic_block/latest.skin.php index 791e2b48b..2682480e0 100644 --- a/theme/basic/skin/latest/pic_block/latest.skin.php +++ b/theme/basic/skin/latest/pic_block/latest.skin.php @@ -25,7 +25,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0; $img_content = ''.$thumb['alt'].''; ?>
  • - + 비밀글 "; diff --git a/theme/basic/skin/latest/pic_block/style.css b/theme/basic/skin/latest/pic_block/style.css index 6b5dbb8af..fe377172b 100644 --- a/theme/basic/skin/latest/pic_block/style.css +++ b/theme/basic/skin/latest/pic_block/style.css @@ -12,7 +12,7 @@ .pic_lt li {float:left;width:25%;padding:0 10px} .pic_lt li.galley_li:nth-child(4n+1) {clear: both!important} .pic_lt li .lt_img {margin:5px 0;display:block} -.pic_lt li .lt_img img {width:100%;height:auto} +.pic_lt li .lt_img img, .pic_lt li .lt_img video{width:100%;height:auto} .pic_lt li a:hover {color:#a22121} .pic_lt li .fa-heart {color:#ff0000} .pic_lt li .fa-lock {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 #cbe3e8;vertical-align:middle} diff --git a/theme/basic/skin/latest/pic_list/latest.skin.php b/theme/basic/skin/latest/pic_list/latest.skin.php index 1a8a08ed4..50ad31951 100644 --- a/theme/basic/skin/latest/pic_list/latest.skin.php +++ b/theme/basic/skin/latest/pic_list/latest.skin.php @@ -27,7 +27,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0; $thumb['alt'] = '이미지가 없습니다.'; } $img_content = ''.$thumb['alt'].''; - $img_link_html = ''.$img_content.''; + $img_link_html = ''.run_replace('thumb_image_tag', $img_content, $thumb).''; } ?>
  • diff --git a/theme/basic/skin/latest/pic_list/style.css b/theme/basic/skin/latest/pic_list/style.css index 9c8db93f2..b263aa2f0 100644 --- a/theme/basic/skin/latest/pic_list/style.css +++ b/theme/basic/skin/latest/pic_list/style.css @@ -12,7 +12,7 @@ .pic_li_lt li {border-bottom:1px solid #e5ecee;margin-bottom:10px} .pic_li_lt li .lt_img {display:none} .pic_li_lt li:first-child .lt_img {display:block;margin:0 0 10px;display:block} -.pic_li_lt li:first-child .lt_img img {width:100%;height:auto} +.pic_li_lt li:first-child .lt_img img, .pic_li_lt li .lt_img video {width:100%;height:auto} .pic_li_lt li .pic_li_tit {font-weight:bold;font-size:1.2em;line-height:20px;vertical-align:middle} .pic_li_lt li .fa-heart {color:#ff0000} From 2ff4306cc62c00f798f55c07821ea6c7b5760437 Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 28 Sep 2020 16:59:59 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20head?= =?UTF-8?q?er=20attachment=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/download.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bbs/download.php b/bbs/download.php index 2b2aa1f2b..60e0a7dc2 100644 --- a/bbs/download.php +++ b/bbs/download.php @@ -100,7 +100,8 @@ if(preg_match("/[\xA1-\xFE][\xA1-\xFE]/", $file['bf_source'])){ } */ -$original = urlencode($file['bf_source']); +//$original = urlencode($file['bf_source']); +$original = rawurlencode($file['bf_source']); @include_once($board_skin_path.'/download.tail.skin.php'); @@ -114,7 +115,8 @@ if(preg_match("/msie/i", $_SERVER['HTTP_USER_AGENT']) && preg_match("/5\.5/", $_ } else if (preg_match("/Firefox/i", $_SERVER['HTTP_USER_AGENT'])){ header("content-type: file/unknown"); header("content-length: ".filesize($filepath)); - header("content-disposition: attachment; filename=\"".basename($file['bf_source'])."\""); + //header("content-disposition: attachment; filename=\"".basename($file['bf_source'])."\""); + header("content-disposition: attachment; filename=\"".$original."\""); header("content-description: php generated data"); } else { header("content-type: file/unknown"); From 158a7f50d8ee5cf58b5bfc067c72c23c26c54e74 Mon Sep 17 00:00:00 2001 From: thisgun Date: Tue, 6 Oct 2020 17:12:11 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20->=20?= =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=EC=88=98=EC=A0=95=EC=97=90=EC=84=9C?= =?UTF-8?q?=20=EC=BB=AC=EB=9F=BC=EB=AA=85=20=EC=B6=94=EA=B0=80=20sql=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 --- adm/board_form.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adm/board_form.php b/adm/board_form.php index 0fd63b0f3..ec8676883 100644 --- a/adm/board_form.php +++ b/adm/board_form.php @@ -77,11 +77,11 @@ if (!isset($board['bo_mobile_subject'])) { } if (!isset($board['bo_use_captcha'])) { - sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_use_captcha` TINYINT NOT NULL DEFAULT '0' AFTER `bo_use_sns` "); + sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_use_captcha` TINYINT NOT NULL DEFAULT '0' AFTER `bo_use_sns` ", false); } if (!isset($board['bo_select_editor'])) { - sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_select_editor` VARCHAR(50) NOT NULL DEFAULT '' AFTER `bo_use_dhtml_editor` "); + sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_select_editor` VARCHAR(50) NOT NULL DEFAULT '' AFTER `bo_use_dhtml_editor` ", false); } run_event('adm_board_form_before', $board, $w); From d19cfdc7225e71a61d152f5d2145ad72969f0d86 Mon Sep 17 00:00:00 2001 From: thisgun Date: Tue, 6 Oct 2020 18:26:45 +0900 Subject: [PATCH 5/6] =?UTF-8?q?php7.4=EB=B2=84=EC=A0=84=EC=9D=B4=ED=9B=84?= =?UTF-8?q?=20array=20Deprecate=20curly=20brace=20syntax=20=EC=98=81?= =?UTF-8?q?=ED=96=A5=EC=9C=BC=EB=A1=9C=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 --- plugin/kcaptcha/kcaptcha.lib.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin/kcaptcha/kcaptcha.lib.php b/plugin/kcaptcha/kcaptcha.lib.php index 50a3cef69..fc897b5a1 100644 --- a/plugin/kcaptcha/kcaptcha.lib.php +++ b/plugin/kcaptcha/kcaptcha.lib.php @@ -50,13 +50,13 @@ class KCAPTCHA{ $transparent = (imagecolorat($font, $i, 0) >> 24) == 127; if(!$reading_symbol && !$transparent){ - $font_metrics[$alphabet{$symbol}]=array('start'=>$i); + $font_metrics[$alphabet[$symbol]]=array('start'=>$i); $reading_symbol=true; continue; } if($reading_symbol && $transparent){ - $font_metrics[$alphabet{$symbol}]['end']=$i; + $font_metrics[$alphabet[$symbol]]['end']=$i; $reading_symbol=false; $symbol++; continue; @@ -75,7 +75,7 @@ class KCAPTCHA{ $odd=mt_rand(0,1); if($odd==0) $odd=-1; for($i=0;$i<$length;$i++){ - $m=$font_metrics[$this->keystring{$i}]; + $m=$font_metrics[$this->keystring[$i]]; $y=(($i%2)*$fluctuation_amplitude - $fluctuation_amplitude/2)*$odd + mt_rand(-round($fluctuation_amplitude/3), round($fluctuation_amplitude/3)) From df9891e68b11de72ed113f6a5582de1a7bb28a5e Mon Sep 17 00:00:00 2001 From: thisgun Date: Wed, 7 Oct 2020 10:40:35 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=EB=B2=84=EC=A0=84=205.4.2.9=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 8fc0eab37..1c54cdc90 100644 --- a/config.php +++ b/config.php @@ -5,7 +5,7 @@ ********************/ define('G5_VERSION', '그누보드5'); -define('G5_GNUBOARD_VER', '5.4.2.8'); +define('G5_GNUBOARD_VER', '5.4.2.9'); // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음 define('_GNUBOARD_', true);