diff --git a/adm/shop_admin/itemlist.php b/adm/shop_admin/itemlist.php index dbe723c76..23971d676 100644 --- a/adm/shop_admin/itemlist.php +++ b/adm/shop_admin/itemlist.php @@ -171,13 +171,12 @@ for ($i=0; $row=mysql_fetch_array($result); $i++) break; } } - $it_img = it_img_thumb($filename, G4_DATA_PATH.'/item/'.$row['it_id'], 50, 50); echo " $row[it_id] - ".get_it_image("{$row['it_id']}/{$it_img}", 50, 50)." + ".get_it_image($row['it_id'], $filename, 50, 50)." $tmp_ca_list
diff --git a/lib/shop.lib.php b/lib/shop.lib.php index e5f494dea..1f22fbad9 100644 --- a/lib/shop.lib.php +++ b/lib/shop.lib.php @@ -143,14 +143,30 @@ function get_image($img, $width=0, $height=0) } // 상품 이미지를 얻는다 -function get_it_image($img, $width=0, $height=0, $id="") +function get_it_image($dir, $img, $width, $height, $it_id="", $class="", $thumbnail=true) { - global $g4; + if($thumbnail && !$width) + return ""; - $str = get_image($img, $width, $height); - if ($id) { - $str = "$str"; + $src = G4_DATA_URL.'/item/'.$dir.'/'.$img; + + if($thumbnail) { + $filepath = G4_DATA_PATH.'/item/'.$dir; + + if(file_exists($filepath.'/'.$img) && is_file($filepath.'/'.$img)) { + $src = G4_DATA_URL.'/item/'.$dir.'/'.it_img_thumb($img, $filepath, $width, $height); + } } + + $str = "$str"; + } + return $str; } @@ -209,16 +225,14 @@ function get_option_stock_qty($it_id, $opt_id, $is_option) // 큰 이미지 function get_large_image($img, $it_id, $btn_image=true) { - global $g4; - - if (file_exists(G4_DATA_PATH."/item/$img") && $img != "") + if (file_exists(G4_DATA_PATH."/item/$it_id/$img") && $img != "") { - $size = getimagesize(G4_DATA_PATH."/item/$img"); + $size = getimagesize(G4_DATA_PATH."/item/$it_id/$img"); $width = $size[0]; $height = $size[1]; - $str = ""; + $str = ""; if ($btn_image) - $str .= ""; + $str .= ""; } else $str = ""; diff --git a/shop/boxtodayview.inc.php b/shop/boxtodayview.inc.php index bd5729696..826fe9880 100644 --- a/shop/boxtodayview.inc.php +++ b/shop/boxtodayview.inc.php @@ -66,8 +66,8 @@ for ($i=1; $i<=$tv_idx; $i++) if(file_exists($tv_filepath.'/'.$tv_filename) && $tv_filename != "") break; } - $tv_it_img = $tv_it_id.'/'.it_img_thumb($tv_filename, $tv_filepath, $tv_div['img_width'], $tv_div['img_height']); - $img = get_it_image($tv_it_img, $tv_div['img_width'], $tv_div['img_height'], $tv_it_id); + $img = get_it_image($tv_it_id, $tv_filename, $tv_div['img_width'], $tv_div['img_height'], $tv_it_id); + $img = str_replace("\"", "\\\"", $img); $img = preg_replace("/\".cut_str($it_name,10,"")."\";\n"; } diff --git a/shop/cartsub.inc.php b/shop/cartsub.inc.php index 1ca59687b..d01a2a55e 100644 --- a/shop/cartsub.inc.php +++ b/shop/cartsub.inc.php @@ -88,13 +88,23 @@ $sql = " select a.ct_id, b.it_option_use, b.it_supplement_use, b.it_nocoupon, - b.it_notax + b.it_notax, + b.it_img1, + b.it_img2, + b.it_img3, + b.it_img4, + b.it_img5, + b.it_img6, + b.it_img7, + b.it_img8, + b.it_img9, + b.it_img10 from {$g4['yc4_cart_table']} as a left join {$g4['yc4_item_table']} as b on ( a.it_id = b.it_id ) where $sql_where and a.ct_parent = '0' and a.ct_direct = '$sw_direct' "; -if($w == "selectedbuy") +if($act == "selectedbuy") $sql .= " and a.ct_selected = '1' "; if($s_page == "cart.php" || $s_page == "orderform.php") @@ -146,14 +156,24 @@ for ($i=0; $row=mysql_fetch_array($result); $i++) $continue_ca_id = $row['ca_id']; } + // 리스트 썸네일 이미지 + $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; + } + } + if ($s_page == "cart.php" || $s_page == "orderinquiryview.php") { // 링크를 붙이고 $a1 = ""; $a2 = ""; - $image = get_it_image($row['it_id']."_s", 50, 50, $row['it_id']); + $image = get_it_image($row['it_id'], $filename, 50, 50, $row['it_id']); } else { // 붙이지 않고 $a1 = ""; $a2 = ""; - $image = get_it_image($row['it_id']."_s", 50, 50); + $image = get_it_image($row['it_id'], $filename, 50, 50); } $it_name = $a1 . stripslashes($row['it_name']) . $a2 . '
'; diff --git a/shop/item.php b/shop/item.php index 570881985..41baf541a 100644 --- a/shop/item.php +++ b/shop/item.php @@ -183,14 +183,12 @@ else break; } } - - $middle_image = $it['it_id'].'/'.it_img_thumb($filename, $filepath, $default['de_mimg_width'], $default['de_mimg_height']); ?>
+
-
@@ -201,9 +199,8 @@ else if (file_exists($filepath.'/'.$filename) && $filename != "") { - echo get_large_image($it['it_id'].'/'.$filename, $it['it_id'], false); - echo ""; + echo get_large_image($filename, $it['it_id'], false); + echo get_it_image($it['it_id'], $filename, 40, 40, "", "item_view_thumbnail"); echo "  "; } } @@ -1110,6 +1107,12 @@ function explan_resize_image() diff --git a/shop/largeimage.php b/shop/largeimage.php index 3ffefeb78..253667d11 100644 --- a/shop/largeimage.php +++ b/shop/largeimage.php @@ -1,13 +1,14 @@  "; + echo get_it_image($it_id, $filename, 50, 50, "", "image_thumbnail")." "; } ?>  
+ + + \ No newline at end of file diff --git a/shop/list.skin.10.php b/shop/list.skin.10.php index 7f6f2dbb3..5b5ca33fc 100644 --- a/shop/list.skin.10.php +++ b/shop/list.skin.10.php @@ -23,13 +23,12 @@ for ($i=0; $row=sql_fetch_array($result); $i++) break; } } - $it_img = it_img_thumb($filename, G4_DATA_PATH.'/item/'.$row['it_id'], $img_width, $img_height); echo "
- + "; if ($row[it_cust_amount] && !$row[it_gallery]) diff --git a/shop/maintype10.inc.php b/shop/maintype10.inc.php index 76ec1098a..ce92bc797 100644 --- a/shop/maintype10.inc.php +++ b/shop/maintype10.inc.php @@ -21,12 +21,11 @@ for ($i=0; $row=sql_fetch_array($result); $i++) { break; } } - $it_img = it_img_thumb($filename, G4_DATA_PATH.'/item/'.$row['it_id'], $img_width, $img_height); ?> @@ -50,7 +50,7 @@ var member_skin_path = ""; - + diff --git a/skin/new/neo/new.skin.php b/skin/new/neo/new.skin.php index d9eb740d3..2c7166a1c 100644 --- a/skin/new/neo/new.skin.php +++ b/skin/new/neo/new.skin.php @@ -12,7 +12,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
".get_it_image($row['it_id'].'/'.$it_img, $img_width , $img_height, $row[it_id])."
".get_it_image($row['it_id'], $filename, $img_width , $img_height, $row['it_id'])."
".it_name_icon($row)."
- + diff --git a/skin/board/neo/list.skin.php b/skin/board/neo/list.skin.php index 16a4b0905..6cd82b325 100644 --- a/skin/board/neo/list.skin.php +++ b/skin/board/neo/list.skin.php @@ -39,7 +39,7 @@ if ($is_nogood) $colspan++; - + @@ -68,7 +68,7 @@ if ($is_nogood) $colspan++; - + diff --git a/skin/board/neo/write.skin.php b/skin/board/neo/write.skin.php index 838467814..2d06bcab9 100644 --- a/skin/board/neo/write.skin.php +++ b/skin/board/neo/write.skin.php @@ -53,7 +53,7 @@ echo $option_hidden; - + @@ -99,7 +99,7 @@ echo $option_hidden; - + @@ -118,7 +118,7 @@ echo $option_hidden; - + - +
번호 제목 글쓴이 날짜
파일 # - + @@ -143,7 +143,7 @@ echo $option_hidden; diff --git a/skin/member/neo/login.skin.php b/skin/member/neo/login.skin.php index db5737733..cb6465dce 100644 --- a/skin/member/neo/login.skin.php +++ b/skin/member/neo/login.skin.php @@ -10,9 +10,9 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
- + - + diff --git a/skin/member/neo/member_confirm.skin.php b/skin/member/neo/member_confirm.skin.php index 53f2ab5f6..c7ea673d2 100644 --- a/skin/member/neo/member_confirm.skin.php +++ b/skin/member/neo/member_confirm.skin.php @@ -21,7 +21,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 - +
diff --git a/skin/member/neo/password.skin.php b/skin/member/neo/password.skin.php index e21d7d697..80a892f9f 100644 --- a/skin/member/neo/password.skin.php +++ b/skin/member/neo/password.skin.php @@ -20,7 +20,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
- +
diff --git a/skin/member/neo/password_lost.skin.php b/skin/member/neo/password_lost.skin.php index 276bab473..0faaa3864 100644 --- a/skin/member/neo/password_lost.skin.php +++ b/skin/member/neo/password_lost.skin.php @@ -13,7 +13,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 해당 이메일로 아이디와 패스워드 정보를 보내드립니다.

- +
diff --git a/skin/member/neo/register_form.skin.php b/skin/member/neo/register_form.skin.php index fde11461a..ffa780f06 100644 --- a/skin/member/neo/register_form.skin.php +++ b/skin/member/neo/register_form.skin.php @@ -21,18 +21,18 @@ var member_skin_path = "";
- title="회원아이디"> + > 영문자, 숫자, _ 만 입력 가능. 최소 3자이상 입력하세요.
title="패스워드">>
title="패스워드 확인">>
@@ -41,7 +41,7 @@ var member_skin_path = "";
- title="이름"> + > 공백없이 한글만 입력하세요."; } ?>
- + 공백없이 한글,영문,숫자만 입력 가능 (한글2자, 영문4자 이상)
@@ -64,7 +64,7 @@ var member_skin_path = "";
- " maxlength="100" size="50" value='' title="E-mail"> + " maxlength="100" size="50" value='' > @@ -195,7 +195,7 @@ var member_skin_path = "";