From f474b1464341c5a057641cd4e27005164e6f89cd Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 2 May 2013 09:12:41 +0900 Subject: [PATCH 1/3] =?UTF-8?q?#105=20=EC=97=90=20=EB=94=B0=EB=A5=B8=20?= =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EA=B8=B0=EB=B3=B8=20=EC=82=AC?= =?UTF-8?q?=EC=9D=B4=EC=A6=88=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/install_db.php | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/install/install_db.php b/install/install_db.php index 306e3e311..87bff7229 100644 --- a/install/install_db.php +++ b/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= '

회사소개에 대한 내용을 입력하십시오.' ") or die(mysql_error() . "

" . $sql); @mysql_query(" insert into `{$shop_prefix}content` set co_id = 'privacy', co_html = '1', co_subject = '개인정보 취급방침', co_content= '

개인정보 취급방침에 대한 내용을 입력하십시오.' ") or die(mysql_error() . "

" . $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_height = '$simg_height', + de_type1_img_width = '$mimg_width', + 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_height = '$simg_height', + de_type2_img_width = '$mimg_width', + 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_height = '$simg_height', + de_type3_img_width = '$mimg_width', + 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_height = '$simg_height', + de_type4_img_width = '$mimg_width', + 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_height = '$simg_height', + de_type5_img_width = '$mimg_width', + 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 = '배송 안내 입력전입니다.', de_change_content = '교환/반품 안내 입력전입니다.', de_rel_list_mod = '4', - de_rel_img_width = '$simg_width', - de_rel_img_height = '$simg_height', + de_rel_img_width = '$mimg_width', + de_rel_img_height = '$mimg_height', de_simg_width = '$simg_width', de_simg_height = '$simg_height', de_mimg_width = '$mimg_width', From 379b0b9337e0c67cc7a7e1afe8f4c6ec2fbebf9d Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 2 May 2013 09:18:01 +0900 Subject: [PATCH 2/3] =?UTF-8?q?#110=20=EC=97=90=20=EB=94=B0=EB=A5=B8=20$is?= =?UTF-8?q?=5Fadmin=20global=20=EB=B3=80=EC=88=98=EB=A1=9C=20=EC=A7=80?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/visit.lib.php | 2 +- skin/visit/shop_basic/visit.skin.php | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/visit.lib.php b/lib/visit.lib.php index 5edfefc7d..e650bf2fe 100644 --- a/lib/visit.lib.php +++ b/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] = 오늘 diff --git a/skin/visit/shop_basic/visit.skin.php b/skin/visit/shop_basic/visit.skin.php index 1a271e1e2..fb72a80f7 100644 --- a/skin/visit/shop_basic/visit.skin.php +++ b/skin/visit/shop_basic/visit.skin.php @@ -1,7 +1,5 @@ From aa381c5aa9c82ffd5970fde32530dcda9ad046f8 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 2 May 2013 09:38:46 +0900 Subject: [PATCH 3/3] =?UTF-8?q?#111=20=EC=97=90=20=EB=94=B0=EB=A5=B8=20?= =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=20=EC=9D=B8=EB=8D=B1=EC=8A=A4=20?= =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20ID=20=EC=9C=A0=ED=9A=A8=EC=84=B1?= =?UTF-8?q?=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/shop.lib.php | 13 ++++++++----- shop/maintype10.inc.php | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/shop.lib.php b/lib/shop.lib.php index 592553ea7..5beeb68b9 100644 --- a/lib/shop.lib.php +++ b/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 = ''; + $str = ''; } 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 = ''.$str.''; } diff --git a/shop/maintype10.inc.php b/shop/maintype10.inc.php index a15c7068b..f11d4e6bc 100644 --- a/shop/maintype10.inc.php +++ b/shop/maintype10.inc.php @@ -12,7 +12,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) { ?>

  • - +