Merge branch 'master' of github.com:gnuboard/yc4s

adm/shop_admin/iteminfo.php

@@ -66,7 +66,7 @@ include_once(G4_PATH.'/head.sub.php');
         <td>
         <input type="hidden" name="<?php echo $el_name; ?>[]" value="<?php echo $el_title; ?>">
         <?php if ($el_example != "") echo help($el_example); ?>
-        <input type="text" name="<?php echo $el_name; ?>[]" value="<?php echo $el_value; ?>" id="<?php ehco $el_name.$i; ?>" required class="frm_input required" />
+        <input type="text" name="<?php echo $el_name; ?>[]" value="<?php echo $el_value; ?>" id="<?php echo $el_name.$i; ?>" required class="frm_input required" />
         </td>
     </tr>
     <?php

lib/shop.lib.php

@@ -14,14 +14,11 @@ function get_cart_count($uq_id)
 }
 
 // 이미지를 얻는다
-function get_image($img, $width=0, $height=0, $type='')
+function get_image($img, $width=0, $height=0, $img_id='')
 {
     global $g4, $default;
 
     $full_img = G4_DATA_PATH.'/item/'.$img;
-    if($type != '') {
-        $img_id = 'type'.$type.'_'.$img;
-    }
 
     if (file_exists($full_img) && $img)
     {
@@ -31,7 +28,12 @@ function get_image($img, $width=0, $height=0, $type='')
             $width = $size[0];
             $height = $size[1];
         }
-        $str = '<img src="'.G4_DATA_URL.'/item/'.$img.'" alt="" width="'.$width.'" height="'.$height.'" id="'.$img_id.'">';
+        $str = '<img src="'.G4_DATA_URL.'/item/'.$img.'" alt="" width="'.$width.'" height="'.$height.'"';
+
+        if($img_id)
+            $str .= ' id="'.$img_id.'"';
+
+        $str .= '>';
     }
     else
     {
@@ -40,16 +42,19 @@ function get_image($img, $width=0, $height=0, $type='')
             $str .= 'width="'.$width.'" height="'.$height.'"';
         else
             $str .= 'width="'.$default['de_mimg_width'].'" height="'.$default['de_mimg_height'].'"';
-        $str .= ' id="'.$img_id.'">';
+
+        if($img_id)
+            $str .= ' id="'.$img_id.'"'.
+        $str .= '>';
     }
 
     return $str;
 }
 
 // 상품 이미지를 얻는다
-function get_it_image($img, $width=0, $height=0, $id="", $type='')
+function get_it_image($img, $width=0, $height=0, $id='', $img_id='')
 {
-    $str = get_image($img, $width, $height, $type);
+    $str = get_image($img, $width, $height, $img_id);
     if ($id) {
         $str = '<a href="'.G4_SHOP_URL.'/item.php?it_id='.$id.'">'.$str.'</a>';
     }
@@ -214,9 +219,11 @@ function display_type($type, $skin_file, $list_mod, $list_row, $img_width, $img_
     $sql .= " order by it_order, it_id desc
               limit $items ";
     $result = sql_query($sql);
+    /*
     if (!mysql_num_rows($result)) {
         return false;
     }
+    */
 
     $file = G4_SHOP_PATH.'/'.$skin_file;
     if (!file_exists($file)) {

shop/list.php

@@ -42,7 +42,7 @@ if ($is_admin)
 
     // 상품 출력순서가 있다면
     if ($sort != "") {
-        $order_by = $sort . " , ";
+        $order_by = $sort . ' '.$sortodr. ' , ';
     }
 
     // 상품 (하위 분류의 상품을 모두 포함한다.)
@@ -91,7 +91,10 @@ if ($is_admin)
         echo '<div>'.$error.'</div>';
     }
 
-    $qstr1 .= 'ca_id='.$ca_id.'&amp;skin='.$skin.'&amp;ev_id='.$ev_id.'&amp;sort='.$sort;
+    $qstr1 .= 'ca_id='.$ca_id;
+    if($skin)
+        $qstr1 .= '&amp;skin='.$skin;
+    $qstr1 .='&amp;ev_id='.$ev_id.'&amp;sort='.$sort.'&amp;'.$sortodr;
     echo get_paging($config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr1.'&amp;page=');
     ?>
 

shop/list.skin.10.php

@@ -21,7 +21,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++)
 ?>
     <li class="sct_li <?php echo $sct_last; ?>">
         <a href="<?php echo $href; ?>" class="sct_a">
-            <span class="sct_img"><?php echo get_it_image($row['it_id'].'_m', $img_width, $img_height, '', $type); ?></span>
+            <span class="sct_img"><?php echo get_it_image($row['it_id'].'_m', $img_width, $img_height); ?></span>
             <b><?php echo stripslashes($row['it_name']); ?></b>
             <?php if ($row['it_cust_amount'] && !$row['it_gallery']) { ?>
             <s><?php echo display_amount($row['it_cust_amount']); ?></s>
@@ -39,6 +39,9 @@ for ($i=1; $row=sql_fetch_array($result); $i++)
             <a href="<?php echo $sns_send; ?>&amp;sns=google" target="_blank"><img src="<?php echo G4_URL; ?>/img/shop/sns_goo.png" alt="구글플러스에 공유"></a>
         </div>
     </li>
-<?php }
+<?php
+}
 if ($i > 1) echo '</ul>';
+
+if($i == 1) echo '<p class="sct_noitem">등록된 상품이 없습니다.</p>';
 ?>

shop/list.skin.11.php

@@ -21,7 +21,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++)
 ?>
     <li class="sct_li <?php echo $sct_last; ?>">
         <a href="<?php echo $href; ?>" class="sct_a">
-            <span class="sct_img"><?php echo get_it_image($row['it_id'].'_m', $img_width, $img_height, '', $type); ?></span>
+            <span class="sct_img"><?php echo get_it_image($row['it_id'].'_m', $img_width, $img_height); ?></span>
             <b><?php echo stripslashes($row['it_name']); ?></b>
             <?php if ($row['it_cust_amount'] && !$row['it_gallery']) { ?>
             <s><?php echo display_amount($row['it_cust_amount']); ?></s>
@@ -39,6 +39,9 @@ for ($i=1; $row=sql_fetch_array($result); $i++)
             <a href="<?php echo $sns_send; ?>&amp;sns=google" target="_blank"><img src="<?php echo G4_URL; ?>/img/shop/sns_goo.png" alt="구글플러스에 공유"></a>
         </div>
     </li>
-<?php }
+<?php
+}
 if ($i > 1) echo '</ul>';
+
+if($i == 1) echo '<p class="sct_noitem">등록된 상품이 없습니다.</p>';
 ?>

shop/list.skin.12.php

@@ -21,7 +21,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++)
 ?>
     <li class="sct_li <?php echo $sct_last; ?>">
         <a href="<?php echo $href; ?>" class="sct_a">
-            <span class="sct_img"><?php echo get_it_image($row['it_id'].'_m', $img_width, $img_height, '', $type); ?></span>
+            <span class="sct_img"><?php echo get_it_image($row['it_id'].'_m', $img_width, $img_height); ?></span>
             <b><?php echo stripslashes($row['it_name']); ?></b>
             <?php if ($row['it_cust_amount'] && !$row['it_gallery']) { ?>
             <s><?php echo display_amount($row['it_cust_amount']); ?></s>
@@ -39,6 +39,9 @@ for ($i=1; $row=sql_fetch_array($result); $i++)
             <a href="<?php echo $sns_send; ?>&amp;sns=google" target="_blank"><img src="<?php echo G4_URL; ?>/img/shop/sns_goo.png" alt="구글플러스에 공유"></a>
         </div>
     </li>
-<?php }
+<?php
+}
 if ($i > 1) echo '</ul>';
+
+if($i == 1) echo '<p class="sct_noitem">등록된 상품이 없습니다.</p>';
 ?>

shop/list.skin.13.php

@@ -21,7 +21,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++)
 ?>
     <li class="sct_li <?php echo $sct_last; ?>">
         <a href="<?php echo $href; ?>" class="sct_a">
-            <span class="sct_img"><?php echo get_it_image($row['it_id'].'_m', $img_width, $img_height, '', $type); ?></span>
+            <span class="sct_img"><?php echo get_it_image($row['it_id'].'_m', $img_width, $img_height); ?></span>
             <b><?php echo stripslashes($row['it_name']); ?></b>
             <?php if ($row['it_cust_amount'] && !$row['it_gallery']) { ?>
             <s><?php echo display_amount($row['it_cust_amount']); ?></s>
@@ -42,6 +42,9 @@ for ($i=1; $row=sql_fetch_array($result); $i++)
             <a href="<?php echo $sns_send; ?>&amp;sns=google" target="_blank"><img src="<?php echo G4_URL; ?>/img/shop/sns_goo.png" alt="구글플러스에 공유"></a>
         </div>
     </li>
-<?php }
+<?php
+}
 if ($i > 1) echo '</ul>';
+
+if($i == 1) echo '<p class="sct_noitem">등록된 상품이 없습니다.</p>';
 ?>

shop/list.sort.php

@@ -1,7 +1,10 @@
 <?php
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 
-$sct_sort_href = $_SERVER['PHP_SELF'].'?ca_id='.$ca_id.'&amp;skin='.$skin.'&amp;ev_id='.$ev_id.'&amp;sort=';
+$sct_sort_href = $_SERVER['PHP_SELF'].'?ca_id='.$ca_id;
+if($skin)
+    $sct_sort_href .= '&amp;skin='.$skin;
+$sct_sort_href .= '&amp;ev_id='.$ev_id.'&amp;sort=';
 ?>
 
 <section id="sct_sort">
@@ -11,8 +14,8 @@ $sct_sort_href = $_SERVER['PHP_SELF'].'?ca_id='.$ca_id.'&amp;skin='.$skin.'&amp;
     </div>
 
     <ul>
-        <li><a href="<?php echo $sct_sort_href; ?>it_amount&amp;sortodr=desc" class="btn01">낮은가격순</a></li>
+        <li><a href="<?php echo $sct_sort_href; ?>it_amount&amp;sortodr=asc" class="btn01">낮은가격순</a></li>
-        <li><a href="<?php echo $sct_sort_href; ?>it_amount&amp;sortodr=asc" class="btn01">높은가격순</a></li>
+        <li><a href="<?php echo $sct_sort_href; ?>it_amount&amp;sortodr=desc" class="btn01">높은가격순</a></li>
         <li><a href="<?php echo $sct_sort_href; ?>it_name&amp;sortodr=asc" class="btn01">상품명순</a></li>
         <li><a href="<?php echo $sct_sort_href; ?>it_type1&amp;sortodr=desc" class="btn01">히트상품</a></li>
         <li><a href="<?php echo $sct_sort_href; ?>it_type2&amp;sortodr=desc" class="btn01">추천상품</a></li>

shop/maintype10.inc.php

@@ -20,7 +20,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
 ?>
     <li class="sct_li <?php echo $sct_last; ?>">
         <a href="<?php echo $href; ?>" class="sct_a">
-            <span class="sct_img"><?php echo get_it_image($row['it_id'].'_m', $img_width, $img_height, '', $type); ?></span>
+            <span class="sct_img"><?php echo get_it_image($row['it_id'].'_m', $img_width, $img_height); ?></span>
             <b><?php echo stripslashes($row['it_name']); ?></b>
             <span class="sct_cost"><?php echo display_amount(get_amount($row), $row['it_tel_inq']); ?></span>
             <span class="sct_icon">
@@ -33,6 +33,9 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
             <a href="<?php echo $sns_send; ?>&amp;sns=google" target="_blank"><img src="<?php echo G4_URL; ?>/img/shop/sns_goo.png" alt="구글플러스에 공유"></a>
         </div>
     </li>
-<?php }
+<?php
+}
 if ($i > 1) echo '</ul>';
+
+if($i == 1) echo '<p class="sct_noitem">등록된 상품이 없습니다.</p>';
 ?>

shop/maintype11.inc.php

@@ -20,7 +20,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
 ?>
     <li class="sct_li <?php echo $sct_last; ?>">
         <a href="<?php echo $href; ?>" class="sct_a">
-            <span class="sct_img"><?php echo get_it_image($row['it_id'].'_m', $img_width, $img_height, '', $type); ?></span>
+            <span class="sct_img"><?php echo get_it_image($row['it_id'].'_m', $img_width, $img_height); ?></span>
             <b><?php echo stripslashes($row['it_name']); ?></b>
             <span class="sct_cost"><?php echo display_amount(get_amount($row), $row['it_tel_inq']); ?></span>
             <span class="sct_icon">
@@ -33,6 +33,9 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
             <a href="<?php echo $sns_send; ?>&amp;sns=google" target="_blank"><img src="<?php echo G4_URL; ?>/img/shop/sns_goo.png" alt="구글플러스에 공유"></a>
         </div>
     </li>
-<?php }
+<?php
+}
 if ($i > 1) echo '</ul>';
+
+if($i == 1) echo '<p class="sct_noitem">등록된 상품이 없습니다.</p>';
 ?>

shop/maintype12.inc.php

@@ -21,7 +21,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
     <li class="sct_li <?php echo $sct_last; ?>">
         <a href="<?php echo $href; ?>" class="sct_a">
             <span class="sct_arw_toleft"></span>
-            <span class="sct_img"><?php echo get_it_image($row['it_id'].'_m', $img_width, $img_height, '', $type); ?></span>
+            <span class="sct_img"><?php echo get_it_image($row['it_id'].'_m', $img_width, $img_height); ?></span>
             <b><?php echo stripslashes($row['it_name']); ?></b>
             <p><?php echo $row['it_basic']; ?></p>
             <span class="sct_cost"><?php echo display_amount(get_amount($row), $row['it_tel_inq']); ?></span>
@@ -35,6 +35,9 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
             <a href="<?php echo $sns_send; ?>&amp;sns=google" target="_blank"><img src="<?php echo G4_URL; ?>/img/shop/sns_goo.png" alt="구글플러스에 공유"></a>
         </div>
     </li>
-<?php }
+<?php
+}
 if ($i > 1) echo '</ul>';
+
+if($i == 1) echo '<p class="sct_noitem">등록된 상품이 없습니다.</p>';
 ?>

shop/maintype13.inc.php

@@ -21,7 +21,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
     <li class="sct_li <?php echo $sct_last; ?>">
         <a href="<?php echo $href; ?>" class="sct_a">
             <span class="sct_arw_toleft"></span>
-            <span class="sct_img"><?php echo get_it_image($row['it_id'].'_m', $img_width, $img_height, '', $type); ?></span>
+            <span class="sct_img"><?php echo get_it_image($row['it_id'].'_m', $img_width, $img_height); ?></span>
             <b><?php echo stripslashes($row['it_name']); ?></b>
             <p><?php echo $row['it_basic']; ?></p>
             <span class="sct_cost"><?php echo display_amount(get_amount($row), $row['it_tel_inq']); ?></span>
@@ -38,6 +38,9 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
             <a href="<?php echo $sns_send; ?>&amp;sns=google" target="_blank"><img src="<?php echo G4_URL; ?>/img/shop/sns_goo.png" alt="구글플러스에 공유"></a>
         </div>
     </li>
-<?php }
+<?php
+}
 if ($i > 1) echo '</ul>';
+
+if($i == 1) echo '<p class="sct_noitem">등록된 상품이 없습니다.</p>';
 ?>