diff --git a/.gitignore b/.gitignore
index 3d871923e..232d69f68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ sirgle
 sr_*
 google*
 skin/latest/basic2
+Rankiss*
+thumb.lib.php
diff --git a/adm/admin.head.php b/adm/admin.head.php
index e8ab7b1a5..39a11acb2 100644
--- a/adm/admin.head.php
+++ b/adm/admin.head.php
@@ -24,7 +24,14 @@ function print_menu2($key, $no)
         if ($is_admin != 'super' && (!array_key_exists($menu[$key][$i][0],$auth) || !strstr($auth[$menu[$key][$i][0]], 'r')))
             continue;
 
-        $str .= '<li class="gnb_2depth"><a href="'.$menu[$key][$i][2].'">'.$menu[$key][$i][1].'</a></li>';
+        if ($menu[$key][$i][4] == 1 && $gnb_grp_style == false) $gnb_grp_div = 'gnb_grp_div';
+        else if ($menu[$key][$i][4] != 1 && $gnb_grp_style == true) $gnb_grp_div = 'gnb_grp_div';
+        else $gnb_grp_div = '';
+
+        if ($menu[$key][$i][4] == 1) $gnb_grp_style = 'gnb_grp_style';
+        else $gnb_grp_style = '';
+
+        $str .= '<li class="gnb_2depth"><a href="'.$menu[$key][$i][2].'" class="'.$gnb_grp_style.' '.$gnb_grp_div.'">'.$menu[$key][$i][1].'</a></li>';
 
         $auth_menu[$menu[$key][$i][0]] = $menu[$key][$i][1];
     }
diff --git a/adm/admin.menu100.php b/adm/admin.menu100.php
index dca04e108..985edef26 100644
--- a/adm/admin.menu100.php
+++ b/adm/admin.menu100.php
@@ -1,15 +1,15 @@
 <?
 $menu['menu100'] = array (
-    array('100000', '환경설정',         G4_ADMIN_URL.'/config_form.php',   'config'),
-    array('',       '기본환경설정',     G4_ADMIN_URL.'/config_form.php',   'cf_basic'),
-    array('',       '관리권한설정',     G4_ADMIN_URL.'/auth_list.php',     'cf_auth'),
-    array('100300', '메일 테스트',      G4_ADMIN_URL.'/sendmail_test.php', 'cf_mailtest'),
+    array('100000', '환경설정', G4_ADMIN_URL.'/config_form.php',   'config'),
+    array('', '기본환경설정', G4_ADMIN_URL.'/config_form.php',   'cf_basic'),
+    array('', '관리권한설정', G4_ADMIN_URL.'/auth_list.php',     'cf_auth'),
+    array('100300', '메일 테스트', G4_ADMIN_URL.'/sendmail_test.php', 'cf_mailtest'),
     //array('100400', '버전정보', G4_ADMIN_URL.'/version.php', 'cf_version'),
+    array('100800', '세션파일 일괄삭제',G4_ADMIN_URL.'/session_file_delete.php', 'cf_session', 1),
+    array('100900', '캐쉬파일 일괄삭제',G4_ADMIN_URL.'/cache_file_delete.php',   'cf_cache', 1),
     array('100500', 'phpinfo()',        G4_ADMIN_URL.'/phpinfo.php',       'cf_phpinfo'),
     //array('100600', '업그레이드', G4_ADMIN_URL.'/upgrade.php', 'cf_upgrade'),
     //array('100700', '복구/최적화', G4_ADMIN_URL.'/repair.php', 'cf_repair'),
-    array('100800', '세션파일 일괄삭제',G4_ADMIN_URL.'/session_file_delete.php', 'cf_session'),
-    array('100900', '캐쉬파일 일괄삭제',G4_ADMIN_URL.'/cache_file_delete.php',   'cf_cache'),
     //array('', 'phpMyAdmin', ''.$g4['path'].'/'.$g4['phpmyadmin_dir'].'', 'cf_phpmyadmin')
 );
 ?>
\ No newline at end of file
diff --git a/adm/admin.menu200.php b/adm/admin.menu200.php
index acf09fd80..f3802a123 100644
--- a/adm/admin.menu200.php
+++ b/adm/admin.menu200.php
@@ -1,10 +1,10 @@
 <?
 $menu['menu200'] = array (
-    array('200000', '회원관리',     G4_ADMIN_URL.'/member_list.php',    'member'),
-    array('200100', '회원관리',     G4_ADMIN_URL.'/member_list.php',    'mb_list'),
-    array('200200', '포인트관리',   G4_ADMIN_URL.'/point_list.php',     'mb_point'),
-    array('200300', '회원메일발송', G4_ADMIN_URL.'/mail_list.php',      'mb_mail'),
-    array('200800', '접속자집계',   G4_ADMIN_URL.'/visit_list.php',     'mb_visit'),
-    array('200900', '투표관리',     G4_ADMIN_URL.'/poll_list.php',      'mb_poll')
+    array('200000', '회원관리', G4_ADMIN_URL.'/member_list.php', 'member'),
+    array('200100', '회원관리', G4_ADMIN_URL.'/member_list.php', 'mb_list'),
+    array('200300', '회원메일발송', G4_ADMIN_URL.'/mail_list.php', 'mb_mail'),
+    array('200800', '접속자집계', G4_ADMIN_URL.'/visit_list.php', 'mb_visit', 1),
+    array('200200', '포인트관리', G4_ADMIN_URL.'/point_list.php', 'mb_point'),
+    array('200900', '투표관리', G4_ADMIN_URL.'/poll_list.php', 'mb_poll')
 );
 ?>
\ No newline at end of file
diff --git a/adm/admin.menu300.php b/adm/admin.menu300.php
index 97779c0d4..01018af35 100644
--- a/adm/admin.menu300.php
+++ b/adm/admin.menu300.php
@@ -3,7 +3,7 @@ $menu['menu300'] = array (
     array('300000', '게시판관리', ''.G4_ADMIN_URL.'/board_list.php', 'board'),
     array('300100', '게시판관리', ''.G4_ADMIN_URL.'/board_list.php', 'bbs_board'),
     array('300200', '게시판그룹관리', ''.G4_ADMIN_URL.'/boardgroup_list.php', 'bbs_group'),
-    array('300300', '인기검색어관리', ''.G4_ADMIN_URL.'/popular_list.php', 'bbs_poplist'),
-    array('300400', '인기검색어순위', ''.G4_ADMIN_URL.'/popular_rank.php', 'bbs_poprank'),
+    array('300300', '인기검색어관리', ''.G4_ADMIN_URL.'/popular_list.php', 'bbs_poplist', 1),
+    array('300400', '인기검색어순위', ''.G4_ADMIN_URL.'/popular_rank.php', 'bbs_poprank', 1),
 );
 ?>
\ No newline at end of file
diff --git a/adm/board_copy.php b/adm/board_copy.php
index 1f8124fd5..cc24a7e5d 100644
--- a/adm/board_copy.php
+++ b/adm/board_copy.php
@@ -4,8 +4,6 @@ include_once("./_common.php");
 
 auth_check($auth[$sub_menu], 'w');
 
-$token = get_token();
-
 $g4['title'] = '게시판 복사';
 $administrator = 1;
 include_once(G4_PATH.'/head.sub.php');
diff --git a/adm/board_copy_update.php b/adm/board_copy_update.php
index 1715617fc..5628417d3 100644
--- a/adm/board_copy_update.php
+++ b/adm/board_copy_update.php
@@ -15,8 +15,6 @@ $row = sql_fetch(" select count(*) as cnt from {$g4['board_table']} where bo_tab
 if ($row['cnt'])
     alert($target_table.'은(는) 이미 존재하는 게시판 테이블명 입니다.\\n복사할 테이블명으로 사용할 수 없습니다.');
 
-check_token();
-
 // 게시판 테이블 생성
 $sql = get_table_define($g4['write_prefix'] . $bo_table);
 $sql = str_replace($g4['write_prefix'] . $bo_table, $g4['write_prefix'] . $target_table, $sql);
@@ -24,6 +22,11 @@ sql_query($sql);
 
 $file_copy = array();
 
+// 구조만 복사시에는 공지사항 번호는 복사하지 않는다.
+if ($copy_case == 'schema_only') {
+    $board['bo_notice'] = '';
+}
+
 // 게시판 정보
 $sql = " insert into {$g4['board_table']}
             set bo_table = '$target_table',
diff --git a/adm/board_form.php b/adm/board_form.php
index 2c781dfc9..4fd5e96e9 100644
--- a/adm/board_form.php
+++ b/adm/board_form.php
@@ -566,7 +566,7 @@ $pg_anchor = "<ul class=\"anchor\">
     <tr>
         <th scope="row"><label for="bo_upload_size">파일 업로드 용량<strong class="sound_only">필수</strong></label></th>
         <td>
-            <?=help('최대 '.ini_get("upload_max_filesize").' 이하 업로드 가능, 1 MB = 1,024,768 bytes')?>
+            <?=help('최대 '.ini_get("upload_max_filesize").' 이하 업로드 가능, 1 MB = 1,048,576 bytes')?>
             업로드 파일 한개당 <input type="text" name="bo_upload_size" value="<?=$board['bo_upload_size']?>" id="bo_upload_size" required class="required numeric frm_input"  size="10"> bytes 이하
         </td>
         <td class="group_setting">
diff --git a/adm/cache_file_delete.php b/adm/cache_file_delete.php
index 854923d4c..fd8738a76 100644
--- a/adm/cache_file_delete.php
+++ b/adm/cache_file_delete.php
@@ -1,52 +1,47 @@
-<?
-$sub_menu = "100900";
-include_once("./_common.php");
+<?php
+$sub_menu = '100900';
+include_once('./_common.php');
 
-if ($is_admin != "super")
-    alert("최고관리자만 접근 가능합니다.", G4_URL);
+if ($is_admin != 'super')
+    alert('최고관리자만 접근 가능합니다.', G4_URL);
 
-$g4['title'] = "캐시파일 일괄삭제";
-include_once("./admin.head.php");
+$g4['title'] = '캐시파일 일괄삭제';
+include_once('./admin.head.php');
 ?>
 
 <div id="cache_del">
     <p>
         완료 메세지가 나오기 전에 프로그램의 실행을 중지하지 마십시오.
     </p>
-    <?
+    <?php
     flush();
 
     if (!$dir=@opendir(G4_DATA_PATH.'/cache')) {
-        echo "<p>최신글 캐시디렉토리를 열지못했습니다.</p>";
+        echo '<p>캐시디렉토리를 열지못했습니다.</p>';
     }
 
     $cnt=0;
-    echo "<ul>\n";
-    while($file=readdir($dir)) {
-        if ($file=='.' || $file=='..') continue;
+    echo '<ul>'.PHP_EOL;
 
-        $cache_file = G4_DATA_PATH.'/cache/'.$file;
+    $files = glob(G4_DATA_PATH.'/cache/latest-*');
+    if (is_array($files)) {
+        foreach ($files as $cache_file) {
+            $cnt++;
+            unlink($cache_file);
+            echo '<li>'.$cache_file.'</li>'.PHP_EOL;
 
-        if (!$atime=@fileatime($cache_file))
-            continue;
+            flush();
 
-        $cnt++;
-        $return = unlink($cache_file);
-        //echo "<script>document.getElementById('delete_message').innerHTML += '{$cache_file}<br>';</script>\n";
-        echo "<li>{$cache_file}</li>\n";
-
-        flush();
-
-        if ($cnt%10==0)
-            //echo "<script>document.getElementById('delete_message').innerHTML = '';</script>\n";
-            echo "\n";
+            if ($cnt%10==0) 
+                echo PHP_EOL;
+        }
     }
-    echo "<li>완료됨</li>\n</ul>\n";
-    //echo "<script>document.getElementById('delete_message').innerHTML += '최신글 캐시파일 {$cnt}건 삭제 완료.<br><br>프로그램의 실행을 끝마치셔도 좋습니다.';</script>\n";
-    echo "<p><span>최신글 캐시파일 {$cnt}건 삭제가 완료됐습니다.</span><br>프로그램의 실행을 끝마치셔도 좋습니다.</p>\n";
+
+    echo '<li>완료됨</li></ul>'.PHP_EOL;
+    echo '<p><span>최신글 캐시파일 '.$cnt.'건 삭제가 완료됐습니다.</span><br>프로그램의 실행을 끝마치셔도 좋습니다.</p>'.PHP_EOL;
     ?>
 </div>
 
 <?php
-include_once("./admin.tail.php");
+include_once('./admin.tail.php');
 ?>
\ No newline at end of file
diff --git a/adm/config_form.php b/adm/config_form.php
index 1995dc857..06b58c975 100644
--- a/adm/config_form.php
+++ b/adm/config_form.php
@@ -41,6 +41,14 @@ if(!isset($config['cf_mobile_pages'])) {
     sql_query(" UPDATE `{$g4['config_table']}` SET cf_mobile_pages = '5' ", TRUE);
 }
 
+// uniqid 테이블이 없을 경우 생성
+if(!sql_query(" select uq_id from {$g4['uniqid_table']} limit 1 ", false)) {
+    sql_query(" CREATE TABLE IF NOT EXISTS `{$g4['uniqid_table']}` (
+                  `uq_id` bigint(20) unsigned NOT NULL,
+                  PRIMARY KEY (`uq_id`)
+                ) ", false);
+}
+
 $g4['title'] = '환경설정';
 include_once ('./admin.head.php');
 
diff --git a/adm/gcaptcha_file_delete.php b/adm/gcaptcha_file_delete.php
new file mode 100644
index 000000000..3a9930550
--- /dev/null
+++ b/adm/gcaptcha_file_delete.php
@@ -0,0 +1,52 @@
+<?php
+$sub_menu = '100910';
+include_once('./_common.php');
+
+if ($is_admin != 'super')
+    alert('최고관리자만 접근 가능합니다.', G4_URL);
+
+$g4['title'] = '캡챠파일 일괄삭제';
+include_once('./admin.head.php');
+?>
+
+<div id="cache_del">
+    <p>
+        완료 메세지가 나오기 전에 프로그램의 실행을 중지하지 마십시오.
+    </p>
+    <?php
+    flush();
+
+    if (!$dir=@opendir(G4_DATA_PATH.'/cache')) {
+        echo '<p>캐시디렉토리를 열지못했습니다.</p>';
+    }
+
+    $cnt=0;
+    echo '<ul>'.PHP_EOL;
+
+    $files = glob(G4_DATA_PATH.'/cache/gcaptcha-*');
+    if (is_array($files)) {
+        $before_time  = G4_SERVER_TIME - 3600; // 한시간전
+        foreach ($files as $gcaptcha_file) {
+            $modification_time = filemtime($gcaptcha_file); // 파일접근시간
+
+            if ($modification_time > $before_time) continue;
+
+            $cnt++;
+            unlink($gcaptcha_file);
+            echo '<li>'.$gcaptcha_file.'</li>'.PHP_EOL;
+
+            flush();
+
+            if ($cnt%10==0) 
+                echo PHP_EOL;
+        }
+    }
+
+    echo '<li>완료됨</li></ul>'.PHP_EOL;
+    echo '<p><span>캡챠파일 '.$cnt.'건의 삭제가 완료됐습니다.</span><br>프로그램의 실행을 끝마치셔도 좋습니다.</p>'.PHP_EOL;
+    ?>
+</div>
+
+<?php
+include_once('./admin.tail.php');
+?>
\ No newline at end of file
diff --git a/adm/member_form.php b/adm/member_form.php
index 7515eab75..201409545 100644
--- a/adm/member_form.php
+++ b/adm/member_form.php
@@ -147,11 +147,17 @@ include_once('./admin.head.php');
     <tr>
         <th scope="row"><label for="mb_zip1">주소</label></th>
         <td colspan="3" style="line-height:2em">
-            <input type="text" name="mb_zip1" value="<?=$mb['mb_zip1']?>" id="mb_zip1" title="우편번호 앞자리" class="frm_input readonly" size="3" maxlength="3" readonly> -
-            <input type="text" name="mb_zip2" value="<?=$mb['mb_zip2']?>" id="mb_zip2" title="우편번호 뒷자리" class="frm_input readonly" size="3" maxlength="3" readonly>
-            <a href="<?=G4_BBS_URL.'/zip.php?frm_name=fmember&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2'?>" class="win_zip_find btn_frmline">우편번호 검색</a><br>
-            <input type="text" name="mb_addr1" value="<?=$mb['mb_addr1']?>" id="mb_addr1" title="행정기본주소" class="frm_input readonly" size="50" readonly><br>
+            <input type="text" name="mb_zip1" value="<?=$mb['mb_zip1']?>" id="mb_zip1" title="우편번호 앞자리" class="frm_input readonly" size="3" maxlength="3"> -
+            <input type="text" name="mb_zip2" value="<?=$mb['mb_zip2']?>" id="mb_zip2" title="우편번호 뒷자리" class="frm_input readonly" size="3" maxlength="3">
+            <span id="win_zip" style="display:block"></span>
+            <input type="text" name="mb_addr1" value="<?=$mb['mb_addr1']?>" id="mb_addr1" title="행정기본주소" class="frm_input readonly" size="50"><br>
             <input type="text" name="mb_addr2" value="<?=$mb['mb_addr2']?>" id="mb_addr2" title="상세주소" class="frm_input" size="50"> 상세주소 입력
+            <script>
+            // 우편번호 자바스크립트 비활성화 대응을 위한 코드
+            $('<a href="<?=G4_BBS_URL?>/zip.php?frm_name=fmember&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2" id="win_zip" class="win_zip_find btn_frmline" target="_blank">우편번호 검색</a><br>').appendTo('#win_zip');
+            $('#win_zip').css('display','inline');
+            $('#mb_zip1,#mb_zip2,#mb_addr1').attr('readonly','readonly');
+            </script>
         </td>
     </tr>
     <tr>
diff --git a/bbs/board.php b/bbs/board.php
index 9098c359c..013eff092 100644
--- a/bbs/board.php
+++ b/bbs/board.php
@@ -28,7 +28,7 @@ if (isset($wr_id) && $wr_id) {
     if (isset($group['gr_use_access']) && $group['gr_use_access']) {
         if ($is_guest) {
             $msg = "비회원은 이 게시판에 접근할 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.";
-            alert($msg, './login.php?wr_id='.$wr_id.$qstr.'&amp;url='.urlencode(G4_BBS_URL.'/board.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id));
+            alert($msg, './login.php?wr_id='.$wr_id.$qstr.'&amp;url='.urlencode(G4_BBS_URL.'/board.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id.$qstr));
         }
 
         // 그룹관리자 이상이라면 통과
@@ -49,7 +49,7 @@ if (isset($wr_id) && $wr_id) {
         if ($is_member)
             alert('글을 읽을 권한이 없습니다.', G4_URL);
         else
-            alert('글을 읽을 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', './login.php?wr_id='.$wr_id.$qstr.'&amp;url='.urlencode(G4_BBS_URL.'/board.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id));
+            alert('글을 읽을 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', './login.php?wr_id='.$wr_id.$qstr.'&amp;url='.urlencode(G4_BBS_URL.'/board.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id.$qstr));
     }
 
     // 자신의 글이거나 관리자라면 통과
@@ -112,24 +112,27 @@ if (isset($wr_id) && $wr_id) {
         set_session($ss_name, TRUE);
     }
 
-    $g4['title'] = strip_tags(conv_subject($write['wr_subject'], 255));
+    $g4['title'] = strip_tags(conv_subject($write['wr_subject'], 255))." > ".$board['bo_subject'];
 } else {
     if ($member['mb_level'] < $board['bo_list_level']) {
         if ($member['mb_id'])
             alert('목록을 볼 권한이 없습니다.', G4_URL);
         else
-            alert('목록을 볼 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', './login.php?wr_id='.$wr_id.$qstr.'&amp;url='.urlencode(G4_BBS_URL.'/board.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id));
+            alert('목록을 볼 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', './login.php?wr_id='.$wr_id.$qstr.'&amp;url='.urlencode(G4_BBS_URL.'/board.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id.$qstr));
     }
 
     if (!isset($page) || (isset($page) && $page == 0)) $page = 1;
 
-    $g4['title'] = $board['bo_subject'];
+    $g4['title'] = $board['bo_subject']." ".$page." 페이지";
 }
 
 include_once(G4_PATH.'/head.sub.php');
 
 $width = $board['bo_table_width'];
-if ($width <= 100) $width .= '%';
+if ($width <= 100)
+    $width .= '%';
+else
+    $width .='px';
 
 // IP보이기 사용 여부
 $ip = "";
diff --git a/bbs/email_certify.php b/bbs/email_certify.php
index f689866a1..31c816d82 100644
--- a/bbs/email_certify.php
+++ b/bbs/email_certify.php
@@ -1,21 +1,21 @@
 <?
 include_once('./_common.php');
 
-$sql = " select mb_id, mb_email, mb_datetime from {$g4[member_table]} where mb_id = '{$mb_id}' ";
+$sql = " select mb_id, mb_email, mb_datetime from {$g4['member_table']} where mb_id = '{$mb_id}' ";
 $row = sql_fetch($sql);
-if (!$row[mb_id])
-    alert('존재하는 회원이 아닙니다.', G4_PATH);
+if (!$row['mb_id'])
+    alert('존재하는 회원이 아닙니다.', G4_URL);
 
-if ($mb_md5) 
+if ($mb_md5)
 {
-    $tmp_md5 = md5($row[mb_id].$row[mb_email].$row[mb_datetime]);
-    if ($mb_md5 == $tmp_md5) 
+    $tmp_md5 = md5($row['mb_id'].$row['mb_email'].$row['mb_datetime']);
+    if ($mb_md5 == $tmp_md5)
     {
-        sql_query(" update {$g4[member_table]} set mb_email_certify = '".G4_TIME_YMDHIS."' where mb_id = '{$mb_id}' ");
+        sql_query(" update {$g4['member_table']} set mb_email_certify = '".G4_TIME_YMDHIS."' where mb_id = '{$mb_id}' ");
 
-        alert('E-mail 인증 처리를 완료 하였습니다.', G4_PATH);
+        alert('E-mail 인증 처리를 완료 하였습니다.', G4_URL);
     }
 }
 
-alert('제대로 된 값이 넘어오지 않았습니다.', G4_PATH);
+alert('제대로 된 값이 넘어오지 않았습니다.', G4_URL);
 ?>
\ No newline at end of file
diff --git a/bbs/password.php b/bbs/password.php
index 532d8e0d2..287032410 100644
--- a/bbs/password.php
+++ b/bbs/password.php
@@ -21,8 +21,10 @@ switch ($w) {
         // 패스워드 창에서 로그인 하는 경우 관리자 또는 자신의 글이면 바로 글보기로 감
         if ($is_admin || ($member['mb_id'] == $write['mb_id'] && $write['mb_id']))
             goto_url('./board.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id);
-        else
+        else {
             $action = './password_check.php';
+            $return_url = './board.php?bo_table='.$bo_table;
+        }
         break;
     default :
         alert('w 값이 제대로 넘어오지 않았습니다.');
diff --git a/bbs/password_lost_certify.php b/bbs/password_lost_certify.php
index 847a5e7bf..7a969e94c 100644
--- a/bbs/password_lost_certify.php
+++ b/bbs/password_lost_certify.php
@@ -19,7 +19,7 @@ sql_query(" update {$g4['member_table']} set mb_lost_certify = '' where mb_no =
 // 변경될 패스워드가 넘어와야하고 저장된 변경패스워드를 md5 로 변환하여 같으면 정상
 if ($mb_lost_certify && $mb_datetime === sql_password($mb['mb_datetime']) && $mb_lost_certify === $mb['mb_lost_certify']) {
     sql_query(" update {$g4['member_table']} set mb_password = '{$mb['mb_lost_certify']}' where mb_no = '$mb_no' ");
-    alert('변경된 패스워드를 이메일로 보내드렸습니다.\\n\\n회원아이디와 변경된 패스워드로 로그인 하시기 바랍니다.', G4_BBS_URL.'/login.php');
+    alert('패스워드가 변경됐습니다.\\n\\n회원아이디와 변경된 패스워드로 로그인 하시기 바랍니다.', G4_BBS_URL.'/login.php');
 }
 else {
     die("Error");
diff --git a/bbs/register_form_update_mail1.php b/bbs/register_form_update_mail1.php
index ec63c0456..50faeb715 100644
--- a/bbs/register_form_update_mail1.php
+++ b/bbs/register_form_update_mail1.php
@@ -23,12 +23,15 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         <p style="margin:20px 0 0;padding:30px 30px 50px;min-height:200px;height:auto !important;height:200px;border-bottom:1px solid #eee">
             <b><?=$mb_name?></b> 님의 회원가입을 진심으로 축하합니다.<br>
             회원님의 성원에 보답하고자 더욱 더 열심히 하겠습니다.<br>
+            <? if ($config['cf_use_email_certify']) { ?>아래의 <strong>메일인증</strong>을 클릭하시면 회원가입이 완료됩니다.<br><? } ?>
             감사합니다.
         </p>
+
         <? if ($config['cf_use_email_certify']) { ?>
-        <p>아래의 주소를 클릭하시면 회원가입이 완료됩니다.<br><a href="<?=$certify_href?>"><?=$certify_href?></a></p>
+        <a href="<?=$certify_href?>" target="_blank" style="display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center">메일인증</a>
+        <? } else { ?>
+        <a href="<?=G4_URL?>" target="_blank" style="display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center">사이트바로가기</a>
         <? } ?>
-        <a href="<?=$link_url?>" style="display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center">사이트에서 게시물 확인하기</a>
     </div>
 </div>
 
diff --git a/bbs/register_form_update_mail3.php b/bbs/register_form_update_mail3.php
index b7cd690f5..3f5991b17 100644
--- a/bbs/register_form_update_mail3.php
+++ b/bbs/register_form_update_mail3.php
@@ -24,12 +24,12 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
             <b><?=$mb_name?></b> 님의 E-mail 주소가 변경되었습니다.<br><br>
 
             아래의 주소를 클릭하시면 인증이 완료됩니다.<br>
-            <a href="<?=$certify_href?>"><b><?=$certify_href?></b></a><br><br>
+            <a href="<?=$certify_href?>" target="_blank"><b><?=$certify_href?></b></a><br><br>
 
             회원님의 성원에 보답하고자 더욱 더 열심히 하겠습니다.<br>
             감사합니다.
         </p>
-        <a href="<?=G4_BBS_URL?>/login.php" style="display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center"><?=$config['cf_title']?> 로그인</a>
+        <a href="<?=G4_BBS_URL?>/login.php" target="_blank" style="display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center"><?=$config['cf_title']?> 로그인</a>
     </div>
 </div>
 
diff --git a/bbs/write.php b/bbs/write.php
index 72f82b978..5159cfb9b 100644
--- a/bbs/write.php
+++ b/bbs/write.php
@@ -338,6 +338,8 @@ $upload_max_filesize = number_format($board['bo_upload_size']) . ' 바이트';
 $width = $board['bo_table_width'];
 if ($width <= 100)
     $width .= '%';
+else
+    $width .= 'px';
 
 $captcha_html = '';
 $captcha_js   = '';
diff --git a/common.php b/common.php
index 3540a3805..f816f4ade 100644
--- a/common.php
+++ b/common.php
@@ -102,7 +102,7 @@ if (file_exists($dbconfig_file)) {
 <html lang="ko">
 <head>
 <meta charset="utf-8">
-<title>오류! 그누보드4S 설치하기</title>
+<title>오류! 그누보드4s 설치하기</title>
 <style>
 body {background:#f7f7f2}
 h1 {margin:50px auto 30px;width:540px;color:#ff3061;font-size:1.4em}
@@ -119,7 +119,7 @@ div a {display:block;margin:50px auto 10px;width:170px;text-align:center}
             <li><strong><?=G4_DATA_DIR.'/'.G4_DBCONFIG_FILE?></strong></li>
         </ul>
         <p>프로그램 설치 후 실행하시기 바랍니다.</p>
-        <a href="./install/">그누보드4S 설치하기</a>
+        <a href="./install/">그누보드4s 설치하기</a>
     </div>
 </body>
 </html>
diff --git a/config.php b/config.php
index 6373a15e1..417a966fd 100644
--- a/config.php
+++ b/config.php
@@ -41,10 +41,13 @@ define('G4_EXTEND_DIR', 'extend');
 define('G4_IMG_DIR', 'img');
 define('G4_JS_DIR', 'js');
 define('G4_LIB_DIR', 'lib');
+define('G4_PLUGIN_DIR', 'plugin');
 define('G4_SKIN_DIR', 'skin');
 define('G4_GCAPTCHA_DIR', 'gcaptcha');
 define('G4_CKEDITOR_DIR', 'ckeditor');
 define('G4_MOBILE_DIR', 'mobile');
+define('G4_KCP_DIR', 'kcp');
+define('G4_OKNAME_DIR', 'okname');
 
 // URL 은 브라우저상에서의 경로 (도메인으로 부터의)
 if (G4_DOMAIN) {
@@ -69,8 +72,11 @@ define('G4_DATA_URL', G4_URL.'/'.G4_DATA_DIR);
 define('G4_IMG_URL', G4_URL.'/'.G4_IMG_DIR);
 define('G4_JS_URL', G4_URL.'/'.G4_JS_DIR);
 define('G4_SKIN_URL', G4_URL.'/'.G4_SKIN_DIR);
-define('G4_GCAPTCHA_URL', G4_BBS_URL.'/'.G4_GCAPTCHA_DIR);
-define('G4_CKEDITOR_URL', G4_BBS_URL.'/'.G4_CKEDITOR_DIR); // CKEDITOR 의 라이브러리 경로
+define('G4_PLUGIN_URL', G4_URL.'/'.G4_PLUGIN_DIR);
+define('G4_GCAPTCHA_URL', G4_PLUGIN_URL.'/'.G4_GCAPTCHA_DIR);
+define('G4_CKEDITOR_URL', G4_PLUGIN_URL.'/'.G4_CKEDITOR_DIR); // CKEDITOR 의 라이브러리 경로
+define('G4_KCP_URL', G4_PLUGIN_URL.'/'.G4_KCP_DIR);
+define('G4_OKNAME_URL', G4_PLUGIN_URL.'/'.G4_OKNAME_DIR);
 define('G4_MOBILE_URL', G4_URL.'/'.G4_MOBILE_DIR);
 
 // PATH 는 서버상에서의 절대경로
@@ -79,9 +85,12 @@ define('G4_BBS_PATH', G4_PATH.'/'.G4_BBS_DIR);
 define('G4_DATA_PATH', G4_PATH.'/'.G4_DATA_DIR);
 define('G4_EXTEND_PATH', G4_PATH.'/'.G4_EXTEND_DIR);
 define('G4_LIB_PATH', G4_PATH.'/'.G4_LIB_DIR);
+define('G4_PLUGIN_PATH', G4_PATH.'/'.G4_PLUGIN_DIR);
 define('G4_SKIN_PATH', G4_PATH.'/'.G4_SKIN_DIR);
-define('G4_GCAPTCHA_PATH', G4_BBS_PATH.'/'.G4_GCAPTCHA_DIR);
-define('G4_CKEDITOR_PATH', G4_BBS_PATH.'/'.G4_CKEDITOR_DIR);
+define('G4_GCAPTCHA_PATH', G4_PLUGIN_PATH.'/'.G4_GCAPTCHA_DIR);
+define('G4_CKEDITOR_PATH', G4_PLUGIN_PATH.'/'.G4_CKEDITOR_DIR);
+define('G4_KCP_PATH', G4_PLUGIN_PATH.'/'.G4_KCP_DIR);
+define('G4_OKNAME_PATH', G4_PLUGIN_PATH.'/'.G4_OKNAME_DIR);
 define('G4_MOBILE_PATH', G4_PATH.'/'.G4_MOBILE_DIR);
 //==============================================================================
 
@@ -95,7 +104,7 @@ define('G4_USE_CACHE', true); // 최신글등에 cache 기능 사용 여부
 // 6시간이 빠른 경우 time() + (3600 * 6);
 // 6시간이 느린 경우 time() - (3600 * 6);
 define('G4_SERVER_TIME', time());
-define('G4_TIME_YMDHIS', date("Y-m-d H:i:s", G4_SERVER_TIME));
+define('G4_TIME_YMDHIS', date('Y-m-d H:i:s', G4_SERVER_TIME));
 define('G4_TIME_YMD', substr(G4_TIME_YMDHIS, 0, 10));
 define('G4_TIME_HIS', substr(G4_TIME_YMDHIS, 11, 8));
 
@@ -119,4 +128,4 @@ define('G4_MOBILE_AGENT', 'phone|samsung|lgtel|mobile|skt|nokia|blackberry|andro
 // 필드를 추가하면 이 숫자를 필드수에 맞게 늘려주십시오.
 //$g4['link_count'] = 2;
 define('G4_LINK_COUNT', 2);
-?>
+?>
\ No newline at end of file
diff --git a/css/admin.css b/css/admin.css
index 2892cba1f..bcb8a3051 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -90,6 +90,9 @@ h2 {font-size:1.2em}
 .gnb_1depth_over .gnb_sub_ul {left:-1px;width:181px;height:auto;border:1px solid #c3c7c5;border-top:0;background:#fff}
 .gnb_1depth_over2 .gnb_sub_ul {right:-1px;width:181px;height:auto;border:1px solid #c3c7c5;border-top:0;background:#fff}
 
+.gnb_js .gnb_grp_style {background:#f7f7f7 !important}
+.gnb_js .gnb_grp_div {border-top:1px solid #eee}
+
 /* 중간 레이아웃 */
 #wrapper {z-index:5;margin:30px auto;width:1000px;min-height:630px;height:auto !important;height:630px;zoom:1}
 #wrapper:after {display:block;visibility:hidden;clear:both;content:""}
@@ -164,11 +167,6 @@ fieldset span {display:block;margin-bottom:10px}
 fieldset p {color:#4c5f67}
 fieldset button, .fieldset_submit {padding:0 15px;height:23px;border:0;background:#74868b;color:#fff;font-size:1em;line-height:2.1em;vertical-align:middle;cursor:pointer}
 fieldset button:focus, .fieldset_submit:focus {padding:0 15px;height:23px;border:0;background:#555;color:#fff;font-size:1em;line-height:2.1em;vertical-align:middle}
-/* 캡챠 입력상자 */
-.fs_input,
-fieldset textarea {padding:3px 3px 4px;border:1px solid #ccc;background:#f7f7f7;vertical-align:middle}
-.fs_input:focus,
-fieldset textarea:focus {padding:4px 4px 5px;border:0;background:#494949;color:#fff}
 
 .readonly {}
 
diff --git a/css/default.css b/css/default.css
index ed7de8713..cc2799ecb 100644
--- a/css/default.css
+++ b/css/default.css
@@ -110,7 +110,7 @@ a:active {color:#000;text-decoration:underline}
 #wrapper:after {display:block;visibility:hidden;clear:both;content:""}
 #wrapper_title {margin-bottom:20px;font-size:1.2em}
 
-#side_nb {float:right;width:209px;border:1px solid #cfded8;background:#fff}
+#wrapper #aside {float:right;width:209px;border:1px solid #cfded8;background:#fff}
 
 #container {z-index:4;position:relative;float:left;padding:25px 15px 15px;width:728px;min-height:500px;height:auto !important;height:500px;border:1px solid #cfded8;background:#fff;zoom:1}
 #container:after {display:block;visibility:hidden;clear:both;content:""}
@@ -145,6 +145,7 @@ a:active {color:#000;text-decoration:underline}
 .btn_confirm {text-align:center} /* 서식단계 진행 */
 .btn_submit {padding:0 10px;height:24px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer}
 button.btn_submit {height:22px !important;font-size:1em}
+fieldset .btn_submit {height:22px;font-size:1em}
 .btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em}
 button.btn_cancel {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc;background:#fafafa;line-height:2em}
 .btn_cancel:focus,
diff --git a/css/mobile.css b/css/mobile.css
index 83864f189..0736184d0 100644
--- a/css/mobile.css
+++ b/css/mobile.css
@@ -94,7 +94,7 @@ pre {overflow-x:scroll;font-size:1.1em}
 #ft_copy {background:#232323}
 #ft_copy p {position:relative;padding:0.5em;color:#4a9ab8}
 #ft_copy b {color:#fff}
-#ft_copy a {position:absolute;top:0.5em;right:0.5em;color:#fff;text-decoration:none}
+#ft_copy a {color:#fff;text-decoration:none}
 
 /* PC화면으로 */
 #g4s_cng {display:block;margin:0.3em;padding:0.5em 0;border:1px solid #eee;border-radius:2em;color:#000;font-size:1em;text-decoration:none;text-align:center}
@@ -109,7 +109,7 @@ pre {overflow-x:scroll;font-size:1.1em}
 .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}
-.btn_frmline {display:inline-block;padding:0 7px 0 0.3em;height:22px;border:0;background:#333;color:#fff !important;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:1.4em} /* 우편번호검색버튼 등 */
+.btn_frmline {display:inline-block;padding:0 0.3em;height:1.9em;border:0;background:#333;color:#fff !important;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:1.9em} /* 우편번호검색버튼 등 */
 .btn_win {clear:both;margin-bottom:1.5em;text-align:center} /* 새창용 */
 .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}
 /* 게시판용 버튼 */
diff --git a/head.php b/head.php
index 02ed55ba8..441cd5f7d 100644
--- a/head.php
+++ b/head.php
@@ -155,10 +155,10 @@ if ($config['cf_include_head']) {
 <hr>
 
 <div id="wrapper">
-    <div id="side_nb">
-        <?=(G4_IS_MOBILE?outlogin('basic'):outlogin('basic')); // 외부 로그인 ?>
-        <?=(G4_IS_MOBILE?poll('basic'):poll('basic')); // 설문조사 ?>
-    </div>
+    <aside id="aside">
+        <?=outlogin('basic'); // 외부 로그인 ?>
+        <?=poll('basic'); // 설문조사 ?>
+    </aside>
     <div id="container">
         <? if ((!$bo_table || $w == 's' ) && !defined("_INDEX_")) {?><h1 id="wrapper_title"><?=$g4['title']?></h1><?}?>
         <div id="text_size">
diff --git a/head.sub.php b/head.sub.php
index f802f1d26..27ea33d45 100644
--- a/head.sub.php
+++ b/head.sub.php
@@ -10,7 +10,7 @@ if (!isset($g4['title'])) {
 }
 else {
     $g4_head_title = $g4['title']; // 상태바에 표시될 제목
-    $g4_head_title .= " : ".$config['cf_title'];
+    $g4_head_title .= " | ".$config['cf_title'];
 }
 
 // 현재 접속자
@@ -32,13 +32,14 @@ header("Pragma: no-cache"); // HTTP/1.0
 <html lang="ko">
 <head>
 <meta charset="utf-8">
+<title><?=$g4_head_title?></title>
 <? if (G4_IS_MOBILE) {?>
 <meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=0,maximum-scale=10,user-scalable=yes">
 <meta name="HandheldFriendly" content="true">
 <meta name="format-detection" content="telephone=no">
 <? } ?>
+<meta http-equiv="imagetoolbar" content="no">
 <!-- <meta http-equiv="X-UA-Compatible" content="IE=Edge" /> -->
-<title><?=$g4_head_title?></title>
 <? if (defined('G4_IS_ADMIN')) { ?>
 <link rel="stylesheet" href="<?=G4_CSS_URL?>/admin.css?=<?=date("md")?>">
 <? } else { ?>
@@ -67,7 +68,6 @@ if (!defined('G4_IS_ADMIN')) {
 // 자바스크립트에서 사용하는 전역변수 선언
 var g4_url       = "<?=G4_URL?>";
 var g4_bbs_url   = "<?=G4_BBS_URL?>";
-var g4_img_url   = "<?=G4_IMG_URL?>";
 var g4_is_member = "<?=isset($is_member)?$is_member:'';?>";
 var g4_is_admin  = "<?=isset($is_admin)?$is_admin:'';?>";
 var g4_is_mobile = "<?=G4_IS_MOBILE?>";
diff --git a/install/install.inc.php b/install/install.inc.php
index 1591ef359..64884720d 100644
--- a/install/install.inc.php
+++ b/install/install.inc.php
@@ -61,6 +61,7 @@ if (!is_dir($data_path))
     <p>루트 디렉토리에 아래로 <?=G4_DATA_DIR?> 디렉토리를 생성하여 주십시오.<br />
     (common.php 파일이 있는곳이 루트 디렉토리 입니다.)<br /><br />
     $> mkdir <?=G4_DATA_DIR?><br /><br />
+    윈도우의 경우 data 폴더를 하나 생성해 주시기 바랍니다.<br /><br />
     위 명령 실행후 브라우저를 새로고침 하십시오.</p>
 <?
     $exists_data_dir = false;
diff --git a/lib/common.lib.php b/lib/common.lib.php
index 6b571e669..3da1f3716 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -87,7 +87,17 @@ function goto_url($url)
 {
     $url = str_replace("&amp;", "&", $url);
     //echo "<script> location.replace('$url'); </script>";
-    @header("Location:$url");
+
+    if (!headers_sent())
+        header('Location: '.$url);
+    else {
+        echo '<script>';
+        echo 'location.replace("'.$url.'");';
+        echo '</script>';
+        echo '<noscript>';
+        echo '<meta http-equiv="refresh" content="0;url='.$url.'" />';
+        echo '</noscript>';
+    }
     exit;
 }
 
@@ -510,13 +520,13 @@ function conv_content($content, $html)
             $content .= "</table>";
         }
 
-        $content = preg_replace_callback("/<([^>]+)>/s", 'bad130128', $content); 
+        $content = preg_replace_callback("/<([^>]+)>/s", 'bad130128', $content);
 
         $content = preg_replace($source, $target, $content);
 
         // XSS (Cross Site Script) 막기
         // 완벽한 XSS 방지는 없다.
-        
+
         // 이런 경우를 방지함 <IMG STYLE="xss:expr/*XSS*/ession(alert('XSS'))">
         //$content = preg_replace("#\/\*.*\*\/#iU", "", $content);
         // 위의 정규식이 아래와 같은 내용을 통과시키므로 not greedy(비탐욕수량자?) 옵션을 제거함. ignore case 옵션도 필요 없으므로 제거
@@ -560,9 +570,9 @@ function conv_content($content, $html)
         $pattern .= "(o|&#(x6f|111);?)";
         $pattern .= "(n|&#(x6e|110);?)";
         //$content = preg_replace("/".$pattern."/i", "__EXPRESSION__", $content);
-        $content = preg_replace("/<[^>]*".$pattern."/i", "__EXPRESSION__", $content); 
+        $content = preg_replace("/<[^>]*".$pattern."/i", "__EXPRESSION__", $content);
         // <IMG STYLE="xss:e\xpression(alert('XSS'))"></IMG> 와 같은 코드에 취약점이 있어 수정함. 121213
-        $content = preg_replace("/(?<=style)(\s*=\s*[\"\']?xss\:)/i", '="__XSS__', $content); 
+        $content = preg_replace("/(?<=style)(\s*=\s*[\"\']?xss\:)/i", '="__XSS__', $content);
         $content = bad_tag_convert($content);
     }
     else // text 이면
diff --git a/mobile/head.php b/mobile/head.php
index 6d79e2ece..58e1248a1 100644
--- a/mobile/head.php
+++ b/mobile/head.php
@@ -94,9 +94,9 @@ include_once(G4_LIB_PATH.'/popular.lib.php');
 <hr>
 
 <div id="wrapper">
-    <div id="side_nb">
-        <?=(G4_IS_MOBILE?outlogin('basic'):outlogin('basic')); // 외부 로그인 ?>
-    </div>
+    <aside id="aside">
+        <?=outlogin('basic'); // 외부 로그인 ?>
+    </aside>
     <div id="container">
         <? if ((!$bo_table || $w == 's' ) && !defined("_INDEX_")) {?><h1 id="wrapper_title"><?=$g4['title']?></h1><?}?>
         <div id="text_size">
diff --git a/mobile/skin/board/basic/list.skin.php b/mobile/skin/board/basic/list.skin.php
index 8d7cc4236..0325d804e 100644
--- a/mobile/skin/board/basic/list.skin.php
+++ b/mobile/skin/board/basic/list.skin.php
@@ -12,7 +12,7 @@ if ($is_nogood) $colspan++;
 <? if (!$wr_id) {?><h1 id="bo_list_title"><?=$g4['title']?></h1><?}?>
 
 <!-- 게시판 목록 시작 -->
-<div id="bo_list<? if ($is_admin) echo "_admin";?>" style="width:<?=$width;?>">
+<div id="bo_list<? if ($is_admin) echo "_admin";?>">
 
     <? if ($is_category) { ?>
     <form name="fcategory" id="fcategory" method="get">
diff --git a/mobile/skin/board/gallery/list.skin.php b/mobile/skin/board/gallery/list.skin.php
index 969f83966..4eed350c9 100644
--- a/mobile/skin/board/gallery/list.skin.php
+++ b/mobile/skin/board/gallery/list.skin.php
@@ -20,7 +20,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
 </div>
 
 <!-- 게시판 목록 시작 -->
-<div id="bo_img" style="width:<?=$width;?>">
+<div id="bo_img">
 
     <? if ($is_category) { ?>
     <form name="fcategory" id="fcategory" method="get">
diff --git a/mobile/skin/member/basic/login.skin.php b/mobile/skin/member/basic/login.skin.php
index 3c72d208c..b79b17aa7 100644
--- a/mobile/skin/member/basic/login.skin.php
+++ b/mobile/skin/member/basic/login.skin.php
@@ -23,7 +23,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
             아직 회원이 아니시라면 회원으로 가입 후 이용해 주십시오.
         </p>
         <div>
-            <a href="<?=$g4['bbs_url']?>/password_lost.php" target="win_password_lost" id="login_password_lost" class="btn02">아이디 패스워드 찾기</a>
+            <a href="<?=G4_BBS_URL?>/password_lost.php" target="win_password_lost" id="login_password_lost" class="btn02">아이디 패스워드 찾기</a>
             <a href="./register.php" class="btn01">회원 가입</a>
         </div>
     </section>
diff --git a/mobile/skin/member/basic/password_lost2.skin.php b/mobile/skin/member/basic/password_lost2.skin.php
index 7fffff044..568d8b1fc 100644
--- a/mobile/skin/member/basic/password_lost2.skin.php
+++ b/mobile/skin/member/basic/password_lost2.skin.php
@@ -62,7 +62,7 @@ $content .= "<p style=\"margin:0;padding:30px 30px 30px;border-bottom:1px solid
 $content .= "<span style=\"display:inline-block;width:100px\">회원아이디</span> ".$mb['mb_id']."<br>";
 $content .= "<span style=\"display:inline-block;width:100px\">변경될 패스워드</span> <strong style=\"color:#ff3061\">".$change_password."</strong>";
 $content .= "</p>";
-$content .= "<a href=\"".$href."/\" style=\"display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center\">패스워드 변경</a>";
+$content .= "<a href=\"".$href."\" target=\"_blank\" style=\"display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center\">패스워드 변경</a>";
 $content .= "</div>";
 $content .= "</div>";
 
diff --git a/mobile/skin/member/basic/register_form.skin.php b/mobile/skin/member/basic/register_form.skin.php
index f3e42cb3a..325228568 100644
--- a/mobile/skin/member/basic/register_form.skin.php
+++ b/mobile/skin/member/basic/register_form.skin.php
@@ -94,21 +94,25 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 </tr>
 <? } ?>
 
-<? if ($config['cf_use_addr']) {
-    $zip_href = G4_BBS_URL.'/zip.php?frm_name=fregisterform&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2';
-?>
+<? if ($config['cf_use_addr']) {?>
 <tr>
     <th scope="row">
         주소
         <? if ($config['cf_req_addr']) {?><strong class="sound_only">필수</strong><? } ?>
     </th>
     <td>
-        <input type="text" name="mb_zip1" value="<?=$member['mb_zip1']?>" id="reg_mb_zip1" title="우편번호 앞자리" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" maxlength="3" <?=$config['cf_req_addr']?"required":"";?>>
+        <input type="text" name="mb_zip1" value="<?=$member['mb_zip1']?>" id="reg_mb_zip1" <?=$config['cf_req_addr']?"required":"";?> title="우편번호 앞자리<?=$config['cf_req_addr']?"(필수)":"";?>" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3">
         -
-        <input type="text" name="mb_zip2" value="<?=$member['mb_zip2']?>" id="reg_mb_zip2" title="우편번호 뒷자리" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" maxlength="3" <?=$config['cf_req_addr']?"required":"";?> >
-        <a href="<? echo $zip_href; ?>" id="reg_zip_find" class="btn_frmline win_zip_find" target="_blank">주소찾기</a>
-        <input type="text" name="mb_addr1" value="<?=$member['mb_addr1']?>" id="reg_mb_addr1" title="행정구역주소" class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" <?=$config['cf_req_addr']?"required":"";?> >
-        <input type="text" name="mb_addr2" value="<?=$member['mb_addr2']?>" id="reg_mb_addr2"  title="상세주소"class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" <?=$config['cf_req_addr']?"required":"";?>>
+        <input type="text"  name="mb_zip2" value="<?=$member['mb_zip2']?>" id="reg_mb_zip2" <?=$config['cf_req_addr']?"required":"";?> title="우편번호 뒷자리<?=$config['cf_req_addr']?"(필수)":"";?>" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3">
+        <span id="reg_win_zip" style="display:block"></span>
+        <input type="text"  name="mb_addr1" value="<?=$member['mb_addr1']?>" id="reg_mb_addr1" <?=$config['cf_req_addr']?"required":"";?> title="행정구역주소<?=$config['cf_req_addr']?"(필수)":"";?>" class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" size="50">
+        <input type="text" name="mb_addr2" value="<?=$member['mb_addr2']?>" id="reg_mb_addr2" <?=$config['cf_req_addr']?"required":"";?> title="상세주소<?=$config['cf_req_addr']?"(필수)":"";?>" class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" size="50">
+        <script>
+        // 우편번호 자바스크립트 비활성화 대응을 위한 코드
+        $('<a href="<?=G4_BBS_URL?>/zip.php?frm_name=fregisterform&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2" id="reg_zip_find" class="btn_frmline win_zip_find" target="_blank">우편번호 검색</a><br>').appendTo('#reg_win_zip');
+        $("#reg_win_zip").css("display", "inline");
+        $("#reg_mb_zip1, #reg_mb_zip2, #reg_mb_addr1").attr('readonly', 'readonly');
+        </script>
     </td>
 </tr>
 <? } ?>
diff --git a/mobile/skin/member/kcpcert/login.skin.php b/mobile/skin/member/kcpcert/login.skin.php
index 3c72d208c..b79b17aa7 100644
--- a/mobile/skin/member/kcpcert/login.skin.php
+++ b/mobile/skin/member/kcpcert/login.skin.php
@@ -23,7 +23,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
             아직 회원이 아니시라면 회원으로 가입 후 이용해 주십시오.
         </p>
         <div>
-            <a href="<?=$g4['bbs_url']?>/password_lost.php" target="win_password_lost" id="login_password_lost" class="btn02">아이디 패스워드 찾기</a>
+            <a href="<?=G4_BBS_URL?>/password_lost.php" target="win_password_lost" id="login_password_lost" class="btn02">아이디 패스워드 찾기</a>
             <a href="./register.php" class="btn01">회원 가입</a>
         </div>
     </section>
diff --git a/mobile/skin/member/kcpcert/register_form.skin.php b/mobile/skin/member/kcpcert/register_form.skin.php
index 2a24f5f52..cb112d511 100644
--- a/mobile/skin/member/kcpcert/register_form.skin.php
+++ b/mobile/skin/member/kcpcert/register_form.skin.php
@@ -108,12 +108,18 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         <? if ($config['cf_req_addr']) {?><strong class="sound_only">필수</strong><? } ?>
     </th>
     <td>
-        <input type="text" name="mb_zip1"value="<?=$member['mb_zip1']?>" id="reg_mb_zip1" title="우편번호 앞자리" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3" <?=$config['cf_req_addr']?"required":"";?> >
+        <input type="text" name="mb_zip1" value="<?=$member['mb_zip1']?>" id="reg_mb_zip1" <?=$config['cf_req_addr']?"required":"";?> title="우편번호 앞자리<?=$config['cf_req_addr']?"(필수)":"";?>" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3">
         -
-        <input type="text" name="mb_zip2" value="<?=$member['mb_zip2']?>" id="reg_mb_zip2" title="우편번호 뒷자리" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3" <?=$config['cf_req_addr']?"required":"";?>>
-        <a href="<? echo $zip_href; ?>" target="_blank" id="reg_zip_find" class="btn_frmline win_zip_find">주소찾기</a>
-        <input type="text" name="mb_addr1" value="<?=$member['mb_addr1']?>" id="reg_mb_addr1" title="행정구역주소" class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" size="50" <?=$config['cf_req_addr']?"required":"";?>>
-        <input type="text" name="mb_addr2" value="<?=$member['mb_addr2']?>" id="reg_mb_addr2" title="상세주소" class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" size="50" <?=$config['cf_req_addr']?"required":"";?>>
+        <input type="text"  name="mb_zip2" value="<?=$member['mb_zip2']?>" id="reg_mb_zip2" <?=$config['cf_req_addr']?"required":"";?> title="우편번호 뒷자리<?=$config['cf_req_addr']?"(필수)":"";?>" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3">
+        <span id="reg_win_zip" style="display:block"></span>
+        <input type="text"  name="mb_addr1" value="<?=$member['mb_addr1']?>" id="reg_mb_addr1" <?=$config['cf_req_addr']?"required":"";?> title="행정구역주소<?=$config['cf_req_addr']?"(필수)":"";?>" class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" size="50">
+        <input type="text" name="mb_addr2" value="<?=$member['mb_addr2']?>" id="reg_mb_addr2" <?=$config['cf_req_addr']?"required":"";?> title="상세주소<?=$config['cf_req_addr']?"(필수)":"";?>" class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" size="50">
+        <script>
+        // 우편번호 자바스크립트 비활성화 대응을 위한 코드
+        $('<a href="<?=G4_BBS_URL?>/zip.php?frm_name=fregisterform&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2" id="reg_zip_find" class="btn_frmline win_zip_find" target="_blank">우편번호 검색</a><br>').appendTo('#reg_win_zip');
+        $("#reg_win_zip").css("display", "inline");
+        $("#reg_mb_zip1, #reg_mb_zip2, #reg_mb_addr1").attr('readonly', 'readonly');
+        </script>
     </td>
 </tr>
 <? } ?>
diff --git a/mobile/skin/member/kcpcert/register_form_update.tail.skin.php b/mobile/skin/member/kcpcert/register_form_update.tail.skin.php
index 414359db4..922a1a2f6 100644
--- a/mobile/skin/member/kcpcert/register_form_update.tail.skin.php
+++ b/mobile/skin/member/kcpcert/register_form_update.tail.skin.php
@@ -1,5 +1,28 @@
 <?
-if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 // 자신만의 코드를 넣어주세요.
+
+// 휴대폰번호 포맷(010-0000-0000) 변경해서 기록
+// $reg_mb_hp 는 rigister_form_update.head.skin.php 파일
+$sql = " update {$g4['member_table']}
+            set mb_hp = '$reg_mb_hp'
+            where mb_id = '$mb_id' ";
+sql_query($sql);
+
+/* =========================================================================== */
+/* = 휴대폰인증 및 성인인증                                                  = */
+/* =========================================================================== */
+if($_POST['kcpcert_no']) {
+    $mb_adult = 'N';
+    if(get_session('ss_adult_check') == 'Y')
+        $mb_adult = 'Y';
+
+    $sql = " update {$g4['member_table']}
+                set mb_hp_certify   = '{$_POST['kcpcert_time']}',
+                    mb_adult        = '$mb_adult'
+                where mb_id = '$mb_id' ";
+    sql_query($sql);
+}
+/* =========================================================================== */
 ?>
diff --git a/mobile/skin/member/kcpcert/style.css b/mobile/skin/member/kcpcert/style.css
index c83bb7a90..03a31acc6 100644
--- a/mobile/skin/member/kcpcert/style.css
+++ b/mobile/skin/member/kcpcert/style.css
@@ -22,6 +22,7 @@
 /* 아이디/패스워드 찾기 */
 #find_info_fs {margin:0 auto 1em;padding:1em;border-bottom:1px solid #eee}
 #find_info_fs #mb_email {width:100%}
+#find_info_fs .btn_submit {height:1.85em !important}
 #find_info #captcha {margin:0 0 1em;padding:0 1em 1em}
 #find_info #captcha input {margin-left:0.3em}
 
diff --git a/mobile/tail.php b/mobile/tail.php
index 1d7302527..a61bcb183 100644
--- a/mobile/tail.php
+++ b/mobile/tail.php
@@ -13,7 +13,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         <?
         $sql = " select * from {$g4['group_table']} where gr_show_menu = 1 order by gr_order ";
         $result = sql_query($sql);
-        for ($gi=0; $row=sql_fetch_array($result); $gi++) { // gi 는 group index 
+        for ($gi=0; $row=sql_fetch_array($result); $gi++) { // gi 는 group index
         ?>
         <li><a href="<?=G4_BBS_URL?>/group.php?gr_id=<?=$row['gr_id']?>"><?=$row['gr_subject']?></a></li>
         <?}?>
@@ -23,7 +23,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 <hr>
 
-<?=(G4_IS_MOBILE?poll('basic'):poll('basic')); // 설문조사 ?>
+<?=poll('basic'); // 설문조사 ?>
 
 <hr>
 
diff --git a/bbs/ckeditor/CHANGES.md b/plugin/ckeditor/CHANGES.md
similarity index 100%
rename from bbs/ckeditor/CHANGES.md
rename to plugin/ckeditor/CHANGES.md
diff --git a/bbs/ckeditor/LICENSE.md b/plugin/ckeditor/LICENSE.md
similarity index 100%
rename from bbs/ckeditor/LICENSE.md
rename to plugin/ckeditor/LICENSE.md
diff --git a/bbs/ckeditor/README.md b/plugin/ckeditor/README.md
similarity index 100%
rename from bbs/ckeditor/README.md
rename to plugin/ckeditor/README.md
diff --git a/bbs/ckeditor/build-config.js b/plugin/ckeditor/build-config.js
similarity index 100%
rename from bbs/ckeditor/build-config.js
rename to plugin/ckeditor/build-config.js
diff --git a/bbs/ckeditor/ckeditor.js b/plugin/ckeditor/ckeditor.js
similarity index 100%
rename from bbs/ckeditor/ckeditor.js
rename to plugin/ckeditor/ckeditor.js
diff --git a/bbs/ckeditor/ckeditor.lib.php b/plugin/ckeditor/ckeditor.lib.php
similarity index 100%
rename from bbs/ckeditor/ckeditor.lib.php
rename to plugin/ckeditor/ckeditor.lib.php
diff --git a/bbs/ckeditor/config.js b/plugin/ckeditor/config.js
similarity index 100%
rename from bbs/ckeditor/config.js
rename to plugin/ckeditor/config.js
diff --git a/bbs/ckeditor/contents.css b/plugin/ckeditor/contents.css
similarity index 100%
rename from bbs/ckeditor/contents.css
rename to plugin/ckeditor/contents.css
diff --git a/bbs/ckeditor/lang/af.js b/plugin/ckeditor/lang/af.js
similarity index 100%
rename from bbs/ckeditor/lang/af.js
rename to plugin/ckeditor/lang/af.js
diff --git a/bbs/ckeditor/lang/ar.js b/plugin/ckeditor/lang/ar.js
similarity index 100%
rename from bbs/ckeditor/lang/ar.js
rename to plugin/ckeditor/lang/ar.js
diff --git a/bbs/ckeditor/lang/bg.js b/plugin/ckeditor/lang/bg.js
similarity index 100%
rename from bbs/ckeditor/lang/bg.js
rename to plugin/ckeditor/lang/bg.js
diff --git a/bbs/ckeditor/lang/bn.js b/plugin/ckeditor/lang/bn.js
similarity index 100%
rename from bbs/ckeditor/lang/bn.js
rename to plugin/ckeditor/lang/bn.js
diff --git a/bbs/ckeditor/lang/bs.js b/plugin/ckeditor/lang/bs.js
similarity index 100%
rename from bbs/ckeditor/lang/bs.js
rename to plugin/ckeditor/lang/bs.js
diff --git a/bbs/ckeditor/lang/ca.js b/plugin/ckeditor/lang/ca.js
similarity index 100%
rename from bbs/ckeditor/lang/ca.js
rename to plugin/ckeditor/lang/ca.js
diff --git a/bbs/ckeditor/lang/cs.js b/plugin/ckeditor/lang/cs.js
similarity index 100%
rename from bbs/ckeditor/lang/cs.js
rename to plugin/ckeditor/lang/cs.js
diff --git a/bbs/ckeditor/lang/cy.js b/plugin/ckeditor/lang/cy.js
similarity index 100%
rename from bbs/ckeditor/lang/cy.js
rename to plugin/ckeditor/lang/cy.js
diff --git a/bbs/ckeditor/lang/da.js b/plugin/ckeditor/lang/da.js
similarity index 100%
rename from bbs/ckeditor/lang/da.js
rename to plugin/ckeditor/lang/da.js
diff --git a/bbs/ckeditor/lang/de.js b/plugin/ckeditor/lang/de.js
similarity index 100%
rename from bbs/ckeditor/lang/de.js
rename to plugin/ckeditor/lang/de.js
diff --git a/bbs/ckeditor/lang/el.js b/plugin/ckeditor/lang/el.js
similarity index 100%
rename from bbs/ckeditor/lang/el.js
rename to plugin/ckeditor/lang/el.js
diff --git a/bbs/ckeditor/lang/en-au.js b/plugin/ckeditor/lang/en-au.js
similarity index 100%
rename from bbs/ckeditor/lang/en-au.js
rename to plugin/ckeditor/lang/en-au.js
diff --git a/bbs/ckeditor/lang/en-ca.js b/plugin/ckeditor/lang/en-ca.js
similarity index 100%
rename from bbs/ckeditor/lang/en-ca.js
rename to plugin/ckeditor/lang/en-ca.js
diff --git a/bbs/ckeditor/lang/en-gb.js b/plugin/ckeditor/lang/en-gb.js
similarity index 100%
rename from bbs/ckeditor/lang/en-gb.js
rename to plugin/ckeditor/lang/en-gb.js
diff --git a/bbs/ckeditor/lang/en.js b/plugin/ckeditor/lang/en.js
similarity index 100%
rename from bbs/ckeditor/lang/en.js
rename to plugin/ckeditor/lang/en.js
diff --git a/bbs/ckeditor/lang/eo.js b/plugin/ckeditor/lang/eo.js
similarity index 100%
rename from bbs/ckeditor/lang/eo.js
rename to plugin/ckeditor/lang/eo.js
diff --git a/bbs/ckeditor/lang/es.js b/plugin/ckeditor/lang/es.js
similarity index 100%
rename from bbs/ckeditor/lang/es.js
rename to plugin/ckeditor/lang/es.js
diff --git a/bbs/ckeditor/lang/et.js b/plugin/ckeditor/lang/et.js
similarity index 100%
rename from bbs/ckeditor/lang/et.js
rename to plugin/ckeditor/lang/et.js
diff --git a/bbs/ckeditor/lang/eu.js b/plugin/ckeditor/lang/eu.js
similarity index 100%
rename from bbs/ckeditor/lang/eu.js
rename to plugin/ckeditor/lang/eu.js
diff --git a/bbs/ckeditor/lang/fa.js b/plugin/ckeditor/lang/fa.js
similarity index 100%
rename from bbs/ckeditor/lang/fa.js
rename to plugin/ckeditor/lang/fa.js
diff --git a/bbs/ckeditor/lang/fi.js b/plugin/ckeditor/lang/fi.js
similarity index 100%
rename from bbs/ckeditor/lang/fi.js
rename to plugin/ckeditor/lang/fi.js
diff --git a/bbs/ckeditor/lang/fo.js b/plugin/ckeditor/lang/fo.js
similarity index 100%
rename from bbs/ckeditor/lang/fo.js
rename to plugin/ckeditor/lang/fo.js
diff --git a/bbs/ckeditor/lang/fr-ca.js b/plugin/ckeditor/lang/fr-ca.js
similarity index 100%
rename from bbs/ckeditor/lang/fr-ca.js
rename to plugin/ckeditor/lang/fr-ca.js
diff --git a/bbs/ckeditor/lang/fr.js b/plugin/ckeditor/lang/fr.js
similarity index 100%
rename from bbs/ckeditor/lang/fr.js
rename to plugin/ckeditor/lang/fr.js
diff --git a/bbs/ckeditor/lang/gl.js b/plugin/ckeditor/lang/gl.js
similarity index 100%
rename from bbs/ckeditor/lang/gl.js
rename to plugin/ckeditor/lang/gl.js
diff --git a/bbs/ckeditor/lang/gu.js b/plugin/ckeditor/lang/gu.js
similarity index 100%
rename from bbs/ckeditor/lang/gu.js
rename to plugin/ckeditor/lang/gu.js
diff --git a/bbs/ckeditor/lang/he.js b/plugin/ckeditor/lang/he.js
similarity index 100%
rename from bbs/ckeditor/lang/he.js
rename to plugin/ckeditor/lang/he.js
diff --git a/bbs/ckeditor/lang/hi.js b/plugin/ckeditor/lang/hi.js
similarity index 100%
rename from bbs/ckeditor/lang/hi.js
rename to plugin/ckeditor/lang/hi.js
diff --git a/bbs/ckeditor/lang/hr.js b/plugin/ckeditor/lang/hr.js
similarity index 100%
rename from bbs/ckeditor/lang/hr.js
rename to plugin/ckeditor/lang/hr.js
diff --git a/bbs/ckeditor/lang/hu.js b/plugin/ckeditor/lang/hu.js
similarity index 100%
rename from bbs/ckeditor/lang/hu.js
rename to plugin/ckeditor/lang/hu.js
diff --git a/bbs/ckeditor/lang/is.js b/plugin/ckeditor/lang/is.js
similarity index 100%
rename from bbs/ckeditor/lang/is.js
rename to plugin/ckeditor/lang/is.js
diff --git a/bbs/ckeditor/lang/it.js b/plugin/ckeditor/lang/it.js
similarity index 100%
rename from bbs/ckeditor/lang/it.js
rename to plugin/ckeditor/lang/it.js
diff --git a/bbs/ckeditor/lang/ja.js b/plugin/ckeditor/lang/ja.js
similarity index 100%
rename from bbs/ckeditor/lang/ja.js
rename to plugin/ckeditor/lang/ja.js
diff --git a/bbs/ckeditor/lang/ka.js b/plugin/ckeditor/lang/ka.js
similarity index 100%
rename from bbs/ckeditor/lang/ka.js
rename to plugin/ckeditor/lang/ka.js
diff --git a/bbs/ckeditor/lang/km.js b/plugin/ckeditor/lang/km.js
similarity index 100%
rename from bbs/ckeditor/lang/km.js
rename to plugin/ckeditor/lang/km.js
diff --git a/bbs/ckeditor/lang/ko.js b/plugin/ckeditor/lang/ko.js
similarity index 100%
rename from bbs/ckeditor/lang/ko.js
rename to plugin/ckeditor/lang/ko.js
diff --git a/bbs/ckeditor/lang/ku.js b/plugin/ckeditor/lang/ku.js
similarity index 100%
rename from bbs/ckeditor/lang/ku.js
rename to plugin/ckeditor/lang/ku.js
diff --git a/bbs/ckeditor/lang/lt.js b/plugin/ckeditor/lang/lt.js
similarity index 100%
rename from bbs/ckeditor/lang/lt.js
rename to plugin/ckeditor/lang/lt.js
diff --git a/bbs/ckeditor/lang/lv.js b/plugin/ckeditor/lang/lv.js
similarity index 100%
rename from bbs/ckeditor/lang/lv.js
rename to plugin/ckeditor/lang/lv.js
diff --git a/bbs/ckeditor/lang/mk.js b/plugin/ckeditor/lang/mk.js
similarity index 100%
rename from bbs/ckeditor/lang/mk.js
rename to plugin/ckeditor/lang/mk.js
diff --git a/bbs/ckeditor/lang/mn.js b/plugin/ckeditor/lang/mn.js
similarity index 100%
rename from bbs/ckeditor/lang/mn.js
rename to plugin/ckeditor/lang/mn.js
diff --git a/bbs/ckeditor/lang/ms.js b/plugin/ckeditor/lang/ms.js
similarity index 100%
rename from bbs/ckeditor/lang/ms.js
rename to plugin/ckeditor/lang/ms.js
diff --git a/bbs/ckeditor/lang/nb.js b/plugin/ckeditor/lang/nb.js
similarity index 100%
rename from bbs/ckeditor/lang/nb.js
rename to plugin/ckeditor/lang/nb.js
diff --git a/bbs/ckeditor/lang/nl.js b/plugin/ckeditor/lang/nl.js
similarity index 100%
rename from bbs/ckeditor/lang/nl.js
rename to plugin/ckeditor/lang/nl.js
diff --git a/bbs/ckeditor/lang/no.js b/plugin/ckeditor/lang/no.js
similarity index 100%
rename from bbs/ckeditor/lang/no.js
rename to plugin/ckeditor/lang/no.js
diff --git a/bbs/ckeditor/lang/pl.js b/plugin/ckeditor/lang/pl.js
similarity index 100%
rename from bbs/ckeditor/lang/pl.js
rename to plugin/ckeditor/lang/pl.js
diff --git a/bbs/ckeditor/lang/pt-br.js b/plugin/ckeditor/lang/pt-br.js
similarity index 100%
rename from bbs/ckeditor/lang/pt-br.js
rename to plugin/ckeditor/lang/pt-br.js
diff --git a/bbs/ckeditor/lang/pt.js b/plugin/ckeditor/lang/pt.js
similarity index 100%
rename from bbs/ckeditor/lang/pt.js
rename to plugin/ckeditor/lang/pt.js
diff --git a/bbs/ckeditor/lang/ro.js b/plugin/ckeditor/lang/ro.js
similarity index 100%
rename from bbs/ckeditor/lang/ro.js
rename to plugin/ckeditor/lang/ro.js
diff --git a/bbs/ckeditor/lang/ru.js b/plugin/ckeditor/lang/ru.js
similarity index 100%
rename from bbs/ckeditor/lang/ru.js
rename to plugin/ckeditor/lang/ru.js
diff --git a/bbs/ckeditor/lang/sk.js b/plugin/ckeditor/lang/sk.js
similarity index 100%
rename from bbs/ckeditor/lang/sk.js
rename to plugin/ckeditor/lang/sk.js
diff --git a/bbs/ckeditor/lang/sl.js b/plugin/ckeditor/lang/sl.js
similarity index 100%
rename from bbs/ckeditor/lang/sl.js
rename to plugin/ckeditor/lang/sl.js
diff --git a/bbs/ckeditor/lang/sr-latn.js b/plugin/ckeditor/lang/sr-latn.js
similarity index 100%
rename from bbs/ckeditor/lang/sr-latn.js
rename to plugin/ckeditor/lang/sr-latn.js
diff --git a/bbs/ckeditor/lang/sr.js b/plugin/ckeditor/lang/sr.js
similarity index 100%
rename from bbs/ckeditor/lang/sr.js
rename to plugin/ckeditor/lang/sr.js
diff --git a/bbs/ckeditor/lang/sv.js b/plugin/ckeditor/lang/sv.js
similarity index 100%
rename from bbs/ckeditor/lang/sv.js
rename to plugin/ckeditor/lang/sv.js
diff --git a/bbs/ckeditor/lang/th.js b/plugin/ckeditor/lang/th.js
similarity index 100%
rename from bbs/ckeditor/lang/th.js
rename to plugin/ckeditor/lang/th.js
diff --git a/bbs/ckeditor/lang/tr.js b/plugin/ckeditor/lang/tr.js
similarity index 100%
rename from bbs/ckeditor/lang/tr.js
rename to plugin/ckeditor/lang/tr.js
diff --git a/bbs/ckeditor/lang/ug.js b/plugin/ckeditor/lang/ug.js
similarity index 100%
rename from bbs/ckeditor/lang/ug.js
rename to plugin/ckeditor/lang/ug.js
diff --git a/bbs/ckeditor/lang/uk.js b/plugin/ckeditor/lang/uk.js
similarity index 100%
rename from bbs/ckeditor/lang/uk.js
rename to plugin/ckeditor/lang/uk.js
diff --git a/bbs/ckeditor/lang/vi.js b/plugin/ckeditor/lang/vi.js
similarity index 100%
rename from bbs/ckeditor/lang/vi.js
rename to plugin/ckeditor/lang/vi.js
diff --git a/bbs/ckeditor/lang/zh-cn.js b/plugin/ckeditor/lang/zh-cn.js
similarity index 100%
rename from bbs/ckeditor/lang/zh-cn.js
rename to plugin/ckeditor/lang/zh-cn.js
diff --git a/bbs/ckeditor/lang/zh.js b/plugin/ckeditor/lang/zh.js
similarity index 100%
rename from bbs/ckeditor/lang/zh.js
rename to plugin/ckeditor/lang/zh.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/da.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/de.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/el.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/en.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/et.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/he.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/it.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/no.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
diff --git a/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js b/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
similarity index 100%
rename from bbs/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
rename to plugin/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
diff --git a/bbs/ckeditor/plugins/about/dialogs/about.js b/plugin/ckeditor/plugins/about/dialogs/about.js
similarity index 100%
rename from bbs/ckeditor/plugins/about/dialogs/about.js
rename to plugin/ckeditor/plugins/about/dialogs/about.js
diff --git a/bbs/ckeditor/plugins/about/dialogs/logo_ckeditor.png b/plugin/ckeditor/plugins/about/dialogs/logo_ckeditor.png
similarity index 100%
rename from bbs/ckeditor/plugins/about/dialogs/logo_ckeditor.png
rename to plugin/ckeditor/plugins/about/dialogs/logo_ckeditor.png
diff --git a/bbs/ckeditor/plugins/clipboard/dialogs/paste.js b/plugin/ckeditor/plugins/clipboard/dialogs/paste.js
similarity index 100%
rename from bbs/ckeditor/plugins/clipboard/dialogs/paste.js
rename to plugin/ckeditor/plugins/clipboard/dialogs/paste.js
diff --git a/bbs/ckeditor/plugins/colordialog/dialogs/colordialog.js b/plugin/ckeditor/plugins/colordialog/dialogs/colordialog.js
similarity index 100%
rename from bbs/ckeditor/plugins/colordialog/dialogs/colordialog.js
rename to plugin/ckeditor/plugins/colordialog/dialogs/colordialog.js
diff --git a/bbs/ckeditor/plugins/dialog/dialogDefinition.js b/plugin/ckeditor/plugins/dialog/dialogDefinition.js
similarity index 100%
rename from bbs/ckeditor/plugins/dialog/dialogDefinition.js
rename to plugin/ckeditor/plugins/dialog/dialogDefinition.js
diff --git a/bbs/ckeditor/plugins/div/dialogs/div.js b/plugin/ckeditor/plugins/div/dialogs/div.js
similarity index 100%
rename from bbs/ckeditor/plugins/div/dialogs/div.js
rename to plugin/ckeditor/plugins/div/dialogs/div.js
diff --git a/bbs/ckeditor/plugins/fakeobjects/images/spacer.gif b/plugin/ckeditor/plugins/fakeobjects/images/spacer.gif
similarity index 100%
rename from bbs/ckeditor/plugins/fakeobjects/images/spacer.gif
rename to plugin/ckeditor/plugins/fakeobjects/images/spacer.gif
diff --git a/bbs/ckeditor/plugins/find/dialogs/find.js b/plugin/ckeditor/plugins/find/dialogs/find.js
similarity index 100%
rename from bbs/ckeditor/plugins/find/dialogs/find.js
rename to plugin/ckeditor/plugins/find/dialogs/find.js
diff --git a/bbs/ckeditor/plugins/flash/dialogs/flash.js b/plugin/ckeditor/plugins/flash/dialogs/flash.js
similarity index 100%
rename from bbs/ckeditor/plugins/flash/dialogs/flash.js
rename to plugin/ckeditor/plugins/flash/dialogs/flash.js
diff --git a/bbs/ckeditor/plugins/flash/images/placeholder.png b/plugin/ckeditor/plugins/flash/images/placeholder.png
similarity index 100%
rename from bbs/ckeditor/plugins/flash/images/placeholder.png
rename to plugin/ckeditor/plugins/flash/images/placeholder.png
diff --git a/bbs/ckeditor/plugins/forms/dialogs/button.js b/plugin/ckeditor/plugins/forms/dialogs/button.js
similarity index 100%
rename from bbs/ckeditor/plugins/forms/dialogs/button.js
rename to plugin/ckeditor/plugins/forms/dialogs/button.js
diff --git a/bbs/ckeditor/plugins/forms/dialogs/checkbox.js b/plugin/ckeditor/plugins/forms/dialogs/checkbox.js
similarity index 100%
rename from bbs/ckeditor/plugins/forms/dialogs/checkbox.js
rename to plugin/ckeditor/plugins/forms/dialogs/checkbox.js
diff --git a/bbs/ckeditor/plugins/forms/dialogs/form.js b/plugin/ckeditor/plugins/forms/dialogs/form.js
similarity index 100%
rename from bbs/ckeditor/plugins/forms/dialogs/form.js
rename to plugin/ckeditor/plugins/forms/dialogs/form.js
diff --git a/bbs/ckeditor/plugins/forms/dialogs/hiddenfield.js b/plugin/ckeditor/plugins/forms/dialogs/hiddenfield.js
similarity index 100%
rename from bbs/ckeditor/plugins/forms/dialogs/hiddenfield.js
rename to plugin/ckeditor/plugins/forms/dialogs/hiddenfield.js
diff --git a/bbs/ckeditor/plugins/forms/dialogs/radio.js b/plugin/ckeditor/plugins/forms/dialogs/radio.js
similarity index 100%
rename from bbs/ckeditor/plugins/forms/dialogs/radio.js
rename to plugin/ckeditor/plugins/forms/dialogs/radio.js
diff --git a/bbs/ckeditor/plugins/forms/dialogs/select.js b/plugin/ckeditor/plugins/forms/dialogs/select.js
similarity index 100%
rename from bbs/ckeditor/plugins/forms/dialogs/select.js
rename to plugin/ckeditor/plugins/forms/dialogs/select.js
diff --git a/bbs/ckeditor/plugins/forms/dialogs/textarea.js b/plugin/ckeditor/plugins/forms/dialogs/textarea.js
similarity index 100%
rename from bbs/ckeditor/plugins/forms/dialogs/textarea.js
rename to plugin/ckeditor/plugins/forms/dialogs/textarea.js
diff --git a/bbs/ckeditor/plugins/forms/dialogs/textfield.js b/plugin/ckeditor/plugins/forms/dialogs/textfield.js
similarity index 100%
rename from bbs/ckeditor/plugins/forms/dialogs/textfield.js
rename to plugin/ckeditor/plugins/forms/dialogs/textfield.js
diff --git a/bbs/ckeditor/plugins/forms/images/hiddenfield.gif b/plugin/ckeditor/plugins/forms/images/hiddenfield.gif
similarity index 100%
rename from bbs/ckeditor/plugins/forms/images/hiddenfield.gif
rename to plugin/ckeditor/plugins/forms/images/hiddenfield.gif
diff --git a/bbs/ckeditor/plugins/icons.png b/plugin/ckeditor/plugins/icons.png
similarity index 100%
rename from bbs/ckeditor/plugins/icons.png
rename to plugin/ckeditor/plugins/icons.png
diff --git a/bbs/ckeditor/plugins/iframe/dialogs/iframe.js b/plugin/ckeditor/plugins/iframe/dialogs/iframe.js
similarity index 100%
rename from bbs/ckeditor/plugins/iframe/dialogs/iframe.js
rename to plugin/ckeditor/plugins/iframe/dialogs/iframe.js
diff --git a/bbs/ckeditor/plugins/iframe/images/placeholder.png b/plugin/ckeditor/plugins/iframe/images/placeholder.png
similarity index 100%
rename from bbs/ckeditor/plugins/iframe/images/placeholder.png
rename to plugin/ckeditor/plugins/iframe/images/placeholder.png
diff --git a/bbs/ckeditor/plugins/image/dialogs/image.js b/plugin/ckeditor/plugins/image/dialogs/image.js
similarity index 100%
rename from bbs/ckeditor/plugins/image/dialogs/image.js
rename to plugin/ckeditor/plugins/image/dialogs/image.js
diff --git a/bbs/ckeditor/plugins/image/images/noimage.png b/plugin/ckeditor/plugins/image/images/noimage.png
similarity index 100%
rename from bbs/ckeditor/plugins/image/images/noimage.png
rename to plugin/ckeditor/plugins/image/images/noimage.png
diff --git a/bbs/ckeditor/plugins/link/dialogs/anchor.js b/plugin/ckeditor/plugins/link/dialogs/anchor.js
similarity index 100%
rename from bbs/ckeditor/plugins/link/dialogs/anchor.js
rename to plugin/ckeditor/plugins/link/dialogs/anchor.js
diff --git a/bbs/ckeditor/plugins/link/dialogs/link.js b/plugin/ckeditor/plugins/link/dialogs/link.js
similarity index 100%
rename from bbs/ckeditor/plugins/link/dialogs/link.js
rename to plugin/ckeditor/plugins/link/dialogs/link.js
diff --git a/bbs/ckeditor/plugins/link/images/anchor.png b/plugin/ckeditor/plugins/link/images/anchor.png
similarity index 100%
rename from bbs/ckeditor/plugins/link/images/anchor.png
rename to plugin/ckeditor/plugins/link/images/anchor.png
diff --git a/bbs/ckeditor/plugins/liststyle/dialogs/liststyle.js b/plugin/ckeditor/plugins/liststyle/dialogs/liststyle.js
similarity index 100%
rename from bbs/ckeditor/plugins/liststyle/dialogs/liststyle.js
rename to plugin/ckeditor/plugins/liststyle/dialogs/liststyle.js
diff --git a/bbs/ckeditor/plugins/magicline/images/icon.png b/plugin/ckeditor/plugins/magicline/images/icon.png
similarity index 100%
rename from bbs/ckeditor/plugins/magicline/images/icon.png
rename to plugin/ckeditor/plugins/magicline/images/icon.png
diff --git a/bbs/ckeditor/plugins/pagebreak/images/pagebreak.gif b/plugin/ckeditor/plugins/pagebreak/images/pagebreak.gif
similarity index 100%
rename from bbs/ckeditor/plugins/pagebreak/images/pagebreak.gif
rename to plugin/ckeditor/plugins/pagebreak/images/pagebreak.gif
diff --git a/bbs/ckeditor/plugins/pastefromword/filter/default.js b/plugin/ckeditor/plugins/pastefromword/filter/default.js
similarity index 100%
rename from bbs/ckeditor/plugins/pastefromword/filter/default.js
rename to plugin/ckeditor/plugins/pastefromword/filter/default.js
diff --git a/bbs/ckeditor/plugins/preview/preview.html b/plugin/ckeditor/plugins/preview/preview.html
similarity index 100%
rename from bbs/ckeditor/plugins/preview/preview.html
rename to plugin/ckeditor/plugins/preview/preview.html
diff --git a/bbs/ckeditor/plugins/showblocks/images/block_address.png b/plugin/ckeditor/plugins/showblocks/images/block_address.png
similarity index 100%
rename from bbs/ckeditor/plugins/showblocks/images/block_address.png
rename to plugin/ckeditor/plugins/showblocks/images/block_address.png
diff --git a/bbs/ckeditor/plugins/showblocks/images/block_blockquote.png b/plugin/ckeditor/plugins/showblocks/images/block_blockquote.png
similarity index 100%
rename from bbs/ckeditor/plugins/showblocks/images/block_blockquote.png
rename to plugin/ckeditor/plugins/showblocks/images/block_blockquote.png
diff --git a/bbs/ckeditor/plugins/showblocks/images/block_div.png b/plugin/ckeditor/plugins/showblocks/images/block_div.png
similarity index 100%
rename from bbs/ckeditor/plugins/showblocks/images/block_div.png
rename to plugin/ckeditor/plugins/showblocks/images/block_div.png
diff --git a/bbs/ckeditor/plugins/showblocks/images/block_h1.png b/plugin/ckeditor/plugins/showblocks/images/block_h1.png
similarity index 100%
rename from bbs/ckeditor/plugins/showblocks/images/block_h1.png
rename to plugin/ckeditor/plugins/showblocks/images/block_h1.png
diff --git a/bbs/ckeditor/plugins/showblocks/images/block_h2.png b/plugin/ckeditor/plugins/showblocks/images/block_h2.png
similarity index 100%
rename from bbs/ckeditor/plugins/showblocks/images/block_h2.png
rename to plugin/ckeditor/plugins/showblocks/images/block_h2.png
diff --git a/bbs/ckeditor/plugins/showblocks/images/block_h3.png b/plugin/ckeditor/plugins/showblocks/images/block_h3.png
similarity index 100%
rename from bbs/ckeditor/plugins/showblocks/images/block_h3.png
rename to plugin/ckeditor/plugins/showblocks/images/block_h3.png
diff --git a/bbs/ckeditor/plugins/showblocks/images/block_h4.png b/plugin/ckeditor/plugins/showblocks/images/block_h4.png
similarity index 100%
rename from bbs/ckeditor/plugins/showblocks/images/block_h4.png
rename to plugin/ckeditor/plugins/showblocks/images/block_h4.png
diff --git a/bbs/ckeditor/plugins/showblocks/images/block_h5.png b/plugin/ckeditor/plugins/showblocks/images/block_h5.png
similarity index 100%
rename from bbs/ckeditor/plugins/showblocks/images/block_h5.png
rename to plugin/ckeditor/plugins/showblocks/images/block_h5.png
diff --git a/bbs/ckeditor/plugins/showblocks/images/block_h6.png b/plugin/ckeditor/plugins/showblocks/images/block_h6.png
similarity index 100%
rename from bbs/ckeditor/plugins/showblocks/images/block_h6.png
rename to plugin/ckeditor/plugins/showblocks/images/block_h6.png
diff --git a/bbs/ckeditor/plugins/showblocks/images/block_p.png b/plugin/ckeditor/plugins/showblocks/images/block_p.png
similarity index 100%
rename from bbs/ckeditor/plugins/showblocks/images/block_p.png
rename to plugin/ckeditor/plugins/showblocks/images/block_p.png
diff --git a/bbs/ckeditor/plugins/showblocks/images/block_pre.png b/plugin/ckeditor/plugins/showblocks/images/block_pre.png
similarity index 100%
rename from bbs/ckeditor/plugins/showblocks/images/block_pre.png
rename to plugin/ckeditor/plugins/showblocks/images/block_pre.png
diff --git a/bbs/ckeditor/plugins/smiley/dialogs/smiley.js b/plugin/ckeditor/plugins/smiley/dialogs/smiley.js
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/dialogs/smiley.js
rename to plugin/ckeditor/plugins/smiley/dialogs/smiley.js
diff --git a/bbs/ckeditor/plugins/smiley/images/angel_smile.gif b/plugin/ckeditor/plugins/smiley/images/angel_smile.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/angel_smile.gif
rename to plugin/ckeditor/plugins/smiley/images/angel_smile.gif
diff --git a/bbs/ckeditor/plugins/smiley/images/angry_smile.gif b/plugin/ckeditor/plugins/smiley/images/angry_smile.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/angry_smile.gif
rename to plugin/ckeditor/plugins/smiley/images/angry_smile.gif
diff --git a/bbs/ckeditor/plugins/smiley/images/broken_heart.gif b/plugin/ckeditor/plugins/smiley/images/broken_heart.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/broken_heart.gif
rename to plugin/ckeditor/plugins/smiley/images/broken_heart.gif
diff --git a/bbs/ckeditor/plugins/smiley/images/confused_smile.gif b/plugin/ckeditor/plugins/smiley/images/confused_smile.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/confused_smile.gif
rename to plugin/ckeditor/plugins/smiley/images/confused_smile.gif
diff --git a/bbs/ckeditor/plugins/smiley/images/cry_smile.gif b/plugin/ckeditor/plugins/smiley/images/cry_smile.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/cry_smile.gif
rename to plugin/ckeditor/plugins/smiley/images/cry_smile.gif
diff --git a/bbs/ckeditor/plugins/smiley/images/devil_smile.gif b/plugin/ckeditor/plugins/smiley/images/devil_smile.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/devil_smile.gif
rename to plugin/ckeditor/plugins/smiley/images/devil_smile.gif
diff --git a/bbs/ckeditor/plugins/smiley/images/embaressed_smile.gif b/plugin/ckeditor/plugins/smiley/images/embaressed_smile.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/embaressed_smile.gif
rename to plugin/ckeditor/plugins/smiley/images/embaressed_smile.gif
diff --git a/bbs/ckeditor/plugins/smiley/images/embarrassed_smile.gif b/plugin/ckeditor/plugins/smiley/images/embarrassed_smile.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/embarrassed_smile.gif
rename to plugin/ckeditor/plugins/smiley/images/embarrassed_smile.gif
diff --git a/bbs/ckeditor/plugins/smiley/images/envelope.gif b/plugin/ckeditor/plugins/smiley/images/envelope.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/envelope.gif
rename to plugin/ckeditor/plugins/smiley/images/envelope.gif
diff --git a/bbs/ckeditor/plugins/smiley/images/heart.gif b/plugin/ckeditor/plugins/smiley/images/heart.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/heart.gif
rename to plugin/ckeditor/plugins/smiley/images/heart.gif
diff --git a/bbs/ckeditor/plugins/smiley/images/kiss.gif b/plugin/ckeditor/plugins/smiley/images/kiss.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/kiss.gif
rename to plugin/ckeditor/plugins/smiley/images/kiss.gif
diff --git a/bbs/ckeditor/plugins/smiley/images/lightbulb.gif b/plugin/ckeditor/plugins/smiley/images/lightbulb.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/lightbulb.gif
rename to plugin/ckeditor/plugins/smiley/images/lightbulb.gif
diff --git a/bbs/ckeditor/plugins/smiley/images/omg_smile.gif b/plugin/ckeditor/plugins/smiley/images/omg_smile.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/omg_smile.gif
rename to plugin/ckeditor/plugins/smiley/images/omg_smile.gif
diff --git a/bbs/ckeditor/plugins/smiley/images/regular_smile.gif b/plugin/ckeditor/plugins/smiley/images/regular_smile.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/regular_smile.gif
rename to plugin/ckeditor/plugins/smiley/images/regular_smile.gif
diff --git a/bbs/ckeditor/plugins/smiley/images/sad_smile.gif b/plugin/ckeditor/plugins/smiley/images/sad_smile.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/sad_smile.gif
rename to plugin/ckeditor/plugins/smiley/images/sad_smile.gif
diff --git a/bbs/ckeditor/plugins/smiley/images/shades_smile.gif b/plugin/ckeditor/plugins/smiley/images/shades_smile.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/shades_smile.gif
rename to plugin/ckeditor/plugins/smiley/images/shades_smile.gif
diff --git a/bbs/ckeditor/plugins/smiley/images/teeth_smile.gif b/plugin/ckeditor/plugins/smiley/images/teeth_smile.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/teeth_smile.gif
rename to plugin/ckeditor/plugins/smiley/images/teeth_smile.gif
diff --git a/bbs/ckeditor/plugins/smiley/images/thumbs_down.gif b/plugin/ckeditor/plugins/smiley/images/thumbs_down.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/thumbs_down.gif
rename to plugin/ckeditor/plugins/smiley/images/thumbs_down.gif
diff --git a/bbs/ckeditor/plugins/smiley/images/thumbs_up.gif b/plugin/ckeditor/plugins/smiley/images/thumbs_up.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/thumbs_up.gif
rename to plugin/ckeditor/plugins/smiley/images/thumbs_up.gif
diff --git a/bbs/ckeditor/plugins/smiley/images/tongue_smile.gif b/plugin/ckeditor/plugins/smiley/images/tongue_smile.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/tongue_smile.gif
rename to plugin/ckeditor/plugins/smiley/images/tongue_smile.gif
diff --git a/bbs/ckeditor/plugins/smiley/images/tounge_smile.gif b/plugin/ckeditor/plugins/smiley/images/tounge_smile.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/tounge_smile.gif
rename to plugin/ckeditor/plugins/smiley/images/tounge_smile.gif
diff --git a/bbs/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif b/plugin/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
rename to plugin/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
diff --git a/bbs/ckeditor/plugins/smiley/images/wink_smile.gif b/plugin/ckeditor/plugins/smiley/images/wink_smile.gif
similarity index 100%
rename from bbs/ckeditor/plugins/smiley/images/wink_smile.gif
rename to plugin/ckeditor/plugins/smiley/images/wink_smile.gif
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt b/plugin/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/ca.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/ca.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/ca.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/ca.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/cs.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/cs.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/cs.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/cs.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/cy.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/cy.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/cy.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/cy.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/de.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/de.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/de.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/de.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/el.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/el.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/el.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/el.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/en.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/en.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/en.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/en.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/eo.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/eo.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/eo.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/eo.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/et.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/et.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/et.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/et.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/fa.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/fa.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/fa.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/fa.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/fi.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/fi.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/fi.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/fi.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/fr.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/fr.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/fr.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/fr.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/he.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/he.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/he.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/he.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/hr.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/hr.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/hr.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/hr.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/it.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/it.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/it.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/it.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/ku.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/ku.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/ku.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/ku.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/lv.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/lv.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/lv.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/lv.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/nb.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/nb.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/nb.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/nb.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/nl.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/nl.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/nl.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/nl.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/no.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/no.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/no.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/no.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/sk.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/sk.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/sk.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/sk.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/tr.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/tr.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/tr.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/tr.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/ug.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/ug.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/ug.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/ug.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js b/plugin/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
diff --git a/bbs/ckeditor/plugins/specialchar/dialogs/specialchar.js b/plugin/ckeditor/plugins/specialchar/dialogs/specialchar.js
similarity index 100%
rename from bbs/ckeditor/plugins/specialchar/dialogs/specialchar.js
rename to plugin/ckeditor/plugins/specialchar/dialogs/specialchar.js
diff --git a/bbs/ckeditor/plugins/table/dialogs/table.js b/plugin/ckeditor/plugins/table/dialogs/table.js
similarity index 100%
rename from bbs/ckeditor/plugins/table/dialogs/table.js
rename to plugin/ckeditor/plugins/table/dialogs/table.js
diff --git a/bbs/ckeditor/plugins/tabletools/dialogs/tableCell.js b/plugin/ckeditor/plugins/tabletools/dialogs/tableCell.js
similarity index 100%
rename from bbs/ckeditor/plugins/tabletools/dialogs/tableCell.js
rename to plugin/ckeditor/plugins/tabletools/dialogs/tableCell.js
diff --git a/bbs/ckeditor/plugins/templates/dialogs/templates.css b/plugin/ckeditor/plugins/templates/dialogs/templates.css
similarity index 100%
rename from bbs/ckeditor/plugins/templates/dialogs/templates.css
rename to plugin/ckeditor/plugins/templates/dialogs/templates.css
diff --git a/bbs/ckeditor/plugins/templates/dialogs/templates.js b/plugin/ckeditor/plugins/templates/dialogs/templates.js
similarity index 100%
rename from bbs/ckeditor/plugins/templates/dialogs/templates.js
rename to plugin/ckeditor/plugins/templates/dialogs/templates.js
diff --git a/bbs/ckeditor/plugins/templates/templates/default.js b/plugin/ckeditor/plugins/templates/templates/default.js
similarity index 100%
rename from bbs/ckeditor/plugins/templates/templates/default.js
rename to plugin/ckeditor/plugins/templates/templates/default.js
diff --git a/bbs/ckeditor/plugins/templates/templates/images/template1.gif b/plugin/ckeditor/plugins/templates/templates/images/template1.gif
similarity index 100%
rename from bbs/ckeditor/plugins/templates/templates/images/template1.gif
rename to plugin/ckeditor/plugins/templates/templates/images/template1.gif
diff --git a/bbs/ckeditor/plugins/templates/templates/images/template2.gif b/plugin/ckeditor/plugins/templates/templates/images/template2.gif
similarity index 100%
rename from bbs/ckeditor/plugins/templates/templates/images/template2.gif
rename to plugin/ckeditor/plugins/templates/templates/images/template2.gif
diff --git a/bbs/ckeditor/plugins/templates/templates/images/template3.gif b/plugin/ckeditor/plugins/templates/templates/images/template3.gif
similarity index 100%
rename from bbs/ckeditor/plugins/templates/templates/images/template3.gif
rename to plugin/ckeditor/plugins/templates/templates/images/template3.gif
diff --git a/bbs/ckeditor/samples/ajax.html b/plugin/ckeditor/samples/ajax.html
similarity index 100%
rename from bbs/ckeditor/samples/ajax.html
rename to plugin/ckeditor/samples/ajax.html
diff --git a/bbs/ckeditor/samples/api.html b/plugin/ckeditor/samples/api.html
similarity index 100%
rename from bbs/ckeditor/samples/api.html
rename to plugin/ckeditor/samples/api.html
diff --git a/bbs/ckeditor/samples/appendto.html b/plugin/ckeditor/samples/appendto.html
similarity index 100%
rename from bbs/ckeditor/samples/appendto.html
rename to plugin/ckeditor/samples/appendto.html
diff --git a/bbs/ckeditor/samples/assets/inlineall/logo.png b/plugin/ckeditor/samples/assets/inlineall/logo.png
similarity index 100%
rename from bbs/ckeditor/samples/assets/inlineall/logo.png
rename to plugin/ckeditor/samples/assets/inlineall/logo.png
diff --git a/bbs/ckeditor/samples/assets/outputxhtml/outputxhtml.css b/plugin/ckeditor/samples/assets/outputxhtml/outputxhtml.css
similarity index 100%
rename from bbs/ckeditor/samples/assets/outputxhtml/outputxhtml.css
rename to plugin/ckeditor/samples/assets/outputxhtml/outputxhtml.css
diff --git a/bbs/ckeditor/samples/assets/posteddata.php b/plugin/ckeditor/samples/assets/posteddata.php
similarity index 100%
rename from bbs/ckeditor/samples/assets/posteddata.php
rename to plugin/ckeditor/samples/assets/posteddata.php
diff --git a/bbs/ckeditor/samples/assets/sample.css b/plugin/ckeditor/samples/assets/sample.css
similarity index 100%
rename from bbs/ckeditor/samples/assets/sample.css
rename to plugin/ckeditor/samples/assets/sample.css
diff --git a/bbs/ckeditor/samples/assets/sample.jpg b/plugin/ckeditor/samples/assets/sample.jpg
similarity index 100%
rename from bbs/ckeditor/samples/assets/sample.jpg
rename to plugin/ckeditor/samples/assets/sample.jpg
diff --git a/bbs/ckeditor/samples/assets/uilanguages/languages.js b/plugin/ckeditor/samples/assets/uilanguages/languages.js
similarity index 100%
rename from bbs/ckeditor/samples/assets/uilanguages/languages.js
rename to plugin/ckeditor/samples/assets/uilanguages/languages.js
diff --git a/bbs/ckeditor/samples/divreplace.html b/plugin/ckeditor/samples/divreplace.html
similarity index 100%
rename from bbs/ckeditor/samples/divreplace.html
rename to plugin/ckeditor/samples/divreplace.html
diff --git a/bbs/ckeditor/samples/index.html b/plugin/ckeditor/samples/index.html
similarity index 100%
rename from bbs/ckeditor/samples/index.html
rename to plugin/ckeditor/samples/index.html
diff --git a/bbs/ckeditor/samples/inlineall.html b/plugin/ckeditor/samples/inlineall.html
similarity index 100%
rename from bbs/ckeditor/samples/inlineall.html
rename to plugin/ckeditor/samples/inlineall.html
diff --git a/bbs/ckeditor/samples/inlinebycode.html b/plugin/ckeditor/samples/inlinebycode.html
similarity index 100%
rename from bbs/ckeditor/samples/inlinebycode.html
rename to plugin/ckeditor/samples/inlinebycode.html
diff --git a/bbs/ckeditor/samples/plugins/dialog/assets/my_dialog.js b/plugin/ckeditor/samples/plugins/dialog/assets/my_dialog.js
similarity index 100%
rename from bbs/ckeditor/samples/plugins/dialog/assets/my_dialog.js
rename to plugin/ckeditor/samples/plugins/dialog/assets/my_dialog.js
diff --git a/bbs/ckeditor/samples/plugins/dialog/dialog.html b/plugin/ckeditor/samples/plugins/dialog/dialog.html
similarity index 100%
rename from bbs/ckeditor/samples/plugins/dialog/dialog.html
rename to plugin/ckeditor/samples/plugins/dialog/dialog.html
diff --git a/bbs/ckeditor/samples/plugins/enterkey/enterkey.html b/plugin/ckeditor/samples/plugins/enterkey/enterkey.html
similarity index 100%
rename from bbs/ckeditor/samples/plugins/enterkey/enterkey.html
rename to plugin/ckeditor/samples/plugins/enterkey/enterkey.html
diff --git a/bbs/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.fla b/plugin/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.fla
similarity index 100%
rename from bbs/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.fla
rename to plugin/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.fla
diff --git a/bbs/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.swf b/plugin/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.swf
similarity index 100%
rename from bbs/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.swf
rename to plugin/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.swf
diff --git a/bbs/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/swfobject.js b/plugin/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/swfobject.js
similarity index 100%
rename from bbs/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/swfobject.js
rename to plugin/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/swfobject.js
diff --git a/bbs/ckeditor/samples/plugins/htmlwriter/outputforflash.html b/plugin/ckeditor/samples/plugins/htmlwriter/outputforflash.html
similarity index 100%
rename from bbs/ckeditor/samples/plugins/htmlwriter/outputforflash.html
rename to plugin/ckeditor/samples/plugins/htmlwriter/outputforflash.html
diff --git a/bbs/ckeditor/samples/plugins/htmlwriter/outputhtml.html b/plugin/ckeditor/samples/plugins/htmlwriter/outputhtml.html
similarity index 100%
rename from bbs/ckeditor/samples/plugins/htmlwriter/outputhtml.html
rename to plugin/ckeditor/samples/plugins/htmlwriter/outputhtml.html
diff --git a/bbs/ckeditor/samples/plugins/magicline/magicline.html b/plugin/ckeditor/samples/plugins/magicline/magicline.html
similarity index 100%
rename from bbs/ckeditor/samples/plugins/magicline/magicline.html
rename to plugin/ckeditor/samples/plugins/magicline/magicline.html
diff --git a/bbs/ckeditor/samples/plugins/toolbar/toolbar.html b/plugin/ckeditor/samples/plugins/toolbar/toolbar.html
similarity index 100%
rename from bbs/ckeditor/samples/plugins/toolbar/toolbar.html
rename to plugin/ckeditor/samples/plugins/toolbar/toolbar.html
diff --git a/bbs/ckeditor/samples/plugins/wysiwygarea/fullpage.html b/plugin/ckeditor/samples/plugins/wysiwygarea/fullpage.html
similarity index 100%
rename from bbs/ckeditor/samples/plugins/wysiwygarea/fullpage.html
rename to plugin/ckeditor/samples/plugins/wysiwygarea/fullpage.html
diff --git a/bbs/ckeditor/samples/readonly.html b/plugin/ckeditor/samples/readonly.html
similarity index 100%
rename from bbs/ckeditor/samples/readonly.html
rename to plugin/ckeditor/samples/readonly.html
diff --git a/bbs/ckeditor/samples/replacebyclass.html b/plugin/ckeditor/samples/replacebyclass.html
similarity index 100%
rename from bbs/ckeditor/samples/replacebyclass.html
rename to plugin/ckeditor/samples/replacebyclass.html
diff --git a/bbs/ckeditor/samples/replacebycode.html b/plugin/ckeditor/samples/replacebycode.html
similarity index 100%
rename from bbs/ckeditor/samples/replacebycode.html
rename to plugin/ckeditor/samples/replacebycode.html
diff --git a/bbs/ckeditor/samples/sample.css b/plugin/ckeditor/samples/sample.css
similarity index 100%
rename from bbs/ckeditor/samples/sample.css
rename to plugin/ckeditor/samples/sample.css
diff --git a/bbs/ckeditor/samples/sample.js b/plugin/ckeditor/samples/sample.js
similarity index 100%
rename from bbs/ckeditor/samples/sample.js
rename to plugin/ckeditor/samples/sample.js
diff --git a/bbs/ckeditor/samples/sample_posteddata.php b/plugin/ckeditor/samples/sample_posteddata.php
similarity index 100%
rename from bbs/ckeditor/samples/sample_posteddata.php
rename to plugin/ckeditor/samples/sample_posteddata.php
diff --git a/bbs/ckeditor/samples/tabindex.html b/plugin/ckeditor/samples/tabindex.html
similarity index 100%
rename from bbs/ckeditor/samples/tabindex.html
rename to plugin/ckeditor/samples/tabindex.html
diff --git a/bbs/ckeditor/samples/uicolor.html b/plugin/ckeditor/samples/uicolor.html
similarity index 100%
rename from bbs/ckeditor/samples/uicolor.html
rename to plugin/ckeditor/samples/uicolor.html
diff --git a/bbs/ckeditor/samples/uilanguages.html b/plugin/ckeditor/samples/uilanguages.html
similarity index 100%
rename from bbs/ckeditor/samples/uilanguages.html
rename to plugin/ckeditor/samples/uilanguages.html
diff --git a/bbs/ckeditor/samples/xhtmlstyle.html b/plugin/ckeditor/samples/xhtmlstyle.html
similarity index 100%
rename from bbs/ckeditor/samples/xhtmlstyle.html
rename to plugin/ckeditor/samples/xhtmlstyle.html
diff --git a/bbs/ckeditor/shortcut.html b/plugin/ckeditor/shortcut.html
similarity index 100%
rename from bbs/ckeditor/shortcut.html
rename to plugin/ckeditor/shortcut.html
diff --git a/bbs/ckeditor/skins/moono/dialog.css b/plugin/ckeditor/skins/moono/dialog.css
similarity index 100%
rename from bbs/ckeditor/skins/moono/dialog.css
rename to plugin/ckeditor/skins/moono/dialog.css
diff --git a/bbs/ckeditor/skins/moono/dialog_ie.css b/plugin/ckeditor/skins/moono/dialog_ie.css
similarity index 100%
rename from bbs/ckeditor/skins/moono/dialog_ie.css
rename to plugin/ckeditor/skins/moono/dialog_ie.css
diff --git a/bbs/ckeditor/skins/moono/dialog_ie7.css b/plugin/ckeditor/skins/moono/dialog_ie7.css
similarity index 100%
rename from bbs/ckeditor/skins/moono/dialog_ie7.css
rename to plugin/ckeditor/skins/moono/dialog_ie7.css
diff --git a/bbs/ckeditor/skins/moono/dialog_ie8.css b/plugin/ckeditor/skins/moono/dialog_ie8.css
similarity index 100%
rename from bbs/ckeditor/skins/moono/dialog_ie8.css
rename to plugin/ckeditor/skins/moono/dialog_ie8.css
diff --git a/bbs/ckeditor/skins/moono/dialog_opera.css b/plugin/ckeditor/skins/moono/dialog_opera.css
similarity index 100%
rename from bbs/ckeditor/skins/moono/dialog_opera.css
rename to plugin/ckeditor/skins/moono/dialog_opera.css
diff --git a/bbs/ckeditor/skins/moono/editor.css b/plugin/ckeditor/skins/moono/editor.css
similarity index 100%
rename from bbs/ckeditor/skins/moono/editor.css
rename to plugin/ckeditor/skins/moono/editor.css
diff --git a/bbs/ckeditor/skins/moono/editor_gecko.css b/plugin/ckeditor/skins/moono/editor_gecko.css
similarity index 100%
rename from bbs/ckeditor/skins/moono/editor_gecko.css
rename to plugin/ckeditor/skins/moono/editor_gecko.css
diff --git a/bbs/ckeditor/skins/moono/editor_ie.css b/plugin/ckeditor/skins/moono/editor_ie.css
similarity index 100%
rename from bbs/ckeditor/skins/moono/editor_ie.css
rename to plugin/ckeditor/skins/moono/editor_ie.css
diff --git a/bbs/ckeditor/skins/moono/editor_ie7.css b/plugin/ckeditor/skins/moono/editor_ie7.css
similarity index 100%
rename from bbs/ckeditor/skins/moono/editor_ie7.css
rename to plugin/ckeditor/skins/moono/editor_ie7.css
diff --git a/bbs/ckeditor/skins/moono/editor_ie8.css b/plugin/ckeditor/skins/moono/editor_ie8.css
similarity index 100%
rename from bbs/ckeditor/skins/moono/editor_ie8.css
rename to plugin/ckeditor/skins/moono/editor_ie8.css
diff --git a/bbs/ckeditor/skins/moono/icons.png b/plugin/ckeditor/skins/moono/icons.png
similarity index 100%
rename from bbs/ckeditor/skins/moono/icons.png
rename to plugin/ckeditor/skins/moono/icons.png
diff --git a/bbs/ckeditor/skins/moono/images/arrow.png b/plugin/ckeditor/skins/moono/images/arrow.png
similarity index 100%
rename from bbs/ckeditor/skins/moono/images/arrow.png
rename to plugin/ckeditor/skins/moono/images/arrow.png
diff --git a/bbs/ckeditor/skins/moono/images/close.png b/plugin/ckeditor/skins/moono/images/close.png
similarity index 100%
rename from bbs/ckeditor/skins/moono/images/close.png
rename to plugin/ckeditor/skins/moono/images/close.png
diff --git a/bbs/ckeditor/skins/moono/images/mini.png b/plugin/ckeditor/skins/moono/images/mini.png
similarity index 100%
rename from bbs/ckeditor/skins/moono/images/mini.png
rename to plugin/ckeditor/skins/moono/images/mini.png
diff --git a/bbs/ckeditor/skins/moono/readme.md b/plugin/ckeditor/skins/moono/readme.md
similarity index 100%
rename from bbs/ckeditor/skins/moono/readme.md
rename to plugin/ckeditor/skins/moono/readme.md
diff --git a/bbs/ckeditor/styles.js b/plugin/ckeditor/styles.js
similarity index 100%
rename from bbs/ckeditor/styles.js
rename to plugin/ckeditor/styles.js
diff --git a/bbs/ckeditor/upload.php b/plugin/ckeditor/upload.php
similarity index 100%
rename from bbs/ckeditor/upload.php
rename to plugin/ckeditor/upload.php
diff --git a/bbs/gcaptcha/_common.php b/plugin/gcaptcha/_common.php
similarity index 100%
rename from bbs/gcaptcha/_common.php
rename to plugin/gcaptcha/_common.php
diff --git a/bbs/gcaptcha/example.php b/plugin/gcaptcha/example.php
similarity index 100%
rename from bbs/gcaptcha/example.php
rename to plugin/gcaptcha/example.php
diff --git a/bbs/gcaptcha/fonts/.htaccess b/plugin/gcaptcha/fonts/.htaccess
similarity index 100%
rename from bbs/gcaptcha/fonts/.htaccess
rename to plugin/gcaptcha/fonts/.htaccess
diff --git a/bbs/gcaptcha/fonts/DAUM_FONTS_LICENSE.txt b/plugin/gcaptcha/fonts/DAUM_FONTS_LICENSE.txt
similarity index 100%
rename from bbs/gcaptcha/fonts/DAUM_FONTS_LICENSE.txt
rename to plugin/gcaptcha/fonts/DAUM_FONTS_LICENSE.txt
diff --git a/bbs/gcaptcha/fonts/NAVER_FONTS_LICENSE.txt b/plugin/gcaptcha/fonts/NAVER_FONTS_LICENSE.txt
similarity index 100%
rename from bbs/gcaptcha/fonts/NAVER_FONTS_LICENSE.txt
rename to plugin/gcaptcha/fonts/NAVER_FONTS_LICENSE.txt
diff --git a/bbs/gcaptcha/fonts/NanumGothic.ttf b/plugin/gcaptcha/fonts/NanumGothic.ttf
similarity index 100%
rename from bbs/gcaptcha/fonts/NanumGothic.ttf
rename to plugin/gcaptcha/fonts/NanumGothic.ttf
diff --git a/bbs/gcaptcha/fonts/NanumMyeongjo.ttf b/plugin/gcaptcha/fonts/NanumMyeongjo.ttf
similarity index 100%
rename from bbs/gcaptcha/fonts/NanumMyeongjo.ttf
rename to plugin/gcaptcha/fonts/NanumMyeongjo.ttf
diff --git a/bbs/gcaptcha/gcaptcha.js b/plugin/gcaptcha/gcaptcha.js
similarity index 100%
rename from bbs/gcaptcha/gcaptcha.js
rename to plugin/gcaptcha/gcaptcha.js
diff --git a/bbs/gcaptcha/gcaptcha.lib.php b/plugin/gcaptcha/gcaptcha.lib.php
similarity index 96%
rename from bbs/gcaptcha/gcaptcha.lib.php
rename to plugin/gcaptcha/gcaptcha.lib.php
index d59b41007..4fdd5da7d 100644
--- a/bbs/gcaptcha/gcaptcha.lib.php
+++ b/plugin/gcaptcha/gcaptcha.lib.php
@@ -198,6 +198,7 @@ function chk_captcha()
     $captcha_cnt = (int)$_SESSION['ss_captcha_cnt'];
     if ($captcha_cnt > 5) return false;
 
+    if (!trim($_POST['captcha_key'])) return false;
     if (!isset($_POST['captcha_key'])) return false;
     if ($_POST['captcha_key'] != $_SESSION['ss_captcha_key']) {
         $_SESSION['ss_captcha_cnt'] = $captcha_cnt + 1;
diff --git a/bbs/gcaptcha/get.php b/plugin/gcaptcha/get.php
similarity index 100%
rename from bbs/gcaptcha/get.php
rename to plugin/gcaptcha/get.php
diff --git a/bbs/gcaptcha/img/dot.gif b/plugin/gcaptcha/img/dot.gif
similarity index 100%
rename from bbs/gcaptcha/img/dot.gif
rename to plugin/gcaptcha/img/dot.gif
diff --git a/bbs/gcaptcha/img/sound.gif b/plugin/gcaptcha/img/sound.gif
similarity index 100%
rename from bbs/gcaptcha/img/sound.gif
rename to plugin/gcaptcha/img/sound.gif
diff --git a/bbs/gcaptcha/info.php b/plugin/gcaptcha/info.php
similarity index 100%
rename from bbs/gcaptcha/info.php
rename to plugin/gcaptcha/info.php
diff --git a/bbs/gcaptcha/mp3/0.mp3 b/plugin/gcaptcha/mp3/0.mp3
similarity index 100%
rename from bbs/gcaptcha/mp3/0.mp3
rename to plugin/gcaptcha/mp3/0.mp3
diff --git a/bbs/gcaptcha/mp3/1.mp3 b/plugin/gcaptcha/mp3/1.mp3
similarity index 100%
rename from bbs/gcaptcha/mp3/1.mp3
rename to plugin/gcaptcha/mp3/1.mp3
diff --git a/bbs/gcaptcha/mp3/2.mp3 b/plugin/gcaptcha/mp3/2.mp3
similarity index 100%
rename from bbs/gcaptcha/mp3/2.mp3
rename to plugin/gcaptcha/mp3/2.mp3
diff --git a/bbs/gcaptcha/mp3/3.mp3 b/plugin/gcaptcha/mp3/3.mp3
similarity index 100%
rename from bbs/gcaptcha/mp3/3.mp3
rename to plugin/gcaptcha/mp3/3.mp3
diff --git a/bbs/gcaptcha/mp3/4.mp3 b/plugin/gcaptcha/mp3/4.mp3
similarity index 100%
rename from bbs/gcaptcha/mp3/4.mp3
rename to plugin/gcaptcha/mp3/4.mp3
diff --git a/bbs/gcaptcha/mp3/5.mp3 b/plugin/gcaptcha/mp3/5.mp3
similarity index 100%
rename from bbs/gcaptcha/mp3/5.mp3
rename to plugin/gcaptcha/mp3/5.mp3
diff --git a/bbs/gcaptcha/mp3/6.mp3 b/plugin/gcaptcha/mp3/6.mp3
similarity index 100%
rename from bbs/gcaptcha/mp3/6.mp3
rename to plugin/gcaptcha/mp3/6.mp3
diff --git a/bbs/gcaptcha/mp3/7.mp3 b/plugin/gcaptcha/mp3/7.mp3
similarity index 100%
rename from bbs/gcaptcha/mp3/7.mp3
rename to plugin/gcaptcha/mp3/7.mp3
diff --git a/bbs/gcaptcha/mp3/8.mp3 b/plugin/gcaptcha/mp3/8.mp3
similarity index 100%
rename from bbs/gcaptcha/mp3/8.mp3
rename to plugin/gcaptcha/mp3/8.mp3
diff --git a/bbs/gcaptcha/mp3/9.mp3 b/plugin/gcaptcha/mp3/9.mp3
similarity index 100%
rename from bbs/gcaptcha/mp3/9.mp3
rename to plugin/gcaptcha/mp3/9.mp3
diff --git a/bbs/gcaptcha/run.php b/plugin/gcaptcha/run.php
similarity index 100%
rename from bbs/gcaptcha/run.php
rename to plugin/gcaptcha/run.php
diff --git a/bbs/kcp/_common.php b/plugin/kcp/_common.php
similarity index 100%
rename from bbs/kcp/_common.php
rename to plugin/kcp/_common.php
diff --git a/bbs/kcp/bin/ct_cli b/plugin/kcp/bin/ct_cli
similarity index 100%
rename from bbs/kcp/bin/ct_cli
rename to plugin/kcp/bin/ct_cli
diff --git a/bbs/kcp/kcpcert_config.php b/plugin/kcp/kcpcert_config.php
similarity index 92%
rename from bbs/kcp/kcpcert_config.php
rename to plugin/kcp/kcpcert_config.php
index a3a8e4405..b3e88b94f 100644
--- a/bbs/kcp/kcpcert_config.php
+++ b/plugin/kcp/kcpcert_config.php
@@ -2,7 +2,7 @@
 include_once('./_common.php');
 
 // /home/kcpcert_enc ( 서버상 bin 폴더 이전까지 경로)
-$home_dir = G4_BBS_PATH.'/kcp'; // ct_cli 절대경로 ( bin 전까지 )
+$home_dir = G4_PLUGIN_PATH.'/kcp'; // ct_cli 절대경로 ( bin 전까지 )
 
 // DI 를 위한 중복확인 식별 아이디
 //web_siteid 값이 없으면 KCP 에서 지정한 값으로 설정됨
@@ -20,7 +20,7 @@ if(!$site_cd)
     alert('KCP 휴대폰인증 사이트코드가 없습니다.\\관리자 > 기본환경설정에 사이트코드를 입력해 주십시오.', G4_URL);
 
 // KCP 인증 라이브러리
-require G4_BBS_PATH.'/kcp/lib/ct_cli_lib.php';
+require G4_KCP_PATH.'/lib/ct_cli_lib.php';
 
 /* ============================================================================== */
 /* =   null 값을 처리하는 메소드                                                = */
diff --git a/bbs/kcp/kcpcert_form.php b/plugin/kcp/kcpcert_form.php
similarity index 95%
rename from bbs/kcp/kcpcert_form.php
rename to plugin/kcp/kcpcert_form.php
index aa7225266..805b54de3 100644
--- a/bbs/kcp/kcpcert_form.php
+++ b/plugin/kcp/kcpcert_form.php
@@ -2,7 +2,7 @@
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 // kcp 휴대폰인증파일
-include_once(G4_BBS_PATH.'/kcp/kcpcert_config.php');
+include_once(G4_KCP_PATH.'/kcpcert_config.php');
 if(!$ordr_idxx = get_session('ss_uniqid'))
     $ordr_idxx = get_uniqid();
 ?>
@@ -25,7 +25,7 @@ if(!$ordr_idxx = get_session('ss_uniqid'))
 <!-- 사이트코드 -->
 <input type="hidden" name="site_cd"      value="<?= $site_cd ?>" />
 <!-- Ret_URL : 인증결과 리턴 페이지 ( 가맹점 URL 로 설정해 주셔야 합니다. ) -->
-<input type="hidden" name="Ret_URL"      value="<?=G4_BBS_URL?>/kcp/kcpcert_result.php" />
+<input type="hidden" name="Ret_URL"      value="<?=G4_KCP_PATH?>/kcpcert_result.php" />
 <!-- cert_otp_use 필수 ( 메뉴얼 참고)
      Y : 실명 확인 + OTP 점유 확인 , N : 실명 확인 only
 -->
diff --git a/bbs/kcp/kcpcert_request.php b/plugin/kcp/kcpcert_request.php
similarity index 74%
rename from bbs/kcp/kcpcert_request.php
rename to plugin/kcp/kcpcert_request.php
index 00fe64744..b9057c28f 100644
--- a/bbs/kcp/kcpcert_request.php
+++ b/plugin/kcp/kcpcert_request.php
@@ -1,8 +1,16 @@
 <?
 include_once('./kcpcert_config.php');
 
-// UTF-8 ȯ�濡�� �ؽ� ������ ������ ���� ���� �ڵ�
-setlocale(LC_CTYPE, 'ko_KR.euc-kr');
+// utf-8로 넘어돈 post 값을 euc-kr 로 변경
+$_POST = array_map("iconv_euckr", $_POST);
+
+// UTF-8 환경에서 해시 데이터 오류를 막기 위한 코드
+$def_locale = setlocale(LC_CTYPE, 0);
+$locale_change = false;
+if(preg_match("/utf[\-]?8/i", $def_locale)) {
+    setlocale(LC_CTYPE, 'ko_KR.euc-kr');
+    $locale_change = true;
+}
 
 $req_tx        = "";
 
@@ -18,16 +26,13 @@ $local_code    = "";
 
 $up_hash       = "";
 /*------------------------------------------------------------------------*/
-/*  :: ��ü �Ķ���� �����                                               */
+/*  :: 전체 파라미터 남기기                                               */
 /*------------------------------------------------------------------------*/
 
 $ct_cert = new C_CT_CLI;
 $ct_cert->mf_clear();
 
-// utf-8�� �Ѿ post ���� euc-kr �� ����
-$_POST = array_map("iconv_euckr", $_POST);
-
-// request �� �Ѿ�� �� ó��
+// request 로 넘어온 값 처리
 $key = array_keys($_POST);
 $sbParam ="";
 
@@ -81,16 +86,16 @@ for($i=0; $i<count($key); $i++)
         $local_code = f_get_parm_str ( $valParam );
     }
 
-    // ����â���� �ѱ�� form ������ ���� �ʵ�
+    // 인증창으로 넘기는 form 데이터 생성 필드
     $sbParam .= "<input type='hidden' name='" . $nmParam . "' value='" . f_get_parm_str( $valParam ) . "'/>";
 }
 
 if ( $req_tx == "cert" )
 {
-    // !!up_hash ������ ������ ���� ����
-    // year , month , day �� ��� �ִ� ��� "00" , "00" , "00" ���� ������ �˴ϴ�
-    // �׿��� ���� ���� ��� ""(null) �� �����Ͻø� �˴ϴ�.
-    // up_hash ������ ������ site_cd �� ordr_idxx �� �ʼ� ���Դϴ�.
+    // !!up_hash 데이터 생성시 주의 사항
+    // year , month , day 가 비어 있는 경우 "00" , "00" , "00" 으로 설정이 됩니다
+    // 그외의 값은 없을 경우 ""(null) 로 세팅하시면 됩니다.
+    // up_hash 데이터 생성시 site_cd 와 ordr_idxx 는 필수 값입니다.
     $hash_data = $site_cd                  .
                  $ordr_idxx                .
                  $user_name                .
@@ -102,7 +107,7 @@ if ( $req_tx == "cert" )
 
     $up_hash = $ct_cert->make_hash_data( $home_dir, $hash_data );
 
-    // ����â���� �ѱ�� form ������ ���� �ʵ� ( up_hash )
+    // 인증창으로 넘기는 form 데이터 생성 필드 ( up_hash )
     $sbParam .= "<input type='hidden' name='up_hash' value='" . $up_hash . "'/>";
 }
 
@@ -119,10 +124,10 @@ $ct_cert->mf_clear();
             {
                 var frm = document.form_auth;
 
-                // ���� ��û �� ȣ�� �Լ�
+                // 인증 요청 시 호출 함수
                 if ( frm.req_tx.value == "cert" )
                 {
-                    opener.document.form_auth.veri_up_hash.value = frm.up_hash.value; // up_hash ������ ������ ���� �ʵ�
+                    opener.document.form_auth.veri_up_hash.value = frm.up_hash.value; // up_hash 데이터 검증을 위한 필드
 
                     frm.action="<?=$cert_url?>";
                     frm.submit();
@@ -135,4 +140,9 @@ $ct_cert->mf_clear();
             <?= $sbParam ?>
         </form>
     </body>
-</html>
\ No newline at end of file
+</html>
+
+<?
+if($locale_change)
+    setlocale(LC_CTYPE, $def_locale);
+?>
\ No newline at end of file
diff --git a/bbs/kcp/kcpcert_result.php b/plugin/kcp/kcpcert_result.php
similarity index 92%
rename from bbs/kcp/kcpcert_result.php
rename to plugin/kcp/kcpcert_result.php
index c9df1327f..8fbe2143b 100644
--- a/bbs/kcp/kcpcert_result.php
+++ b/plugin/kcp/kcpcert_result.php
@@ -153,13 +153,23 @@ else if( $cert_enc_use != "Y" )
 }
 
 $ct_cert->mf_clear();
+
+// 휴대폰번호 포맷변경
+$phone_no = preg_replace("/[^0-9]/", "", $phone_no);
+$hp_len = strlen($phone_no);
+
+if($hp_len == 10)
+    $phone_no = preg_replace("/([0-9]{3})([0-9]{3})([0-9]{4})/", "\\1-\\2-\\3", $phone_no);
+else if($hp_len == 11)
+    $phone_no = preg_replace("/([0-9]{3})([0-9]{4})([0-9]{4})/", "\\1-\\2-\\3", $phone_no);
 ?>
 
 <script>
 $(function() {
     var $opener = window.opener;
 
-    // 인증번호
+    // 인증정보
+    $opener.$("input[name=mb_hp]").val("<?=$phone_no?>");
     $opener.$("input[name=kcpcert_no]").val("<?=$md5_cert_no?>");
     $opener.$("input[name=kcpcert_time]").val("<?=G4_TIME_YMDHIS?>");
     window.close();
diff --git a/bbs/kcp/lib/ct_cli_lib.php b/plugin/kcp/lib/ct_cli_lib.php
similarity index 100%
rename from bbs/kcp/lib/ct_cli_lib.php
rename to plugin/kcp/lib/ct_cli_lib.php
diff --git a/plugin/okname/index.php b/plugin/okname/index.php
new file mode 100644
index 000000000..dc2009f0f
--- /dev/null
+++ b/plugin/okname/index.php
@@ -0,0 +1,2 @@
+git 에서 빈 디렉토리는 push 되지 않으므로 일부러 생성한 파일입니다.
+이 디렉토리에 다른 파일이 하나라도 있다면 나중에 삭제하세요.
\ No newline at end of file
diff --git a/bbs/syndi/_common.php b/plugin/syndi/_common.php
similarity index 100%
rename from bbs/syndi/_common.php
rename to plugin/syndi/_common.php
diff --git a/bbs/syndi/config/site.config.php b/plugin/syndi/config/site.config.php
similarity index 100%
rename from bbs/syndi/config/site.config.php
rename to plugin/syndi/config/site.config.php
diff --git a/bbs/syndi/func/site.func.php b/plugin/syndi/func/site.func.php
similarity index 95%
rename from bbs/syndi/func/site.func.php
rename to plugin/syndi/func/site.func.php
index b6a9cc632..453d1cfcd 100644
--- a/bbs/syndi/func/site.func.php
+++ b/plugin/syndi/func/site.func.php
@@ -15,15 +15,15 @@
 
 
 // include gnuboard config & lib
-include '../config.php';
-include '../'.G4_LIB_DIR.'/common.lib.php';
-include '../'.G4_DATA_DIR.'/dbconfig.php';
+include G4_PATH.'/config.php';
+//include G4_LIB_PATH.'/common.lib.php';
+include G4_DATA_PATH.'/dbconfig.php';
 
-$connect_db = sql_connect($mysql_host, $mysql_user, $mysql_password);
+$connect_db = sql_connect(G4_MYSQL_HOST, G4_MYSQL_USER, G4_MYSQL_PASSWORD);
 if(!$connect_db) return;
 $GLOBALS['connect_db'] = $connect_db;
 
-sql_select_db($mysql_db, $connect_db);
+sql_select_db(G4_MYSQL_DB, $connect_db);
 
 
 /**
diff --git a/bbs/syndi/include/include.adm.board_delete.inc.php b/plugin/syndi/include/include.adm.board_delete.inc.php
similarity index 100%
rename from bbs/syndi/include/include.adm.board_delete.inc.php
rename to plugin/syndi/include/include.adm.board_delete.inc.php
diff --git a/bbs/syndi/include/include.adm.board_form_update.php b/plugin/syndi/include/include.adm.board_form_update.php
similarity index 100%
rename from bbs/syndi/include/include.adm.board_form_update.php
rename to plugin/syndi/include/include.adm.board_form_update.php
diff --git a/bbs/syndi/include/include.adm.boardgroup_form_update.php b/plugin/syndi/include/include.adm.boardgroup_form_update.php
similarity index 100%
rename from bbs/syndi/include/include.adm.boardgroup_form_update.php
rename to plugin/syndi/include/include.adm.boardgroup_form_update.php
diff --git a/bbs/syndi/include/include.bbs.delete.php b/plugin/syndi/include/include.bbs.delete.php
similarity index 100%
rename from bbs/syndi/include/include.bbs.delete.php
rename to plugin/syndi/include/include.bbs.delete.php
diff --git a/bbs/syndi/include/include.bbs.delete_all.php b/plugin/syndi/include/include.bbs.delete_all.php
similarity index 100%
rename from bbs/syndi/include/include.bbs.delete_all.php
rename to plugin/syndi/include/include.bbs.delete_all.php
diff --git a/bbs/syndi/include/include.bbs.move_update.php b/plugin/syndi/include/include.bbs.move_update.php
similarity index 100%
rename from bbs/syndi/include/include.bbs.move_update.php
rename to plugin/syndi/include/include.bbs.move_update.php
diff --git a/bbs/syndi/include/include.bbs.write_update.php b/plugin/syndi/include/include.bbs.write_update.php
similarity index 100%
rename from bbs/syndi/include/include.bbs.write_update.php
rename to plugin/syndi/include/include.bbs.write_update.php
diff --git a/bbs/syndi/install.php b/plugin/syndi/install.php
similarity index 100%
rename from bbs/syndi/install.php
rename to plugin/syndi/install.php
diff --git a/bbs/syndi/libs/SyndicationArticle.class.php b/plugin/syndi/libs/SyndicationArticle.class.php
similarity index 100%
rename from bbs/syndi/libs/SyndicationArticle.class.php
rename to plugin/syndi/libs/SyndicationArticle.class.php
diff --git a/bbs/syndi/libs/SyndicationChannel.class.php b/plugin/syndi/libs/SyndicationChannel.class.php
similarity index 100%
rename from bbs/syndi/libs/SyndicationChannel.class.php
rename to plugin/syndi/libs/SyndicationChannel.class.php
diff --git a/bbs/syndi/libs/SyndicationDeleted.class.php b/plugin/syndi/libs/SyndicationDeleted.class.php
similarity index 100%
rename from bbs/syndi/libs/SyndicationDeleted.class.php
rename to plugin/syndi/libs/SyndicationDeleted.class.php
diff --git a/bbs/syndi/libs/SyndicationHandler.class.php b/plugin/syndi/libs/SyndicationHandler.class.php
similarity index 100%
rename from bbs/syndi/libs/SyndicationHandler.class.php
rename to plugin/syndi/libs/SyndicationHandler.class.php
diff --git a/bbs/syndi/libs/SyndicationObject.class.php b/plugin/syndi/libs/SyndicationObject.class.php
similarity index 100%
rename from bbs/syndi/libs/SyndicationObject.class.php
rename to plugin/syndi/libs/SyndicationObject.class.php
diff --git a/bbs/syndi/libs/SyndicationPing.class.php b/plugin/syndi/libs/SyndicationPing.class.php
similarity index 100%
rename from bbs/syndi/libs/SyndicationPing.class.php
rename to plugin/syndi/libs/SyndicationPing.class.php
diff --git a/bbs/syndi/libs/SyndicationSite.class.php b/plugin/syndi/libs/SyndicationSite.class.php
similarity index 100%
rename from bbs/syndi/libs/SyndicationSite.class.php
rename to plugin/syndi/libs/SyndicationSite.class.php
diff --git a/bbs/syndi/libs/SyndicationStatus.class.php b/plugin/syndi/libs/SyndicationStatus.class.php
similarity index 100%
rename from bbs/syndi/libs/SyndicationStatus.class.php
rename to plugin/syndi/libs/SyndicationStatus.class.php
diff --git a/bbs/syndi/syndi_echo.php b/plugin/syndi/syndi_echo.php
similarity index 89%
rename from bbs/syndi/syndi_echo.php
rename to plugin/syndi/syndi_echo.php
index 5c103f128..85528a06b 100644
--- a/bbs/syndi/syndi_echo.php
+++ b/plugin/syndi/syndi_echo.php
@@ -1,12 +1,14 @@
 <?php
+include_once('./_common.php');
+
 /**
  * @file syndi_echo.php
  * @author sol (ngleader@gmail.com)
  * @brief Print Syndication Data XML
  */
 
-header("Content-Type: text/html; charset=UTF-8");
-header("Pragma: no-cache");
+header('Content-Type: text/html; charset=UTF-8');
+header('Pragma: no-cache');
 
 if(version_compare(PHP_VERSION, '5.3.0') >= 0)
 {
diff --git a/skin/board/basic/list.skin.php b/skin/board/basic/list.skin.php
index d9ae09446..5b2f0cc01 100644
--- a/skin/board/basic/list.skin.php
+++ b/skin/board/basic/list.skin.php
@@ -9,7 +9,7 @@ if ($is_good) $colspan++;
 if ($is_nogood) $colspan++;
 ?>
 
-<? if (!$wr_id) {?><h1 id="bo_list_title"><?=$g4['title']?></h1><?}?>
+<? if (!$wr_id) {?><h1 id="bo_list_title"><?=$board['bo_subject']?></h1><?}?>
 
 <!-- 게시판 목록 시작 -->
 <div id="bo_list" style="width:<?=$width;?>">
@@ -128,7 +128,7 @@ if ($is_nogood) $colspan++;
         </ul>
 
         <ul class="btn_bo_user">
-            <li><? if ($write_href) { ?><a href="<?=$write_href?>" class="btn_b02">글쓰기</a><? } ?></li>
+            <? if ($write_href) { ?><li><a href="<?=$write_href?>" class="btn_b02">글쓰기</a></li><? } ?>
         </ul>
     </div>
     <? } ?>
diff --git a/skin/board/basic/style.css b/skin/board/basic/style.css
index 5e836b1f2..e9b257b52 100644
--- a/skin/board/basic/style.css
+++ b/skin/board/basic/style.css
@@ -86,7 +86,7 @@
 .bo_v_com li {float:left;margin-left:5px}
 
 #bo_v_atc {min-height:200px;height:auto !important;height:200px}
-#bo_v_atc h1 {margin:0;padding:0;height:0;overflow:hidden}
+#bo_v_atc header h1 {margin:0;padding:0;width:1px;height:1px;overflow:hidden}
 
 #bo_v_img {margin:0 0 10px;width:100%;overflow:hidden:zoom:1}
 #bo_v_img:after {display:block;visibility:hidden;clear:both;content:""}
diff --git a/skin/board/basic/view.skin.php b/skin/board/basic/view.skin.php
index 09cef2ce3..918a18c52 100644
--- a/skin/board/basic/view.skin.php
+++ b/skin/board/basic/view.skin.php
@@ -41,9 +41,9 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
         ?>
             <li>
                 <a href="<? echo $view['file'][$i]['href']; ?>" class="view_file_download">
-                    <img src="<?=$board_skin_url?>/img/icon_file.gif" alt="첨부파일">
+                    <img src="<?=$board_skin_url?>/img/icon_file.gif" alt="첨부">
                     <strong><?=$view['file'][$i]['source']?></strong>
-                    <span> (<?=$view['file'][$i]['size']?>)</span>
+                    <?=$view['file'][$i]['bf_content']?> (<?=$view['file'][$i]['size']?>)
                 </a>
                 <span class="bo_v_file_cnt"><?=$view['file'][$i]['download']?>회 다운로드</span>
                 <span>DATE : <?=$view['file'][$i]['datetime']?></span>
diff --git a/skin/board/gallery/list.skin.php b/skin/board/gallery/list.skin.php
index 487d839b5..a68bfd0bb 100644
--- a/skin/board/gallery/list.skin.php
+++ b/skin/board/gallery/list.skin.php
@@ -3,7 +3,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 include_once(G4_LIB_PATH.'/thumbnail.lib.php');
 ?>
 
-<? if (!$wr_id) {?><h1 id="bo_list_title"><?=$g4['title']?></h1><?}?>
+<? if (!$wr_id) {?><h1 id="bo_list_title"><?=$board['bo_subject']?></h1><?}?>
 
 <!-- 게시판 목록 시작 -->
 <div id="bo_img" style="width:<?=$width;?>">
diff --git a/skin/board/gallery/style.css b/skin/board/gallery/style.css
index 5df3788c8..06c560b61 100644
--- a/skin/board/gallery/style.css
+++ b/skin/board/gallery/style.css
@@ -108,7 +108,7 @@
 .bo_v_com li {float:left;margin-left:5px}
 
 #bo_v_atc {min-height:200px;height:auto !important;height:200px}
-#bo_v_atc h1 {margin:0;padding:0;height:0;overflow:hidden}
+#bo_v_atc header h1 {margin:0;padding:0;width:1px;height:1px;overflow:hidden}
 
 #bo_v_img {margin:0 0 10px;width:100%;overflow:hidden:zoom:1}
 #bo_v_img:after {display:block;visibility:hidden;clear:both;content:""}
diff --git a/skin/board/gallery/view.skin.php b/skin/board/gallery/view.skin.php
index c250885eb..7365151dd 100644
--- a/skin/board/gallery/view.skin.php
+++ b/skin/board/gallery/view.skin.php
@@ -41,9 +41,9 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
         ?>
             <li>
                 <a href="<? echo $view['file'][$i]['href']; ?>" class="view_file_download">
-                    <img src="<?=$board_skin_url?>/img/icon_file.gif" alt="첨부파일">
+                    <img src="<?=$board_skin_url?>/img/icon_file.gif" alt="첨부">
                     <strong><?=$view['file'][$i]['source']?></strong>
-                    <span> (<?=$view['file'][$i]['size']?>)</span>
+                    <?=$view['file'][$i]['bf_content']?> (<?=$view['file'][$i]['size']?>)
                 </a>
                 <span class="bo_v_file_cnt"><?=$view['file'][$i]['download']?>회 다운로드</span>
                 <span>DATE : <?=$view['file'][$i]['datetime']?></span>
diff --git a/skin/member/basic/password_lost2.skin.php b/skin/member/basic/password_lost2.skin.php
index 7fffff044..568d8b1fc 100644
--- a/skin/member/basic/password_lost2.skin.php
+++ b/skin/member/basic/password_lost2.skin.php
@@ -62,7 +62,7 @@ $content .= "<p style=\"margin:0;padding:30px 30px 30px;border-bottom:1px solid
 $content .= "<span style=\"display:inline-block;width:100px\">회원아이디</span> ".$mb['mb_id']."<br>";
 $content .= "<span style=\"display:inline-block;width:100px\">변경될 패스워드</span> <strong style=\"color:#ff3061\">".$change_password."</strong>";
 $content .= "</p>";
-$content .= "<a href=\"".$href."/\" style=\"display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center\">패스워드 변경</a>";
+$content .= "<a href=\"".$href."\" target=\"_blank\" style=\"display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center\">패스워드 변경</a>";
 $content .= "</div>";
 $content .= "</div>";
 
diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php
index e67e37a0c..aca692bc9 100644
--- a/skin/member/basic/register_form.skin.php
+++ b/skin/member/basic/register_form.skin.php
@@ -94,9 +94,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 </tr>
 <? } ?>
 
-<? if ($config['cf_use_addr']) {
-    $zip_href = G4_BBS_URL.'/zip.php?frm_name=fregisterform&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2';
-?>
+<? if ($config['cf_use_addr']) {?>
 <tr>
     <th scope="row">
         주소
@@ -106,9 +104,15 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         <input type="text" name="mb_zip1" value="<?=$member['mb_zip1']?>" id="reg_mb_zip1" <?=$config['cf_req_addr']?"required":"";?> title="우편번호 앞자리<?=$config['cf_req_addr']?"(필수)":"";?>" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3">
         -
         <input type="text"  name="mb_zip2" value="<?=$member['mb_zip2']?>" id="reg_mb_zip2" <?=$config['cf_req_addr']?"required":"";?> title="우편번호 뒷자리<?=$config['cf_req_addr']?"(필수)":"";?>" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3">
-        <a href="<? echo $zip_href; ?>" id="reg_zip_find" class="btn_frmline win_zip_find" target="_blank">주소찾기</a>
+        <span id="reg_win_zip" style="display:block"></span>
         <input type="text"  name="mb_addr1" value="<?=$member['mb_addr1']?>" id="reg_mb_addr1" <?=$config['cf_req_addr']?"required":"";?> title="행정구역주소<?=$config['cf_req_addr']?"(필수)":"";?>" class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" size="50">
         <input type="text" name="mb_addr2" value="<?=$member['mb_addr2']?>" id="reg_mb_addr2" <?=$config['cf_req_addr']?"required":"";?> title="상세주소<?=$config['cf_req_addr']?"(필수)":"";?>" class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" size="50">
+        <script>
+        // 우편번호 자바스크립트 비활성화 대응을 위한 코드
+        $('<a href="<?=G4_BBS_URL?>/zip.php?frm_name=fregisterform&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2" id="reg_zip_find" class="btn_frmline win_zip_find" target="_blank">우편번호 검색</a><br>').appendTo('#reg_win_zip');
+        $("#reg_win_zip").css("display", "inline");
+        $("#reg_mb_zip1, #reg_mb_zip2, #reg_mb_addr1").attr('readonly', 'readonly');
+        </script>
     </td>
 </tr>
 <? } ?>
@@ -213,11 +217,6 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 </form>
 
 <script>
-$(function() {
-    $("#reg_zip_find").css("display", "inline-block");
-    $("#reg_mb_zip1, #reg_mb_zip2, #reg_mb_addr1").attr("readonly", true);
-});
-
 // submit 최종 폼체크
 function fregisterform_submit(f)
 {
diff --git a/skin/member/basic/register_result.skin.php b/skin/member/basic/register_result.skin.php
index 383393a40..76e2774ad 100644
--- a/skin/member/basic/register_result.skin.php
+++ b/skin/member/basic/register_result.skin.php
@@ -28,7 +28,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
     <p>
         회원님의 패스워드는 아무도 알 수 없는 암호화 코드로 저장되므로 안심하셔도 좋습니다.<br>
-        아이디, 패스워드 분실시에는 회원가입시 입력하신 패스워드 분실시 질문, 답변을 이용하여 찾을 수 있습니다.
+        아이디, 패스워드 분실시에는 회원가입시 입력하신 이메일 주소를 이용하여 찾을 수 있습니다.
     </p>
 
     <p>
diff --git a/skin/member/kcpcert/register_form.skin.php b/skin/member/kcpcert/register_form.skin.php
index a2cad4776..cff3d8e70 100644
--- a/skin/member/kcpcert/register_form.skin.php
+++ b/skin/member/kcpcert/register_form.skin.php
@@ -4,7 +4,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 <script src="<?=G4_JS_URL?>/jquery.register_form.js"></script>
 
-<form name="fregisterform" id="fregisterform"action="<?=$register_action_url?>" onsubmit="return fregisterform_submit(this);" method="post"  enctype="multipart/form-data" autocomplete="off">
+<form id="fregisterform" name="fregisterform" method="post" action="<?=$register_action_url?>" onsubmit="return fregisterform_submit(this);" enctype="multipart/form-data" autocomplete="off">
 <input type="hidden" name="w" value="<?=$w?>">
 <input type="hidden" name="url" value="<?=$urlencode?>">
 <input type="hidden" name="agree" value="<?=$agree?>">
@@ -20,18 +20,18 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 <tr>
     <th scope="row"><label for="reg_mb_id">아이디<strong class="sound_only">필수</strong></label></th>
     <td>
-        <input type="text" name="mb_id" value="<?=$member['mb_id']?>" id="reg_mb_id"<?=$required?> <?=$readonly?> class="frm_input minlength_3 <?=$required?> <?=$readonly?>" maxlength="20">
+        <input type="text" id="reg_mb_id" name="mb_id" class="frm_input minlength_3 <?=$required?> <?=$readonly?>" value="<?=$member['mb_id']?>" maxlength="20" <?=$required?> <?=$readonly?>>
         <span id="msg_mb_id"></span>
         <span class="frm_info">영문자, 숫자, _ 만 입력 가능. 최소 3자이상 입력하세요.</span>
     </td>
 </tr>
 <tr>
     <th scope="row"><label for="reg_mb_password">패스워드<strong class="sound_only">필수</strong></label></th>
-    <td><input type="password" name="mb_password" id="reg_mb_password" <?=$required?> class="frm_input minlength_3 <?=$required?>" maxlength="20"></td>
+    <td><input type="password" id="reg_mb_password" name="mb_password" class="frm_input minlength_3 <?=$required?>" maxlength="20" <?=$required?>></td>
 </tr>
 <tr>
     <th scope="row"><label for="reg_mb_password_re">패스워드 확인<strong class="sound_only">필수</strong></label></th>
-    <td><input type="password" name="mb_password_re" id="reg_mb_password_re" <?=$required?> class="frm_input minlength_3 <?=$required?>" maxlength="20"></td>
+    <td><input type="password" id="reg_mb_password_re" name="mb_password_re" class="frm_input minlength_3 <?=$required?>" maxlength="20" <?=$required?>></td>
 </tr>
 </table>
 
@@ -40,7 +40,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 <tr>
     <th scope="row"><label for="reg_mb_name">이름<strong class="sound_only">필수</strong></label></th>
     <td>
-        <input name="mb_name" value="<?=$member['mb_name']?>" id="reg_mb_name" <?=$required?> <?=$readonly?> class="frm_input hangul nospace <?=$required?> <?=$readonly?>" size="10">
+        <input id="reg_mb_name" name="mb_name" class="frm_input hangul nospace <?=$required?> <?=$readonly?>" value="<?=$member['mb_name']?>" size="10" <?=$required?> <?=$readonly?>>
         <? if ($w=='') { echo "<span class=\"frm_info\">공백없이 한글만 입력하세요.</span>"; } ?>
     </td>
 </tr>
@@ -49,7 +49,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     <th scope="row"><label for="reg_mb_nick">별명<strong class="sound_only">필수</strong></label></th>
     <td>
         <input type="hidden" name="mb_nick_default" value="<?=isset($member['mb_nick'])?$member['mb_nick']:'';?>">
-        <input type="text" name="mb_nick" value="<?=isset($member['mb_nick'])?$member['mb_nick']:'';?>" id="reg_mb_nick" required class="frm_input required nospace" size="10" maxlength="20" >
+        <input type="text" id="reg_mb_nick" name="mb_nick" class="frm_input required nospace" maxlength="20" size="10" value="<?=isset($member['mb_nick'])?$member['mb_nick']:'';?>" required>
         <span id="msg_mb_nick"></span>
         <span class="frm_info">
             공백없이 한글,영문,숫자만 입력 가능 (한글2자, 영문4자 이상)<br>
@@ -60,10 +60,10 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 <? } ?>
 
 <tr>
-    <th scope="row"><label for="reg_mb_email">E-mail<strong class="sound_only">필수</strong></label></th>
+    <th scope="row"><label for="reg_mb_email">E-mail<? if ($config['cf_use_email_certify']) {?><strong class="sound_only">필수</strong><?}?></label></th>
     <td>
         <input type="hidden" name="old_email" value="<?=$member['mb_email']?>">
-        <input type="text" name="mb_email" value='<?=isset($member['mb_email'])?$member['mb_email']:'';?>' id="reg_mb_email" required class="frm_input email required" size="50" maxlength="100">
+        <input type="text" id="reg_mb_email" name="mb_email" class="frm_input email <?=$config['cf_use_email_certify']?"required":"";?>" maxlength="100" size="50" value='<?=isset($member['mb_email'])?$member['mb_email']:'';?>' <?=$config['cf_use_email_certify']?"required":"";?>>
         <? if ($config['cf_use_email_certify']) { ?>
         <span class="frm_info">
             <? if ($w=='') { echo "E-mail 로 발송된 내용을 확인한 후 인증하셔야 회원가입이 완료됩니다."; } ?>
@@ -76,14 +76,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 <? if ($config['cf_use_homepage']) { ?>
 <tr>
     <th scope="row"><label for="reg_mb_homepage">홈페이지<? if ($config['cf_req_homepage']){?><strong class="sound_only">필수</strong><?}?></label></th>
-    <td><input type="text" name="mb_homepage" value="<?=$member['mb_homepage']?>" id="reg_mb_homepage" class="frm_input <?=$config['cf_req_homepage']?"required":"";?>" size="50" maxlength="255"<?=$config['cf_req_homepage']?"required":"";?>></td>
+    <td><input type="text" id="reg_mb_homepage" name="mb_homepage" class="frm_input <?=$config['cf_req_homepage']?"required":"";?>" maxlength="255" size="50" <?=$config['cf_req_homepage']?"required":"";?> value="<?=$member['mb_homepage']?>"></td>
 </tr>
 <? } ?>
 
 <? if ($config['cf_use_tel']) { ?>
 <tr>
     <th scope="row"><label for="reg_mb_tel">전화번호<? if ($config['cf_req_tel']) {?><strong class="sound_only">필수</strong><?}?></label></th>
-    <td><input type="text" name="mb_tel" value="<?=$member['mb_tel']?>" id="reg_mb_tel" class="frm_input <?=$config['cf_req_tel']?"required":"";?>" maxlength="20" <?=$config['cf_req_tel']?"required":"";?>></td>
+    <td><input type="text" id="reg_mb_tel" name="mb_tel" class="frm_input <?=$config['cf_req_tel']?"required":"";?>" maxlength="20" <?=$config['cf_req_tel']?"required":"";?> value="<?=$member['mb_tel']?>"></td>
 </tr>
 <? } ?>
 
@@ -93,27 +93,31 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         <input type="hidden" name="kcpcert_no" value="">
         <input type="hidden" name="kcpcert_time" value="<?=$member['mb_hp_certify']?>">
         <input type="hidden" name="old_mb_hp" value="<?=$member['mb_hp']?>">
-        <input type="text" name="mb_hp" value="<?=$member['mb_hp']?>" id="reg_mb_hp" required class="frm_input required" maxlength="20">
+        <input type="text" id="reg_mb_hp" name="mb_hp" class="frm_input required" maxlength="20" required value="<?=$member['mb_hp']?>">
         <button type="button" id="win_kcpcert" class="btn_frmline">휴대폰인증</button>
         <noscript>휴대폰인증을 위해서는 자바스크립트 사용이 가능해야합니다.</noscript>
     </td>
 </tr>
 
-<? if ($config['cf_use_addr']) {
-    $zip_href = G4_BBS_URL.'/zip.php?frm_name=fregisterform&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2';
-?>
+<? if ($config['cf_use_addr']) { ?>
 <tr>
     <th scope="row">
         주소
         <? if ($config['cf_req_addr']) {?><strong class="sound_only">필수</strong><? } ?>
     </th>
     <td>
-        <input type="text" name="mb_zip1"value="<?=$member['mb_zip1']?>" id="reg_mb_zip1" title="우편번호 앞자리" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3" <?=$config['cf_req_addr']?"required":"";?> >
+        <input type="text" name="mb_zip1" value="<?=$member['mb_zip1']?>" id="reg_mb_zip1" <?=$config['cf_req_addr']?"required":"";?> title="우편번호 앞자리<?=$config['cf_req_addr']?"(필수)":"";?>" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3">
         -
-        <input type="text" name="mb_zip2" value="<?=$member['mb_zip2']?>" id="reg_mb_zip2" title="우편번호 뒷자리" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3" <?=$config['cf_req_addr']?"required":"";?>>
-        <a href="<? echo $zip_href; ?>" target="_blank" id="reg_zip_find" class="btn_frmline win_zip_find">주소찾기</a>
-        <input type="text" name="mb_addr1" value="<?=$member['mb_addr1']?>" id="reg_mb_addr1" title="행정구역주소" class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" size="50" <?=$config['cf_req_addr']?"required":"";?>>
-        <input type="text" name="mb_addr2" value="<?=$member['mb_addr2']?>" id="reg_mb_addr2" title="상세주소" class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" size="50" <?=$config['cf_req_addr']?"required":"";?>>
+        <input type="text"  name="mb_zip2" value="<?=$member['mb_zip2']?>" id="reg_mb_zip2" <?=$config['cf_req_addr']?"required":"";?> title="우편번호 뒷자리<?=$config['cf_req_addr']?"(필수)":"";?>" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3">
+        <span id="reg_win_zip" style="display:block"></span>
+        <input type="text"  name="mb_addr1" value="<?=$member['mb_addr1']?>" id="reg_mb_addr1" <?=$config['cf_req_addr']?"required":"";?> title="행정구역주소<?=$config['cf_req_addr']?"(필수)":"";?>" class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" size="50">
+        <input type="text" name="mb_addr2" value="<?=$member['mb_addr2']?>" id="reg_mb_addr2" <?=$config['cf_req_addr']?"required":"";?> title="상세주소<?=$config['cf_req_addr']?"(필수)":"";?>" class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" size="50">
+        <script>
+        // 우편번호 자바스크립트 비활성화 대응을 위한 코드
+        $('<a href="<?=G4_BBS_URL?>/zip.php?frm_name=fregisterform&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2" id="reg_zip_find" class="btn_frmline win_zip_find" target="_blank">우편번호 검색</a><br>').appendTo('#reg_win_zip');
+        $("#reg_win_zip").css("display", "inline");
+        $("#reg_mb_zip1, #reg_mb_zip2, #reg_mb_addr1").attr('readonly', 'readonly');
+        </script>
     </td>
 </tr>
 <? } ?>
@@ -124,24 +128,24 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 <? if ($config['cf_use_signature']) { ?>
 <tr>
     <th scope="row"><label for="reg_mb_signature">서명<? if ($config['cf_req_signature']){?><strong class="sound_only">필수</strong><?}?></label></th>
-    <td><textarea name="mb_signature" id="reg_mb_signature" class="<?=$config['cf_req_signature']?"required":"";?>" <?=$config['cf_req_signature']?"required":"";?>><?=$member['mb_signature']?></textarea></td>
+    <td><textarea id="reg_mb_signature" name="mb_signature" class="<?=$config['cf_req_signature']?"required":"";?>" <?=$config['cf_req_signature']?"required":"";?>><?=$member['mb_signature']?></textarea></td>
 </tr>
 <? } ?>
 
 <? if ($config['cf_use_profile']) { ?>
 <tr>
     <th scope="row"><label for="reg_mb_profile">자기소개</label></th>
-    <td><textarea name="mb_profile" id="reg_mb_profile" class="<?=$config['cf_req_profile']?"required":"";?>" <?=$config['cf_req_profile']?"required":"";?>><?=$member['mb_profile']?></textarea></td>
+    <td><textarea id="reg_mb_profile" name="mb_profile" class="<?=$config['cf_req_profile']?"required":"";?>" <?=$config['cf_req_profile']?"required":"";?>><?=$member['mb_profile']?></textarea></td>
 </tr>
 <? } ?>
 
-<? if ($config['cf_use_member_icon'] && $member['mb_level'] >= $config['cf_icon_level']) { ?>
+<? if ($member['mb_level'] >= $config['cf_icon_level']) { ?>
 <tr>
     <th scope="row"><label for="reg_mb_icon">회원아이콘</label></th>
     <td>
-        <input type="file" name="mb_icon" id="reg_mb_icon" class="frm_input">
+        <input type="file" id="reg_mb_icon" name="mb_icon" class="frm_input">
         <? if ($w == 'u' && file_exists($mb_icon)) { ?>
-        <input type="checkbox" name="del_mb_icon" value="1" id="del_mb_icon">
+        <input type="checkbox" id="del_mb_icon" name="del_mb_icon" value="1">
         <label for="del_mb_icon">삭제</label>
         <? } ?>
         <span class="frm_info">
@@ -155,7 +159,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 <tr>
     <th scope="row"><label for="reg_mb_mailling">메일링서비스</label></th>
     <td>
-        <input type="checkbox" name="mb_mailling" value="1" id="reg_mb_mailling" <?=($w=='' || $member['mb_mailling'])?'checked':'';?>>
+        <input type="checkbox" id="reg_mb_mailling" name="mb_mailling" value="1" <?=($w=='' || $member['mb_mailling'])?'checked':'';?>>
         정보 메일을 받겠습니다.
     </td>
 </tr>
@@ -164,7 +168,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 <tr>
     <th scope="row"><label for="reg_mb_sms">SMS 수신여부</label></th>
     <td>
-        <input type="checkbox" name="mb_sms" value="1" id="reg_mb_sms" <?=($w=='' || $member['mb_sms'])?'checked':'';?>>
+        <input type="checkbox" id="reg_mb_sms" name="mb_sms" value="1" <?=($w=='' || $member['mb_sms'])?'checked':'';?>>
         핸드폰 문자메세지를 받겠습니다.
     </td>
 </tr>
@@ -175,7 +179,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     <th scope="row"><label for="reg_mb_open">정보공개</label></th>
     <td>
         <input type="hidden" name="mb_open_default" value="<?=$member['mb_open']?>">
-        <input type="checkbox" name="mb_open" value="1" id="reg_mb_open" <?=($w=='' || $member['mb_open'])?'checked':'';?>>
+        <input type="checkbox" id="reg_mb_open" name="mb_open" value="1" <?=($w=='' || $member['mb_open'])?'checked':'';?>>
         다른분들이 나의 정보를 볼 수 있도록 합니다.
         <span class="frm_info">
             정보공개를 바꾸시면 앞으로 <?=(int)$config['cf_open_modify']?>일 이내에는 변경이 안됩니다.
@@ -198,7 +202,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 <? if ($w == "" && $config['cf_use_recommend']) { ?>
 <tr>
     <th scope="row"><label for="reg_mb_recommend">추천인아이디</label></th>
-    <td><input type="text" name="mb_recommend" id="reg_mb_recommend" class="frm_input"></td>
+    <td><input type="text" id="reg_mb_recommend" name="mb_recommend" class="frm_input"></td>
 </tr>
 <? } ?>
 
@@ -209,13 +213,13 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 </table>
 
 <div class="btn_confirm">
-    <input type="submit" value="<?=$w==''?'회원가입':'정보수정';?>" class="btn_submit" accesskey="s">
-    <a href="<?=G4_URL?>/" class="btn_cancel">취소</a>
+    <input type="submit" class="btn_submit" value="<?=$w==''?'회원가입':'정보수정';?>" accesskey="s">
+    <a href="<?=$g4['path']?>/" class="btn_cancel">취소</a>
 </div>
 </form>
 
 <? // 휴대폰인증 form
-include_once(G4_BBS_PATH.'/kcp/kcpcert_form.php');
+include_once(G4_KCP_PATH.'/kcpcert_form.php');
 ?>
 
 <script>
diff --git a/skin/member/kcpcert/register_form_update.head.skin.php b/skin/member/kcpcert/register_form_update.head.skin.php
index 414359db4..e5f38b09d 100644
--- a/skin/member/kcpcert/register_form_update.head.skin.php
+++ b/skin/member/kcpcert/register_form_update.head.skin.php
@@ -1,5 +1,54 @@
 <?
-if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 // 자신만의 코드를 넣어주세요.
-?>
+
+// 핸드폰번호 체크
+if ($msg = valid_mb_hp($mb_hp))   alert($msg, "", true, true);
+if ($msg = exist_mb_hp($mb_hp, $mb_id))   alert($msg, "", true, true);
+
+$reg_hp = preg_replace("/[^0-9]/", "", $mb_hp);
+$hp_len = strlen($reg_hp);
+
+if($hp_len == 10)
+    $reg_mb_hp = preg_replace("/([0-9]{3})([0-9]{3})([0-9]{4})/", "\\1-\\2-\\3", $reg_hp);
+else if($hp_len == 11)
+    $reg_mb_hp = preg_replace("/([0-9]{3})([0-9]{4})([0-9]{4})/", "\\1-\\2-\\3", $reg_hp);
+
+/* ======================================================================================================= */
+/* = 휴대폰인증 및 성인인증                                                                              = */
+/* ======================================================================================================= */
+if($w == '') {
+    // 본인인증체크
+    $kcpcert_no = trim($_POST['kcpcert_no']);
+    if(!$kcpcert_no)
+        alert('휴대폰인증이 되지 않았습니다. 휴대폰인증을 해주세요.', "", true, true);
+
+    // 본인인증 hash 체크
+    $reg_hash = md5($reg_hp.$mb_name.$kcpcert_no);
+    if(get_session('ss_kcpcert_hash') != $reg_hash)
+        alert('휴대폰인증 정보가 올바르지 않습니다. 정상적인 방법으로 이용해 주세요.', "", true, true);
+
+    // 성인인증을 사용한다면
+    if($config['cf_adult_check']) {
+        if(get_session('ss_adult_check') != 'Y')
+            alert('성인인증이 되지 않았습니다. 다음에 다시 가입해 주세요.', "", true, true);
+    }
+} else if($w == 'u') {
+    // 휴대폰번호 변경체크
+    $old_hp = preg_replace("/[^0-9]/", "", $_POST['old_mb_hp']);
+
+    if($old_hp != $reg_hp) {
+        // 본인인증체크
+        $kcpcert_no = trim($_POST['kcpcert_no']);
+        if(!$kcpcert_no)
+            alert('휴대폰번호가 변경됐습니다. 휴대폰인증을 해주세요.', "", true, true);
+
+        // 본인인증 hash 체크
+        $reg_hash = md5($reg_hp.$mb_name.$kcpcert_no);
+        if(get_session('ss_kcpcert_hash') != $reg_hash)
+            alert('휴대폰인증 정보가 올바르지 않습니다. 정상적인 방법으로 이용해 주세요.', "", true, true);
+    }
+}
+/* ======================================================================================================= */
+?>
\ No newline at end of file
diff --git a/skin/member/kcpcert/register_form_update.tail.skin.php b/skin/member/kcpcert/register_form_update.tail.skin.php
index 414359db4..922a1a2f6 100644
--- a/skin/member/kcpcert/register_form_update.tail.skin.php
+++ b/skin/member/kcpcert/register_form_update.tail.skin.php
@@ -1,5 +1,28 @@
 <?
-if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 // 자신만의 코드를 넣어주세요.
+
+// 휴대폰번호 포맷(010-0000-0000) 변경해서 기록
+// $reg_mb_hp 는 rigister_form_update.head.skin.php 파일
+$sql = " update {$g4['member_table']}
+            set mb_hp = '$reg_mb_hp'
+            where mb_id = '$mb_id' ";
+sql_query($sql);
+
+/* =========================================================================== */
+/* = 휴대폰인증 및 성인인증                                                  = */
+/* =========================================================================== */
+if($_POST['kcpcert_no']) {
+    $mb_adult = 'N';
+    if(get_session('ss_adult_check') == 'Y')
+        $mb_adult = 'Y';
+
+    $sql = " update {$g4['member_table']}
+                set mb_hp_certify   = '{$_POST['kcpcert_time']}',
+                    mb_adult        = '$mb_adult'
+                where mb_id = '$mb_id' ";
+    sql_query($sql);
+}
+/* =========================================================================== */
 ?>
diff --git a/skin/member/kcpcert/register_result.skin.php b/skin/member/kcpcert/register_result.skin.php
index 383393a40..76e2774ad 100644
--- a/skin/member/kcpcert/register_result.skin.php
+++ b/skin/member/kcpcert/register_result.skin.php
@@ -28,7 +28,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
     <p>
         회원님의 패스워드는 아무도 알 수 없는 암호화 코드로 저장되므로 안심하셔도 좋습니다.<br>
-        아이디, 패스워드 분실시에는 회원가입시 입력하신 패스워드 분실시 질문, 답변을 이용하여 찾을 수 있습니다.
+        아이디, 패스워드 분실시에는 회원가입시 입력하신 이메일 주소를 이용하여 찾을 수 있습니다.
     </p>
 
     <p>
diff --git a/skin/outlogin/basic/style.css b/skin/outlogin/basic/style.css
index 92b4e2b78..214de0913 100644
--- a/skin/outlogin/basic/style.css
+++ b/skin/outlogin/basic/style.css
@@ -14,11 +14,7 @@
 #auto_login {}
 #auto_login_label {letter-spacing:-0.1em}
 #ol_submit {display:inline-block;width:60px;height:24px;border:0;background:#333;color:#fff;font-size:0.9em;font-weight:bold;vertical-align:top}
-#ol_before ul {float:right;margin:7px 0 13px;zoom:1}
-#ol_before ul:after {display:block;visibility:hidden;clear:both;content:""}
-#ol_before li {float:left;margin-left:5px;padding-top:2px}
-#ol_before #ol_auto {float:left;margin:4px 0 0;padding:0}
-#ol_before a {letter-spacing:-0.1em}
+#ol_before a {letter-spacing:-0.15em}
 #ol_svc {padding-top:8px;text-align:right}
 
 #ol_after {}
diff --git a/tail.php b/tail.php
index 467927911..79713c5c9 100644
--- a/tail.php
+++ b/tail.php
@@ -32,7 +32,7 @@ if ($config['cf_include_tail']) {
     </div>
 </footer>
 
-<?if(!is_mobile()){?>
+<?if(!G4_IS_MOBILE){?>
 <a href="<?=$_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING']?'?'.$_SERVER['QUERY_STRING'].'&amp;':'?').'device=mobile';?>" id="g4s_cng">모바일 버전으로 보기</a>
 <?}?>
 
diff --git a/tail.sub.php b/tail.sub.php
index d343e9d15..af5d419c8 100644
--- a/tail.sub.php
+++ b/tail.sub.php
@@ -21,8 +21,6 @@ $(function() {
 <![endif]-->
 
 <script>
-$('.sv').removeClass('sv_js_off'); //js 사용 가능한지를 사이드뷰에 알려주는 역할
-
 $(function(){
     var hide_menu = false;
     var mouse_event = false;