그누보드 5.0.31 수정내역 적용

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">

bbs/list.php

@@ -46,9 +46,15 @@ if ($sca || $stx) {
     $sql_search .= " and (wr_num between {$spt} and ({$spt} + {$config['cf_search_part']})) ";
 
     // 원글만 얻는다. (코멘트의 내용도 검색하기 위함)
+    // 라엘님 제안 코드로 대체 http://sir.co.kr/bbs/board.php?bo_table=g5_bug&wr_id=2922
+    $sql = " SELECT COUNT(DISTINCT `wr_parent`) AS `cnt` FROM {$write_table} WHERE {$sql_search} ";
+    $row = sql_fetch($sql);
+    $total_count = $row['cnt'];
+    /*
     $sql = " select distinct wr_parent from {$write_table} where {$sql_search} ";
     $result = sql_query($sql);
     $total_count = mysql_num_rows($result);
+    */
 } else {
     $sql_search = "";
 

bbs/move.php

@@ -51,6 +51,8 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
     <input type="hidden" name="sfl" value="<?php echo $sfl ?>">
     <input type="hidden" name="stx" value="<?php echo $stx ?>">
     <input type="hidden" name="spt" value="<?php echo $spt ?>">
+    <input type="hidden" name="sst" value="<?php echo $sst ?>">
+    <input type="hidden" name="sod" value="<?php echo $sod ?>">
     <input type="hidden" name="page" value="<?php echo $page ?>">
     <input type="hidden" name="act" value="<?php echo $act ?>">
     <input type="hidden" name="url" value="<?php echo $_SERVER['HTTP_REFERER'] ?>">

bbs/move_update.php

@@ -196,13 +196,14 @@ if ($sw == 'move')
 }
 
 $msg = '해당 게시물을 선택한 게시판으로 '.$act.' 하였습니다.';
-$opener_href = './board.php?bo_table='.$bo_table.'&page='.$page.'&'.$qstr;
+$opener_href  = './board.php?bo_table='.$bo_table.'&page='.$page.'&'.$qstr;
+$opener_href1 = str_replace('&', '&', $opener_href);
 
 echo <<<HEREDOC
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <script>
 alert("$msg");
-opener.document.location.href = "$opener_href";
+opener.document.location.href = "$opener_href1";
 window.close();
 </script>
 <noscript>

bbs/rss.php

@@ -43,7 +43,7 @@ $sql = " select gr_subject from {$g5['group_table']} where gr_id = '{$row['gr_id
 $row = sql_fetch($sql);
 $subj1 = specialchars_replace($row['gr_subject'], 255);
 
-echo '<?phpxml version="1.0" encoding="utf-8" ?>'."\n";
+echo '<?xml version="1.0" encoding="utf-8" ?>'."\n";
 ?>
 <rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
 <channel>
@@ -87,4 +87,4 @@ $date = date('r', strtotime($date));
 
 echo '</channel>'."\n";
 echo '</rss>'."\n";
-?>
+?>

bbs/visit_insert.inc.php

@@ -13,7 +13,7 @@ if (get_cookie('ck_visit_ip') != $_SERVER['REMOTE_ADDR'])
     $remote_addr = escape_trim($_SERVER['REMOTE_ADDR']);
     $referer = "";
     if (isset($_SERVER['HTTP_REFERER']))
-        $referer = escape_trim($_SERVER['HTTP_REFERER']);
+        $referer = escape_trim(clean_xss_tags($_SERVER['HTTP_REFERER']));
     $user_agent  = escape_trim($_SERVER['HTTP_USER_AGENT']);
     $sql = " insert {$g5['visit_table']} ( vi_id, vi_ip, vi_date, vi_time, vi_referer, vi_agent ) values ( '{$vi_id}', '{$remote_addr}', '".G5_TIME_YMD."', '".G5_TIME_HIS."', '{$referer}', '{$user_agent}' ) ";
 

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 로 변경 가능

head.php

@@ -11,7 +11,7 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
 
 // 상단 파일 경로 지정 : 이 코드는 가능한 삭제하지 마십시오.
 if ($config['cf_include_head'] && is_file(G5_PATH.'/'.$config['cf_include_head'])) {
-    include_once($config['cf_include_head']);
+    include_once(G5_PATH.'/'.$config['cf_include_head']);
     return; // 이 코드의 아래는 실행을 하지 않습니다.
 }
 

index.php

@@ -4,7 +4,7 @@ include_once('./_common.php');
 
 // 초기화면 파일 경로 지정 : 이 코드는 가능한 삭제하지 마십시오.
 if ($config['cf_include_index'] && is_file(G5_PATH.'/'.$config['cf_include_index'])) {
-    include_once($config['cf_include_index']);
+    include_once(G5_PATH.'/'.$config['cf_include_index']);
     return; // 이 코드의 아래는 실행을 하지 않습니다.
 }
 

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/board/basic/list.skin.php

@@ -44,6 +44,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     <input type="hidden" name="sfl" value="<?php echo $sfl ?>">
     <input type="hidden" name="stx" value="<?php echo $stx ?>">
     <input type="hidden" name="spt" value="<?php echo $spt ?>">
+    <input type="hidden" name="sst" value="<?php echo $sst ?>">
+    <input type="hidden" name="sod" value="<?php echo $sod ?>">
     <input type="hidden" name="page" value="<?php echo $page ?>">
     <input type="hidden" name="sw" value="">
 
@@ -151,7 +153,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <option value="wr_name,1"<?php echo get_selected($sfl, 'wr_name,1'); ?>>글쓴이</option>
         <option value="wr_name,0"<?php echo get_selected($sfl, 'wr_name,0'); ?>>글쓴이(코)</option>
     </select>
-    <input name="stx" value="<?php echo stripslashes($stx) ?>" placeholder="검색어(필수)" required id="stx" class="required frm_input" size="15" maxlength="15">
+    <input name="stx" value="<?php echo stripslashes($stx) ?>" placeholder="검색어(필수)" required id="stx" class="required frm_input" size="15" maxlength="20">
     <input type="submit" value="검색" class="btn_submit">
     </form>
 </fieldset>

mobile/skin/board/gallery/list.skin.php

@@ -42,6 +42,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     <input type="hidden" name="sfl" value="<?php echo $sfl ?>">
     <input type="hidden" name="stx" value="<?php echo $stx ?>">
     <input type="hidden" name="spt" value="<?php echo $spt ?>">
+    <input type="hidden" name="sst" value="<?php echo $sst ?>">
+    <input type="hidden" name="sod" value="<?php echo $sod ?>">
     <input type="hidden" name="page" value="<?php echo $page ?>">
     <input type="hidden" name="sw" value="">
 
@@ -178,7 +180,7 @@ $(window).on("load", function() {
         <option value="wr_name,1"<?php echo get_selected($sfl, "wr_name,1"); ?>>글쓴이</option>
         <option value="wr_name,0"<?php echo get_selected($sfl, "wr_name,0"); ?>>글쓴이(코)</option>
     </select>
-    <input name="stx" value="<?php echo stripslashes($stx) ?>" placeholder="검색어(필수)" required id="stx" class="required" size="15" maxlength="15">
+    <input name="stx" value="<?php echo stripslashes($stx) ?>" placeholder="검색어(필수)" required id="stx" class="required" size="15" maxlength="20">
     <input type="submit" value="검색">
     </form>
 </fieldset>

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

skin/board/basic/list.skin.php

@@ -51,6 +51,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     <input type="hidden" name="stx" value="<?php echo $stx ?>">
     <input type="hidden" name="spt" value="<?php echo $spt ?>">
     <input type="hidden" name="sca" value="<?php echo $sca ?>">
+    <input type="hidden" name="sst" value="<?php echo $sst ?>">
+    <input type="hidden" name="sod" value="<?php echo $sod ?>">
     <input type="hidden" name="page" value="<?php echo $page ?>">
     <input type="hidden" name="sw" value="">
 
@@ -181,7 +183,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <option value="wr_name,0"<?php echo get_selected($sfl, 'wr_name,0'); ?>>글쓴이(코)</option>
     </select>
     <label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
-    <input type="text" name="stx" value="<?php echo stripslashes($stx) ?>" required id="stx" class="frm_input required" size="15" maxlength="15">
+    <input type="text" name="stx" value="<?php echo stripslashes($stx) ?>" required id="stx" class="frm_input required" size="15" maxlength="20">
     <input type="submit" value="검색" class="btn_submit">
     </form>
 </fieldset>

skin/board/basic/style.css

@@ -107,7 +107,7 @@
 #bo_list .txt_expired {color:#ccc}
 
 #bo_cate h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
-#bo_cate ul {margin-bottom:10px;padding-left:1px;width:728px;zoom:1}
+#bo_cate ul {margin-bottom:10px;padding-left:1px;zoom:1}
 #bo_cate ul:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_cate li {float:left;margin-bottom:-1px}
 #bo_cate a {display:block;position:relative;margin-left:-1px;padding:6px 0 5px;width:90px;border:1px solid #ddd;background:#f7f7f7;color:#888;text-align:center;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer}

skin/board/gallery/list.skin.php

@@ -40,6 +40,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     <input type="hidden" name="sfl" value="<?php echo $sfl ?>">
     <input type="hidden" name="stx" value="<?php echo $stx ?>">
     <input type="hidden" name="spt" value="<?php echo $spt ?>">
+    <input type="hidden" name="sst" value="<?php echo $sst ?>">
+    <input type="hidden" name="sod" value="<?php echo $sod ?>">
     <input type="hidden" name="page" value="<?php echo $page ?>">
     <input type="hidden" name="sw" value="">
 
@@ -175,7 +177,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
         <option value="wr_name,0"<?php echo get_selected($sfl, 'wr_name,0'); ?>>글쓴이(코)</option>
     </select>
     <label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
-    <input type="text" name="stx" value="<?php echo stripslashes($stx) ?>" required id="stx" class="frm_input required" size="15" maxlength="15">
+    <input type="text" name="stx" value="<?php echo stripslashes($stx) ?>" required id="stx" class="frm_input required" size="15" maxlength="20">
     <input type="submit" value="검색" class="btn_submit">
     </form>
 </fieldset>

skin/board/gallery/style.css

@@ -79,7 +79,7 @@
 
 /* 게시판 목록 */
 #bo_cate h2 {width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
-#bo_cate ul {margin-bottom:10px;padding-left:1px;width:728px;zoom:1}
+#bo_cate ul {margin-bottom:10px;padding-left:1px;zoom:1}
 #bo_cate ul:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_cate li {float:left;margin-bottom:-1px}
 #bo_cate a {display:block;position:relative;margin-left:-1px;padding:6px 0 5px;width:90px;border:1px solid #ddd;background:#f7f7f7;color:#888;text-align:center;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer}

skin/faq/basic/style.css

@@ -1,7 +1,7 @@
 @charset "utf-8";
 
 #bo_cate h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
-#bo_cate ul {margin-bottom:10px;padding-left:1px;width:728px;zoom:1}
+#bo_cate ul {margin-bottom:10px;padding-left:1px;zoom:1}
 #bo_cate ul:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_cate li {float:left;margin-bottom:-1px}
 #bo_cate a {display:block;position:relative;margin-left:-1px;padding:6px 0 5px;width:90px;border:1px solid #ddd;background:#f7f7f7;color:#888;text-align:center;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer}

skin/qa/basic/style.css

@@ -107,7 +107,7 @@
 #bo_list .txt_expired {color:#ccc}
 
 #bo_cate h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
-#bo_cate ul {margin-bottom:10px;padding-left:1px;width:728px;zoom:1}
+#bo_cate ul {margin-bottom:10px;padding-left:1px;zoom:1}
 #bo_cate ul:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_cate li {float:left;margin-bottom:-1px}
 #bo_cate a {display:block;position:relative;margin-left:-1px;padding:6px 0 5px;width:90px;border:1px solid #ddd;background:#f7f7f7;color:#888;text-align:center;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer}

skin/search/basic/style.css

@@ -12,10 +12,10 @@
 #sch_res_ov dd {float:left;margin:0 10px 0 5px}
 #sch_res_ov p {float:right;margin:0;padding:0;line-height:1em}
 
-#sch_res_board {margin:0 0 10px;padding-left:1px;width:728px;list-style:none;zoom:1}
+#sch_res_board {margin:0 0 10px;padding-left:1px;list-style:none;zoom:1}
 #sch_res_board:after {display:block;visibility:hidden;clear:both;content:""}
 #sch_res_board li {float:left;margin-bottom:-1px}
-#sch_res_board a {display:block;position:relative;margin-left:-1px;padding:6px 0 5px;width:181px;border:1px solid #ddd;text-align:center;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer}
+#sch_res_board a {display:block;position:relative;margin-left:-1px;padding:6px 0 5px;width:180px;border:1px solid #ddd;text-align:center;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer}
 #sch_res_board a:focus, #sch_res_board a:hover, #sch_res_board a:active {text-decoration:none}
 #sch_res_board .cnt_cmt {font-weight:normal !important}
 

tail.php

@@ -3,7 +3,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 // 하단 파일 경로 지정 : 이 코드는 가능한 삭제하지 마십시오.
 if ($config['cf_include_tail'] && is_file(G5_PATH.'/'.$config['cf_include_tail'])) {
-    include_once($config['cf_include_tail']);
+    include_once(G5_PATH.'/'.$config['cf_include_tail']);
     return; // 이 코드의 아래는 실행을 하지 않습니다.
 }
 
@@ -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) {