From dc06aed1642d663f5b89d834b2a9b14d2eff4d6f Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 16 Jun 2014 10:24:15 +0900
Subject: [PATCH] =?UTF-8?q?FAQ=20=EA=B2=80=EC=83=89=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EC=9D=B4=EC=A0=84=20=ED=94=84?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EB=9E=A8=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

---
 bbs/faq.php                         |  8 +++++---
 g4_import_run.php                   | 12 ++++++++++++
 mobile/skin/faq/basic/list.skin.php |  4 ++--
 skin/faq/basic/list.skin.php        |  4 ++--
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/bbs/faq.php b/bbs/faq.php
index d3fe9406e..affa51c97 100644
--- a/bbs/faq.php
+++ b/bbs/faq.php
@@ -64,11 +64,9 @@ if(is_file($skin_file)) {
     $faq_list = array();
 
     $stx = trim($stx);
-    $sql_search = '';
 
     if($stx) {
        $sql_search = " and ( INSTR(fa_subject, '$stx') > 0 or INSTR(fa_content, '$stx') > 0 ) ";
-       $category_stx = '&amp;stx='.$stx;
     }
 
     if ($page < 1) { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
@@ -92,8 +90,12 @@ if(is_file($skin_file)) {
                 order by fa_order , fa_id
                 limit $from_record, $page_rows ";
     $result = sql_query($sql);
-    while ($row=sql_fetch_array($result)){
+    for ($i=0;$row=sql_fetch_array($result);$i++){
         $faq_list[] = $row;
+        if($stx) {
+            $faq_list[$i]['fa_subject'] = search_font($stx, $faq_list[$i]['fa_subject']);
+            $faq_list[$i]['fa_content'] = search_font($stx, $faq_list[$i]['fa_content']);
+        }
     }
     include_once($skin_file);
 } else {
diff --git a/g4_import_run.php b/g4_import_run.php
index 8392e0d6b..867af24cc 100644
--- a/g4_import_run.php
+++ b/g4_import_run.php
@@ -263,15 +263,21 @@ document.onkeydown = noRefresh ;
         // visit table 복사
         $sql = " select * from {$g4['visit_table']} ";
         $result = sql_query($sql);
+
+        // g5_visit 테이블 초기화
+        sql_query(" delete from {$g5['visit_table']} ");
+
         for($i=0; $row=sql_fetch_array($result); $i++) {
             if($is_euckr)
                 $row = array_map('iconv_utf8', $row);
 
             // 중복체크
+            /*
             $sql2 = " select count(*) as cnt from {$g5['visit_table']} where vi_ip = '{$row['vi_ip']}' and vi_date = '{$row['vi_date']}' ";
             $row2 = sql_fetch($sql2);
             if($row2['cnt'])
                 continue;
+            */
 
             $comma = '';
             $sql_common = '';
@@ -289,15 +295,21 @@ document.onkeydown = noRefresh ;
         // visit sum table 복사
         $sql = " select * from {$g4['visit_sum_table']} ";
         $result = sql_query($sql);
+
+        // g5_visit_sub 테이블 초기화
+        sql_query(" delete from {$g5['visit_sum_table']} ");
+
         for($i=0; $row=sql_fetch_array($result); $i++) {
             if($is_euckr)
                 $row = array_map('iconv_utf8', $row);
 
             // 중복체크
+            /*
             $sql2 = " select count(*) as cnt from {$g5['visit_sum_table']} where vs_date = '{$row['vs_date']}' ";
             $row2 = sql_fetch($sql2);
             if($row2['cnt'])
                 continue;
+            */
 
             $comma = '';
             $sql_common = '';
diff --git a/mobile/skin/faq/basic/list.skin.php b/mobile/skin/faq/basic/list.skin.php
index 931fb8832..d823a9579 100644
--- a/mobile/skin/faq/basic/list.skin.php
+++ b/mobile/skin/faq/basic/list.skin.php
@@ -26,7 +26,7 @@ if( count($faq_master_list) ){
                 $category_msg = '<span class="sound_only">열린 분류 </span>';
             }
         ?>
-        <li><a href="<?php echo $category_href;?>?fm_id=<?php echo $v['fm_id'].$category_stx;?>" <?php echo $category_option;?> ><?php echo $category_msg.$v['fm_subject'];?></a></li>
+        <li><a href="<?php echo $category_href;?>?fm_id=<?php echo $v['fm_id']?>" <?php echo $category_option;?> ><?php echo $category_msg.$v['fm_subject'];?></a></li>
         <?php
         }
         ?>
@@ -62,7 +62,7 @@ if( count($faq_master_list) ){
 
     } else {
         if($stx){
-            echo '<p>검색된 게시물이 없습니다.</p>';
+            echo '<p class="empty_list">검색된 게시물이 없습니다.</p>';
         } else {
             echo '<div class="empty_table">등록된 FAQ가 없습니다.';
             if($is_admin)
diff --git a/skin/faq/basic/list.skin.php b/skin/faq/basic/list.skin.php
index 56792c1be..bf26708de 100644
--- a/skin/faq/basic/list.skin.php
+++ b/skin/faq/basic/list.skin.php
@@ -32,7 +32,7 @@ if( count($faq_master_list) ){
                 $category_msg = '<span class="sound_only">열린 분류 </span>';
             }
         ?>
-        <li><a href="<?php echo $category_href;?>?fm_id=<?php echo $v['fm_id'].$category_stx;?>" <?php echo $category_option;?> ><?php echo $category_msg.$v['fm_subject'];?></a></li>
+        <li><a href="<?php echo $category_href;?>?fm_id=<?php echo $v['fm_id'];?>" <?php echo $category_option;?> ><?php echo $category_msg.$v['fm_subject'];?></a></li>
         <?php
         }
         ?>
@@ -68,7 +68,7 @@ if( count($faq_master_list) ){
 
     } else {
         if($stx){
-            echo '<p>검색된 게시물이 없습니다.</p>';
+            echo '<p class="empty_list">검색된 게시물이 없습니다.</p>';
         } else {
             echo '<div class="empty_list">등록된 FAQ가 없습니다.';
             if($is_admin)