get_it_image 함수 수정에 따른 코드 수정

adm/shop_admin/itemlist.php

@@ -162,21 +162,11 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
 
     $list = $i%2;
 
-    // 리스트 썸네일 이미지
-    $filepath = G4_DATA_PATH.'/item/'.$row['it_id'];
-    for($k=1; $k<=10; $k++) {
-        $idx = 'it_img'.$k;
-        if(file_exists($filepath.'/'.$row[$idx]) && is_file($filepath.'/'.$row[$idx])) {
-            $filename = $row[$idx];
-            break;
-        }
-    }
-
     echo "
     <input type=\"hidden\" name='it_id[$i]' value='$row[it_id]'>
     <tr class='list$list'>
         <td>$row[it_id]</td>
-        <td style='padding-top:5px; padding-bottom:5px;'><a href='$href'>".get_it_image($row['it_id'], $filename, 50, 50)."</a></td>
+        <td style='padding-top:5px; padding-bottom:5px;'><a href='$href'>".get_it_image($row['it_id'], 50, 50)."</a></td>
         <td align=left>$tmp_ca_list<br><input type=\"text\" name='it_name[$i]' value='".htmlspecialchars2(cut_str($row[it_name],250, ""))."' required size=40 class=ed></td>
         <td colspan=3>
             <table width=210 cellpadding=0 cellspacing=0>

adm/shop_admin/orderlist2.php

@@ -1,6 +1,7 @@
 <?
 $sub_menu = "400420";
 include_once("./_common.php");
+include_once(G4_LIB_PATH.'/thumbnail.lib.php');
 
 auth_check($auth[$sub_menu], "r");
 
@@ -25,8 +26,8 @@ if ($sel_field == "")  $sel_field = "od_id";
 if ($sort1 == "") $sort1 = "od_id";
 if ($sort2 == "") $sort2 = "desc";
 
-$sql_common = " from $g4[yc4_order_table] a
+$sql_common = " from $g4[yc4_cart_table] a
-                left join $g4[yc4_cart_table] b on (a.on_uid="b".on_uid)
+                left join $g4[yc4_order_table] b on ( a.uq_id = b.od_id)
                 $sql_search ";
 
 // 테이블의 전체 레코드수만 얻음
@@ -38,10 +39,10 @@ $total_page  = ceil($total_count / $rows);  // 전체 페이지 계산
 if ($page == "") { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
 $from_record = ($page - 1) * $rows; // 시작 열을 구함
 
-$sql  = " select a.od_id,
+$sql  = " select b.od_id,
-                 a.*, "._MISU_QUERY_."
+                 b.*, "._MISU_QUERY_."
            $sql_common
-           group by a.od_id
+           group by b.od_id
            order by $sort1 $sort2
            limit $from_record, $rows ";
 $result = sql_query($sql);
@@ -169,6 +170,7 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
         echo "<tr><td colspan=12 height=1 bgcolor='#CCCCCC'></td></tr>";
 
     $list = $i%2;
+
     echo "
     <tr class='list$list ht'>
         <td align=center title='주문일시 : $row[od_time]'><a href='$g4[shop_path]/orderinquiryview.php?od_id=$row[od_id]&on_uid=$row[on_uid]'>$row[od_id]</a></td>
@@ -197,7 +199,7 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
     $sql2 = " select c.it_name,
                      b.*
                 from $g4[yc4_order_table] a
-                left join $g4[yc4_cart_table] b on (a.on_uid = b.on_uid)
+                left join $g4[yc4_cart_table] b on (a.od_id = b.uq_id)
                 left join $g4[yc4_item_table] c on (b.it_id = c.it_id)
                where od_id = '$row[od_id]' ";
     $result2 = sql_query($sql2);
@@ -216,7 +218,7 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
             <td colspan=3>
                 <table width=100% cellpadding=0 cellspacing=0>
                 <tr>
-                	<td style='padding-top:5px; padding-bottom:5px;'><a href='$href'>".get_it_image("{$row2[it_id]}_s", 50, 50)."</a></td>
+                	<td style='padding-top:5px; padding-bottom:5px;'><a href='$href'>".get_it_image($row2[it_id], 50, 50)."</a></td>
                 	<td>$it_name</td>
                 </tr>
                 </table></td>

adm/shop_admin/orderstatuslist.php

@@ -1,6 +1,7 @@
 <?
 $sub_menu = "400410";
 include_once("./_common.php");
+include_once(G4_LIB_PATH.'/thumbnail.lib.php');
 
 auth_check($auth[$sub_menu], "r");
 
@@ -26,9 +27,9 @@ if ($sel_field == "")  $sel_field = "od_id";
 if ($sort1 == "") $sort1 = "od_id";
 if ($sort2 == "") $sort2 = "desc";
 
-$sql_common = " from $g4[yc4_order_table] a
+$sql_common = " from {$g4['yc4_order_table']} a
-                left join $g4[yc4_cart_table] b on (a.on_uid = b.on_uid)
+                left join {$g4['yc4_cart_table']} b on (a.od_id = b.uq_id)
-                left join $g4[yc4_item_table] c on (b.it_id = c.it_id)
+                left join {$g4['yc4_item_table']} c on (b.it_id = c.it_id)
                 $sql_search ";
 
 // 테이블의 전체 레코드수만 얻음
@@ -46,26 +47,16 @@ $sql  = " select a.od_id,
                  a.od_name,
                  a.od_deposit_name,
                  a.od_time,
-                 b.it_opt1,
+                 b.ct_option,
-                 b.it_opt2,
-                 b.it_opt3,
-                 b.it_opt4,
-                 b.it_opt5,
-                 b.it_opt6,
                  b.ct_status,
                  b.ct_qty,
+                 b.it_amount,
                  b.ct_amount,
                  b.ct_point,
-                 (b.ct_qty * b.ct_amount) as ct_sub_amount,
+                 (b.ct_qty * (b.ct_amount+b.it_amount)) as ct_sub_amount,
                  (b.ct_qty * b.ct_point)  as ct_sub_point,
                  c.it_id,
-                 c.it_name,
+                 c.it_name
-                 c.it_opt1_subject,
-                 c.it_opt2_subject,
-                 c.it_opt3_subject,
-                 c.it_opt4_subject,
-                 c.it_opt5_subject,
-                 c.it_opt6_subject
            $sql_common
            order by $sort1 $sort2
            limit $from_record, $rows ";
@@ -160,14 +151,15 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
     $s_mod = icon("수정", "./orderform.php?od_id=$row[od_id]");
 
     $list = $i%2;
+
     echo "
     <tr class='list$list center'>
         <td align=center title='주문일시 : $row[od_time]'><a href='$_SERVER[PHP_SELF]?sort1=$sort1&sort2=$sort2&sel_field=od_id&search=$row[od_id]'>$row[od_id]</a></td>
         <td align=center $od_deposit_name><a href='$_SERVER[PHP_SELF]?sort1=$sort1&sort2=$sort2&sel_field=od_name&search=$row[od_name]'>".cut_str($row[od_name],10,"")."</a></td>
         <td align=center><a href='$_SERVER[PHP_SELF]?sort1=$sort1&sort2=$sort2&sel_field=mb_id&search=$row[mb_id]'>$row[mb_id]</a></td>
-        <td style='padding-top:5px; padding-bottom:5px;'><a href='$href'>".get_it_image("{$row[it_id]}_s", 50, 50)."</a></td>
+        <td style='padding-top:5px; padding-bottom:5px;'><a href='$href'>".get_it_image($row['it_id'], 50, 50)."</a></td>
         <td align=left>$it_name</td>
-        <td align=right>".number_format($row[ct_amount])."&nbsp;</td>
+        <td align=right>".number_format($row[it_amount] + $row[ct_amount])."&nbsp;</td>
         <td align=center>$row[ct_qty]</td>
         <td align=right>".number_format($row[ct_sub_amount])."&nbsp;</td>
         <td align=right>".number_format($row[ct_sub_point])."&nbsp;</td>

lib/shop.lib.php

@@ -143,27 +143,42 @@ function get_image($img, $width=0, $height=0)
 }
 
 // 상품 이미지를 얻는다
-function get_it_image($dir, $img, $width, $height, $it_id="", $class="", $thumbnail=true)
+function get_it_image($it_id, $width, $height, $id="", $thumbnail=true)
 {
+    global $g4;
+
     if($thumbnail && !$width)
         return "";
 
-    $src = G4_DATA_URL.'/item/'.$dir.'/'.$img;
+    $sql = " select it_id, it_img1, it_img2, it_img3, it_img4, it_img5, it_img6, it_img7, it_img8, it_img9, it_img10
+                from {$g4['yc4_item_table']}
+                where it_id = '$it_id' ";
+    $row = sql_fetch($sql);
 
-    if($thumbnail) {
+    if(!$row['it_id'])
-        $filepath = G4_DATA_PATH.'/item/'.$dir;
+        return "";
 
-        if(file_exists($filepath.'/'.$img) && is_file($filepath.'/'.$img)) {
+    $filepath = G4_DATA_PATH.'/item/'.$row['it_id'];
-            $src = G4_DATA_URL.'/item/'.$dir.'/'.it_img_thumb($img, $filepath, $width, $height);
+    $filename = "";
+    for($k=1; $k<=10; $k++) {
+        $idx = 'it_img'.$k;
+        if(file_exists($filepath.'/'.$row[$idx]) && is_file($filepath.'/'.$row[$idx])) {
+            $filename = $row[$idx];
+            break;
         }
     }
 
-    $str = "<img id=\"$img\" src=\"$src\" width=\"$width\" height=\"$height\"";
+    $src = G4_DATA_URL.'/item/'.$row['it_id'].'/'.$filename;
-    if($class)
-        $str .= " class=\"$class\"";
-    $str .= " />";
 
-    if ($it_id) {
+    if($thumbnail) {
+        if(file_exists($filepath.'/'.$filename) && is_file($filepath.'/'.$filename)) {
+            $src = G4_DATA_URL.'/item/'.$row['it_id'].'/'.it_img_thumb($filename, $filepath, $width, $height);
+        }
+    }
+
+    $str = "<img id=\"$img\" src=\"$src\" width=\"$width\" height=\"$height\" />";
+
+    if ($id) {
         $str = "<a href='".G4_SHOP_URL."/item.php?it_id=$it_id'>$str</a>";
     }
 

shop/boxtodayview.inc.php

@@ -66,7 +66,7 @@ for ($i=1; $i<=$tv_idx; $i++)
         if(file_exists($tv_filepath.'/'.$tv_filename) && $tv_filename != "")
             break;
     }
-    $img = get_it_image($tv_it_id, $tv_filename, $tv_div['img_width'], $tv_div['img_height'], $tv_it_id);
+    $img = get_it_image($tv_it_id, $tv_div['img_width'], $tv_div['img_height'], $tv_it_id);
     $img = str_replace("\"", "\\\"", $img);
     $img = preg_replace("/\<a /", "<a title='$it_name' ", $img);
     echo "goods_link[$i] = \"{$img}<br/><span class=small>".cut_str($it_name,10,"")."</span>\";\n";

shop/item.php

@@ -188,7 +188,7 @@ else
         <table cellpadding=0 cellspacing=0>
             <tr><td height=22></td></tr>
             <tr><td colspan=3 align=center>
-                <table cellpadding=1 cellspacing=0 bgcolor=#E4E4E4><tr><td id="middle_image"><?=get_large_image($filename, $it['it_id'], false)?><?=get_it_image($it['it_id'], $filename, $default['de_mimg_width'], $default['de_mimg_height']);?></a></td></tr></table></td></tr>
+                <table cellpadding=1 cellspacing=0 bgcolor=#E4E4E4><tr><td id="middle_image"><?=get_large_image($filename, $it['it_id'], false)?><?=get_it_image($it['it_id'], $default['de_mimg_width'], $default['de_mimg_height']);?></a></td></tr></table></td></tr>
             <tr><td colspan=3 height=10></td></tr>
             <tr>
                 <td colspan=3 align=center>
@@ -200,8 +200,8 @@ else
                     if (file_exists($filepath.'/'.$filename) && $filename != "")
                     {
                         echo get_large_image($filename, $it['it_id'], false);
-                        echo get_it_image($it['it_id'], $filename, 40, 40, "", "item_view_thumbnail");
+                        echo "<img id=\"".$filename."\" src=\"".G4_DATA_URL."/item/".$it['it_id']."/".it_img_thumb($filename, $filepath, 40, 40)."\" class=\"item_view_thumbnail\" />";
-                        echo "</a> &nbsp;";
+                        echo "&nbsp;";
                     }
                 }
                 ?>

shop/largeimage.php

@@ -26,9 +26,12 @@ include_once(G4_PATH.'/head.sub.php');
         <?
         for ($i=1; $i<=10; $i++)
         {
+            $filepath = G4_DATA_PATH.'/item/'.$it_id;
             $filename = $row['it_img'.$i];
-            if (file_exists(G4_DATA_PATH."/item/{$it_id}/{$filename}") && $filename != "")
+            if (file_exists($filepath.'/'.$filename) && $filename != "") {
-                echo get_it_image($it_id, $filename, 50, 50, "", "image_thumbnail")."&nbsp;";
+                echo "<img id=\"".$filename."\" src=\"".G4_DATA_URL."/item/".$it_id."/".it_img_thumb($filename, $filepath, 50, 50)."\" class=\"image_thumbnail\" />";
+                echo "&nbsp;";
+            }
         }
         ?>
         &nbsp;</td>

shop/list.skin.10.php

@@ -14,21 +14,11 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
         echo "<tr>\n";
     }
 
-    // 리스트 썸네일 이미지
-    $filepath = G4_DATA_PATH.'/item/'.$row['it_id'];
-    for($k=1; $k<=10; $k++) {
-        $idx = 'it_img'.$k;
-        if(file_exists($filepath.'/'.$row[$idx]) && is_file($filepath.'/'.$row[$idx])) {
-            $filename = $row[$idx];
-            break;
-        }
-    }
-
     echo "
     <td width='{$td_width}%' align=center valign=top>
         <br>
         <table width=98% cellpadding=2 cellspacing=0>
-        <tr><td align=center>".get_it_image($row['it_id'], $filename, $img_width , $img_height, $row['it_id'])."</td></tr>
+        <tr><td align=center>".get_it_image($row['it_id'], $img_width , $img_height, $row['it_id'])."</td></tr>
         <tr><td align=center>".it_name_icon($row)."</td></tr>";
 
     if ($row[it_cust_amount] && !$row[it_gallery])

shop/maintype10.inc.php

@@ -11,21 +11,11 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
     }
 
     $href = "<a href='".G4_SHOP_URL."/item.php?it_id={$row['it_id']}' class=item>";
-
-    // 리스트 썸네일 이미지
-    $filepath = G4_DATA_PATH.'/item/'.$row['it_id'];
-    for($k=1; $k<=10; $k++) {
-        $idx = 'it_img'.$k;
-        if(file_exists($filepath.'/'.$row[$idx]) && is_file($filepath.'/'.$row[$idx])) {
-            $filename = $row[$idx];
-            break;
-        }
-    }
 ?>
     <td width="<?=$td_width?>%" align=center valign=top>
         <table width=98% cellpadding=1 cellspacing=0 border=0>
         <tr><td height=5></td></tr>
-        <tr><td align=center><?=$href?><?=get_it_image($row['it_id'], $filename, $img_width, $img_height)?></a></td></tr>
+        <tr><td align=center><?=$href?><?=get_it_image($row['it_id'], $img_width, $img_height)?></a></td></tr>
         <tr><td align=center><?=$href?><?=stripslashes($row['it_name'])?></a></td></tr>
         <!--시중가격<tr><td align=center><strike><?=display_amount($row[it_cust_amount])?></strike></td></tr>-->
         <tr><td align=center><span class=amount><?=display_amount(get_amount($row), $row['it_tel_inq'])?></span></td></tr>