From bd557fbdb4570deb61be35d5af296d008f9a857e Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 23 Feb 2015 11:02:48 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EC=BF=BC=EB=A6=AC=EB=AC=B8=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EB=94=B0=EC=98=B4=ED=91=9C=20=EC=A0=9C=EB=8C=80?= =?UTF-8?q?=EB=A1=9C=20=EC=A0=9C=EA=B1=B0=EB=90=98=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8A=94=20=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 --- common.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common.php b/common.php index 8a69c4539..f4fd07275 100644 --- a/common.php +++ b/common.php @@ -287,7 +287,7 @@ if (isset($_REQUEST['sca'])) { if (isset($_REQUEST['sfl'])) { $sfl = trim($_REQUEST['sfl']); - $sfl = preg_replace("/[\<\>\'\"\%\=\(\)\s]/", "", $sfl); + $sfl = preg_replace("/[\<\>\'\"\\\'\\\"\%\=\(\)\s]/", "", $sfl); if ($sfl) $qstr .= '&sfl=' . urlencode($sfl); // search field (검색 필드) } else { @@ -305,7 +305,7 @@ if (isset($_REQUEST['stx'])) { // search text (검색어) if (isset($_REQUEST['sst'])) { $sst = trim($_REQUEST['sst']); - $sst = preg_replace("/[\<\>\'\"\%\=\(\)\s]/", "", $sst); + $sst = preg_replace("/[\<\>\'\"\\\'\\\"\%\=\(\)\s]/", "", $sst); if ($sst) $qstr .= '&sst=' . urlencode($sst); // search sort (검색 정렬 필드) } else { From b25ec93d1472f82341593dce35c14651323b56a1 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 23 Feb 2015 11:30:41 +0900 Subject: [PATCH 2/6] =?UTF-8?q?sql=20=EC=97=90=EB=9F=AC=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=EC=84=A4=EC=A0=95=EA=B0=92=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.php b/config.php index 6c2dfc6a1..edcd085b0 100644 --- a/config.php +++ b/config.php @@ -165,8 +165,8 @@ define('G5_SMTP', '127.0.0.1'); ********************/ // SQL 에러를 표시할 것인지 지정 -// 에러를 표시하지 않으려면 FALSE 로 변경 -define('G5_DISPLAY_SQL_ERROR', TRUE); +// 에러를 표시하려면 TRUE 로 변경 +define('G5_DISPLAY_SQL_ERROR', FALSE); // escape string 처리 함수 지정 // addslashes 로 변경 가능 From ae3601af92d0b9a17c2b9557acd62ad7bb887673 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 23 Feb 2015 14:19:14 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/point_clear.php | 64 --------------------------------------------- adm/point_list.php | 11 -------- 2 files changed, 75 deletions(-) delete mode 100644 adm/point_clear.php diff --git a/adm/point_clear.php b/adm/point_clear.php deleted file mode 100644 index 22b5d25d7..000000000 --- a/adm/point_clear.php +++ /dev/null @@ -1,64 +0,0 @@ -'; -include_once('./admin.tail.php'); -flush(); - -echo ''."\n"; -flush(); - -$max_count = 50; - -// 테이블 락을 걸고 -$sql = " LOCK TABLES {$g5['member_table']} WRITE, {$g5['point_table']} WRITE "; -sql_query($sql); - -$sql = " select mb_id, count(po_point) as cnt - from {$g5['point_table']} - group by mb_id - having cnt > {$max_count}+1 - order by cnt "; -$result = sql_query($sql); -for ($i=0; $row=sql_fetch_array($result); $i++) -{ - $count = 0; - $total = 0; - $sql2 = " select po_id, po_point - from {$g5['point_table']} - where mb_id = '{$row['mb_id']}' - order by po_id desc - limit {$max_count}, {$row['cnt']} "; - $result2 = sql_query($sql2); - for ($k=0; $row2=sql_fetch_array($result2); $k++) - { - $count++; - $total += $row2['po_point']; - - sql_query(" delete from {$g5['point_table']} where po_id = '{$row2['po_id']}' "); - } - - insert_point($row['mb_id'], $total, '포인트 {$count}건 정리', '@clear', $row['mb_id'], G5_TIME_YMD."-".uniqid("")); - - $str = $row['mb_id']."님 포인트 내역 ".number_format($count)."건 ".number_format($total)."점 정리
"; - echo ''."\n"; - flush(); -} - -// 테이블 락을 풀고 -$sql = " UNLOCK TABLES "; -sql_query($sql); - -echo ''."\n"; -?> diff --git a/adm/point_list.php b/adm/point_list.php index 08f44d5b1..084c5ad09 100644 --- a/adm/point_list.php +++ b/adm/point_list.php @@ -70,16 +70,6 @@ else $mb_id = ""; ?> - -
전체 건 @@ -91,7 +81,6 @@ function point_clear() echo ' (전체 합계 '.number_format($row2['sum_point']).'점)'; } ?> -
From 6695abda2f05cd88dd7ae02a5978fb3a90b04456 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 23 Feb 2015 16:16:55 +0900 Subject: [PATCH 4/6] =?UTF-8?q?iOS8=20=ED=99=98=EA=B2=BD=EC=97=90=EC=84=9C?= =?UTF-8?q?=20=EC=A0=91=EC=86=8D=EC=9E=90=20=EC=88=98=20=ED=91=9C=EC=8B=9C?= =?UTF-8?q?=20=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 --- mobile/skin/connect/basic/connect.skin.php | 1 - 1 file changed, 1 deletion(-) diff --git a/mobile/skin/connect/basic/connect.skin.php b/mobile/skin/connect/basic/connect.skin.php index 55849443c..96d2da394 100644 --- a/mobile/skin/connect/basic/connect.skin.php +++ b/mobile/skin/connect/basic/connect.skin.php @@ -5,5 +5,4 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 add_stylesheet('', 0); ?> - From dca1e671053e11578625d0601c3f8dd02d5fc4bc Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 3 Mar 2015 09:50:00 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=EB=8F=84=EB=A9=94=EC=9D=B8=EC=97=90=20port?= =?UTF-8?q?=20=EC=9E=88=EC=9D=84=20=EB=95=8C=20=EB=8C=80=EC=9D=91=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/tail.php | 5 ++++- tail.php | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mobile/tail.php b/mobile/tail.php index 6ada54bbd..ceecca3fd 100644 --- a/mobile/tail.php +++ b/mobile/tail.php @@ -28,7 +28,10 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 if(G5_DEVICE_BUTTON_DISPLAY && G5_IS_MOBILE) { $seq = 0; $p = parse_url(G5_URL); - $href = $p['scheme'].'://'.$p['host'].$_SERVER['PHP_SELF']; + $href = $p['scheme'].'://'.$p['host']; + if(isset($p['port']) && $p['port']) + $href .= ':'.$p['port']; + $href .= $_SERVER['PHP_SELF']; if($_SERVER['QUERY_STRING']) { $sep = '?'; foreach($_GET as $key=>$val) { diff --git a/tail.php b/tail.php index f4b57a4c9..8418253c6 100644 --- a/tail.php +++ b/tail.php @@ -41,7 +41,10 @@ if (G5_IS_MOBILE) { if(G5_DEVICE_BUTTON_DISPLAY && !G5_IS_MOBILE) { $seq = 0; $p = parse_url(G5_URL); - $href = $p['scheme'].'://'.$p['host'].$_SERVER['PHP_SELF']; + $href = $p['scheme'].'://'.$p['host']; + if(isset($p['port']) && $p['port']) + $href .= ':'.$p['port']; + $href .= $_SERVER['PHP_SELF']; if($_SERVER['QUERY_STRING']) { $sep = '?'; foreach($_GET as $key=>$val) { From efe7855776c41e4bacb97ef5038c3b5f6f62b67d Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 3 Mar 2015 16:45:02 +0900 Subject: [PATCH 6/6] =?UTF-8?q?gif=20=EC=8D=B8=EB=84=A4=EC=9D=BC=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EB=95=8C=20=EB=B0=9C=EC=83=9D=ED=95=A0=20?= =?UTF-8?q?=EC=88=98=20=EC=9E=88=EB=8A=94=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 --- lib/thumbnail.lib.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php index b9a5c4abf..15ad429fc 100644 --- a/lib/thumbnail.lib.php +++ b/lib/thumbnail.lib.php @@ -333,11 +333,14 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h if($size[2] == 3) { imagealphablending($dst, false); imagesavealpha($dst, true); - } else if($size[2] == 1 && $src_transparency != -1) { - $transparent_color = imagecolorsforindex($src, $src_transparency); - $current_transparent = imagecolorallocate($dst, $transparent_color['red'], $transparent_color['green'], $transparent_color['blue']); - imagefill($dst, 0, 0, $current_transparent); - imagecolortransparent($dst, $current_transparent); + } else if($size[2] == 1) { + $palletsize = imagecolorstotal($src); + if($src_transparency >= 0 && $src_transparency < $palletsize) { + $transparent_color = imagecolorsforindex($src, $src_transparency); + $current_transparent = imagecolorallocate($dst, $transparent_color['red'], $transparent_color['green'], $transparent_color['blue']); + imagefill($dst, 0, 0, $current_transparent); + imagecolortransparent($dst, $current_transparent); + } } } else { $dst = imagecreatetruecolor($dst_w, $dst_h); @@ -367,7 +370,8 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h imagealphablending($dst, false); imagesavealpha($dst, true); } else if($size[2] == 1) { - if($src_transparency != -1) { + $palletsize = imagecolorstotal($src); + if($src_transparency >= 0 && $src_transparency < $palletsize) { $transparent_color = imagecolorsforindex($src, $src_transparency); $current_transparent = imagecolorallocate($dst, $transparent_color['red'], $transparent_color['green'], $transparent_color['blue']); imagefill($dst, 0, 0, $current_transparent);