From 6965be7ba24bc9f25d1e3972d1cec18a8948c5d6 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 6 Jan 2014 11:28:31 +0900
Subject: [PATCH 1/5] =?UTF-8?q?1:1=EB=AC=B8=EC=9D=98=20=EB=93=B1=EB=A1=9D?=
 =?UTF-8?q?=EC=8B=9C=20=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=9D=B4=EB=A9=94?=
 =?UTF-8?q?=EC=9D=BC=20=EC=95=8C=EB=A6=BC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/qa_config.php        | 13 +++++++++++++
 adm/qa_config_update.php |  1 +
 bbs/qawrite_update.php   | 10 ++++++++++
 install/gnuboard5.sql    |  1 +
 4 files changed, 25 insertions(+)

diff --git a/adm/qa_config.php b/adm/qa_config.php
index f3e297e02..c33410152 100644
--- a/adm/qa_config.php
+++ b/adm/qa_config.php
@@ -92,6 +92,12 @@ if(empty($qaconfig)) {
 
     $qaconfig = get_qa_config();
 }
+
+// 관리자 이메일필드 추가
+if(!isset($qaconfig['qa_admin_email'])) {
+    sql_query(" ALTER TABLE `{$g5['qa_config_table']}`
+                    ADD `qa_admin_email` varchar(255) NOT NULL DEFAULT '' AFTER `qa_admin_hp` ", true);
+}
 ?>
 
 <form name="fqaconfigform" id="fqaconfigform" method="post" onsubmit="return fqaconfigform_submit(this);" autocomplete="off">
@@ -172,6 +178,13 @@ if(empty($qaconfig)) {
                 <input type="text" name="qa_admin_hp" value="<?php echo $qaconfig['qa_admin_hp'] ?>" id="qa_admin_hp" class="frm_input"  size="30">
             </td>
         </tr>
+        <tr>
+            <th scope="row"><label for="qa_admin_email">관리자 이메일</label></th>
+            <td>
+                <?php echo help('관리자 이메일을 입력하시면 문의글 등록시 등록하신 이메일로 알림이 전송됩니다.'); ?>
+                <input type="text" name="qa_admin_email" value="<?php echo $qaconfig['qa_admin_email'] ?>" id="qa_admin_email" class="frm_input"  size="50">
+            </td>
+        </tr>
         <tr>
             <th scope="row"><label for="qa_use_editor">DHTML 에디터 사용</label></th>
             <td>
diff --git a/adm/qa_config_update.php b/adm/qa_config_update.php
index d89563753..7564d68dc 100644
--- a/adm/qa_config_update.php
+++ b/adm/qa_config_update.php
@@ -20,6 +20,7 @@ $sql = " update {$g5['qa_config_table']}
                 qa_use_sms              = '{$_POST['qa_use_sms']}',
                 qa_send_number          = '{$_POST['qa_send_number']}',
                 qa_admin_hp             = '{$_POST['qa_admin_hp']}',
+                qa_admin_email          = '{$_POST['qa_admin_email']}',
                 qa_use_editor           = '{$_POST['qa_use_editor']}',
                 qa_subject_len          = '{$_POST['qa_subject_len']}',
                 qa_mobile_subject_len   = '{$_POST['qa_mobile_subject_len']}',
diff --git a/bbs/qawrite_update.php b/bbs/qawrite_update.php
index b88f36572..396080891 100644
--- a/bbs/qawrite_update.php
+++ b/bbs/qawrite_update.php
@@ -325,6 +325,16 @@ if($w == 'a' && $write['qa_email_recv'] && trim($write['qa_email'])) {
     mailer($config['cf_title'], $admin['mb_email'], $write['qa_email'], $subject, $content, 1);
 }
 
+// 문의글등록 이메일전송
+if(($w == '' || $w == 'r') && trim($qaconfig['qa_admin_email'])) {
+    include_once(G5_LIB_PATH.'/mailer.lib.php');
+
+    $subject = $config['cf_title'].' '.$qaconfig['qa_title'].' 질문 알림 메일';
+    $content = conv_content($qa_content, $qa_html);
+
+    mailer($config['cf_title'], $write['qa_email'], $qaconfig['qa_admin_email'], $subject, $content, 1);
+}
+
 if($w == 'a')
     $result_url = G5_BBS_URL.'/qaview.php?qa_id='.$qa_id.$qstr;
 else if($w == 'u' && $write['qa_type'])
diff --git a/install/gnuboard5.sql b/install/gnuboard5.sql
index 93739d0f8..4fd0372c6 100644
--- a/install/gnuboard5.sql
+++ b/install/gnuboard5.sql
@@ -721,6 +721,7 @@ CREATE TABLE IF NOT EXISTS `g5_qa_config` (
   `qa_use_sms` tinyint(4) NOT NULL DEFAULT '0',
   `qa_send_number` varchar(255) NOT NULL DEFAULT '0',
   `qa_admin_hp` varchar(255) NOT NULL DEFAULT '',
+  `qa_admin_email` varchar(255) NOT NULL DEFAULT '',
   `qa_use_editor` tinyint(4) NOT NULL DEFAULT '0',
   `qa_subject_len` int(11) NOT NULL DEFAULT '0',
   `qa_mobile_subject_len` int(11) NOT NULL DEFAULT '0',

From 58ebc6b7fd918c4b49f3e8a44cf46398c8a8564d Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Mon, 6 Jan 2014 11:34:21 +0900
Subject: [PATCH 2/5] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20=EA=B2=8C?=
 =?UTF-8?q?=EC=8B=9C=ED=8C=90=EA=B4=80=EB=A6=AC=20=EB=AA=A9=EB=A1=9D?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EC=A0=9C?=
 =?UTF-8?q?=EB=AA=A9=20=EC=9E=85=EB=A0=A5=EC=B9=B8=20=EB=84=88=EB=B9=84=20?=
 =?UTF-8?q?=EC=A1=B0=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 94b1b1415..96de20f05 100644
--- a/adm/board_list.php
+++ b/adm/board_list.php
@@ -148,7 +148,7 @@ $colspan = 16;
         </td>
         <td>
             <label for="bo_subject_<?php echo $i; ?>" class="sound_only">게시판 제목</label>
-            <input type="text" name="bo_subject[<?php echo $i ?>]" value="<?php echo get_text($row['bo_subject']) ?>" id="bo_subject_<?php echo $i ?>" required class="required frm_input" size="10">
+            <input type="text" name="bo_subject[<?php echo $i ?>]" value="<?php echo get_text($row['bo_subject']) ?>" id="bo_subject_<?php echo $i ?>" required class="required frm_input bo_subject" size="10">
         </td>
         <td>
             <label for="" class="sound_only">읽기 포인트</label>

From d55e23081ae0923b26fa8dc8951c7e66f103006b Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Mon, 6 Jan 2014 11:34:32 +0900
Subject: [PATCH 3/5] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20CSS=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/admin.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/css/admin.css b/css/admin.css
index 982ed80f8..69ee74d7c 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -171,7 +171,6 @@ h2.h2_frm {padding-top:15px}
 .sitecode {display:inline-block;font:bold 15px 'Verdana';vertical-align:middle}
 
 /* 폼 */
-label {vertical-align:middle}
 textarea, .frm_input {border:1px solid #ced9de;background:#f6f9fa;vertical-align:middle}
 textarea {padding:2px;width:90%}
 .frm_input {height:22px;line-height:2em}
@@ -310,6 +309,9 @@ tfoot td {font-weight:bold;text-align:center}
 .mb_intercept_msg {color:#f59fe4}
 #point_mng {margin-top:50px}
 
+/* 게시판관리 목록 */
+#fboardlist .bo_subject {width:90%}
+
 /* 게시판추가/수정 */
 #anc_bo_extra .td_grpset label {width:auto}
 #anc_bo_extra .td_grpset input {margin:0}

From 7f669023f67d42a7b5772830da20ff5bb9ad927c Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 6 Jan 2014 13:16:36 +0900
Subject: [PATCH 4/5] =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EB=8A=94=20=ED=95=A8=EC=88=98=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/common.lib.php | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/lib/common.lib.php b/lib/common.lib.php
index 910048879..0fddb838e 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -2488,20 +2488,6 @@ function module_exec_check($exe, $type)
     return $error;
 }
 
-// 도로명 상세 주소처리
-function get_address2($addr2, $addr3)
-{
-    if($addr3) {
-        if($addr2) {
-            $addr2 .= ' '.$addr3;
-        } else {
-            $addr2 = $addr3;
-        }
-    }
-
-    return $addr2;
-}
-
 // 도로명주소 출력
 // 주소출력
 function print_address($addr1, $addr2, $addr3)

From 4ed1743a718c108139ebccdce562e069ff9d505f Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 6 Jan 2014 13:29:59 +0900
Subject: [PATCH 5/5] =?UTF-8?q?=EC=9D=B8=EC=A6=9D=EB=AA=A8=EB=93=88=20?=
 =?UTF-8?q?=EC=8B=A4=ED=96=89=EA=B6=8C=ED=95=9C=EC=B2=B4=ED=81=AC=20?=
 =?UTF-8?q?=ED=95=A8=EC=88=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/common.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/common.lib.php b/lib/common.lib.php
index 0fddb838e..299fd28e4 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -2449,7 +2449,7 @@ function module_exec_check($exe, $type)
             // 바이너리 파일인지
             if($is_linux) {
                 $search = false;
-                exec('whoami', $out);
+                exec('ls', $out);
                 if(empty($out)) {
                     $error = 'exec 함수의 실행권한이 없습니다. 서버관리자에게 문의해 주십시오.';
                 } else {