From 2af0caca38d66fd8a2167d25aa80024d60f5709d Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 9 May 2013 14:18:06 +0900
Subject: [PATCH] =?UTF-8?q?#170=20=EC=97=90=20=EB=94=B0=EB=A5=B8=20?=
 =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=B4=88=EA=B8=B0=ED=99=94?=
 =?UTF-8?q?=EB=A9=B4=20=EC=84=A4=EC=A0=95=20=ED=95=AD=EB=AA=A9=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/configform.php       | 35 +++++++++--------------------
 adm/shop_admin/configformupdate.php |  5 -----
 install/shop.sql                    |  5 -----
 lib/shop.lib.php                    |  6 ++---
 mobile/shop/index.php               | 10 ++++-----
 mobile/shop/maintype10.inc.php      |  2 +-
 6 files changed, 19 insertions(+), 44 deletions(-)

diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php
index a572ae6ae..3c311f879 100644
--- a/adm/shop_admin/configform.php
+++ b/adm/shop_admin/configform.php
@@ -56,32 +56,27 @@ if (!isset($default['de_mobile_type1_list_use'])) {
                     ADD `de_mobile_type1_list_use` TINYINT(4) NOT NULL DEFAULT '0' AFTER `de_type5_img_height`,
                     ADD `de_mobile_type1_list_skin` VARCHAR(255) NOT NULL DEFAULT '' AFTER `de_mobile_type1_list_use`,
                     ADD `de_mobile_type1_list_row` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type1_list_skin`,
-                    ADD `de_mobile_type1_list_mod` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type1_list_row`,
-                    ADD `de_mobile_type1_img_width` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type1_list_mod`,
+                    ADD `de_mobile_type1_img_width` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type1_list_row`,
                     ADD `de_mobile_type1_img_height` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type1_img_width`,
                     ADD `de_mobile_type2_list_use` TINYINT(4) NOT NULL DEFAULT '0' AFTER `de_mobile_type1_img_height`,
                     ADD `de_mobile_type2_list_skin` VARCHAR(255) NOT NULL DEFAULT '' AFTER `de_mobile_type2_list_use`,
                     ADD `de_mobile_type2_list_row` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type2_list_skin`,
-                    ADD `de_mobile_type2_list_mod` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type2_list_row`,
-                    ADD `de_mobile_type2_img_width` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type2_list_mod`,
+                    ADD `de_mobile_type2_img_width` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type2_list_row`,
                     ADD `de_mobile_type2_img_height` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type2_img_width`,
                     ADD `de_mobile_type3_list_use` TINYINT(4) NOT NULL DEFAULT '0' AFTER `de_mobile_type2_img_height`,
                     ADD `de_mobile_type3_list_skin` VARCHAR(255) NOT NULL DEFAULT '' AFTER `de_mobile_type3_list_use`,
                     ADD `de_mobile_type3_list_row` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type3_list_skin`,
-                    ADD `de_mobile_type3_list_mod` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type3_list_row`,
-                    ADD `de_mobile_type3_img_width` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type3_list_mod`,
+                    ADD `de_mobile_type3_img_width` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type3_list_row`,
                     ADD `de_mobile_type3_img_height` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type3_img_width`,
                     ADD `de_mobile_type4_list_use` TINYINT(4) NOT NULL DEFAULT '0' AFTER `de_mobile_type3_img_height`,
                     ADD `de_mobile_type4_list_skin` VARCHAR(255) NOT NULL DEFAULT '' AFTER `de_mobile_type4_list_use`,
                     ADD `de_mobile_type4_list_row` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type4_list_skin`,
-                    ADD `de_mobile_type4_list_mod` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type4_list_row`,
-                    ADD `de_mobile_type4_img_width` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type4_list_mod`,
+                    ADD `de_mobile_type4_img_width` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type4_list_row`,
                     ADD `de_mobile_type4_img_height` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type4_img_width`,
                     ADD `de_mobile_type5_list_use` TINYINT(4) NOT NULL DEFAULT '0' AFTER `de_mobile_type4_img_height`,
                     ADD `de_mobile_type5_list_skin` VARCHAR(255) NOT NULL DEFAULT '' AFTER `de_mobile_type5_list_use`,
                     ADD `de_mobile_type5_list_row` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type5_list_skin`,
-                    ADD `de_mobile_type5_list_mod` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type5_list_row`,
-                    ADD `de_mobile_type5_img_width` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type5_list_mod`,
+                    ADD `de_mobile_type5_img_width` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type5_list_row`,
                     ADD `de_mobile_type5_img_height` INT(11) NOT NULL DEFAULT '0' AFTER `de_mobile_type5_img_width`
                     ", true);
 }
@@ -317,10 +312,8 @@ $pg_anchor = '<ul class="anchor">
             <select name="de_mobile_type3_list_skin" id="de_mobile_type3_list_skin">
                 <?php echo get_list_skin_options("^maintype(.*)\.php", G4_MSHOP_PATH, $default['de_mobile_type3_list_skin']); ?>
             </select>
-            <label for="de_mobile_type3_list_row">출력할 줄 수</label>
+            <label for="de_mobile_type3_list_row">출력할 이미지 수</label>
             <input type="text" name="de_mobile_type3_list_row" value="<?php echo $default['de_mobile_type3_list_row']; ?>" id="de_mobile_type3_list_row" class="frm_input" size="3">
-            <label for="de_mobile_type3_list_mod">1줄당 이미지 수</label>
-            <input type="text" name="de_mobile_type3_list_mod" value="<?php echo $default['de_mobile_type3_list_mod']; ?>" id="de_mobile_type3_list_mod" class="frm_input" size="3">
             <label for="de_mobile_type3_img_width">이미지 폭</label>
             <input type="text" name="de_mobile_type3_img_width" value="<?php echo $default['de_mobile_type3_img_width']; ?>" id="de_mobile_type3_img_width" class="frm_input" size="3">
             <label for="de_mobile_type3_img_height">이미지 높이</label>
@@ -335,10 +328,8 @@ $pg_anchor = '<ul class="anchor">
             <select name="de_mobile_type1_list_skin" id="de_mobile_type1_list_skin">
                 <?php echo get_list_skin_options("^maintype(.*)\.php", G4_MSHOP_PATH, $default['de_mobile_type1_list_skin']); ?>
             </select>
-            <label for="de_mobile_type1_list_row">출력할 줄 수</label>
+            <label for="de_mobile_type1_list_row">출력할 이미지 수</label>
             <input type="text" name="de_mobile_type1_list_row" value="<?php echo $default['de_mobile_type1_list_row']; ?>" id="de_mobile_type1_list_row" class="frm_input" size="3">
-            <label for="de_mobile_type1_list_mod">1줄당 이미지 수</label>
-            <input type="text" name="de_mobile_type1_list_mod" value="<?php echo $default['de_mobile_type1_list_mod']; ?>" id="de_mobile_type1_list_mod" class="frm_input" size="3">
             <label for="de_mobile_type1_img_width">이미지 폭</label>
             <input type="text" name="de_mobile_type1_img_width" value="<?php echo $default['de_mobile_type1_img_width']; ?>" id="de_mobile_type1_img_width" class="frm_input" size="3">
             <label for="de_mobile_type1_img_height">이미지 높이</label>
@@ -354,10 +345,8 @@ $pg_anchor = '<ul class="anchor">
             <select name="de_mobile_type2_list_skin" id="de_mobile_type2_list_skin">
                 <?php echo get_list_skin_options("^maintype(.*)\.php", G4_MSHOP_PATH, $default['de_mobile_type2_list_skin']); ?>
             </select>
-            <label for="de_mobile_type2_list_row">출력할 줄 수</label>
+            <label for="de_mobile_type2_list_row">출력할 이미지 수</label>
             <input type="text" name="de_mobile_type2_list_row" value="<?php echo $default['de_mobile_type2_list_row']; ?>" id="de_mobile_type2_list_row" class="frm_input" size="3">
-            <label for="de_mobile_type2_list_mod">1줄당 이미지 수</label>
-            <input type="text" name="de_mobile_type2_list_mod" value="<?php echo $default['de_mobile_type2_list_mod']; ?>" id="de_mobile_type2_list_mod" class="frm_input" size="3">
             <label for="de_mobile_type2_img_width">이미지 폭</label>
             <input type="text" name="de_mobile_type2_img_width" value="<?php echo $default['de_mobile_type2_img_width']; ?>" id="de_mobile_type2_img_width" class="frm_input" size="3">
             <label for="de_mobile_type2_img_height">이미지 높이</label>
@@ -373,10 +362,8 @@ $pg_anchor = '<ul class="anchor">
             <select name="de_mobile_type4_list_skin" id="de_mobile_type4_list_skin">
                 <?php echo get_list_skin_options("^maintype(.*)\.php", G4_MSHOP_PATH, $default['de_mobile_type4_list_skin']); ?>
             </select>
-            <label for="de_mobile_type4_list_row">출력할 줄 수</label>
+            <label for="de_mobile_type4_list_row">출력할 이미지 수</label>
             <input type="text" name="de_mobile_type4_list_row" value="<?php echo $default['de_mobile_type4_list_row']; ?>" id="de_mobile_type4_list_row" class="frm_input" size="3">
-            <label for="de_mobile_type4_list_mod">1줄당 이미지 수</label>
-            <input type="text" name="de_mobile_type4_list_mod" value="<?php echo $default['de_mobile_type4_list_mod']; ?>" id="de_mobile_type4_list_mod" class="frm_input" size="3">
             <label for="de_mobile_type4_img_width">이미지 폭</label>
             <input type="text" name="de_mobile_type4_img_width" value="<?php echo $default['de_mobile_type4_img_width']; ?>" id="de_mobile_type4_img_width" class="frm_input" size="3">
             <label for="de_mobile_type4_img_height">이미지 높이</label>
@@ -392,10 +379,8 @@ $pg_anchor = '<ul class="anchor">
             <select id="de_mobile_type5_list_skin" name="de_mobile_type5_list_skin">
                 <?php echo get_list_skin_options("^maintype(.*)\.php", G4_MSHOP_PATH, $default['de_mobile_type5_list_skin']); ?>
             </select>
-            <label for="de_mobile_type5_list_row">출력할 줄 수</label>
+            <label for="de_mobile_type5_list_row">출력할 이미지 수</label>
             <input type="text" name="de_mobile_type5_list_row" value="<?php echo $default['de_mobile_type5_list_row']; ?>" id="de_mobile_type5_list_row" class="frm_input" size="3">
-            <label for="de_mobile_type5_list_mod">1줄당 이미지 수</label>
-            <input type="text" name="de_mobile_type5_list_mod" value="<?php echo $default['de_mobile_type5_list_mod']; ?>" id="de_mobile_type5_list_mod" class="frm_input" size="3">
             <label for="de_mobile_type5_img_width">이미지 폭</label>
             <input type="text" name="de_mobile_type5_img_width" value="<?php echo $default['de_mobile_type5_img_width']; ?>" id="de_mobile_type5_img_width" class="frm_input" size="3">
             <label for="de_mobile_type5_img_height">이미지 높이</label>
diff --git a/adm/shop_admin/configformupdate.php b/adm/shop_admin/configformupdate.php
index 5f11e342b..6fa845a3f 100644
--- a/adm/shop_admin/configformupdate.php
+++ b/adm/shop_admin/configformupdate.php
@@ -63,31 +63,26 @@ $sql = " update {$g4['shop_default_table']}
                 de_type5_img_height         = '$de_type5_img_height',
                 de_mobile_type1_list_use    = '$de_mobile_type1_list_use',
                 de_mobile_type1_list_skin   = '$de_mobile_type1_list_skin',
-                de_mobile_type1_list_mod    = '$de_mobile_type1_list_mod',
                 de_mobile_type1_list_row    = '$de_mobile_type1_list_row',
                 de_mobile_type1_img_width   = '$de_mobile_type1_img_width',
                 de_mobile_type1_img_height  = '$de_mobile_type1_img_height',
                 de_mobile_type2_list_use    = '$de_mobile_type2_list_use',
                 de_mobile_type2_list_skin   = '$de_mobile_type2_list_skin',
-                de_mobile_type2_list_mod    = '$de_mobile_type2_list_mod',
                 de_mobile_type2_list_row    = '$de_mobile_type2_list_row',
                 de_mobile_type2_img_width   = '$de_mobile_type2_img_width',
                 de_mobile_type2_img_height  = '$de_mobile_type2_img_height',
                 de_mobile_type3_list_use    = '$de_mobile_type3_list_use',
                 de_mobile_type3_list_skin   = '$de_mobile_type3_list_skin',
-                de_mobile_type3_list_mod    = '$de_mobile_type3_list_mod',
                 de_mobile_type3_list_row    = '$de_mobile_type3_list_row',
                 de_mobile_type3_img_width   = '$de_mobile_type3_img_width',
                 de_mobile_type3_img_height  = '$de_mobile_type3_img_height',
                 de_mobile_type4_list_use    = '$de_mobile_type4_list_use',
                 de_mobile_type4_list_skin   = '$de_mobile_type4_list_skin',
-                de_mobile_type4_list_mod    = '$de_mobile_type4_list_mod',
                 de_mobile_type4_list_row    = '$de_mobile_type4_list_row',
                 de_mobile_type4_img_width   = '$de_mobile_type4_img_width',
                 de_mobile_type4_img_height  = '$de_mobile_type4_img_height',
                 de_mobile_type5_list_use    = '$de_mobile_type5_list_use',
                 de_mobile_type5_list_skin   = '$de_mobile_type5_list_skin',
-                de_mobile_type5_list_mod    = '$de_mobile_type5_list_mod',
                 de_mobile_type5_list_row    = '$de_mobile_type5_list_row',
                 de_mobile_type5_img_width   = '$de_mobile_type5_img_width',
                 de_mobile_type5_img_height  = '$de_mobile_type5_img_height',
diff --git a/install/shop.sql b/install/shop.sql
index 8a5009888..fc6292224 100644
--- a/install/shop.sql
+++ b/install/shop.sql
@@ -186,31 +186,26 @@ CREATE TABLE IF NOT EXISTS `shop_default` (
   `de_type5_img_height` int(11) NOT NULL DEFAULT '0',
   `de_mobile_type1_list_use` tinyint(4) NOT NULL DEFAULT '0',
   `de_mobile_type1_list_skin` varchar(255) NOT NULL DEFAULT '',
-  `de_mobile_type1_list_mod` int(11) NOT NULL DEFAULT '0',
   `de_mobile_type1_list_row` int(11) NOT NULL DEFAULT '0',
   `de_mobile_type1_img_width` int(11) NOT NULL DEFAULT '0',
   `de_mobile_type1_img_height` int(11) NOT NULL DEFAULT '0',
   `de_mobile_type2_list_use` tinyint(4) NOT NULL DEFAULT '0',
   `de_mobile_type2_list_skin` varchar(255) NOT NULL DEFAULT '',
-  `de_mobile_type2_list_mod` int(11) NOT NULL DEFAULT '0',
   `de_mobile_type2_list_row` int(11) NOT NULL DEFAULT '0',
   `de_mobile_type2_img_width` int(11) NOT NULL DEFAULT '0',
   `de_mobile_type2_img_height` int(11) NOT NULL DEFAULT '0',
   `de_mobile_type3_list_use` tinyint(4) NOT NULL DEFAULT '0',
   `de_mobile_type3_list_skin` varchar(255) NOT NULL DEFAULT '',
-  `de_mobile_type3_list_mod` int(11) NOT NULL DEFAULT '0',
   `de_mobile_type3_list_row` int(11) NOT NULL DEFAULT '0',
   `de_mobile_type3_img_width` int(11) NOT NULL DEFAULT '0',
   `de_mobile_type3_img_height` int(11) NOT NULL DEFAULT '0',
   `de_mobile_type4_list_use` tinyint(4) NOT NULL DEFAULT '0',
   `de_mobile_type4_list_skin` varchar(255) NOT NULL DEFAULT '',
-  `de_mobile_type4_list_mod` int(11) NOT NULL DEFAULT '0',
   `de_mobile_type4_list_row` int(11) NOT NULL DEFAULT '0',
   `de_mobile_type4_img_width` int(11) NOT NULL DEFAULT '0',
   `de_mobile_type4_img_height` int(11) NOT NULL DEFAULT '0',
   `de_mobile_type5_list_use` tinyint(4) NOT NULL DEFAULT '0',
   `de_mobile_type5_list_skin` varchar(255) NOT NULL DEFAULT '',
-  `de_mobile_type5_list_mod` int(11) NOT NULL DEFAULT '0',
   `de_mobile_type5_list_row` int(11) NOT NULL DEFAULT '0',
   `de_mobile_type5_img_width` int(11) NOT NULL DEFAULT '0',
   `de_mobile_type5_img_height` int(11) NOT NULL DEFAULT '0',
diff --git a/lib/shop.lib.php b/lib/shop.lib.php
index e02f8cb91..c80480f95 100644
--- a/lib/shop.lib.php
+++ b/lib/shop.lib.php
@@ -200,14 +200,14 @@ function is_null_time($datetime)
         return false;
 }
 
-// 출력유형, 스킨파일, 1라인이미지수, 총라인수, 이미지폭, 이미지높이
+// 출력유형, 스킨파일, 이미지수, 이미지폭, 이미지높이
 // 1.02.01 $ca_id 추가
-function display_type($type, $skin_file, $list_mod, $list_row, $img_width, $img_height, $ca_id="")
+function display_type($type, $skin_file, $list_row, $img_width, $img_height, $ca_id="")
 {
     global $member, $g4, $config;
 
     // 상품의 갯수
-    $items = $list_mod * $list_row;
+    $items = $list_row;
 
     // 1.02.00
     // it_order 추가
diff --git a/mobile/shop/index.php b/mobile/shop/index.php
index 00c56b6ff..dc83d8880 100644
--- a/mobile/shop/index.php
+++ b/mobile/shop/index.php
@@ -16,7 +16,7 @@ include_once(G4_MSHOP_PATH.'/shop.head.php');
     $type = 3;
     if ($default['de_mobile_type'.$type.'_list_us'])
     {
-        mobile_display_type($type, $default["de_mobile_type{$type}_list_skin"], $default["de_mobile_type{$type}_list_mod"], $default["de_mobile_type{$type}_list_row"], $default["de_mobile_type{$type}_img_width"], $default["de_mobile_type{$type}_img_height"]);
+        mobile_display_type($type, $default["de_mobile_type{$type}_list_skin"], $default["de_mobile_type{$type}_list_row"], $default["de_mobile_type{$type}_img_width"], $default["de_mobile_type{$type}_img_height"]);
     }
     ?>
 </section>
@@ -31,7 +31,7 @@ include_once(G4_MSHOP_PATH.'/shop.head.php');
     $type = 1;
     if ($default['de_mobile_type'.$type.'_list_use'])
     {
-        mobile_display_type($type, $default["de_mobile_type{$type}_list_skin"], $default["de_mobile_type{$type}_list_mod"], $default["de_mobile_type{$type}_list_row"], $default["de_mobile_type{$type}_img_width"], $default["de_mobile_type{$type}_img_height"]);
+        mobile_display_type($type, $default["de_mobile_type{$type}_list_skin"], $default["de_mobile_type{$type}_list_row"], $default["de_mobile_type{$type}_img_width"], $default["de_mobile_type{$type}_img_height"]);
     }
     ?>
 </section>
@@ -46,7 +46,7 @@ include_once(G4_MSHOP_PATH.'/shop.head.php');
     $type = 2;
     if ($default['de_mobile_type'.$type.'_list_use'])
     {
-        mobile_display_type($type, $default["de_mobile_type{$type}_list_skin"], $default["de_mobile_type{$type}_list_mod"], $default["de_mobile_type{$type}_list_row"], $default["de_mobile_type{$type}_img_width"], $default["de_mobile_type{$type}_img_height"]);
+        mobile_display_type($type, $default["de_mobile_type{$type}_list_skin"], $default["de_mobile_type{$type}_list_row"], $default["de_mobile_type{$type}_img_width"], $default["de_mobile_type{$type}_img_height"]);
     }
     ?>
 </section>
@@ -61,7 +61,7 @@ include_once(G4_MSHOP_PATH.'/shop.head.php');
     $type = 4;
     if ($default['de_mobile_type'.$type.'_list_use'])
     {
-        mobile_display_type($type, $default["de_mobile_type{$type}_list_skin"], $default["de_mobile_type{$type}_list_mod"], $default["de_mobile_type{$type}_list_row"], $default["de_mobile_type{$type}_img_width"], $default["de_mobile_type{$type}_img_height"]);
+        mobile_display_type($type, $default["de_mobile_type{$type}_list_skin"], $default["de_mobile_type{$type}_list_row"], $default["de_mobile_type{$type}_img_width"], $default["de_mobile_type{$type}_img_height"]);
     }
     ?>
 </section>
@@ -76,7 +76,7 @@ include_once(G4_MSHOP_PATH.'/shop.head.php');
     $type = 5;
     if ($default['de_mobile_type'.$type.'_list_use'])
     {
-        mobile_display_type($type, $default["de_mobile_type{$type}_list_skin"], $default["de_mobile_type{$type}_list_mod"], $default["de_mobile_type{$type}_list_row"], $default["de_mobile_type{$type}_img_width"], $default["de_mobile_type{$type}_img_height"]);
+        mobile_display_type($type, $default["de_mobile_type{$type}_list_skin"], $default["de_mobile_type{$type}_list_row"], $default["de_mobile_type{$type}_img_width"], $default["de_mobile_type{$type}_img_height"]);
     }
     ?>
 </section>
diff --git a/mobile/shop/maintype10.inc.php b/mobile/shop/maintype10.inc.php
index d14bfa64c..ff837d7e7 100644
--- a/mobile/shop/maintype10.inc.php
+++ b/mobile/shop/maintype10.inc.php
@@ -1,6 +1,6 @@
 <?php
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
-// $list_mod 가로 나열 수
+// $list_row 출력할 이미지 수
 
 for ($i=1; $row=sql_fetch_array($result); $i++) {
     $href = G4_SHOP_URL.'/item.php?it_id='.$row['it_id'];