From fcce945fc19fb00efcc370e2746d643bf520b87b Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 3 May 2013 09:19:05 +0900 Subject: [PATCH 1/5] =?UTF-8?q?img=20=ED=83=9C=EA=B7=B8=EC=97=90=20id=20?= =?UTF-8?q?=EC=86=8D=EC=84=B1=20=EC=B6=94=EA=B0=80=20=EB=A3=A8=ED=8B=B4=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/shop.lib.php | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/shop.lib.php b/lib/shop.lib.php index 4eb5a9c21..ef620e915 100644 --- a/lib/shop.lib.php +++ b/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 = ''; + $str = ''; + + 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 = ''.$str.''; } From bcf6a51990c1f78806b944aebd05144bf810aa2e Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 3 May 2013 09:19:59 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EC=83=81=ED=92=88=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=EC=97=90=EC=84=9C=20id=20=EC=86=8D=EC=84=B1=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/list.skin.10.php | 2 +- shop/list.skin.11.php | 2 +- shop/list.skin.12.php | 2 +- shop/list.skin.13.php | 2 +- shop/maintype10.inc.php | 2 +- shop/maintype11.inc.php | 2 +- shop/maintype12.inc.php | 2 +- shop/maintype13.inc.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/shop/list.skin.10.php b/shop/list.skin.10.php index f52436e1f..51e6320c8 100644 --- a/shop/list.skin.10.php +++ b/shop/list.skin.10.php @@ -21,7 +21,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) ?>
  • - + diff --git a/shop/list.skin.11.php b/shop/list.skin.11.php index 4b354ddc0..328d42b49 100644 --- a/shop/list.skin.11.php +++ b/shop/list.skin.11.php @@ -21,7 +21,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) ?>
  • - + diff --git a/shop/list.skin.12.php b/shop/list.skin.12.php index cc63ead67..13b3ffc13 100644 --- a/shop/list.skin.12.php +++ b/shop/list.skin.12.php @@ -21,7 +21,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) ?>
  • - + diff --git a/shop/list.skin.13.php b/shop/list.skin.13.php index f8da714c4..ee2dc42b0 100644 --- a/shop/list.skin.13.php +++ b/shop/list.skin.13.php @@ -21,7 +21,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) ?>
  • - + diff --git a/shop/maintype10.inc.php b/shop/maintype10.inc.php index 803289aa3..3aabc0d06 100644 --- a/shop/maintype10.inc.php +++ b/shop/maintype10.inc.php @@ -20,7 +20,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) { ?>
  • - + diff --git a/shop/maintype11.inc.php b/shop/maintype11.inc.php index b0eeb0be4..6fa49be19 100644 --- a/shop/maintype11.inc.php +++ b/shop/maintype11.inc.php @@ -20,7 +20,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) { ?>
  • - + diff --git a/shop/maintype12.inc.php b/shop/maintype12.inc.php index 4a38027d5..12fd0077c 100644 --- a/shop/maintype12.inc.php +++ b/shop/maintype12.inc.php @@ -21,7 +21,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
  • - +

    diff --git a/shop/maintype13.inc.php b/shop/maintype13.inc.php index 55017d4ff..6e7c407b3 100644 --- a/shop/maintype13.inc.php +++ b/shop/maintype13.inc.php @@ -21,7 +21,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
  • - +

    From 72e4a9f677fa11baccd2ceae0d650216d53a9c3e Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 3 May 2013 09:40:57 +0900 Subject: [PATCH 3/5] =?UTF-8?q?#120=20=EC=97=90=20=EB=94=B0=EB=A5=B8=20?= =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EC=A0=95=EB=A0=AC=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/list.php | 7 +++++-- shop/list.sort.php | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/shop/list.php b/shop/list.php index da3573f97..a4ab2e0fb 100644 --- a/shop/list.php +++ b/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 '
    '.$error.'
    '; } - $qstr1 .= 'ca_id='.$ca_id.'&skin='.$skin.'&ev_id='.$ev_id.'&sort='.$sort; + $qstr1 .= 'ca_id='.$ca_id; + if($skin) + $qstr1 .= '&skin='.$skin; + $qstr1 .='&ev_id='.$ev_id.'&sort='.$sort.'&'.$sortodr; echo get_paging($config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr1.'&page='); ?> diff --git a/shop/list.sort.php b/shop/list.sort.php index 33bb96870..75ae24e32 100644 --- a/shop/list.sort.php +++ b/shop/list.sort.php @@ -1,7 +1,10 @@
    @@ -11,8 +14,8 @@ $sct_sort_href = $_SERVER['PHP_SELF'].'?ca_id='.$ca_id.'&skin='.$skin.'&
      -
    • 낮은가격순
      • -
    • 높은가격순
      • +
    • 낮은가격순
      • +
    • 높은가격순
    • 상품명순
    • 히트상품
    • 추천상품
      • From 0ed73e65c1b3279603f30273ce071c9abcda9f58 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 3 May 2013 10:00:10 +0900 Subject: [PATCH 4/5] =?UTF-8?q?#121=20=EC=97=90=20=EB=94=B0=EB=A5=B8=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=EB=90=9C=20=EC=83=81=ED=92=88=EC=9D=B4=20?= =?UTF-8?q?=EC=97=86=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/shop.lib.php | 2 ++ shop/list.skin.10.php | 5 ++++- shop/list.skin.11.php | 5 ++++- shop/list.skin.12.php | 5 ++++- shop/list.skin.13.php | 5 ++++- shop/maintype10.inc.php | 5 ++++- shop/maintype11.inc.php | 5 ++++- shop/maintype12.inc.php | 5 ++++- shop/maintype13.inc.php | 5 ++++- 9 files changed, 34 insertions(+), 8 deletions(-) diff --git a/lib/shop.lib.php b/lib/shop.lib.php index ef620e915..e596d8523 100644 --- a/lib/shop.lib.php +++ b/lib/shop.lib.php @@ -219,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)) { diff --git a/shop/list.skin.10.php b/shop/list.skin.10.php index 51e6320c8..635f3a7dc 100644 --- a/shop/list.skin.10.php +++ b/shop/list.skin.10.php @@ -39,6 +39,9 @@ for ($i=1; $row=sql_fetch_array($result); $i++) 구글플러스에 공유 - 1) echo '
    '; + +if($i == 1) echo '

    등록된 상품이 없습니다.

    '; ?> diff --git a/shop/list.skin.11.php b/shop/list.skin.11.php index 328d42b49..c6a8a8e39 100644 --- a/shop/list.skin.11.php +++ b/shop/list.skin.11.php @@ -39,6 +39,9 @@ for ($i=1; $row=sql_fetch_array($result); $i++) 구글플러스에 공유
    • - 1) echo ''; + +if($i == 1) echo '

    등록된 상품이 없습니다.

    '; ?> diff --git a/shop/list.skin.12.php b/shop/list.skin.12.php index 13b3ffc13..59ce62a44 100644 --- a/shop/list.skin.12.php +++ b/shop/list.skin.12.php @@ -39,6 +39,9 @@ for ($i=1; $row=sql_fetch_array($result); $i++) 구글플러스에 공유 - 1) echo ''; + +if($i == 1) echo '

    등록된 상품이 없습니다.

    '; ?> diff --git a/shop/list.skin.13.php b/shop/list.skin.13.php index ee2dc42b0..cc12d72e0 100644 --- a/shop/list.skin.13.php +++ b/shop/list.skin.13.php @@ -42,6 +42,9 @@ for ($i=1; $row=sql_fetch_array($result); $i++) 구글플러스에 공유 - 1) echo ''; + +if($i == 1) echo '

    등록된 상품이 없습니다.

    '; ?> diff --git a/shop/maintype10.inc.php b/shop/maintype10.inc.php index 3aabc0d06..d14bfa64c 100644 --- a/shop/maintype10.inc.php +++ b/shop/maintype10.inc.php @@ -33,6 +33,9 @@ for ($i=1; $row=sql_fetch_array($result); $i++) { 구글플러스에 공유 - 1) echo ''; + +if($i == 1) echo '

    등록된 상품이 없습니다.

    '; ?> diff --git a/shop/maintype11.inc.php b/shop/maintype11.inc.php index 6fa49be19..38b31c2a4 100644 --- a/shop/maintype11.inc.php +++ b/shop/maintype11.inc.php @@ -33,6 +33,9 @@ for ($i=1; $row=sql_fetch_array($result); $i++) { 구글플러스에 공유 - 1) echo ''; + +if($i == 1) echo '

    등록된 상품이 없습니다.

    '; ?> diff --git a/shop/maintype12.inc.php b/shop/maintype12.inc.php index 12fd0077c..851a32065 100644 --- a/shop/maintype12.inc.php +++ b/shop/maintype12.inc.php @@ -35,6 +35,9 @@ for ($i=1; $row=sql_fetch_array($result); $i++) { 구글플러스에 공유 - 1) echo ''; + +if($i == 1) echo '

    등록된 상품이 없습니다.

    '; ?> diff --git a/shop/maintype13.inc.php b/shop/maintype13.inc.php index 6e7c407b3..3f3f72b71 100644 --- a/shop/maintype13.inc.php +++ b/shop/maintype13.inc.php @@ -38,6 +38,9 @@ for ($i=1; $row=sql_fetch_array($result); $i++) { 구글플러스에 공유 - 1) echo ''; + +if($i == 1) echo '

    등록된 상품이 없습니다.

    '; ?> From fd28b8bc621d786228f9228d38ada446264fbaeb Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 3 May 2013 15:32:18 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=EC=98=A4=ED=83=80=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/iteminfo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/shop_admin/iteminfo.php b/adm/shop_admin/iteminfo.php index 341734e74..3db3fc387 100644 --- a/adm/shop_admin/iteminfo.php +++ b/adm/shop_admin/iteminfo.php @@ -66,7 +66,7 @@ include_once(G4_PATH.'/head.sub.php'); - +