Merge branch 'master' of github.com:gnuboard/g5 into g5

adm/point_clear.php

@@ -1,64 +0,0 @@
-<?php
-$sub_menu = "200200";
-include_once('./_common.php');
-
-check_demo();
-
-if (!$ok)
-    alert();
-
-if ($is_admin != 'super')
-    alert('포인트 정리는 최고관리자만 가능합니다.');
-
-$g5['title'] = '포인트 정리';
-include_once('./admin.head.php');
-echo '<span id="ct"></span>';
-include_once('./admin.tail.php');
-flush();
-
-echo '<script>document.getElementById(\'ct\').innerHTML += \'<p>포인트 정리중...</p>\';</script>'."\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)."점 정리<br>";
-    echo '<script>document.getElementById(\'ct\').innerHTML += \''.$str.'\';</script>'."\n";
-    flush();
-}
-
-// 테이블 락을 풀고
-$sql = " UNLOCK TABLES ";
-sql_query($sql);
-
-echo '<script>document.getElementById(\'ct\').innerHTML += \'<p>총 '.$i.'건의 회원포인트 내역이 정리 되었습니다.</p>\';</script>'."\n";
-?>

adm/point_list.php

@@ -70,16 +70,6 @@ else
     $mb_id = "";
 ?>
 
-<script>
-function point_clear()
-{
-    if (confirm('포인트 정리를 하시면 최근 50건 이전의 포인트 부여 내역을 삭제하므로 포인트 부여 내역을 필요로 할때 찾지 못할 수도 있습니다. 그래도 진행하시겠습니까?'))
-    {
-        document.location.href = "./point_clear.php?ok=1";
-    }
-}
-</script>
-
 <div class="local_ov01 local_ov">
     <?php echo $listall ?>
     전체 <?php echo number_format($total_count) ?> 건
@@ -91,7 +81,6 @@ function point_clear()
         echo '&nbsp;(전체 합계 '.number_format($row2['sum_point']).'점)';
     }
     ?>
-    <?php if ($is_admin == 'super') { ?><!-- <a href="javascript:point_clear();">포인트정리</a> --><?php } ?>
 </div>
 
 <form name="fsearch" id="fsearch" class="local_sch01 local_sch" method="get">

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 .= '&amp;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 .= '&amp;sst=' . urlencode($sst); // search sort (검색 정렬 필드)
 } else {

config.php

@@ -165,8 +165,8 @@ define('G5_SMTP', '127.0.0.1');
 ********************/
 
 // SQL 에러를 표시할 것인지 지정
-// 에러를 표시하지 않으려면 FALSE 로 변경
+// 에러를 표시하려면 TRUE 로 변경
-define('G5_DISPLAY_SQL_ERROR', TRUE);
+define('G5_DISPLAY_SQL_ERROR', FALSE);
 
 // escape string 처리 함수 지정
 // addslashes 로 변경 가능

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) {
+        } else if($size[2] == 1) {
-            $transparent_color   = imagecolorsforindex($src, $src_transparency);
+            $palletsize = imagecolorstotal($src);
-            $current_transparent = imagecolorallocate($dst, $transparent_color['red'], $transparent_color['green'], $transparent_color['blue']);
+            if($src_transparency >= 0 && $src_transparency < $palletsize) {
-            imagefill($dst, 0, 0, $current_transparent);
+                $transparent_color   = imagecolorsforindex($src, $src_transparency);
-            imagecolortransparent($dst, $current_transparent);
+                $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);

mobile/skin/connect/basic/connect.skin.php

@@ -5,5 +5,4 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="'.$connect_skin_url.'/style.css">', 0);
 ?>
-
 <?php echo $row['total_cnt'] ?>

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) {

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) {