firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

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

Browse Source
This commit is contained in:
whitedot
2014-01-06 11:34:50 +09:00
parent d55e23081a 6965be7ba2
commit 098bdf7156
4 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
adm/qa_config.php
View File

@ -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>

1
adm/qa_config_update.php
View File

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

10
bbs/qawrite_update.php
View File

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

1
install/gnuboard5.sql
View File

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