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

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

Browse Source
This commit is contained in:
whitedot
2013-01-08 18:17:30 +09:00
parent b3e24884e9 22356ce7f2
commit eece446013
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
adm/config_form.php
View File

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

1
adm/config_form_update.php
View File

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

2
adm/sendmail_test.php
View File

@ -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 = '메일검사';