Merge branch 'master' of https://github.com/gnuboard/gnuboard5 into inicert

adm/sms_admin/install.php

@@ -61,11 +61,6 @@ for ($i=0; $i<count($f); $i++) {
 echo "<script>document.getElementById('sms5_job_01').innerHTML='전체 테이블 생성 완료';</script>";
 flush(); usleep(50000);
 
-$read_point = -1;
-$write_point = 5;
-$comment_point = 1;
-$download_point = -20;
-
 //-------------------------------------------------------------------------------------------------
 // config 테이블 설정
 $sql = " insert into {$g5['sms5_book_group_table']} set bg_name='미분류'";

bbs/memo.php

@@ -15,8 +15,10 @@ if ($kind == 'recv')
     $unkind = 'send';
 else if ($kind == 'send')
     $unkind = 'recv';
-else
+else {
+    $kind = clean_xss_tags(trim($kind));
     alert(''.$kind .'값을 넘겨주세요.');
+}
 
 if ($page < 1) { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
 

mobile/skin/shop/basic/search.skin.php

@@ -44,12 +44,12 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     <div id="ssch_cate">
         <ul>
         <?php
+        echo '<li><a href="#" onclick="set_ca_id(\'\'); return false;">전체분류 <span>'.$total_count.'</span></a></li>'.PHP_EOL;
         $total_cnt = 0;
         foreach( $categorys as $row ){
             echo "<li><a href=\"#\" onclick=\"set_ca_id('{$row['ca_id']}'); return false;\">{$row['ca_name']} <span>".$row['cnt']."</span></a></li>\n";
             $total_cnt += $row['cnt'];
         }
-        echo '<li><a href="#" onclick="set_ca_id(\'\'); return false;">전체분류 <span>'.$total_cnt.'</span></a></li>'.PHP_EOL;
         ?>
         </ul>
     </div>

skin/qa/basic/view.skin.php

@@ -123,7 +123,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
     <?php if ($prev_href || $next_href) { ?>
     <ul class="bo_v_nb">
         <?php if ($prev_href) { ?><li><a href="<?php echo $prev_href ?>" class="btn_b01 btn"><i class="fa fa-chevron-left" aria-hidden="true"></i> 이전글</a></li><?php } ?>
-        <?php if ($next_href) { ?><li><a href="<?php echo $next_href ?>" class="btn_b01 btn">다음글 <i class="fa fa-chevron-right" aria-hidden="true"></i></i></a></li><?php } ?>
+        <?php if ($next_href) { ?><li><a href="<?php echo $next_href ?>" class="btn_b01 btn">다음글 <i class="fa fa-chevron-right" aria-hidden="true"></i></a></li><?php } ?>
     </ul>
     <?php } ?>
 

skin/shop/basic/search.skin.php

@@ -42,8 +42,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 	    <div id="ssch_cate">
 	        <ul>
 	        <?php
+	        echo '<li><a href="#" onclick="set_ca_id(\'\'); return false;">전체분류 <span>('.$total_count.')</span></a></li>'.PHP_EOL;
             $total_cnt = 0;
-	        echo '<li><a href="#" onclick="set_ca_id(\'\'); return false;">전체분류 <span>('.$total_cnt.')</span></a></li>'.PHP_EOL;
 	        foreach((array) $categorys as $row){
                 if( empty($row) ) continue;
 	            echo "<li><a href=\"#\" onclick=\"set_ca_id('{$row['ca_id']}'); return false;\">{$row['ca_name']} (".$row['cnt'].")</a></li>\n";

theme/basic/mobile/skin/shop/basic/search.skin.php

@@ -44,12 +44,12 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     <div id="ssch_cate">
         <ul>
         <?php
+        echo '<li><a href="#" onclick="set_ca_id(\'\'); return false;">전체분류 <span>'.$total_count.'</span></a></li>'.PHP_EOL;
         $total_cnt = 0;
         foreach( $categorys as $row ){
             echo "<li><a href=\"#\" onclick=\"set_ca_id('{$row['ca_id']}'); return false;\">{$row['ca_name']} <span>".$row['cnt']."</span></a></li>\n";
             $total_cnt += $row['cnt'];
         }
-        echo '<li><a href="#" onclick="set_ca_id(\'\'); return false;">전체분류 <span>'.$total_cnt.'</span></a></li>'.PHP_EOL;
         ?>
         </ul>
     </div>

theme/basic/skin/qa/basic/view.skin.php

@@ -123,7 +123,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$qa_skin_url.'/style.css">', 0);
     <?php if ($prev_href || $next_href) { ?>
     <ul class="bo_v_nb">
         <?php if ($prev_href) { ?><li><a href="<?php echo $prev_href ?>" class="btn_b01 btn"><i class="fa fa-chevron-left" aria-hidden="true"></i> 이전글</a></li><?php } ?>
-        <?php if ($next_href) { ?><li><a href="<?php echo $next_href ?>" class="btn_b01 btn">다음글 <i class="fa fa-chevron-right" aria-hidden="true"></i></i></a></li><?php } ?>
+        <?php if ($next_href) { ?><li><a href="<?php echo $next_href ?>" class="btn_b01 btn">다음글 <i class="fa fa-chevron-right" aria-hidden="true"></i></a></li><?php } ?>
     </ul>
     <?php } ?>
 

theme/basic/skin/shop/basic/search.skin.php

@@ -42,8 +42,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 	    <div id="ssch_cate">
 	        <ul>
 	        <?php
+	        echo '<li><a href="#" onclick="set_ca_id(\'\'); return false;">전체분류 <span>('.$total_count.')</span></a></li>'.PHP_EOL;
 	        $total_cnt = 0;
-	        echo '<li><a href="#" onclick="set_ca_id(\'\'); return false;">전체분류 <span>('.$total_cnt.')</span></a></li>'.PHP_EOL;
 	        foreach((array) $categorys as $row){
                 if( empty($row) ) continue;
 	            echo "<li><a href=\"#\" onclick=\"set_ca_id('{$row['ca_id']}'); return false;\">{$row['ca_name']} (".$row['cnt'].")</a></li>\n";

version.php

@@ -2,7 +2,7 @@
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 define('G5_VERSION', '그누보드5');
-define('G5_GNUBOARD_VER', '5.5.0.3-beta');
+define('G5_GNUBOARD_VER', '5.4.20');
 // 그누보드5.4.5.5 버전과 영카트5.4.5.5.1 버전을 합쳐서 그누보드5.4.6 버전에서 시작함 (kagla-210617)
 // G5_YOUNGCART_VER 이 상수를 사용하는 곳이 있으므로 주석 처리 해제함
 // 그누보드5.4.6 이상 버전 부터는 영카트를 그누보드에 포함하여 배포하므로 영카트5의 버전은 의미가 없습니다.