From bf2248c9a75e5d23ea18f9cade8db5461cfdc064 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 12 Apr 2013 18:22:42 +0900
Subject: [PATCH] =?UTF-8?q?#66=20=EC=97=90=20=EB=94=B0=EB=A5=B8=20?=
 =?UTF-8?q?=EC=83=81=ED=92=88=EA=B4=80=EB=A6=AC=20=EB=B6=84=EB=A5=98=20sel?=
 =?UTF-8?q?ect=20=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/itemlist.php | 14 +++++++-------
 lib/shop.lib.php            |  5 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/adm/shop_admin/itemlist.php b/adm/shop_admin/itemlist.php
index 4fd0e7e68..ed163698b 100644
--- a/adm/shop_admin/itemlist.php
+++ b/adm/shop_admin/itemlist.php
@@ -8,7 +8,7 @@ $g4['title'] = '상품관리';
 include_once (G4_ADMIN_PATH.'/admin.head.php');
 
 // 분류
-$ca_list  = "";
+$ca_list  = '<option value="">선택</option>'.PHP_EOL;
 $sql = " select * from {$g4['shop_category_table']} ";
 if ($is_admin != 'super')
     $sql .= " where ca_mb_id = '{$member['mb_id']}' ";
@@ -19,11 +19,10 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
     $len = strlen($row['ca_id']) / 2 - 1;
     $nbsp = "";
     for ($i=0; $i<$len; $i++) {
-        $nbsp .= "&nbsp;&nbsp;&nbsp;";
+        $nbsp .= '&nbsp;&nbsp;&nbsp;';
     }
-    $ca_list .= "<option value='{$row['ca_id']}'>$nbsp{$row['ca_name']}";
+    $ca_list .= '<option value="'.$row['ca_id'].'">'.$nbsp.$row['ca_name'].'</option>'.PHP_EOL;
 }
-$ca_list .= "</select>";
 
 
 $where = " and ";
@@ -163,9 +162,6 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌
         $href = G4_SHOP_URL.'/item.php?it_id='.$row['it_id'];
 
         $gallery = $row['it_gallery'] ? 'Y' : '';
-
-        $tmp_ca_list  = '<select name="ca_id['.$i.']" id="ca_id_'.$i.'">'.$ca_list;
-        $tmp_ca_list .= "<script language='javascript'>document.getElementById('ca_id_$i').value='{$row['ca_id']}';</script>";
     ?>
     <tr>
         <td rowspan="2">
@@ -174,6 +170,10 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌
         </td>
         <td rowspan="2"><a href="<?=$href?>"><?=get_it_image($row['it_id'].'_s', 50, 50)?></a></td>
         <td rowspan="2">
+            <label for="ca_id_<?=$i?>">분류</label>
+            <select name="ca_id[<?=$i?>]" id="ca_id_<?=$i?>">
+                <?=conv_selected_option($ca_list, $row['ca_id'])?>
+            </select>
             <?=$tmp_ca_list?><br>
             <input type="text" name="it_name[<?=$i?>]" value="<?=htmlspecialchars2(cut_str($row['it_name'],250, ""))?>" required class="frm_input required" size="40">
         </td>
diff --git a/lib/shop.lib.php b/lib/shop.lib.php
index fdbfa988f..cf135408d 100644
--- a/lib/shop.lib.php
+++ b/lib/shop.lib.php
@@ -627,9 +627,10 @@ function conv_selected_option($options, $value)
     if(!$options)
         return '';
 
-    $str = str_replace('value="'.$value.'"', 'value="'.$value.'" selected="selected"', $options);
+    //$options = str_replace('value="'.$value.'"', 'value="'.$value.'" selected="selected"', $options);
+    $options = preg_replace('/(value=[\'\"]'.$value.'[\'\"])/', '\\1 selected="selected"', $options);
 
-    return $str;
+    return $options;
 }
 
 // 주문서 번호를 얻는다.