Merge branch 'master' of github.com:gnuboard/yc4s

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>

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>

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']}',

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'])

css/admin.css

@@ -339,6 +339,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}

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',

lib/common.lib.php

@@ -2458,7 +2458,7 @@ function module_exec_check($exe, $type)
             // 바이너리 파일인지
             if($is_linux) {
                 $search = false;
-                exec('whoami', $out);
+                exec('ls', $out);
                 if(empty($out)) {
                     $error = 'exec 함수의 실행권한이 없습니다. 서버관리자에게 문의해 주십시오.';
                 } else {
@@ -2506,20 +2506,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)