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

install/install_db.php

@@ -164,6 +164,12 @@ $sql = " insert into `{$table_prefix}member`
 @mysql_query($sql);
 
 if($shop_install) {
+    // 이미지 사이즈
+    $simg_width = 130;
+    $simg_height = 130;
+    $mimg_width = 230;
+    $mimg_height = 230;
+
     // 내용관리 생성
     @mysql_query(" insert into `{$shop_prefix}content` set co_id = 'company', co_html = '1', co_subject = '회사소개', co_content= '<p align=center><b>회사소개에 대한 내용을 입력하십시오.</b>' ") or die(mysql_error() . "<p>" . $sql);
     @mysql_query(" insert into `{$shop_prefix}content` set co_id = 'privacy', co_html = '1', co_subject = '개인정보 취급방침', co_content= '<p align=center><b>개인정보 취급방침에 대한 내용을 입력하십시오.' ") or die(mysql_error() . "<p>" . $sql);
@@ -192,32 +198,32 @@ if($shop_install) {
                     de_type1_list_skin = 'maintype10.inc.php',
                     de_type1_list_mod = '3',
                     de_type1_list_row = '2',
-                    de_type1_img_width = '$simg_width',
+                    de_type1_img_width = '$mimg_width',
-                    de_type1_img_height = '$simg_height',
+                    de_type1_img_height = '$mimg_height',
                     de_type2_list_use = '1',
                     de_type2_list_skin = 'maintype10.inc.php',
                     de_type2_list_mod = '3',
                     de_type2_list_row = '2',
-                    de_type2_img_width = '$simg_width',
+                    de_type2_img_width = '$mimg_width',
-                    de_type2_img_height = '$simg_height',
+                    de_type2_img_height = '$mimg_height',
                     de_type3_list_use = '1',
                     de_type3_list_skin = 'maintype10.inc.php',
                     de_type3_list_mod = '1',
                     de_type3_list_row = '3',
-                    de_type3_img_width = '$simg_width',
+                    de_type3_img_width = '$mimg_width',
-                    de_type3_img_height = '$simg_height',
+                    de_type3_img_height = '$mimg_height',
                     de_type4_list_use = '1',
                     de_type4_list_skin = 'maintype10.inc.php',
                     de_type4_list_mod = '3',
                     de_type4_list_row = '1',
-                    de_type4_img_width = '$simg_width',
+                    de_type4_img_width = '$mimg_width',
-                    de_type4_img_height = '$simg_height',
+                    de_type4_img_height = '$mimg_height',
                     de_type5_list_use = '1',
                     de_type5_list_skin = 'maintype10.inc.php',
                     de_type5_list_mod = '3',
                     de_type5_list_row = '1',
-                    de_type5_img_width = '$simg_width',
+                    de_type5_img_width = '$mimg_width',
-                    de_type5_img_height = '$simg_height',
+                    de_type5_img_height = '$mimg_height',
                     de_bank_use = '1',
                     de_bank_account = 'OO은행 12345-67-89012 예금주명',
                     de_vbank_use = '0',
@@ -238,8 +244,8 @@ if($shop_install) {
                     de_baesong_content = '<b>배송 안내 입력전입니다.</b>',
                     de_change_content = '<b>교환/반품 안내 입력전입니다.</b>',
                     de_rel_list_mod = '4',
-                    de_rel_img_width = '$simg_width',
+                    de_rel_img_width = '$mimg_width',
-                    de_rel_img_height = '$simg_height',
+                    de_rel_img_height = '$mimg_height',
                     de_simg_width = '$simg_width',
                     de_simg_height = '$simg_height',
                     de_mimg_width = '$mimg_width',

lib/shop.lib.php

@@ -14,11 +14,14 @@ function get_cart_count($uq_id)
 }
 
 // 이미지를 얻는다
-function get_image($img, $width=0, $height=0)
+function get_image($img, $width=0, $height=0, $type='')
 {
     global $g4, $default;
 
     $full_img = G4_DATA_PATH.'/item/'.$img;
+    if($type != '') {
+        $img_id = 'type'.$type.'_'.$img;
+    }
 
     if (file_exists($full_img) && $img)
     {
@@ -28,7 +31,7 @@ function get_image($img, $width=0, $height=0)
             $width = $size[0];
             $height = $size[1];
         }
-        $str = '<img src="'.G4_DATA_URL.'/item/'.$img.'" alt="" width="'.$width.'" height="'.$height.'" id="'.$img.'">';
+        $str = '<img src="'.G4_DATA_URL.'/item/'.$img.'" alt="" width="'.$width.'" height="'.$height.'" id="'.$img_id.'">';
     }
     else
     {
@@ -37,7 +40,7 @@ function get_image($img, $width=0, $height=0)
             $str .= 'width="'.$width.'" height="'.$height.'"';
         else
             $str .= 'width="'.$default['de_mimg_width'].'" height="'.$default['de_mimg_height'].'"';
-        $str .= ' id="'.$img.'">';
+        $str .= ' id="'.$img_id.'">';
     }
 
 
@@ -45,9 +48,9 @@ function get_image($img, $width=0, $height=0)
 }
 
 // 상품 이미지를 얻는다
-function get_it_image($img, $width=0, $height=0, $id="")
+function get_it_image($img, $width=0, $height=0, $id="", $type='')
 {
-    $str = get_image($img, $width, $height);
+    $str = get_image($img, $width, $height, $type);
     if ($id) {
         $str = '<a href="'.G4_SHOP_URL.'/item.php?it_id='.$id.'" alt="">'.$str.'</a>';
     }

lib/visit.lib.php

@@ -4,7 +4,7 @@ if (!defined('_GNUBOARD_')) exit;
 // 방문자수 출력
 function visit($skin_dir='basic')
 {
-    global $config, $g4;
+    global $config, $g4, $is_admin;
 
     // visit 배열변수에
     // $visit[1] = 오늘

shop/maintype10.inc.php

@@ -12,7 +12,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
 ?>
     <li class="sidx_it_li <?php echo $sidx_it_last; ?>">
         <a href="<?php echo $href; ?>" class="sidx_it_a">
-            <span><?php echo get_it_image($row['it_id']."_s", $img_width, $img_height); ?></span>
+            <span><?php echo get_it_image($row['it_id']."_s", $img_width, $img_height, $row['it_id'], $type); ?></span>
             <b><?php echo stripslashes($row['it_name']); ?></b>
             <?php echo display_amount(get_amount($row), $row['it_tel_inq']); ?>
         </a>

skin/visit/shop_basic/visit.skin.php

@@ -1,7 +1,5 @@
 <?php
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
-
-global $is_admin;
 ?>
 
 <link rel="stylesheet" href="<?php echo $visit_skin_url ?>/style.css">