From fa4034cf8214201e39ced9073ba35e9f81ab00c9 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 13 Sep 2013 17:13:41 +0900
Subject: [PATCH] =?UTF-8?q?shop=20=ED=85=8C=EC=9D=B4=EB=B8=94=EB=AA=85=20g?=
 =?UTF-8?q?5=5Fshop=20=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/deliverylist.php  | 2 +-
 adm/shop_admin/index.php         | 2 +-
 adm/shop_admin/itemstocklist.php | 2 +-
 adm/shop_admin/ordersms.inc.php  | 2 +-
 extend/shop.extend.php           | 4 ++--
 mobile/shop/listcategory.inc.php | 1 -
 mobile/shop/search.php           | 2 +-
 shop/boxtodayview.inc.php        | 2 +-
 shop/listcategory.inc.php        | 1 -
 shop/search.php                  | 2 +-
 10 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/adm/shop_admin/deliverylist.php b/adm/shop_admin/deliverylist.php
index a1d674cdf..38f010523 100644
--- a/adm/shop_admin/deliverylist.php
+++ b/adm/shop_admin/deliverylist.php
@@ -7,7 +7,7 @@ auth_check($auth[$sub_menu], "r");
 $g5['title'] = '배송일괄처리';
 include_once (G5_ADMIN_PATH.'/admin.head.php');
 
-//sql_query(" update $g5[shop_cart_table] set ct_status = '완료' where ct_status = '배송' ");
+//sql_query(" update {$g5['g5_shop_cart_table']} set ct_status = '완료' where ct_status = '배송' ");
 
 // 배송회사리스트 ---------------------------------------------
 $delivery_options = '<option value="">선택하세요</option>'.PHP_EOL;
diff --git a/adm/shop_admin/index.php b/adm/shop_admin/index.php
index 5f0fa2ccc..f40285af9 100644
--- a/adm/shop_admin/index.php
+++ b/adm/shop_admin/index.php
@@ -149,7 +149,7 @@ $pg_anchor = '<ul class="anchor">
     </thead>
     <tbody>
     <?php
-    $sql = " select * from {$g5[shop_item_use_table]}
+    $sql = " select * from {$g5['g5_shop_item_use_table']}
               where is_confirm = 0
               order by is_id desc
               limit $max_limit ";
diff --git a/adm/shop_admin/itemstocklist.php b/adm/shop_admin/itemstocklist.php
index 71a9ee247..7e29b7da1 100644
--- a/adm/shop_admin/itemstocklist.php
+++ b/adm/shop_admin/itemstocklist.php
@@ -22,7 +22,7 @@ if ($sel_field == "")  $sel_field = "it_name";
 if ($sort1 == "") $sort1 = "it_id";
 if ($sort2 == "") $sort2 = "desc";
 
-$sql_common = "  from $g5[shop_item_table] ";
+$sql_common = "  from {$g5['g5_shop_item_table']} ";
 $sql_common .= $sql_search;
 
 // 테이블의 전체 레코드수만 얻음
diff --git a/adm/shop_admin/ordersms.inc.php b/adm/shop_admin/ordersms.inc.php
index ab26ae558..1b5995d22 100644
--- a/adm/shop_admin/ordersms.inc.php
+++ b/adm/shop_admin/ordersms.inc.php
@@ -29,7 +29,7 @@ if ($default['de_sms_use']) {
         {
             $sms_contents = $default['de_sms_cont5'];
             $sms_contents = preg_replace("/{이름}/", $od_name, $sms_contents);
-            $sql = " select dl_company from $g5[shop_delivery_table] where dl_id = '$dl_id' ";
+            $sql = " select dl_company from {$g5['g5_shop_delivery_table']} where dl_id = '$dl_id' ";
             $row = sql_fetch($sql);
             $sms_contents = preg_replace("/{택배회사}/", $row['dl_company'], $sms_contents);
             $sms_contents = preg_replace("/{운송장번호}/", $od_invoice, $sms_contents);
diff --git a/extend/shop.extend.php b/extend/shop.extend.php
index d9431fb2c..c01ac62f2 100644
--- a/extend/shop.extend.php
+++ b/extend/shop.extend.php
@@ -24,8 +24,8 @@ if (G5_HTTPS_DOMAIN) {
 }
 
 // 미수금에 대한 QUERY 문
-// 테이블 a 는 주문서 ($g5[shop_order_table])
-// 테이블 b 는 장바구니 ($g5[shop_cart_table])
+// 테이블 a 는 주문서 ($g5['g5_shop_order_table'])
+// 테이블 b 는 장바구니 ($g5['g5_shop_cart_table'])
 define(_MISU_QUERY_, "
     ( od_cart_amount + od_send_cost + od_send_cost2 - od_cart_coupon - od_coupon - od_send_coupon - od_receipt_amount - od_cancel_amount ) as misu,
     ( od_cart_coupon + od_coupon + od_send_coupon ) as couponamount
diff --git a/mobile/shop/listcategory.inc.php b/mobile/shop/listcategory.inc.php
index 6fe8cb550..aafcff0f7 100644
--- a/mobile/shop/listcategory.inc.php
+++ b/mobile/shop/listcategory.inc.php
@@ -14,7 +14,6 @@ $sql = " select ca_id, ca_name from {$g5['g5_shop_category_table']}
 $result = sql_query($sql);
 while ($row=sql_fetch_array($result)) {
 
-    //$row2 = sql_fetch(" select count(*) as cnt from $g5[shop_category_table] where ca_id like '$row[ca_id]%' ");
     $row2 = sql_fetch(" select count(*) as cnt from {$g5['g5_shop_item_table']} where (ca_id like '{$row['ca_id']}%' or ca_id2 like '{$row['ca_id']}%' or ca_id3 like '{$row['ca_id']}%') and it_use = '1'  ");
 
     $str .= '<li><a href="./list.php?ca_id='.$row['ca_id'].'">'.$row['ca_name'].' ('.$row2['cnt'].')</a></li>';
diff --git a/mobile/shop/search.php b/mobile/shop/search.php
index aa65d27d2..9b1a4cd07 100644
--- a/mobile/shop/search.php
+++ b/mobile/shop/search.php
@@ -94,7 +94,7 @@ $total_count = $row['cnt'];
          $ca_temp = "";
          if(strlen($save['ca_id']) > 2) // 중분류 이하일 경우
          {
-            $sql2 = " select ca_name from $g5[shop_category_table] where ca_id='".substr($save['ca_id'],0,2)."' ";
+            $sql2 = " select ca_name from {$g5['g5_shop_category_table']} where ca_id='".substr($save['ca_id'],0,2)."' ";
             $row2 = sql_fetch($sql2);
             $ca_temp = '<a href="'.G5_SHOP_URL.'/list.php?ca_id='.substr($save['ca_id'],0,2).'">'.$row2['ca_name'].'</a> ';
          }
diff --git a/shop/boxtodayview.inc.php b/shop/boxtodayview.inc.php
index dbf8713e7..629334e3a 100644
--- a/shop/boxtodayview.inc.php
+++ b/shop/boxtodayview.inc.php
@@ -22,7 +22,7 @@ $tv_div['img_length'] = 3; // 한번에 보여줄 이미지 수
     for ($i=1;$i<=$tv_idx;$i++)
     {
         $tv_it_id = get_session("ss_tv[$i]");
-        $rowx = sql_fetch(" select it_name from $g5[shop_item_table] where it_id = '$tv_it_id' ");
+        $rowx = sql_fetch(" select it_name from {$g5['g5_shop_item_table']} where it_id = '$tv_it_id' ");
         $j = $i - 1;
         if ($j%$tv_div['img_length']==0) $k++;
         $it_name = get_text(addslashes($rowx['it_name']));
diff --git a/shop/listcategory.inc.php b/shop/listcategory.inc.php
index 93883bb48..8eeef4a62 100644
--- a/shop/listcategory.inc.php
+++ b/shop/listcategory.inc.php
@@ -10,7 +10,6 @@ $sql = " select ca_id, ca_name from {$g5['g5_shop_category_table']} where ca_id
 $result = sql_query($sql);
 while ($row=sql_fetch_array($result)) {
 
-    //$row2 = sql_fetch(" select count(*) as cnt from $g5[shop_category_table] where ca_id like '$row[ca_id]%' ");
     $row2 = sql_fetch(" select count(*) as cnt from {$g5['g5_shop_item_table']} where (ca_id like '{$row['ca_id']}%' or ca_id2 like '{$row['ca_id']}%' or ca_id3 like '{$row['ca_id']}%') and it_use = '1'  ");
 
     $str .= '<li><a href="./list.php?ca_id='.$row['ca_id'].'">'.$row['ca_name'].' ('.$row2['cnt'].')</a></li>';
diff --git a/shop/search.php b/shop/search.php
index 0bad03912..3f2e97c57 100644
--- a/shop/search.php
+++ b/shop/search.php
@@ -99,7 +99,7 @@ $total_count = $row['cnt'];
          $ca_temp = "";
          if(strlen($save['ca_id']) > 2) // 중분류 이하일 경우
          {
-             $sql2 = " select ca_name from $g5[shop_category_table] where ca_id='".substr($save['ca_id'],0,2)."' ";
+             $sql2 = " select ca_name from {$g5['g5_shop_category_table']} where ca_id='".substr($save['ca_id'],0,2)."' ";
             $row2 = sql_fetch($sql2);
             $ca_temp = '<a href="./list.php?ca_id='.substr($save['ca_id'],0,2).'">'.$row2['ca_name'].'</a> &gt; ';
          }