diff --git a/adm/shop_admin/item_copy_update.php b/adm/shop_admin/item_copy_update.php
index 802edf912..d2c8f2536 100644
--- a/adm/shop_admin/item_copy_update.php
+++ b/adm/shop_admin/item_copy_update.php
@@ -38,6 +38,14 @@ $sql = " insert {$g4['shop_item_table']}
                 $sql_common ";
 sql_query($sql);
 
+// 선택/추가 옵션 copy
+$opt_sql = " insert ignore into {$g4['shop_item_option_table']} ( io_id, io_type, it_id, io_price, io_stock_qty, io_noti_qty, io_use )
+                select io_id, io_type, '$new_it_id', io_price, io_stock_qty, io_noti_qty, io_use
+                    from {$g4['shop_item_option_table']}
+                    where it_id = '$it_id'
+                    order by io_no asc ";
+sql_query($opt_sql);
+
 // html 에디터로 첨부된 이미지 파일 복사
 if($cp['it_explan']) {
     $matchs = get_editor_image($cp['it_explan']);
diff --git a/adm/shop_admin/itemformupdate.php b/adm/shop_admin/itemformupdate.php
index 21819a130..b4ae6a454 100644
--- a/adm/shop_admin/itemformupdate.php
+++ b/adm/shop_admin/itemformupdate.php
@@ -21,14 +21,25 @@ function itemdelete($it_id)
     $it = sql_fetch($sql);
 
     // 상품 이미지 삭제
+    $dir_list = array();
     for($i=1; $i<=10; $i++) {
         $file = G4_DATA_PATH.'/item/'.$it['it_img'.$i];
         if(is_file($file) && $it['it_img'.$i]) {
             @unlink($file);
-            delete_item_thumbnail(dirname($file), basename($file));
+            $dir = dirname($file);
+            delete_item_thumbnail($dir, basename($file));
+
+            if(!in_array($dir, $dir_list))
+                $dir_list[] = $dir;
         }
     }
 
+    // 이미지디렉토리 삭제
+    for($i=0; $i<count($dir_list); $i++) {
+        if(is_dir($dir_list[$i]))
+            rmdir($dir_list[$i]);
+    }
+
     // 상, 하단 이미지 삭제
     @unlink(G4_DATA_PATH."/item/$it_id"."_h");
     @unlink(G4_DATA_PATH."/item/$it_id"."_t");
diff --git a/adm/shop_admin/itemoption.php b/adm/shop_admin/itemoption.php
index df141a1db..2106341eb 100644
--- a/adm/shop_admin/itemoption.php
+++ b/adm/shop_admin/itemoption.php
@@ -14,8 +14,6 @@ if($it['it_id']) {
     if(mysql_num_rows($result))
         $po_run = true;
 } else if(!empty($_POST)) {
-    $po_run = true;
-
     $opt1_subject = trim($_POST['opt1_subject']);
     $opt2_subject = trim($_POST['opt2_subject']);
     $opt3_subject = trim($_POST['opt3_subject']);
@@ -23,6 +21,14 @@ if($it['it_id']) {
     $opt1_val = trim($_POST['opt1']);
     $opt2_val = trim($_POST['opt2']);
     $opt3_val = trim($_POST['opt3']);
+
+    if(!$opt1_subject || !$opt1_val) {
+        echo '옵션1과 옵션1 항목을 입력해 주십시오.';
+        exit;
+    }
+
+    $po_run = true;
+
     $opt1_count = $opt2_count = $opt3_count = 0;
 
     if($opt1_val) {
diff --git a/adm/shop_admin/itemsupply.php b/adm/shop_admin/itemsupply.php
index ceca87df2..adc861932 100644
--- a/adm/shop_admin/itemsupply.php
+++ b/adm/shop_admin/itemsupply.php
@@ -9,8 +9,15 @@ if($it['it_id']) {
     if(mysql_num_rows($result))
         $ps_run = true;
 } else if(!empty($_POST)) {
-    $ps_run = true;
     $subject_count = count($_POST['subject']);
+    $supply_count = count($_POST['supply']);
+
+    if(!$subject_count || !$supply_count) {
+        echo '추가옵션명과 추가옵션항목을 입력해 주십시오.';
+        exit;
+    }
+
+    $ps_run = true;
 }
 
 if($ps_run) {
diff --git a/css/admin.css b/css/admin.css
index f2a431332..8015c51cc 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -335,7 +335,7 @@ textarea {width:90%}
 select {border:1px solid #ced9de}
 button {padding:3px;border:1px solid #ced9de;background:#f6f9fa;cursor:pointer}
 fieldset {margin-bottom:20px}
-legend {position:absolute;font-size:0;line-height:0;border:0;overflow:hidden}
+legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;border:0;overflow:hidden}
 fieldset span {display:block;margin-bottom:10px}
 fieldset p {color:#4c5f67}
 fieldset button {padding:0 15px;height:23px;border:0;background:#617d46;color:#fff;font-size:1em;line-height:2.1em;vertical-align:middle;cursor:pointer}
diff --git a/css/default.css b/css/default.css
index 59c0b955c..1bf16654c 100644
--- a/css/default.css
+++ b/css/default.css
@@ -28,7 +28,7 @@ a:active {color:#000;text-decoration:underline}
 
 /* 전체 검색 */
 #sch_all {position:absolute;top:22px;left:70px;margin:0;padding:0;border:1px solid #555}
-#sch_all legend {position:absolute;text-indent:-9999em;overflow:hidden}
+#sch_all legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
 #sch_all_stx {padding-left:5px;width:165px;height:24px;border:0;background:#fff;line-height:1.9em !important;line-height:1.6em}
 #sch_all_submit {padding:0 5px;height:26px;border:0;background:#555;color:#fff}
 
@@ -36,9 +36,7 @@ a:active {color:#000;text-decoration:underline}
 #tnb:after {display:block;visibility:hidden;clear:both;content:""}
 #tnb li {float:left}
 #tnb a {display:block;padding:5px 10px;color:#333;letter-spacing:-0.1em}
-#tnb a:focus,
-#tnb a:hover,
-#tnb a:active {text-decoration:none}
+#tnb a:focus, #tnb a:hover, #tnb a:active {text-decoration:none}
 #tnb img {margin-right:3px}
 
 /* gnb js off */
@@ -49,13 +47,11 @@ a:active {color:#000;text-decoration:underline}
 .gnb_1dli {z-index:10;clear:both;zoom:1}
 .gnb_1dli:after {display:block;visibility:hidden;clear:both;content:""}
 .gnb_1da {display:block;float:left;width:80px;height:35px;font-weight:bold;line-height:2.95em;text-decoration:none}
-.gnb_1da:focus,
-.gnb_1da:hover {text-decoration:none}
+.gnb_1da:focus, .gnb_1da:hover {text-decoration:none}
 .gnb_2dul {float:left;width:auto}
 .gnb_2dli {float:left}
 .gnb_2da {display:block;float:left;width:80px;height:35px;line-height:2.95em;text-decoration:none}
-.gnb_2da:focus,
-.gnb_2da:hover {text-decoration:none}
+.gnb_2da:focus, .gnb_2da:hover {text-decoration:none}
 /* gnb js on */
 .gnb_js {}
 .gnb_js #gnb_1dul {zoom:1}
@@ -101,8 +97,7 @@ a:active {color:#000;text-decoration:underline}
 
 /* 화면낭독기 사용자용 */
 #hd_login_msg {position:absolute;top:0;left:0;font-size:0;line-height:0;overflow:hidden}
-.msg_sound_only,
-.sound_only {display:inline-block !important;position:absolute;top:0;left:0;margin:0 !important;padding:0 !important;font-size:0;line-height:0;border:0 !important;overflow:hidden !important}
+.msg_sound_only, .sound_only {display:inline-block !important;position:absolute;top:0;left:0;margin:0 !important;padding:0 !important;font-size:0;line-height:0;border:0 !important;overflow:hidden !important}
 /* 본문 바로가기 */
 #skip_to_container a {z-index:100000;position:absolute;top:0;left:0;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
 #skip_to_container a:focus, #skip_to_container a:active {width:100%;height:75px;background:#21272e;color:#fff;font-size:2em;font-weight:bold;text-align:center;text-decoration:none;line-height:3.3em}
@@ -121,8 +116,7 @@ a:active {color:#000;text-decoration:underline}
 .cke_sc_def {margin:0 0 5px;padding:10px;border:1px solid #ccc;background:#f7f7f7;text-align:center}
 .cke_sc_def dl{margin:0 0 5px;text-align:left;zoom:1}
 .cke_sc_def dl:after {display:block;visibility:hidden;clear:both;content:""}
-.cke_sc_def dt,
-.cke_sc_def dd {float:left;margin:0;padding:5px 0;border-bottom:1px solid .e9e9e9}
+.cke_sc_def dt, .cke_sc_def dd {float:left;margin:0;padding:5px 0;border-bottom:1px solid .e9e9e9}
 .cke_sc_def dt {width:20%;font-weight:bold}
 .cke_sc_def dd {width:30%}
 
@@ -143,10 +137,10 @@ button.btn_cancel {display:inline-block;padding:0 10px;height:24px;border:1px so
 .btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff !important;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */
 button.btn_frmline {font-size:1em}
 .btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */
-.btn_win a,
-.btn_win button {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em;cursor:pointer}
-.btn_win a:focus,
-.btn_win a:hover {text-decoration:none}
+
+.btn_win a {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em;cursor:pointer}
+.btn_win a:focus, .btn_win a:hover {text-decoration:none}
+
 /* 게시판용 버튼 */
 .btn_b01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #d9ded9;background:#f5f6fa;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle}
 .btn_b01:focus, .btn_b01:hover {text-decoration:none !important}
@@ -237,4 +231,4 @@ td.empty_table {padding:85px 0;text-align:center}
 .pg_current {background:#333;color:#fff;font-weight:bold}
 
 /* Mobile화면으로 */
-#device_change {display:block;margin:0.3em;padding:0.5em 0;border:1px solid #eee;border-radius:2em;background:#fff;color:#000;font-size:2em;text-decoration:none;text-align:center}
+#device_change {display:block;margin:0.3em;padding:0.5em 0;border:1px solid #eee;border-radius:2em;background:#fff;color:#000;font-size:2em;text-decoration:none;text-align:center}
\ No newline at end of file
diff --git a/css/mobile.css b/css/mobile.css
index 4bcd34e0a..ce1519cf8 100644
--- a/css/mobile.css
+++ b/css/mobile.css
@@ -7,6 +7,7 @@ html, h1, h2, h3, h4, h5, h6, form, fieldset, img {margin:0;padding:0;border:0}
 h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:"dotum"}
 article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block}
 header ul, nav ul, footer ul {margin:0;padding:0;list-style:none}
+<<<<<<< HEAD
 label, input, select, img {vertical-align:middle}
 input {margin:0;padding:0;border-radius:0;font-family:"dotum"}
 button {border-radius:0;font-size:1em;font-family:"dotum"}
@@ -16,6 +17,15 @@ input[type=submit],
 input[type=image],
 button {border-radius:0 !important;font-size:1em} /* 모바일에서만 사용 */
 p {margin:0;padding:10px 0;line-height:1.7em;word-break:break-all}
+=======
+legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
+label, input, select, img {vertical-align:middle}
+input,button {margin:0;padding:0}
+input[type=text], input[type=password], input[type=submit], input[type=image], button {border-radius:0 !important;font-size:1em} /* 모바일에서만 사용 */
+select, textarea {font-size:1em}
+textarea {border-radius:0;-webkit-appearance:none}
+p {margin:0;padding:1em 0;line-height:1.7em;word-break:break-all}
+>>>>>>> g4s
 hr {display:none}
 pre {overflow-x:scroll;font-size:1.1em}
 a:link,
@@ -26,8 +36,7 @@ a:active {color:#000;text-decoration:underline}
 
 /* 화면낭독기 사용자용 */
 #hd_login_msg {position:absolute;top:0;left:0;width:0;height:0;overflow:hidden}
-.msg_sound_only,
-.sound_only {display:inline-block;position:absolute;top:0;left:0;margin:0 !important;padding:0 !important;width:1px !important;height:1px !important;font-size:0 !important;line-height:0 !important;overflow:hidden}
+.msg_sound_only, .sound_only {display:inline-block;position:absolute;top:0;left:0;margin:0 !important;padding:0 !important;width:1px !important;height:1px !important;font-size:0 !important;line-height:0 !important;overflow:hidden}
 /* 본문 바로가기 */
 .to_content a {z-index:100000;position:absolute;top:0;left:0;width:0;height:0;font-size:0;line-height:0;overflow:hidden}
 
@@ -104,11 +113,9 @@ a:active {color:#000;text-decoration:underline}
 
 /* 버튼 */
 .btn01 {display:inline-block;padding:0 0.5em;height:2em;border:1px solid #ccc !important;background:#fafafa !important;color:#000 !important;font-size:1em;text-decoration:none !important;line-height:2em;vertical-align:middle}
-.btn01:focus,
-.btn01:hover {text-decoration:none !important}
+.btn01:focus, .btn01:hover {text-decoration:none !important}
 .btn02 {display:inline-block;padding:0 0.5em;height:2em;border:1px solid #333 !important;background:#333 !important;color:#fff !important;font-size:1em;text-decoration:none !important;line-height:2em;vertical-align:middle}
-.btn02:focus,
-.btn02:hover {text-decoration:none !important}
+.btn02:focus, .btn02:hover {text-decoration:none !important}
 .btn_confirm {text-align:center} /* 서식단계 진행 */
 .btn_submit {padding:0 1em;height:2.6em;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer;-webkit-appearance:none}
 .btn_cancel {display:inline-block;padding:0 1em;height:2.5em;border:1px solid #ccc;background:#fafafa;color:#000;font-size:1em;text-decoration:none;line-height:2.5em}
@@ -117,14 +124,11 @@ a:active {color:#000;text-decoration:underline}
 .btn_win a {display:inline-block;padding:0 1em;height:2.5em;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none;vertical-align:middle;line-height:2.5em;cursor:pointer}
 /* 게시판용 버튼 */
 .btn_b01 {display:inline-block;margin:0 0 0.3em;padding:0 1em;border:1px solid #eee !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:2em;vertical-align:middle}
-.btn_b01:focus,
-.btn_b01:hover {text-decoration:none !important}
+.btn_b01:focus, .btn_b01:hover {text-decoration:none !important}
 .btn_b02 {display:inline-block;margin:0 0 0.3em;padding:0 1em;border:1px solid #eee !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:2em;vertical-align:middle}
-.btn_b02:focus,
-.btn_b02:hover {text-decoration:none !important}
+.btn_b02:focus, .btn_b02:hover {text-decoration:none !important}
 .btn_admin {display:inline-block;margin:0 0 0.3em;padding:0 1em;border:1px solid #e8180c !important;background:#e8180c !important;color:#fff !important;text-decoration:none !important;line-height:2em;vertical-align:middle} /* 관리자 전용 버튼 */
-.btn_admin:focus,
-.btn_admin:hover {text-decoration:none !important}
+.btn_admin:focus, .btn_admin:hover {text-decoration:none !important}
 
 /* 기본테이블 */
 .basic_tbl {margin-bottom:1em;width:100%;border-collapse:collapse;border-spacing:0}
@@ -183,14 +187,9 @@ td.empty_table {padding:5em 0;text-align:center}
 /* pagination */
 .pg_wrap {clear:both;margin:0 0 1em;padding-top:1em;text-align:center}
 .pg {display:inline-block;border:1px solid #cfded8;letter-spacing:-4px}
-.pg a:focus,
-.pg a:hover,
-.pg a:active {text-decoration:none}
-.pg_page,
-.pg_current {display:inline-block;padding:0 0.6em;color:#000;letter-spacing:0;line-height:1.9em;vertical-align:middle}
+.pg a:focus, .pg a:hover, .pg a:active {text-decoration:none}
+.pg_page, .pg_current {display:inline-block;padding:0 0.6em;color:#000;letter-spacing:0;line-height:1.9em;vertical-align:middle}
 .pg_page {background:#f9f9f9;text-decoration:none}
-.pg_start,
-.pg_prev {border-right:1px solid #cfded8}
-.pg_end,
-.pg_next {border-left:1px solid #cfded8}
+.pg_start, .pg_prev {border-right:1px solid #cfded8}
+.pg_end, .pg_next {border-left:1px solid #cfded8}
 .pg_current {background:#333;color:#fff;font-weight:bold}
\ No newline at end of file
diff --git a/lib/common.lib.php b/lib/common.lib.php
index fd2ec5d0a..de8628a2b 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -997,9 +997,11 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
 
                 if ($config['cf_use_member_icon'] == 2) // 회원아이콘+이름
                     $tmp_name = $tmp_name.' '.$name;
-            }
-        } else {
-            $tmp_name = $tmp_name.' '.$name;
+            } else { 
+                $tmp_name = $tmp_name.' '.$name; 
+            } 
+        } else { 
+            $tmp_name = $tmp_name.' '.$name; 
         }
         $tmp_name .= '</a>';
 
@@ -1008,7 +1010,7 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
         if(!$bo_table)
             return $name;
 
-        $tmp_name = "<a href=\"".G4_BBS_URL."/board.php?bo_table=".$bo_table."&amp;sca=".$sca."&amp;sfl=wr_name,1&amp;stx=".$name."\" title=\"$name 이름으로 검색\" class=\"sv_guest\" onclick=\"return false;\">$name</a>";
+        $tmp_name = '<a href="'.G4_BBS_URL.'/board.php?bo_table='.$bo_table.'&amp;sca='.$sca.'&amp;sfl=wr_name,1&amp;stx='.$name.'" title="'.$name.' 이름으로 검색" class="sv_guest" onclick="return false;">'.$name.'</a>';
         $title_mb_id = '[비회원]';
     }