diff --git a/adm/board_form.php b/adm/board_form.php
index 85bb5bd7f..997ad55ea 100644
--- a/adm/board_form.php
+++ b/adm/board_form.php
@@ -119,13 +119,13 @@ $pg_anchor = "<ul class=\"frm_list\">
         </td>
     </tr>
     <tr>
-        <th scope="row"><label for="bo_pc_mobile">접속기기</label></th>
+        <th scope="row"><label for="bo_device">접속기기</label></th>
         <td>
             <?=help("PC 와 모바일 사용을 구분합니다.")?>
-            <select id="bo_pc_mobile" name="bo_pc_mobile">
-            <option value="both" <?=get_selected($board['bo_pc_mobile'], 'both');?>>PC와 모바일에서 모두 사용</option>
-            <option value="pc" <?=get_selected($board['bo_pc_mobile'], 'pc');?>>PC 전용</option>
-            <option value="mobile" <?=get_selected($board['bo_pc_mobile'], 'mobile');?>>모바일 전용</option>
+            <select id="bo_device" name="bo_device">
+            <option value="both" <?=get_selected($board['bo_device'], 'both');?>>PC와 모바일에서 모두 사용</option>
+            <option value="pc" <?=get_selected($board['bo_device'], 'pc');?>>PC 전용</option>
+            <option value="mobile" <?=get_selected($board['bo_device'], 'mobile');?>>모바일 전용</option>
             </select>
         </td>
         <td class="group_setting">
diff --git a/adm/board_form_update.php b/adm/board_form_update.php
index 40ea10943..1865ee021 100644
--- a/adm/board_form_update.php
+++ b/adm/board_form_update.php
@@ -53,7 +53,7 @@ $bo_category_list = str_replace($src_char, $dst_char, $bo_category_list);
 
 $sql_common = " gr_id               = '{$_POST['gr_id']}',
                 bo_subject          = '{$_POST['bo_subject']}',
-                bo_pc_mobile        = '{$_POST['bo_pc_mobile']}',
+                bo_device        = '{$_POST['bo_device']}',
                 bo_admin            = '{$_POST['bo_admin']}',
                 bo_list_level       = '{$_POST['bo_list_level']}',
                 bo_read_level       = '{$_POST['bo_read_level']}',
diff --git a/adm/board_list.php b/adm/board_list.php
index c51509e02..5dbc0eb23 100644
--- a/adm/board_list.php
+++ b/adm/board_list.php
@@ -4,13 +4,13 @@ include_once('./_common.php');
 
 auth_check($auth[$sub_menu], 'r');
 
-if (!isset($board['bo_pc_mobile'])) {
+if (!isset($board['bo_device'])) {
     // 게시판 사용 필드 추가
     // both : pc, mobile 둘다 사용
     // pc : pc 전용 사용
     // mobile : mobile 전용 사용
     // none : 사용 안함
-    sql_query(" ALTER TABLE  `{$g4['board_table']}` ADD  `bo_pc_mobile` ENUM(  'both',  'pc',  'mobile' ) NOT NULL DEFAULT  'both' AFTER  `bo_subject` ", false);
+    sql_query(" ALTER TABLE  `{$g4['board_table']}` ADD  `bo_device` ENUM(  'both',  'pc',  'mobile' ) NOT NULL DEFAULT  'both' AFTER  `bo_subject` ", false);
 }
 
 $sql_common = " from {$g4['board_table']} a ";
@@ -151,10 +151,10 @@ $colspan = 8;
         <td><input type="text" id="bo_order_search_<?=$i?>" name="bo_order_search[<?=$i?>]" class="frm_input" value="<?=$row['bo_order_search']?>" size="2" title="검색순서"></td>
         </td>
         <td>
-            <select id="bo_pc_mobile_<?=$i?>" name="bo_pc_mobile[<?=$i?>]">
-            <option value="both" <?=get_selected($row['bo_pc_mobile'], 'both', true);?>>양쪽</option>
-            <option value="pc" <?=get_selected($row['bo_pc_mobile'], 'pc');?>>PC</option>
-            <option value="mobile" <?=get_selected($row['bo_pc_mobile'], 'mobile');?>>모바일</option>
+            <select id="bo_device_<?=$i?>" name="bo_device[<?=$i?>]">
+            <option value="both" <?=get_selected($row['bo_device'], 'both', true);?>>모두</option>
+            <option value="pc" <?=get_selected($row['bo_device'], 'pc');?>>PC</option>
+            <option value="mobile" <?=get_selected($row['bo_device'], 'mobile');?>>모바일</option>
             </select>
         </td>
         <td><?=$one_update?> <?=$one_copy?></td>
@@ -168,9 +168,17 @@ $colspan = 8;
     </table>
 
     <div class="btn_list">
+<<<<<<< HEAD
+        <input type="submit" name="btn_submit" onclick="document.pressed=this.value" value="선택수정">
+        <!-- <input type="submit" name="act_button" value="선택수정"> -->
+        <?if ($is_admin == 'super') {?>
+        <input type="submit" name="btn_submit" onclick="document.pressed=this.value" value="선택삭제">
+        <!-- <input type="submit" name="act_button" value="선택삭제"> -->
+=======
         <input type="submit" name="act_button" onclick="document.pressed=this.value" value="선택수정">
         <?if ($is_admin == 'super') {?>
         <input type="submit" name="act_button" onclick="document.pressed=this.value" value="선택삭제">
+>>>>>>> 3312cd2377e2b47707196bdb3df5cdab13720d51
         <a href="./board_form.php">게시판추가</a>
         <?}?>
     </div>
diff --git a/adm/board_list_update.php b/adm/board_list_update.php
index bd2bf5499..fb9593fca 100644
--- a/adm/board_list_update.php
+++ b/adm/board_list_update.php
@@ -2,6 +2,9 @@
 $sub_menu = "300100";
 include_once('./_common.php');
 
+print_r2($_POST); exit;
+
+
 check_demo();
 
 if (!count($_POST['chk'])) {
@@ -30,7 +33,7 @@ if ($_POST['act_button'] == "선택수정") {
         $sql = " update {$g4['board_table']}
                     set gr_id               = '{$_POST['gr_id'][$k]}',
                         bo_subject          = '{$_POST['bo_subject'][$k]}',
-                        bo_pc_mobile        = '{$_POST['bo_pc_mobile'][$k]}',
+                        bo_device           = '{$_POST['bo_device'][$k]}',
                         bo_skin             = '{$_POST['bo_skin'][$k]}',
                         bo_read_point       = '{$_POST['bo_read_point'][$k]}',
                         bo_write_point      = '{$_POST['bo_write_point'][$k]}',
diff --git a/adm/boardgroup_form.php b/adm/boardgroup_form.php
index c30585e09..fc38eab1b 100644
--- a/adm/boardgroup_form.php
+++ b/adm/boardgroup_form.php
@@ -58,14 +58,13 @@ include_once('./admin.head.php');
         </td>
     </tr>
     <tr>
-        <th scope="row"><label for="gr_use">사용여부</label></th>
+        <th scope="row"><label for="gr_device">접속기기</label></th>
         <td>
-            <?=help("게시판그룹의 사용여부 설정이 게시판의 사용여부 설정보다 우선합니다.")?>
-            <select id="gr_use_" name="gr_use">
-            <option value="both" <?=get_selected($group['gr_use'], 'both', true);?>>PC와 모바일에서 모두 사용</option>
-            <option value="pc" <?=get_selected($group['gr_use'], 'pc');?>>PC 전용</option>
-            <option value="mobile" <?=get_selected($group['gr_use'], 'mobile');?>>모바일 전용</option>
-            <option value="none" <?=get_selected($group['gr_use'], 'none');?>>사용하지 않음</option>
+            <?=help("PC 와 모바일 사용을 구분합니다.")?>
+            <select id="gr_device_" name="gr_device">
+            <option value="both" <?=get_selected($group['gr_device'], 'both', true);?>>PC와 모바일에서 모두 사용</option>
+            <option value="pc" <?=get_selected($group['gr_device'], 'pc');?>>PC 전용</option>
+            <option value="mobile" <?=get_selected($group['gr_device'], 'mobile');?>>모바일 전용</option>
             </select>
         </td>
     </tr>
diff --git a/adm/boardgroup_form_update.php b/adm/boardgroup_form_update.php
index 786e7c295..c8b1d0a14 100644
--- a/adm/boardgroup_form_update.php
+++ b/adm/boardgroup_form_update.php
@@ -15,6 +15,7 @@ if (!preg_match("/^([A-Za-z0-9_]{1,10})$/", $_POST['gr_id']))
 if (!$gr_subject) alert('그룹 제목을 입력하세요.');
 
 $sql_common = " gr_subject = '{$_POST['gr_subject']}',
+                gr_device = '{$_POST['gr_device']}',
                 gr_admin  = '{$_POST['gr_admin']}',
                 gr_1_subj = '{$_POST['gr_1_subj']}',
                 gr_2_subj = '{$_POST['gr_2_subj']}',
diff --git a/adm/boardgroup_list.php b/adm/boardgroup_list.php
index 6102d473b..e93626f8e 100644
--- a/adm/boardgroup_list.php
+++ b/adm/boardgroup_list.php
@@ -4,13 +4,13 @@ include_once('./_common.php');
 
 auth_check($auth[$sub_menu], 'r');
 
-if (!isset($group['gr_use'])) {
+if (!isset($group['gr_device'])) {
     // 게시판 그룹 사용 필드 추가
     // both : pc, mobile 둘다 사용
     // pc : pc 전용 사용
     // mobile : mobile 전용 사용
     // none : 사용 안함
-    sql_query(" ALTER TABLE  `{$g4['board_group_table']}` ADD  `gr_use` ENUM(  'both',  'pc',  'mobile',  'none' ) NOT NULL DEFAULT  'both' AFTER  `gr_subject` ", false);
+    sql_query(" ALTER TABLE  `{$g4['board_group_table']}` ADD  `gr_device` ENUM(  'both',  'pc',  'mobile' ) NOT NULL DEFAULT  'both' AFTER  `gr_subject` ", false);
 }
 
 $sql_common = " from {$g4['group_table']} ";
@@ -60,10 +60,6 @@ include_once('./admin.head.php');
 $colspan = 8;
 ?>
 
-<script>
-var list_update_php = "./boardgroup_list_update.php";
-</script>
-
 <form id="fsearch" name="fsearch" method="get">
 <fieldset>
     <legend>그룹 검색</legend>
@@ -94,7 +90,7 @@ var list_update_php = "./boardgroup_list_update.php";
     </div>
     <?}?>
 
-    <form id="fboardgrouplist" name="fboardgrouplist" method="post" action="./boardgroup_list_update.php">
+    <form id="fboardgrouplist" name="fboardgrouplist" method="post" action="./boardgroup_list_update.php" onsubmit="return fboardgrouplist_submit(this);">
     <input type="hidden" name="sst" value="<?=$sst?>">
     <input type="hidden" name="sod" value="<?=$sod?>">
     <input type="hidden" name="sfl" value="<?=$sfl?>">
@@ -112,7 +108,7 @@ var list_update_php = "./boardgroup_list_update.php";
         <th scope="col">게시판</th>
         <th scope="col">접근사용</th>
         <th scope="col">접근회원수</th>
-        <th scope="col"><?=subject_sort_link('gr_use')?>사용여부</a></th>
+        <th scope="col">접속기기</th>
         <th scope="col">관리</th>
     </tr>
     </thead>
@@ -129,15 +125,12 @@ var list_update_php = "./boardgroup_list_update.php";
         $row2 = sql_fetch($sql2);
 
         $s_upd = '<a href="./boardgroup_form.php?$qstr&amp;w=u&amp;gr_id='.$row['gr_id'].'">수정</a>';
-        /*$s_del = '';
-        if ($is_admin == 'super') {
-            $s_del = '<a href="javascript:post_delete(\'boardgroup_delete.php\', \''.$row['gr_id'].'\');">삭제</a>';
-        }*/
     ?>
 
     <tr>
         <td class="td_chk">
-            <input type="checkbox" id="chk_<?=$i?>" name="chk[]" value="<?=$row['gr_id']?>" title="<?=$row['gr_subject']?> 그룹선택">
+            <input type="checkbox" id="chk_<?=$i?>" name="chk[]" value="<?=$i?>" title="<?=$row['gr_subject']?> 그룹선택">
+            <input type="hidden" name="group_id[<?=$i?>]" value="<?=$row['gr_id']?>">
         </td>
         <td class="td_mbid"><a href="<?=$g4['bbs_path']?>/group.php?gr_id=<?=$row['gr_id']?>"><?=$row['gr_id']?></a></td>
         <td>
@@ -154,11 +147,10 @@ var list_update_php = "./boardgroup_list_update.php";
         <td><input type="checkbox" id="gr_use_access" name="gr_use_access[<?=$i?>]" <?=$row['gr_use_access']?'checked':''?> value="1" title="선택 시 접근회원 사용"></td>
         <td><a href="./boardgroupmember_list.php?gr_id=<?=$row['gr_id']?>"><?=$row1['cnt']?></a></td>
         <td>
-            <select id="gr_use_<?=$i?>" name="gr_use[<?=$i?>]">
-            <option value="both" <?=get_selected($row['gr_use'], 'both', true);?>>양쪽</option>
-            <option value="pc" <?=get_selected($row['gr_use'], 'pc');?>>PC</option>
-            <option value="mobile" <?=get_selected($row['gr_use'], 'mobile');?>>모바일</option>
-            <option value="none" <?=get_selected($row['gr_use'], 'none');?>>미사용</option>
+            <select id="gr_device_<?=$i?>" name="gr_device[<?=$i?>]">
+            <option value="both" <?=get_selected($row['gr_device'], 'both');?>>모두</option>
+            <option value="pc" <?=get_selected($row['gr_device'], 'pc');?>>PC</option>
+            <option value="mobile" <?=get_selected($row['gr_device'], 'mobile');?>>모바일</option>
             </select>
         </td>
         <td class="td_mng"><?=$s_upd?></td>
@@ -172,8 +164,8 @@ var list_update_php = "./boardgroup_list_update.php";
     </table>
 
     <div class="btn_list">
-        <input type="submit" name="act_button" value="선택수정">
-        <input type="submit" name="act_button" value="선택삭제">
+        <input type="submit" name="act_button" onclick="document.pressed=this.value" value="선택수정">
+        <input type="submit" name="act_button" onclick="document.pressed=this.value" value="선택삭제">
         <a href="./boardgroup_form.php">게시판그룹 추가</a>
     </div>
     </form>
@@ -185,30 +177,15 @@ echo $pagelist;
 ?>
 
 <script>
-$(function() {
-    $('input[name=act_button]').click(function(e) {
-        e.preventDefault();
+function fboardgrouplist_submit(f)
+{
+    if (!is_checked("chk[]")) {
+        alert(document.pressed+" 하실 항목을 하나 이상 선택하세요.");
+        return false;
+    }
 
-        var act = $(this).val();
-        var cnt = $('input[name^=chk]:checked').length;
-
-        if(act == "선택삭제") {
-            if(confirm("한번 삭제한 자료는 복구할 방법이 없습니다.\n\n정말 삭제하시겠습니까?")) {
-                if(cnt < 1) {
-                    alert(act+'할 게시판그룹을 1개 이상 선택해 주세요.');
-                    return false;
-                }
-            }
-        } else if(act == "선택수정") {
-            if(cnt < 1) {
-                alert(act+'할 게시판그룹을 1개 이상 선택해 주세요.');
-                return false;
-            }
-        }
-
-        $('#fboardgrouplist').submit();
-    });
-});
+    return true;
+}
 </script>
 
 <?
diff --git a/adm/boardgroup_list_update.php b/adm/boardgroup_list_update.php
index cd263604c..1cf3fa185 100644
--- a/adm/boardgroup_list_update.php
+++ b/adm/boardgroup_list_update.php
@@ -2,6 +2,8 @@
 $sub_menu = "300200";
 include_once('./_common.php');
 
+//print_r2($_POST); exit;
+
 check_demo();
 
 auth_check($auth[$sub_menu], 'w');
@@ -13,15 +15,16 @@ if(!$count)
 
 for ($i=0; $i<$count; $i++)
 {
-    $gr_id = $_POST['chk'][$i];
-
+    $k     = $_POST['chk'][$i];
+    $gr_id = $_POST['group_id'][$k];
+    
     if($_POST['act_button'] == '선택수정') {
         $sql = " update {$g4['group_table']}
                     set gr_subject    = '{$_POST['gr_subject'][$k]}',
-                        gr_use        = '{$_POST['gr_use'][$k]}',
+                        gr_device     = '{$_POST['gr_device'][$k]}',
                         gr_admin      = '{$_POST['gr_admin'][$k]}',
                         gr_use_access = '{$_POST['gr_use_access'][$k]}'
-                  where gr_id         = '{$_POST['gr_id'][$k]}' ";
+                  where gr_id         = '{$gr_id}' ";
         if ($is_admin != 'super')
             $sql .= " and gr_admin    = '{$_POST['gr_admin'][$k]}' ";
         sql_query($sql);
diff --git a/adm/config_form.php b/adm/config_form.php
index 612f50b1f..d07105a6e 100644
--- a/adm/config_form.php
+++ b/adm/config_form.php
@@ -122,10 +122,9 @@ $pg_anchor = "
             <?
             $arr = get_skin_dir('new');
             for ($i=0; $i<count($arr); $i++) {
-                echo '<option value="'.$arr[$i].'">'.$arr[$i].'</option>'.PHP_EOL;
+                echo '<option '.get_selected($config['cf_new_skin'], $arr[$i]).' value="'.$arr[$i].'">'.$arr[$i].'</option>'.PHP_EOL;
             }
             ?></select>
-            <script> document.getElementById('cf_new_skin').value="<?=$config['cf_new_skin']?>";</script>
         </td>
         <th scope="row"><label for="cf_new_rows">최근게시물 라인수</label></th>
         <td>
diff --git a/bbs/board.php b/bbs/board.php
index e29d067be..f2db1c961 100644
--- a/bbs/board.php
+++ b/bbs/board.php
@@ -5,7 +5,7 @@ if (!$board['bo_table']) {
    alert('존재하지 않는 게시판입니다.', G4_URL);
 }
 
-check_pc_mobile($board['bo_pc_mobile']);
+check_device($board['bo_device']);
 
 if (isset($write['wr_is_comment']) && $write['wr_is_comment']) {
     goto_url('./board.php?bo_table='.$bo_table.'&amp;wr_id='.$write['wr_parent'].'#c_'.$wr_id);
diff --git a/bbs/write.php b/bbs/write.php
index ca9304d5f..2ebff2f83 100644
--- a/bbs/write.php
+++ b/bbs/write.php
@@ -14,7 +14,7 @@ if (!$bo_table) {
     alert("bo_table 값이 넘어오지 않았습니다.\\nwrite.php?bo_table=code 와 같은 방식으로 넘겨 주세요.", G4_URL);
 }
 
-check_pc_mobile($board['bo_pc_mobile']);
+check_device($board['bo_device']);
 
 @include_once (G4_PATH.'/skin/board/write.head.skin.php');
 @include_once ($board_skin_path.'/write.head.skin.php');
diff --git a/install/gnuboard4s.sql b/install/gnuboard4s.sql
index 80e0e845d..8c0530442 100644
--- a/install/gnuboard4s.sql
+++ b/install/gnuboard4s.sql
@@ -23,7 +23,7 @@ CREATE TABLE IF NOT EXISTS `g4s_board` (
   `bo_table` varchar(20) NOT NULL default '',
   `gr_id` varchar(255) NOT NULL default '',
   `bo_subject` varchar(255) NOT NULL default '',
-  `bo_pc_mobile` enum('both','pc','mobile') NOT NULL DEFAULT 'both',
+  `bo_device` enum('both','pc','mobile') NOT NULL DEFAULT 'both',
   `bo_admin` varchar(255) NOT NULL default '',
   `bo_list_level` tinyint(4) NOT NULL default '0',
   `bo_read_level` tinyint(4) NOT NULL default '0',
diff --git a/lib/common.lib.php b/lib/common.lib.php
index 0c9a16cca..e90251f70 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -1637,7 +1637,8 @@ function convert_charset($from_charset, $to_charset, $str)
 // mysql_real_escape_string 의 alias 기능을 한다.
 function escape_trim($field)
 {
-    return mysql_real_escape_string(trim($field));
+    if ($field)
+        return mysql_real_escape_string(trim($field));
 }
 
 
@@ -1719,15 +1720,15 @@ function iconv_euckr($str)
 
 
 // PC 또는 모바일 사용인지를 검사
-function check_pc_mobile($pc_mobile)
+function check_device($device)
 {
     global $is_admin;
 
     if ($is_admin) return;
 
-    if ($pc_mobile=='pc' && G4_IS_MOBILE) {
+    if ($device=='pc' && G4_IS_MOBILE) {
         alert('PC 전용 게시판입니다.', G4_URL);
-    } else if ($pc_mobile=='mobile' && !G4_IS_MOBILE) {
+    } else if ($device=='mobile' && !G4_IS_MOBILE) {
         alert('모바일 전용 게시판입니다.', G4_URL);
     }
 }