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

Merge branch 'g5'

Browse Source
This commit is contained in:
chicpro
2016-05-17 09:55:05 +09:00
parent 15508d067c 6457eded48
commit 7ff9b56e13
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bbs/qawrite_update.php
View File

@ -16,9 +16,11 @@ $msg = array();
$qaconfig = get_qa_config(); $qaconfig = get_qa_config();
if(trim($qaconfig['qa_category'])) { if(trim($qaconfig['qa_category'])) {
$category = explode('|', $qaconfig['qa_category']); if($w != 'a') {
if(!in_array($qa_category, $category)) $category = explode('|', $qaconfig['qa_category']);
alert('분류를 올바르게 지정해 주십시오.'); if(!in_array($qa_category, $category))
alert('분류를 올바르게 지정해 주십시오.');
}
} else { } else {
alert('1:1문의 설정에서 분류를 설정해 주십시오'); alert('1:1문의 설정에서 분류를 설정해 주십시오');
} }
@ -28,7 +30,7 @@ $qa_email = '';
if(isset($_POST['qa_email']) && $_POST['qa_email']) if(isset($_POST['qa_email']) && $_POST['qa_email'])
$qa_email = get_email_address(trim($_POST['qa_email'])); $qa_email = get_email_address(trim($_POST['qa_email']));
if($qaconfig['qa_req_email'] && !$qa_email) if($w != 'a' && $qaconfig['qa_req_email'] && !$qa_email)
$msg[] = '이메일을 입력하세요.'; $msg[] = '이메일을 입력하세요.';
$qa_subject = ''; $qa_subject = '';

3
install/gnuboard5.sql
View File

@ -463,7 +463,8 @@ CREATE TABLE IF NOT EXISTS `g5_member` (
`mb_ip` varchar(255) NOT NULL default '', `mb_ip` varchar(255) NOT NULL default '',
`mb_leave_date` varchar(8) NOT NULL default '', `mb_leave_date` varchar(8) NOT NULL default '',
`mb_intercept_date` varchar(8) NOT NULL default '', `mb_intercept_date` varchar(8) NOT NULL default '',
`mb_email_certify` datetime NOT NULL default '0000-00-00 00:00:00', `mb_email_certify` datetime NOT NULL default '0000-00-00 00:00:00',
`mb_email_certify2` varchar(255) NOT NULL default '',
`mb_memo` text NOT NULL, `mb_memo` text NOT NULL,
`mb_lost_certify` varchar(255) NOT NULL, `mb_lost_certify` varchar(255) NOT NULL,
`mb_mailling` tinyint(4) NOT NULL default '0', `mb_mailling` tinyint(4) NOT NULL default '0',