From 51ea3bcd0ebc5cdf965834fd0eff8eb789b2e408 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Wed, 13 Nov 2013 11:42:25 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=9B=84=EA=B8=B0=20?=
 =?UTF-8?q?=EA=B1=B4=EC=88=98=20=EB=B0=98=EC=98=81=ED=9B=84=20=EA=B2=80?=
 =?UTF-8?q?=EC=83=89=EC=97=90=EC=84=9C=20=EC=82=AC=EC=9A=A9=ED=9B=84?=
 =?UTF-8?q?=EA=B8=B0=20=EB=A7=8E=EC=9D=80=EC=88=9C=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/itemform.php          |  2 +-
 adm/shop_admin/itemuseform.php       |  1 +
 adm/shop_admin/itemuseformupdate.php |  2 +
 adm/shop_admin/itemuselist.php       |  1 +
 adm/shop_admin/itemuselistupdate.php | 31 +++++-----
 adm/shop_admin/orderlistupdate.php   |  9 +--
 lib/shop.lib.php                     |  9 +++
 shop/search.php                      | 85 +++++++++++++++++++---------
 8 files changed, 91 insertions(+), 49 deletions(-)

diff --git a/adm/shop_admin/itemform.php b/adm/shop_admin/itemform.php
index 6e7cc0f43..3b0919f68 100644
--- a/adm/shop_admin/itemform.php
+++ b/adm/shop_admin/itemform.php
@@ -194,7 +194,7 @@ $pg_anchor ='<ul class="anchor">
                     <input type="hidden" name="it_id" value="<?php echo $it['it_id']; ?>">
                     <span class="frm_ca_id"><?php echo $it['it_id']; ?></span>
                     <a href="<?php echo G5_SHOP_URL; ?>/item.php?it_id=<?php echo $it_id; ?>" class="btn_frmline">상품확인</a>
-                    <a href="<?php echo G5_ADMIN_URL; ?>/shop_admin/itemuselist.php?sel_field=a.it_id&amp;search=<?php echo $it_id; ?>" class="btn_frmline">사용후기</a>
+                    <a href="<?php echo G5_ADMIN_URL; ?>/shop_admin/itemuselist.php?sfl=a.it_id&amp;stx=<?php echo $it_id; ?>" class="btn_frmline">사용후기</a>
                     <a href="<?php echo G5_ADMIN_URL; ?>/shop_admin/itemqalist.php?sel_field=a.it_id&amp;search=<?php echo $it_id; ?>" class="btn_frmline">상품문의</a>
                 <?php } ?>
             </td>
diff --git a/adm/shop_admin/itemuseform.php b/adm/shop_admin/itemuseform.php
index 2a44a4369..2b594624d 100644
--- a/adm/shop_admin/itemuseform.php
+++ b/adm/shop_admin/itemuseform.php
@@ -29,6 +29,7 @@ $qstr = 'page='.$page.'&amp;sort1='.$sort1.'&amp;sort2='.$sort2;
 <form name="fitemuseform" method="post" action="./itemuseformupdate.php" onsubmit="return fitemuseform_submit(this);">
 <input type="hidden" name="w" value="<?php echo $w; ?>">
 <input type="hidden" name="is_id" value="<?php echo $is_id; ?>">
+<input type="hidden" name="it_id" value="<?php echo $is['is_id']; ?>">
 <input type="hidden" name="page" value="<?php echo $page; ?>">
 <input type="hidden" name="sort1" value="<?php echo $sort1; ?>">
 <input type="hidden" name="sort2" value="<?php echo $sort2; ?>">
diff --git a/adm/shop_admin/itemuseformupdate.php b/adm/shop_admin/itemuseformupdate.php
index f85ccd834..7ed2cf5fe 100644
--- a/adm/shop_admin/itemuseformupdate.php
+++ b/adm/shop_admin/itemuseformupdate.php
@@ -20,6 +20,8 @@ if ($w == "u")
              where is_id = '$is_id' ";
     sql_query($sql);
 
+    update_use_cnt($_POST['it_id']);
+
     goto_url("./itemuseform.php?w=$w&amp;is_id=$is_id&amp;$qstr");
 }
 else
diff --git a/adm/shop_admin/itemuselist.php b/adm/shop_admin/itemuselist.php
index 595442f12..f41a87be5 100644
--- a/adm/shop_admin/itemuselist.php
+++ b/adm/shop_admin/itemuselist.php
@@ -133,6 +133,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
             <label for="chk_<?php echo $i; ?>" class="sound_only"><?php echo get_text($row['is_subject']) ?> 사용후기</label>
             <input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i; ?>">
             <input type="hidden" name="is_id[<?php echo $i; ?>]" value="<?php echo $row['is_id']; ?>">
+            <input type="hidden" name="it_id[<?php echo $i; ?>]" value="<?php echo $row['it_id']; ?>">
         </td>
         <td><a href="<?php echo $href; ?>"><?php echo get_it_image($row['it_id'], 50, 50); ?><?php echo cut_str($row['it_name'],30); ?></a></td>
         <td class="td_name"><?php echo $name; ?></td>
diff --git a/adm/shop_admin/itemuselistupdate.php b/adm/shop_admin/itemuselistupdate.php
index 3ecf1d4aa..934be173a 100644
--- a/adm/shop_admin/itemuselistupdate.php
+++ b/adm/shop_admin/itemuselistupdate.php
@@ -9,30 +9,31 @@ if (!count($_POST['chk'])) {
 }
 
 if ($_POST['act_button'] == "선택수정") {
-
     auth_check($auth[$sub_menu], 'w');
+} else if ($_POST['act_button'] == "선택삭제") {
+    auth_check($auth[$sub_menu], 'd');
+} else {
+    alert("선택수정이나 선택삭제 작업이 아닙니다.");
+}
 
-    for ($i=0; $i<count($_POST['chk']); $i++) {
-
-        // 실제 번호를 넘김
-        $k = $_POST['chk'][$i];
-
+for ($i=0; $i<count($_POST['chk']); $i++) 
+{
+    $k = $_POST['chk'][$i]; // 실제 번호를 넘김
+    
+    if ($_POST['act_button'] == "선택수정") 
+    {
         $sql = "update {$g5['g5_shop_item_use_table']}
                    set is_confirm = '{$_POST['is_confirm'][$k]}'
                  where is_id      = '{$_POST['is_id'][$k]}' ";
         sql_query($sql);
-    }
-} else if ($_POST['act_button'] == "선택삭제") {
-
-    auth_check($auth[$sub_menu], 'd');
-
-    for ($i=0; $i<count($_POST['chk']); $i++) {
-        // 실제 번호를 넘김
-        $k = $_POST['chk'][$i];
-
+    } 
+    else if ($_POST['act_button'] == "선택삭제") 
+    {
         $sql = "delete from {$g5['g5_shop_item_use_table']} where is_id = '{$_POST['is_id'][$k]}' ";
         sql_query($sql);
     }
+
+    update_use_cnt($_POST['it_id'][$k]);
 }
 
 goto_url("./itemuselist.php?sca=$sca&amp;sst=$sst&amp;sod=$sod&amp;sfl=$sfl&amp;stx=$stx&amp;page=$page");
diff --git a/adm/shop_admin/orderlistupdate.php b/adm/shop_admin/orderlistupdate.php
index bd67aff32..89c7d057d 100644
--- a/adm/shop_admin/orderlistupdate.php
+++ b/adm/shop_admin/orderlistupdate.php
@@ -241,14 +241,11 @@ for ($i=0; $i<count($_POST['chk']); $i++)
             change_status($od_id, '배송', '완료');
 
             // 완료인 경우에만 상품구입 합계수량을 상품테이블에 저장한다.
-            $sql2 = " select ct_id, ct_qty from {$g5['g5_shop_cart_table']} where od_id = '$od_id' ";
+            $sql2 = " select it_id, sum(ct_qty) as sum_qty from {$g5['g5_shop_cart_table']} where od_id = '$od_id' and ct_status = '완료' group by it_id ";
             $result2 = sql_query($sql2);
             for ($k=0; $row2=sql_fetch_array($result2); $k++) {
-                $sql3 = " select it_id, sum(ct_qty) as sum_qty from {$g5['g5_shop_cart_table']} where ct_id = '{$row2['ct_id']}' ";
-                $row3 = sql_fetch($sql3);
-
-                $sql4 = " update {$g5['g5_shop_item_table']} set it_sum_qty = '{$row3['sum_qty']}' where it_id = '{$row3['it_id']}' ";
-                sql_query($sql4);
+                $sql3 = " update {$g5['g5_shop_item_table']} set it_sum_qty = '{$row3['sum_qty']}' where it_id = '{$row3['it_id']}' ";
+                sql_query($sql3);
             }
             break;
 
diff --git a/lib/shop.lib.php b/lib/shop.lib.php
index 25ac4ad6b..cf4fdb098 100644
--- a/lib/shop.lib.php
+++ b/lib/shop.lib.php
@@ -1796,6 +1796,15 @@ function check_itemuse_write($close=true)
 }
 
 
+// 사용후기의 확인된 건수를 상품테이블에 저장합니다.
+function update_use_cnt($it_id)
+{
+    global $g5;
+    $row = sql_fetch(" select count(*) as cnt from {$g5['g5_shop_item_use_table']} where it_id = '{$it_id}' and is_confirm = 1 ");
+    return sql_query(" update {$g5['g5_shop_item_table']} set it_use_cnt = '{$row['cnt']}' where it_id = '{$it_id}' ");
+}
+
+
 //------------------------------------------------------------------------------
 // 주문포인트를 적립한다.
 // 설정일이 지난 포인트 부여되지 않은 배송완료된 장바구니 자료에 포인트 부여
diff --git a/shop/search.php b/shop/search.php
index 02f3e260c..74f111b13 100644
--- a/shop/search.php
+++ b/shop/search.php
@@ -16,6 +16,7 @@ $qid     = escape_trim($_GET['qid']);
 $qcaid   = escape_trim($_GET['qcaid']);
 $qfrom   = escape_trim($_GET['qfrom']);
 $qto     = escape_trim($_GET['qto']);
+$qsort   = escape_trim($_GET['qsort']);
 
 // QUERY 문에 공통적으로 들어가는 내용
 // 상품명에 검색어가 포한된것과 상품판매가능인것만
@@ -35,7 +36,8 @@ if ($q) {
     for ($i=0; $i<count($arr); $i++) {
         $word = trim($arr[$i]);
         if (!$word) continue;
-
+    
+        /*
         $or = array();
         if ($search_all || $qname) 
             $or[] = " a.it_name like '%$word%' ";
@@ -43,15 +45,26 @@ if ($q) {
             $or[] = " a.it_explan2 like '%$word%' "; // tag 를 제거한 상품설명을 검색한다.
         if ($search_all || $qid)
             $or[] = " a.it_id like '%$word%' ";
-
+        
         $detail_where[] = "(" . implode(" or ", $or) . ")";
+        */
+        $concat = array();
+        if ($search_all || $qname) 
+            $concat[] = "a.it_name";
+        if ($search_all || $qexplan)
+            $concat[] = "a.it_explan2";
+        if ($search_all || $qid)
+            $concat[] = "a.it_id";
+        $concat_fields = "concat(".implode(",' ',",$concat).")";
+
+        $detail_where[] = $concat_fields." like '%$word%' ";
 
         // 인기검색어
         $sql = " insert into {$g5['popular_table']} set pp_word = '$word', pp_date = '".G5_TIME_YMD."', pp_ip = '{$_SERVER['REMOTE_ADDR']}' "; 
         sql_query($sql, FALSE);
     }
 
-    $where[] = "(".implode(" or ", $detail_where).")";
+    $where[] = "(".implode(" and ", $detail_where).")";
 }
 
 if ($qcaid)
@@ -63,25 +76,37 @@ if ($qfrom || $qto)
 $sql_where = " where " . implode(" and ", $where);
 
 // 상품 출력순서가 있다면
-if ($sort != "")
-    $order_by = $sort.' '.$sortodr.' , it_order, it_id desc';
+$order_by = "";
+if ($qsort != "") {
+    $order_by = ' order by ' . $qsort . ' ' . $qorder . ' , it_order, it_id desc';
+}
+
+// 총몇개 = 한줄에 몇개 * 몇줄
+$items = $default['de_search_list_mod'] * $default['de_search_list_row'];
+// 페이지가 없으면 첫 페이지 (1 페이지)
+if ($page == "") $page = 1;
+// 시작 레코드 구함
+$from_record = ($page - 1) * $items;
 
 // 검색된 내용이 몇행인지를 얻는다
 $sql = " select COUNT(*) as cnt $sql_common $sql_where ";
 $row = sql_fetch($sql);
 $total_count = $row['cnt'];
+$total_page  = ceil($total_count / $items); // 전체 페이지 계산
 ?>
 
 <!-- 검색결과 시작 { -->
 <div id="ssch">
 
     <div id="ssch_frm">
-        <form name="frmdetailsearch" onsubmit="return detail_search_submit(this);">
+        <form name="frmdetailsearch">
+        <input type="hidden" name="qsort" id="qsort" value="<?php echo $qsort ?>">
+        <input type="hidden" name="qorder" id="qorder" value="<?php echo $qorder ?>">
         <div>
             <strong>검색범위</strong>
-            <input type="checkbox" name="qname"    class="frm_input" <?php echo isset($qname)?'checked="checked"':'';?>> 상품명
-            <input type="checkbox" name="qexplan"  class="frm_input" <?php echo isset($qexplan)?'checked="checked"':'';?>> 상품설명
-            <input type="checkbox" name="qid"      class="frm_input" <?php echo isset($qid)?'checked="checked"':'';?>> 상품코드<br>
+            <label><input type="checkbox" name="qname"   class="frm_input" <?php echo isset($qname)?'checked="checked"':'';?>> 상품명</label>
+            <label><input type="checkbox" name="qexplan" class="frm_input" <?php echo isset($qexplan)?'checked="checked"':'';?>> 상품설명</label>
+            <label><input type="checkbox" name="qid"     class="frm_input" <?php echo isset($qid)?'checked="checked"':'';?>> 상품코드</label><br>
         </div>
         <div>
             <strong>상품가격</strong>
@@ -93,13 +118,26 @@ $total_count = $row['cnt'];
             <input type="text" name="q" value="<?php echo $q; ?>" class="frm_input" size="40" maxlength="30">
             <input type="submit" value="검색" class="btn_submit">
         </div>
-        <p>상세검색을 선택하지 않거나, 상품가격을 입력하지 않으면 전체에서 검색합니다.</p>
+        <p>
+            상세검색을 선택하지 않거나, 상품가격을 입력하지 않으면 전체에서 검색합니다.<br>
+            검색어는 최대 30글자까지, 여러개의 검색어를 공백으로 구분하여 입력 할수 있습니다.
+        </p>
         </form>
 
+<script>
+function set_sort(qsort, qorder)
+{
+    var f = document.frmdetailsearch;
+    f.qsort.value = qsort;
+    f.qorder.value = qorder;
+    f.submit();
+}
+</script>
+
         <ul id="ssch_sort">
-            <li><a href="#" class="btn01">판매량 많은순</a></li>
+            <li><a href="#" class="btn01" onclick="set_sort('it_sum_qty', 'desc'); return false;">판매량 많은순</a></li>
             <li><a href="#" class="btn01">선호도 높은순</a></li>
-            <li><a href="#" class="btn01">사용후기 많은순</a></li>
+            <li><a href="#" class="btn01" onclick="set_sort('it_use_cnt', 'desc'); return false;">사용후기 많은순</a></li>
             <li><a href="#" class="btn01">최근 등록순</a></li>
         </ul>
 
@@ -114,18 +152,11 @@ $total_count = $row['cnt'];
         $list_file = G5_SHOP_SKIN_PATH.'/'.$default['de_search_list_skin'];
         if (file_exists($list_file)) {
 
-            // 총몇개 = 한줄에 몇개 * 몇줄
-            $items = $default['de_search_list_mod'] * $default['de_search_list_row'];
-            // 페이지가 없으면 첫 페이지 (1 페이지)
-            if ($page == "") $page = 1;
-            // 시작 레코드 구함
-            $from_record = ($page - 1) * $items;
-
             $list = new item_list($default['de_search_list_skin'], $default['de_search_list_mod'], $default['de_search_list_row'], $default['de_search_img_width'], $default['de_search_img_height']);
-            $list->set_query(" select * $sql_common $sql_where limit $from_record, $items ");
+            $list->set_query(" select * $sql_common $sql_where {$order_by} limit $from_record, $items ");
             $list->set_is_page(true);
-            $list->set_order_by($order_by);
-            $list->set_from_record($from_record);
+            //$list->set_order_by($order_by);
+            //$list->set_from_record($from_record);
             $list->set_view('it_img', true);
             $list->set_view('it_id', true);
             $list->set_view('it_name', true);
@@ -136,12 +167,14 @@ $total_count = $row['cnt'];
             $list->set_view('sns', true);
             echo $list->run();
 
+            /*
             // where 된 전체 상품수
             $sql = " select count(*) as cnt $sql_common $sql_where ";
             $row = sql_fetch($sql);
             $total_count = $row['cnt'];
             // 전체 페이지 계산
             $total_page  = ceil($total_count / $items);
+            */
         }
         else
         {
@@ -154,11 +187,9 @@ $total_count = $row['cnt'];
             echo '<div>'.$error.'</div>';
         }
 
-        $qstr1 .= 'ca_id='.$ca_id;
-        if($skin)
-            $qstr1 .= '&amp;skin='.$skin;
-        $qstr1 .='&amp;sort='.$sort.'&amp;sortodr='.$sortodr;
-        echo get_paging($config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr1.'&amp;page=');
+        $query_string .= 'ca_id='.$ca_id;
+        $query_string .='&amp;qsort='.$qsort.'&amp;qorder='.$qorder;
+        echo get_paging($config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$query_string.'&amp;page=');
         ?>
     </div>