diff --git a/adm/board_delete.php b/adm/board_delete.php
index 1f123b4e5..6ead47183 100644
--- a/adm/board_delete.php
+++ b/adm/board_delete.php
@@ -15,7 +15,7 @@ check_token();
 define('_BOARD_DELETE_', TRUE);
 
 // include 전에 $bo_table 값을 반드시 넘겨야 함
-$tmp_bo_table = mysql_real_escape_string(trim($_POST['bo_table']));
+$tmp_bo_table = escape_trim($_GET['bo_table']);
 $sql = " select * from {$g4['board_table']} where bo_table = '{$tmp_bo_table}' ";
 $row = sql_fetch($sql);
 if (!$row) {
diff --git a/adm/board_list.php b/adm/board_list.php
index f3145f9fb..f16b7b308 100644
--- a/adm/board_list.php
+++ b/adm/board_list.php
@@ -4,11 +4,6 @@ include_once('./_common.php');
 
 auth_check($auth[$sub_menu], 'r');
 
-// DHTML 에디터 사용 필드 추가 : 061021
-sql_query(" ALTER TABLE `{$g4['board_table']}` ADD `bo_use_dhtml_editor` TINYINT NOT NULL AFTER `bo_use_secret` ", false);
-// RSS 보이기 사용 필드 추가 : 061106
-sql_query(" ALTER TABLE `{$g4['board_table']}` ADD `bo_use_rss_view` TINYINT NOT NULL AFTER `bo_use_dhtml_editor` ", false);
-
 $sql_common = " from {$g4['board_table']} a ";
 $sql_search = " where (1) ";
 
@@ -39,10 +34,7 @@ if (!$sst) {
 }
 $sql_order = " order by $sst $sod ";
 
-$sql = " select count(*) as cnt
-            {$sql_common}
-            {$sql_search}
-            {$sql_order} ";
+$sql = " select count(*) as cnt {$sql_common} {$sql_search} {$sql_order} ";
 $row = sql_fetch($sql);
 $total_count = $row['cnt'];
 
@@ -51,11 +43,7 @@ $total_page  = ceil($total_count / $rows);  // 전체 페이지 계산
 if ($page == "") { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
 $from_record = ($page - 1) * $rows; // 시작 열을 구함
 
-$sql = " select *
-            {$sql_common}
-            {$sql_search}
-            {$sql_order}
-            limit {$from_record}, {$rows} ";
+$sql = " select * {$sql_common} {$sql_search} {$sql_order} limit {$from_record}, {$rows} ";
 $result = sql_query($sql);
 
 $listall = '';
@@ -128,8 +116,7 @@ var list_delete_php = 'board_list_delete.php';
 // 스킨디렉토리
 $skin_options = '';
 $arr = get_skin_dir('board');
-for ($k=0; $k<count($arr); $k++)
-{
+for ($k=0; $k<count($arr); $k++) {
     $option = $arr[$k];
     if (strlen($option) > 10)
         $option = substr($arr[$k], 0, 18) . '…';
@@ -141,8 +128,8 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
     $s_upd = '<a href="./board_form.php?w=u&amp;bo_table='.$row['bo_table'].'&amp;'.$qstr.'">수정</a>';
     $s_del = "";
     if ($is_admin == 'super') {
-        //$s_del = '<a href="javascript:del(\'./board_delete.php?bo_table='.$row['bo_table'].'&amp;'.$qstr.'\');">삭제</a>';
-        $s_del = '<a href="javascript:post_delete(\'board_delete.php\', \''.$row['bo_table'].'\');">삭제</a>';
+        //$s_del = '<a href="javascript:post_delete(\'board_delete.php\', \''.$row['bo_table'].'\');">삭제</a>';
+        $s_del = "<a href=\"./board_delete.php?bo_table={$row['bo_table']}\" class=\"board_delete\">삭제</a>";
     }
     $s_copy = '<a href="javascript:board_copy(\''.$row['bo_table'].'\');">복사</a>';
 ?>
@@ -234,6 +221,16 @@ function post_delete(action_url, val)
 		f.submit();
 	}
 }
+
+$(function(){
+    $(".board_delete").click(function(){
+    	if(confirm("한번 삭제한 자료는 복구할 방법이 없습니다.\n\n정말 삭제하시겠습니까?")) {
+            $("#fpost").attr("action", this.href);
+            $("#fpost").submit();
+        }
+        return false;
+    });
+});
 </script>
 
 <form id="fpost" name="fpost" method="post">
@@ -243,7 +240,7 @@ function post_delete(action_url, val)
 <input type="hidden" name="stx" value="<?=$stx?>">
 <input type="hidden" name="page" value="<?=$page?>">
 <input type="hidden" name="token" value="<?=$token?>">
-<input type="hidden" name="bo_table">
+<!-- <input type="hidden" name="bo_table"> -->
 </form>
 
 <?
diff --git a/bbs/register.php b/bbs/register.php
index 5261ae935..20fd67812 100644
--- a/bbs/register.php
+++ b/bbs/register.php
@@ -11,6 +11,12 @@ set_session("ss_mb_reg", "");
 
 $member_skin_path = $g4['path'].'/skin/member/'.$config['cf_member_skin'];
 
+if ($g4['https_url']) {
+    $register_action_url = $g4['https_url'].'/'.$g4['bbs'].'/register_form.php';
+} else {
+    $register_action_url = $g4['bbs_url'].'/register_form.php';
+}
+
 $g4['title'] = '회원가입약관';
 include_once('./_head.php');
 include_once($member_skin_path.'/register.skin.php');
diff --git a/bbs/register_form.php b/bbs/register_form.php
index 587c75d14..7b3162810 100644
--- a/bbs/register_form.php
+++ b/bbs/register_form.php
@@ -24,7 +24,7 @@ if ($w == "") {
     }
 
     if (!isset($_POST['agree2']) || !$_POST['agree2']) {
-        alert('개인정보취급방침의 내용에 동의하셔야 회원가입 하실 수 있습니다.', './register.php');
+        alert('개인정보수집이용안내의 내용에 동의하셔야 회원가입 하실 수 있습니다.', './register.php');
     }
 
     $member['mb_birth'] = '';
@@ -74,28 +74,28 @@ if ($w == "") {
 
     $g4['title'] = '회원 정보 수정';
 
-    $member[mb_email]       = get_text($member[mb_email]);
-    $member[mb_homepage]    = get_text($member[mb_homepage]);
-    $member[mb_password_q]  = get_text($member[mb_password_q]);
-    $member[mb_password_a]  = get_text($member[mb_password_a]);
-    $member[mb_birth]       = get_text($member[mb_birth]);
-    $member[mb_tel]         = get_text($member[mb_tel]);
-    $member[mb_hp]          = get_text($member[mb_hp]);
-    $member[mb_addr1]       = get_text($member[mb_addr1]);
-    $member[mb_addr2]       = get_text($member[mb_addr2]);
-    $member[mb_signature]   = get_text($member[mb_signature]);
-    $member[mb_recommend]   = get_text($member[mb_recommend]);
-    $member[mb_profile]     = get_text($member[mb_profile]);
-    $member[mb_1]           = get_text($member[mb_1]);
-    $member[mb_2]           = get_text($member[mb_2]);
-    $member[mb_3]           = get_text($member[mb_3]);
-    $member[mb_4]           = get_text($member[mb_4]);
-    $member[mb_5]           = get_text($member[mb_5]);
-    $member[mb_6]           = get_text($member[mb_6]);
-    $member[mb_7]           = get_text($member[mb_7]);
-    $member[mb_8]           = get_text($member[mb_8]);
-    $member[mb_9]           = get_text($member[mb_9]);
-    $member[mb_10]          = get_text($member[mb_10]);
+    $member['mb_email']       = get_text($member['mb_email']);
+    $member['mb_homepage']    = get_text($member['mb_homepage']);
+    $member['mb_password_q']  = get_text($member['mb_password_q']);
+    $member['mb_password_a']  = get_text($member['mb_password_a']);
+    $member['mb_birth']       = get_text($member['mb_birth']);
+    $member['mb_tel']         = get_text($member['mb_tel']);
+    $member['mb_hp']          = get_text($member['mb_hp']);
+    $member['mb_addr1']       = get_text($member['mb_addr1']);
+    $member['mb_addr2']       = get_text($member['mb_addr2']);
+    $member['mb_signature']   = get_text($member['mb_signature']);
+    $member['mb_recommend']   = get_text($member['mb_recommend']);
+    $member['mb_profile']     = get_text($member['mb_profile']);
+    $member['mb_1']           = get_text($member['mb_1']);
+    $member['mb_2']           = get_text($member['mb_2']);
+    $member['mb_3']           = get_text($member['mb_3']);
+    $member['mb_4']           = get_text($member['mb_4']);
+    $member['mb_5']           = get_text($member['mb_5']);
+    $member['mb_6']           = get_text($member['mb_6']);
+    $member['mb_7']           = get_text($member['mb_7']);
+    $member['mb_8']           = get_text($member['mb_8']);
+    $member['mb_9']           = get_text($member['mb_9']);
+    $member['mb_10']          = get_text($member['mb_10']);
 } else {
     alert('w 값이 제대로 넘어오지 않았습니다.');
 }
diff --git a/bbs/search.php b/bbs/search.php
index 24674f9cb..d2ac091d6 100644
--- a/bbs/search.php
+++ b/bbs/search.php
@@ -4,12 +4,18 @@ include_once('./_common.php');
 $g4['title'] = "전체검색 결과";
 include_once('./_head.php');
 
+$search_table = Array();
+$table_index = 0;
+$write_pages = "";
+$text_stx = "";
+$srows = 0;
+
 if ($stx) {
 
     $stx = preg_replace("/\//", "\/", trim($stx));
     $sop = strtolower($sop);
     if (!$sop || !($sop == 'and' || $sop == 'or')) $sop = 'and'; // 연산자 and , or
-    $srows = isset($_GET['srows']) ? $_GET['srows'] : "";
+    $srows = isset($_GET['srows']) ? $_GET['srows'] : 10;
     if (!$srows) $srows = 10; // 한페이지에 출력하는 검색 행수
 
     $g4_search['tables'] = Array();
@@ -105,8 +111,6 @@ if ($stx) {
     $board_count = 0;
 
     $time1 = get_microtime();
-    $search_table = Array();
-    $table_index = 0;
 
     $total_count = 0;
     for ($i=0; $i<count($g4_search['tables']); $i++) {
@@ -130,7 +134,7 @@ if ($stx) {
     }
 
     $rows = $srows;
-    $total_page  = ceil($total_count / $rows);  // 전체 페이지 계산
+    $total_page = ceil($total_count / $rows);  // 전체 페이지 계산
     if ($page == "") { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
     $from_record = ($page - 1) * $rows; // 시작 열을 구함
 
diff --git a/common.php b/common.php
index a0fb9511d..e90c11db0 100644
--- a/common.php
+++ b/common.php
@@ -3,6 +3,7 @@
 ** 공통 변수, 상수, 코드
 *******************************************************************************/
 //error_reporting(E_ALL ^ E_NOTICE);
+error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
 
 // 보안설정이나 프레임이 달라도 쿠키가 통하도록 설정
 header('P3P: CP="ALL CURa ADMa DEVa TAIa OUR BUS IND PHY ONL UNI PUR FIN COM NAV INT DEM CNT STA POL HEA PRE LOC OTC"');
diff --git a/extend/g4s.extend.php b/extend/g4s.extend.php
index 3d9b82124..def09b2d2 100644
--- a/extend/g4s.extend.php
+++ b/extend/g4s.extend.php
@@ -7,6 +7,11 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 $g4['bbs_url']        = $g4['url'].'/'.$g4['bbs'];
 $g4['admin_url']      = $g4['url'].'/'.$g4['admin'];
 
+$g4['https_bbs_url']  = $g4['bbs_url'];
+if ($g4['https_url']) {
+    $g4['https_bbs_url'] = $g4['https_url'].'/'.$g4['bbs'];
+}
+
 $g4['data_dir']       = 'data';
 $g4['data_url']       = $g4['url'].'/'.$g4['data_dir'];
 $g4['data_path']      = $g4['path'].'/'.$g4['data_dir'];
diff --git a/head.php b/head.php
index 80f1008be..d9e5b2789 100644
--- a/head.php
+++ b/head.php
@@ -31,7 +31,7 @@ include_once($g4['path'].'/lib/popular.lib.php');
     </ul>
 
     <fieldset id="hdsch">
-        <form name="fsearchbox" method="get" onsubmit="return fsearchbox_submit(this);">
+        <form name="fsearchbox" method="get" action="<?=$g4['https_bbs_url'].'/search.php'?>" onsubmit="return fsearchbox_submit(this);">
         <input type="hidden" name="sfl" value="wr_subject||wr_content">
         <input type="hidden" name="sop" value="and">
         <legend>사이트 내 전체검색</legend>
diff --git a/skin/member/neo/register.skin.php b/skin/member/neo/register.skin.php
index ad403ea9e..fd40535ea 100644
--- a/skin/member/neo/register.skin.php
+++ b/skin/member/neo/register.skin.php
@@ -2,7 +2,7 @@
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 
 ?>
 
-<form id="fregister" name="fregister" method="POST" onsubmit="return fregister_submit(this);" autocomplete="off">
+<form id="fregister" name="fregister" method="POST" action="<?=$register_action_url?>" onsubmit="return fregister_submit(this);" autocomplete="off">
 
 <section id="fregister_term">
     <h2>회원가입약관</h2>
@@ -16,7 +16,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 </section>
 
 <section id="fregister_private">
-    <h2>개인정보취급방침</h2>
+    <h2>개인정보수집이용안내</h2>
     <textarea readonly><?=get_text($config['cf_privacy'])?></textarea>
     <div class="fregister_agree">
         <input type="radio" id="agree21" name="agree2" value="1">
@@ -44,15 +44,11 @@ function fregister_submit(f)
 
     var agree2 = document.getElementsByName("agree2");
     if (!agree2[0].checked) {
-        alert("개인정보취급방침의 내용에 동의하셔야 회원가입 하실 수 있습니다.");
+        alert("개인정보수집이용안내의 내용에 동의하셔야 회원가입 하실 수 있습니다.");
         agree2[0].focus();
         return false;
     }
 
-    f.action = "./register_form.php";
     return true;
 }
-
-if (typeof(document.fregister.mb_name) != "undefined")
-    document.fregister.mb_name.focus();
 </script>
diff --git a/skin/member/neo/register_form.skin.php b/skin/member/neo/register_form.skin.php
index 1c338dad5..987657741 100644
--- a/skin/member/neo/register_form.skin.php
+++ b/skin/member/neo/register_form.skin.php
@@ -204,26 +204,6 @@ var member_skin_path = "<?=$member_skin_path?>";
 </form>
 
 <script>
-$(function(){
-    /*
-    $("#reg_mb_id").blur(function(){
-        var msg = reg_mb_id_check();
-        if (msg) alert(msg);
-    });
-
-    $("#reg_mb_nick").blur(function(){
-        var msg = reg_mb_nick_check();
-        if (msg) alert(msg);
-    });
-
-    $("#reg_mb_email").blur(function(){
-        var msg = reg_mb_email_check();
-        if (msg) alert(msg);
-    });
-    */
-});
-
-
 // submit 최종 폼체크
 function fregisterform_submit(f) 
 {
@@ -313,12 +293,7 @@ function fregisterform_submit(f)
         }
     }
 
-    if (!check_captcha(f.wr_key)) {
-        return false;
-    }
-
-    // 보안인증관련 코드로 반드시 포함되어야 합니다.
-    set_cookie("<?=md5($token)?>", "<?=base64_encode($token)?>", 1, "<?=$g4['cookie_domain']?>");
+    <? echo chk_captcha_js(); ?>
 
     return true;
 }
diff --git a/skin/outlogin/neo/outlogin.skin.1.php b/skin/outlogin/neo/outlogin.skin.1.php
index 797eb9c64..7228ab62e 100644
--- a/skin/outlogin/neo/outlogin.skin.1.php
+++ b/skin/outlogin/neo/outlogin.skin.1.php
@@ -24,7 +24,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 </section>
 
 <script>
-$(document).ready(function(){
+$(function(){
     $omi = $('#ol_mb_id');
     $omp = $('#ol_mb_pw');
     $omi_label = $('#ol_mb_id_label');
@@ -50,9 +50,7 @@ $(document).ready(function(){
         }
     });
 });
-</script>
 
-<script>
 function fhead_submit(f)
 {
     return true;
diff --git a/skin/poll/neo/poll.skin.php b/skin/poll/neo/poll.skin.php
index 33611b718..291be10d3 100644
--- a/skin/poll/neo/poll.skin.php
+++ b/skin/poll/neo/poll.skin.php
@@ -19,7 +19,11 @@ $po = sql_fetch(" select * from {$g4['poll_table']} where po_id = '$po_id' ");
 <section id="poll">
     <header>
         <h2>설문조사</h2>
+<<<<<<< HEAD
+        <? if ($is_admin == "super") { ?><a href="<?=$g4['admin_url']?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>">설문조사 관리</a><? } ?>
+=======
         <? if ($is_admin == "super") { ?><a href="<?=$g4[admin_path]?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>">설문관리</a><? } ?>
+>>>>>>> 8acf7f8c214b606db9e4d7b3533a916ca4171b83
         <p><?=$po['po_subject']?></p>
     </header>
     <ul>
@@ -58,14 +62,4 @@ function fpoll_submit(f)
     win_poll();
     return true;
 }
-
-function poll_result(po_id)
-{
-    <?
-    if ($member['mb_level'] < $po['po_level'])
-        echo " alert('권한 {$po['po_level']} 이상의 회원만 결과를 보실 수 있습니다.'); return false; ";
-    ?>
-
-    win_poll("<?=$g4['bbs_path']?>/poll_result.php?po_id="+po_id+"&amp;skin_dir="+document.fpoll.skin_dir.value);
-}
 </script>
\ No newline at end of file
diff --git a/tail.php b/tail.php
index d5488a272..a19e30f22 100644
--- a/tail.php
+++ b/tail.php
@@ -38,7 +38,6 @@ function fsearchbox_submit(f)
         return false;
     }
 
-    f.action = "<?=$g4['bbs_path']?>/search.php";
     return true;
 }
 </script>