From 6c5435f2ce85a62814faed25c681ebbd92ce2e83 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 18 Feb 2013 10:08:04 +0900
Subject: [PATCH 1/7] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=EA=B7=B8?=
 =?UTF-8?q?=EB=A3=B9=20=EC=84=A0=ED=83=9D=EC=82=AD=EC=A0=9C,=20=EC=84=A0?=
 =?UTF-8?q?=ED=83=9D=EC=88=98=EC=A0=95=20=EA=B4=80=EB=A0=A8=20=EC=8A=A4?=
 =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/boardgroup_list.php | 43 ++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/adm/boardgroup_list.php b/adm/boardgroup_list.php
index 49065e2ba..48d2476c9 100644
--- a/adm/boardgroup_list.php
+++ b/adm/boardgroup_list.php
@@ -190,29 +190,32 @@ if (isset($stx))
 ?>
 
 <script>
-// POST 방식으로 삭제
-function post_delete(action_url, val)
-{
-    var f = document.fpost;
+$(function() {
+    $('input[name=act_button]').click(function(e) {
+        e.preventDefault();
 
-    if(confirm("한번 삭제한 자료는 복구할 방법이 없습니다.\n\n정말 삭제하시겠습니까?")) {
-        f.gr_id.value = val;
-        f.action      = action_url;
-        f.submit();
-    }
-}
+        var act = $(this).val();
+        var cnt = $('input[name^=chk]:checked').length;
+
+        if(act == "선택삭제") {
+            if(confirm("한번 삭제한 자료는 복구할 방법이 없습니다.\n\n정말 삭제하시겠습니까?")) {
+                if(cnt < 1) {
+                    alert(act+'할 게시판그룹을 1개 이상 선택해 주세요.');
+                    return false;
+                }
+            }
+        } else if(act == "선택수정") {
+            if(cnt < 1) {
+                alert(act+'할 게시판그룹을 1개 이상 선택해 주세요.');
+                return false;
+            }
+        }
+
+        $('#fboardgrouplist').submit();
+    });
+});
 </script>
 
-<form id="fpost" name="fpost" method="post">
-<input type="hidden" name="sst"   value="<?=$sst?>">
-<input type="hidden" name="sod"   value="<?=$sod?>">
-<input type="hidden" name="sfl"   value="<?=$sfl?>">
-<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="gr_id">
-</form>
-
 <?
 include_once('./admin.tail.php');
 ?>

From f7f6088856983a1a2422e4c79e69009918a028ac Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 18 Feb 2013 10:36:19 +0900
Subject: [PATCH 2/7] =?UTF-8?q?=EA=B6=8C=ED=95=9C=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/boardgroup_delete.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adm/boardgroup_delete.php b/adm/boardgroup_delete.php
index 742061c88..c6b2073dd 100644
--- a/adm/boardgroup_delete.php
+++ b/adm/boardgroup_delete.php
@@ -9,7 +9,7 @@ auth_check($auth[$sub_menu], 'd');
 $gr_id = mysql_real_escape_string(trim($_POST['gr_id']));
 $row = sql_fetch(" select count(*) as cnt from {$g4['board_table']} where gr_id = '{$gr_id}' ");
 if ($row['cnt'])
-    alert('이 그룹에 속한 게시판이 존재하여 게시판 그룹을 삭제할 수 없습니다.'.PHP_EOL.PHP_EOL.'이 그룹에 속한 게시판을 먼저 삭제하여 주십시오.', './board_list.php?sfl=gr_id&amp;stx='.$gr_id);
+    alert('이 그룹에 속한 게시판이 존재하여 게시판 그룹을 삭제할 수 없습니다.\\n\\n이 그룹에 속한 게시판을 먼저 삭제하여 주십시오.', './board_list.php?sfl=gr_id&amp;stx='.$gr_id);
 
 
 /*

From 10c44b113ad43379f6bca70acbb69c31e966267b Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 18 Feb 2013 10:38:53 +0900
Subject: [PATCH 3/7] =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EB=B0=8F=20=EC=BA=A1=EC=B1=A0=20=EB=9D=BC=EC=9D=B4=EB=B8=8C?=
 =?UTF-8?q?=EB=9F=AC=EB=A6=AC=20=EA=B2=BD=EB=A1=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/board_copy.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/adm/board_copy.php b/adm/board_copy.php
index a2d2efa27..54c8e20d3 100644
--- a/adm/board_copy.php
+++ b/adm/board_copy.php
@@ -1,7 +1,7 @@
 <?
 $sub_menu = "300100";
-define('G4_CAPTCHA', 1);
 include_once("./_common.php");
+include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
 
 auth_check($auth[$sub_menu], 'w');
 
@@ -9,7 +9,7 @@ $token = get_token();
 
 $g4['title'] = '게시판 복사';
 $administrator = 1;
-include_once($g4['path'].'/head.sub.php');
+include_once(G4_PATH.'/head.sub.php');
 ?>
 
 <form id="fboardcopy" name="fboardcopy" method="post" action="./board_copy_update.php" onsubmit="return fboardcopy_check(this);">
@@ -66,5 +66,5 @@ function fboardcopy_check(f)
 
 
 <?
-include_once($g4['path'].'/tail.sub.php');
+include_once(G4_PATH.'/tail.sub.php');
 ?>

From 583ca2e75d30607ace3aa9145296211666b77ea3 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 18 Feb 2013 10:39:34 +0900
Subject: [PATCH 4/7] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EC=84=A0?=
 =?UTF-8?q?=ED=83=9D=EC=82=AD=EC=A0=9C,=20=EC=84=A0=ED=83=9D=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EA=B4=80=EB=A0=A8=20=EC=8A=A4=ED=81=AC=EB=A6=BD?=
 =?UTF-8?q?=ED=8A=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/board_list.php        | 42 +++++++++++++++++++++++----------------
 adm/board_list_update.php |  4 ++--
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/adm/board_list.php b/adm/board_list.php
index efa98620e..795b4c15b 100644
--- a/adm/board_list.php
+++ b/adm/board_list.php
@@ -65,11 +65,6 @@ include_once('./admin.head.php');
 $colspan = 8;
 ?>
 
-<script>
-var list_update_php = 'board_list_update.php';
-var list_delete_php = 'board_list_delete.php';
-</script>
-
 <form id="fsearch" name="fsearch" method="get">
 <fieldset>
     <legend>게시판 검색</legend>
@@ -173,9 +168,9 @@ var list_delete_php = 'board_list_delete.php';
     </table>
 
     <div class="btn_list">
-        <input type="submit" name="btn_submit" onclick="document.pressed=this.value" value="선택수정">
+        <input type="submit" name="act_button" value="선택수정">
         <?if ($is_admin == 'super') {?>
-        <input type="submit" name="btn_submit" onclick="document.pressed=this.value" value="선택삭제">
+        <input type="submit" name="act_button" value="선택삭제">
         <a href="./board_form.php">게시판추가</a>
         <?}?>
     </div>
@@ -186,21 +181,34 @@ var list_delete_php = 'board_list_delete.php';
 <?=get_paging($config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page=');?>
 
 <script>
-function fboardlist_submit(f)
-{
-    if (!is_checked("chk[]")) {
-        alert(document.pressed+" 하실 항목을 하나 이상 선택하세요.");
-        return false;
-    }
-
-    return true;
-}
-
 $(function(){
     $(".board_copy").click(function(){
         window.open(this.href, "win_board_copy", "left=100,top=100,width=550,height=450");
         return false;
     });
+
+    $('input[name=act_button]').click(function(e) {
+        e.preventDefault();
+
+        var act = $(this).val();
+        var cnt = $('input[name^=chk]:checked').length;
+
+        if(act == "선택삭제") {
+            if(confirm("한번 삭제한 자료는 복구할 방법이 없습니다.\n\n정말 삭제하시겠습니까?")) {
+                if(cnt < 1) {
+                    alert(act+'할 게시판을 1개 이상 선택해 주세요.');
+                    return false;
+                }
+            }
+        } else if(act == "선택수정") {
+            if(cnt < 1) {
+                alert(act+'할 게시판그룹을 1개 이상 선택해 주세요.');
+                return false;
+            }
+        }
+
+        $('#fboardlist').submit();
+    });
 });
 </script>
 
diff --git a/adm/board_list_update.php b/adm/board_list_update.php
index ea2670004..2ca48efe9 100644
--- a/adm/board_list_update.php
+++ b/adm/board_list_update.php
@@ -8,7 +8,7 @@ if (!count($_POST['chk'])) {
     alert($_POST['btn_submit']." 하실 항목을 하나 이상 체크하세요.");
 }
 
-if ($_POST['btn_submit'] == "선택수정") {
+if ($_POST['act_button'] == "선택수정") {
 
     auth_check($auth[$sub_menu], 'w');
 
@@ -42,7 +42,7 @@ if ($_POST['btn_submit'] == "선택수정") {
         sql_query($sql);
     }
 
-} else if ($_POST['btn_submit'] == "선택삭제") {
+} else if ($_POST['act_button'] == "선택삭제") {
 
     if ($is_admin != 'super')
         alert('게시판 삭제는 최고관리자만 가능합니다.');

From 49a3bf614143f68ffc048010586759e851da05d0 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 18 Feb 2013 10:43:41 +0900
Subject: [PATCH 5/7] =?UTF-8?q?=EA=B2=80=EC=83=89=20sfl=20=EC=84=A0?=
 =?UTF-8?q?=ED=83=9D=20=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/boardgroup_list.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/adm/boardgroup_list.php b/adm/boardgroup_list.php
index 48d2476c9..3b11e2b90 100644
--- a/adm/boardgroup_list.php
+++ b/adm/boardgroup_list.php
@@ -72,9 +72,9 @@ var list_update_php = "./boardgroup_list_update.php";
         생성된 그룹수 <?=number_format($total_count)?>개
     </span>
     <select name="sfl" title="검색대상">
-        <option value="gr_subject">제목</option>
-        <option value="gr_id">ID</option>
-        <option value="gr_admin">그룹관리자</option>
+        <option value="gr_subject" <?=get_selected("gr_subject", $_GET['sfl']);?>>제목</option>
+        <option value="gr_id" <?=get_selected("gr_id", $_GET['sfl']);?>>ID</option>
+        <option value="gr_admin" <?=get_selected("gr_admin", $_GET['sfl']);?>>그룹관리자</option>
     </select>
     <input type="text" name="stx" class="required frm_input" required value="<?=$stx?>" title="검색어(필수)">
     <input type="submit" class="btn_submit" value="검색">
@@ -184,11 +184,6 @@ $pagelist = get_paging($config['cf_write_pages'], $page, $total_page, $_SERVER['
 echo $pagelist;
 ?>
 
-<?
-if (isset($stx))
-    echo '<script>document.fsearch.sfl.value = "'.$sfl.'";</script>';
-?>
-
 <script>
 $(function() {
     $('input[name=act_button]').click(function(e) {

From 3a12fcb808c3d381baa06502aa565330de0288ce Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 18 Feb 2013 10:53:16 +0900
Subject: [PATCH 6/7] =?UTF-8?q?form=20onsubmit=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/board_list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adm/board_list.php b/adm/board_list.php
index 795b4c15b..e7e26a308 100644
--- a/adm/board_list.php
+++ b/adm/board_list.php
@@ -92,7 +92,7 @@ $colspan = 8;
     <h2>생성된 게시판 목록</h2>
     <p>여러개의 게시판 설정을 한번에 바꾸실 때는 게시판 체크기능을 이용하세요.</p>
 
-    <form id="fboardlist" name="fboardlist" method="post" action="./board_list_update.php" onsubmit="return fboardlist_submit(this);">
+    <form id="fboardlist" name="fboardlist" method="post" action="./board_list_update.php">
     <input type="hidden" name="sst" value="<?=$sst?>">
     <input type="hidden" name="sod" value="<?=$sod?>">
     <input type="hidden" name="sfl" value="<?=$sfl?>">

From 6351d0732dbb9a7896c228d552d98ba457ee7b4f Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 18 Feb 2013 10:59:05 +0900
Subject: [PATCH 7/7] =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EB=A9=94=EC=8B=9C?=
 =?UTF-8?q?=EC=A7=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/board_list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adm/board_list.php b/adm/board_list.php
index e7e26a308..1b855c5c5 100644
--- a/adm/board_list.php
+++ b/adm/board_list.php
@@ -202,7 +202,7 @@ $(function(){
             }
         } else if(act == "선택수정") {
             if(cnt < 1) {
-                alert(act+'할 게시판그룹을 1개 이상 선택해 주세요.');
+                alert(act+'할 게시판을 1개 이상 선택해 주세요.');
                 return false;
             }
         }