From b8595778ae06eb158808f495a971ca14df279b4d Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Tue, 8 Jan 2013 18:15:23 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EB=A9=94=EC=9D=BC=20=EC=9D=BC?=
 =?UTF-8?q?=EA=B4=84=20=EB=98=90=EB=8A=94=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EB=B0=9C=EC=86=A1=EC=8B=9C=20=EC=82=AC=EC=9A=A9=ED=95=98?=
 =?UTF-8?q?=EB=8A=94=20=EB=A9=94=EC=9D=BC=20=EC=A3=BC=EC=86=8C=20cf=5Femai?=
 =?UTF-8?q?l=5Fadmin=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/config_form.php        | 15 +++++++++++++--
 adm/config_form_update.php |  1 +
 adm/sendmail_test.php      |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/adm/config_form.php b/adm/config_form.php
index 11b3e003a..a80076f25 100644
--- a/adm/config_form.php
+++ b/adm/config_form.php
@@ -10,15 +10,19 @@ if ($is_admin != 'super')
     alert('최고관리자만 접근 가능합니다.');
 
 // 쪽지보낼시 차감 포인트 필드 추가 : 061218
-sql_query(" ALTER TABLE '{$g4['config_table']}' ADD 'cf_memo_send_point' INT NOT NULL AFTER 'cf_login_point' ", FALSE);
+sql_query(" ALTER TABLE {$g4['config_table']} ADD cf_memo_send_point INT NOT NULL AFTER cf_login_point ", FALSE);
 
 // 개인정보보호정책 필드 추가 : 061121
-$sql = " ALTER TABLE '{$g4['config_table']}' ADD 'cf_privacy' TEXT NOT NULL AFTER 'cf_stipulation' ";
+$sql = " ALTER TABLE {$g4['config_table']} ADD cf_privacy TEXT NOT NULL AFTER cf_stipulation ";
 sql_query($sql, FALSE);
 if (!trim($config['cf_privacy'])) {
     $config['cf_privacy'] = '해당 홈페이지에 맞는 개인정보취급방침을 입력합니다.';
 }
 
+if (!isset($config['cf_email_admin'])) {
+    sql_query(" ALTER TABLE {$g4['config_table']} ADD cf_email_admin VARCHAR(255) NOT NULL DEFAULT '' AFTER cf_email_use ", FALSE);
+}
+    
 $g4['title'] = '환경설정';
 include_once ('./admin.head.php');
 ?>
@@ -394,6 +398,13 @@ include_once ('./admin.head.php');
         <input type="checkbox" id="cf_formmail_is_member" name="cf_formmail_is_member" value="1" <?=$config['cf_formmail_is_member']?'checked':'';?>> 회원만 사용
     </td>
 </tr>
+<tr>
+    <th scope="row"><label for="cf_email_admin">관리자 메일주소</label></th>
+    <td>
+        <?=help('일괄발송시 사용하는 이메일 주소입니다.')?>
+        <input type="text" id="cf_email_admin" name="cf_email_admin" class="email" value="<?=$config['cf_email_admin']?>" required size="40" title="관리자 메일주소">
+    </td>
+</tr>
 </table>
 
 <table id="frm_article_mail" class="frm_tbl">
diff --git a/adm/config_form_update.php b/adm/config_form_update.php
index f9e7fdd15..da927fb14 100644
--- a/adm/config_form_update.php
+++ b/adm/config_form_update.php
@@ -66,6 +66,7 @@ $sql = " update {$g4['config_table']}
                  cf_leave_day = '{$_POST['cf_leave_day']}',
                  cf_search_part = '{$_POST['cf_search_part']}',
                  cf_email_use = '{$_POST['cf_email_use']}',
+                 cf_email_admin = '{$_POST['cf_email_admin']}',
                  cf_email_wr_super_admin = '{$_POST['cf_email_wr_super_admin']}',
                  cf_email_wr_group_admin = '{$_POST['cf_email_wr_group_admin']}',
                  cf_email_wr_board_admin = '{$_POST['cf_email_wr_board_admin']}',
diff --git a/adm/sendmail_test.php b/adm/sendmail_test.php
index f39c328ad..a13b280fd 100644
--- a/adm/sendmail_test.php
+++ b/adm/sendmail_test.php
@@ -12,7 +12,7 @@ include_once($g4['path'].'/lib/mailer.lib.php');
 $g4['title'] = '메일 테스트';
 include_once('./admin.head.php');
 
-if ($mail) {
+if (isset($_POST['mail'])) {
     check_token();
 
     $from_name  = '메일검사';