From d1ee1eb4e15368584b6f08730133da50dae2661b Mon Sep 17 00:00:00 2001 From: thisgun Date: Thu, 12 Oct 2017 17:21:51 +0900 Subject: [PATCH 1/7] =?UTF-8?q?lgu=20=EB=B3=B8=EC=9D=B8=EC=9D=B8=EC=A6=9D?= =?UTF-8?q?=20=EA=B8=B0=EB=A1=9D=20=EA=B4=80=EB=A0=A8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/lgxpay/AuthOnlyRes.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plugin/lgxpay/AuthOnlyRes.php b/plugin/lgxpay/AuthOnlyRes.php index cc6b882cc..c16bfa633 100644 --- a/plugin/lgxpay/AuthOnlyRes.php +++ b/plugin/lgxpay/AuthOnlyRes.php @@ -80,9 +80,6 @@ if ($xpay->TX()) { echo "

"; */ - // 인증내역기록 - @insert_cert_history($member['mb_id'], 'lg', 'hp'); - if( "0000" == $xpay->Response_Code() ) { //인증요청 결과 성공 DB처리 //echo "인증요청 결과 성공 DB처리하시기 바랍니다.
"; @@ -153,6 +150,10 @@ if ($xpay->TX()) { set_session("ss_cert_birth", $birth_day); set_session("ss_cert_sex", $mb_sex); set_session('ss_cert_dupinfo', $mb_dupinfo); + + // 인증내역기록 + @insert_cert_history($member['mb_id'], 'lg', 'hp'); + } else { //인증요청 결과 실패 DB처리 //echo "인증요청 결과 실패 DB처리하시기 바랍니다.
"; @@ -161,10 +162,10 @@ if ($xpay->TX()) { echo ''.PHP_EOL; } else { - alert_close('인증요청이 실패하였습니다.\\n\\n코드 : '.$xpay->Response_Code().' '.$xpay->Response_Msg()); + alert_close('인증요청이 취소 또는 실패하였습니다.\\n\\n코드 : '.$xpay->Response_Code().' '.$xpay->Response_Msg()); } exit; } From 2c7f9bd44936b91ca76cd44341b9a7b350d2fe09 Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 16 Oct 2017 09:14:42 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=EC=97=90=EC=84=9C=20=ED=9A=8C=EC=9B=90=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=B0=BE=EC=9D=84=EC=8B=9C=20=EB=A6=AC=EB=8B=A4?= =?UTF-8?q?=EC=9D=B4=EB=A0=89=ED=8A=B8=20=EC=88=9C=ED=99=98=20=EC=98=A4?= =?UTF-8?q?=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 --- bbs/password_lost2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbs/password_lost2.php b/bbs/password_lost2.php index 6c20c0a03..1dbb5209a 100644 --- a/bbs/password_lost2.php +++ b/bbs/password_lost2.php @@ -4,7 +4,7 @@ include_once(G5_CAPTCHA_PATH.'/captcha.lib.php'); include_once(G5_LIB_PATH.'/mailer.lib.php'); if ($is_member) { - alert('이미 로그인중입니다.'); + alert_close('이미 로그인중입니다.', G5_URL); } if (!chk_captcha()) { From 2fe00e5e96eacf7896e9d59b04c70996b75514a7 Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 16 Oct 2017 11:12:54 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=EC=9E=90=EB=B0=94=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A6=BD=ED=8A=B8=20=ED=95=A8=EC=88=98=20number=5Fformat=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 --- js/common.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/common.js b/js/common.js index 49c9c56fd..02ce71a7b 100644 --- a/js/common.js +++ b/js/common.js @@ -69,6 +69,8 @@ function number_format(data) var cutlen = 3; var comma = ','; var i; + + data = data + ''; var sign = data.match(/^[\+\-]/); if(sign) { From e46af305a9d016d9b509be2b2d3a7a69ff8bf85e Mon Sep 17 00:00:00 2001 From: thisgun Date: Wed, 18 Oct 2017 17:01:08 +0900 Subject: [PATCH 4/7] =?UTF-8?q?sql=5Freal=5Fescape=5Fstring=20=ED=95=A8?= =?UTF-8?q?=EC=88=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index 5c25f8233..bd50fd8f9 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -2021,8 +2021,12 @@ function sql_real_escape_string($str, $link=null) if(!$link) $link = $g5['connect_db']; + + if(function_exists('mysqli_connect') && G5_MYSQLI_USE) { + return mysqli_real_escape_string($link, $str); + } - return mysqli_real_escape_string($link, $str); + return mysql_real_escape_string($str, $link); } function escape_trim($field) From 6cfb34ab224b55eb7aa9df1e640c2bfb3294ec59 Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 6 Nov 2017 16:47:24 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=EC=98=81=EC=B9=B4=ED=8A=B8=20Reflected=20X?= =?UTF-8?q?SS=20(17-0789)=20=20=EC=B7=A8=EC=95=BD=EC=A0=90=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/menu_form.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/adm/menu_form.php b/adm/menu_form.php index 15592bd33..8dee73269 100644 --- a/adm/menu_form.php +++ b/adm/menu_form.php @@ -8,6 +8,8 @@ if ($is_admin != 'super') $g5['title'] = '메뉴 추가'; include_once(G5_PATH.'/head.sub.php'); +$code = isset($code) ? preg_replace('/[^0-9a-zA-Z]/', '', strip_tags($code)) : ''; + // 코드 if($new == 'new' || !$code) { $code = base_convert(substr($code,0, 2), 36, 10); From 04620f2475585ed0f2ddf659bb852b0437584495 Mon Sep 17 00:00:00 2001 From: thisgun Date: Tue, 7 Nov 2017 09:55:36 +0900 Subject: [PATCH 6/7] =?UTF-8?q?thumbnail=20=EC=83=9D=EC=84=B1=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EC=9D=BC=EB=B6=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/thumbnail.lib.php | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php index 15ff52513..3f6c20866 100644 --- a/lib/thumbnail.lib.php +++ b/lib/thumbnail.lib.php @@ -284,6 +284,7 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h $is_large = true; // width, height 설정 + if($thumb_width) { if(!$thumb_height) { $thumb_height = round(($thumb_width * $size[1]) / $size[0]); @@ -348,7 +349,6 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h } else { // 비율에 맞게 생성 $dst = imagecreatetruecolor($dst_w, $dst_h); $bgcolor = imagecolorallocate($dst, 255, 255, 255); // 배경색 - if($src_w > $src_h) { $tmp_h = round(($dst_w * $src_h) / $src_w); $dst_y = round(($dst_h - $tmp_h) / 2); @@ -384,8 +384,14 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h if($src_w < $dst_w) { if($src_h >= $dst_h) { - $dst_x = round(($dst_w - $src_w) / 2); - $src_h = $dst_h; + if( $src_h > $src_w ){ + $tmp_w = round(($dst_h * $src_w) / $src_h); + $dst_x = round(($dst_w - $tmp_w) / 2); + $dst_w = $tmp_w; + } else { + $dst_x = round(($dst_w - $src_w) / 2); + $src_h = $dst_h; + } } else { $dst_x = round(($dst_w - $src_w) / 2); $dst_y = round(($dst_h - $src_h) / 2); @@ -394,9 +400,15 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h } } else { if($src_h < $dst_h) { - $dst_y = round(($dst_h - $src_h) / 2); - $dst_h = $src_h; - $src_w = $dst_w; + if( $src_w > $dst_w ){ + $tmp_h = round(($dst_w * $src_h) / $src_w); + $dst_y = round(($dst_h - $tmp_h) / 2); + $dst_h = $tmp_h; + } else { + $dst_y = round(($dst_h - $src_h) / 2); + $dst_h = $src_h; + $src_w = $dst_w; + } } } From 0aa4ae0b96dcba41240f03837b9d60e29fb0c9fe Mon Sep 17 00:00:00 2001 From: thisgun Date: Tue, 7 Nov 2017 10:04:47 +0900 Subject: [PATCH 7/7] =?UTF-8?q?5.2.9.6=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 db6fbdf42..145362077 100644 --- a/config.php +++ b/config.php @@ -5,7 +5,7 @@ ********************/ define('G5_VERSION', '그누보드5'); -define('G5_GNUBOARD_VER', '5.2.9.5'); +define('G5_GNUBOARD_VER', '5.2.9.6'); // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음 define('_GNUBOARD_', true);