diff --git a/adm/boardgroup_form.php b/adm/boardgroup_form.php index 961dd5012..5e82f51ed 100644 --- a/adm/boardgroup_form.php +++ b/adm/boardgroup_form.php @@ -21,7 +21,7 @@ else alert('제대로 된 값이 넘어오지 않았습니다.'); if (!isset($group['gr_show_menu'])) { - sql_query(" ALTER TABLE `{$g4['group_table']}` ADD `gr_show_menu` TINYINT NOT NULL DEFAULT '0' AFTER `gr_use_access`, ADD `gr_order` INT NOT NULL DEFAULT '0' AFTER `gr_show_menu` ", true); + sql_query(" ALTER TABLE `{$g4['group_table']}` ADD `gr_show_menu` TINYINT NOT NULL DEFAULT '0' AFTER `gr_use_access`, ADD `gr_order` INT NOT NULL DEFAULT '0' AFTER `gr_show_menu` ", false); } $g4['title'] = $html_title; diff --git a/adm/config_form.php b/adm/config_form.php index 3ac9f12e4..53124f92f 100644 --- a/adm/config_form.php +++ b/adm/config_form.php @@ -9,11 +9,6 @@ $token = get_token(); if ($is_admin != 'super') alert('최고관리자만 접근 가능합니다.'); -// 메일발송전용 이메일주소 -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 ", TRUE); -} - if (!isset($config['cf_include_index'])) { sql_query(" ALTER TABLE `{$g4['config_table']}` ADD `cf_include_index` VARCHAR(255) NOT NULL AFTER `cf_admin`, @@ -459,13 +454,6 @@ $pg_anchor = " > 회원만 사용 - - - - - - - diff --git a/adm/config_form_update.php b/adm/config_form_update.php index 66efdb5aa..b77e19e4a 100644 --- a/adm/config_form_update.php +++ b/adm/config_form_update.php @@ -70,7 +70,6 @@ $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']}', diff --git a/adm/mail_select_update.php b/adm/mail_select_update.php index 373c0731a..f35dad71e 100644 --- a/adm/mail_select_update.php +++ b/adm/mail_select_update.php @@ -43,6 +43,8 @@ $sql = "select ma_subject, ma_content from {$g4['mail_table']} where ma_id = '$m $ma = sql_fetch($sql); $subject = $ma['ma_subject']; +$admin = get_admin('super', 'mb_email'); +$from_email = $admin['mb_email']; $cnt = 0; for ($i=0; $i

▶ 더 이상 정보 수신을 원치 않으시면 [수신거부] 해 주십시오.

"; - mailer($config['cf_title'], $config['cf_email_admin'], $email, $subject, $content, 1); + mailer($config['cf_title'], $from_email, $email, $subject, $content, 1); echo "\n"; //echo "+"; diff --git a/adm/sendmail_test.php b/adm/sendmail_test.php index df326cce2..c7c3e44a8 100644 --- a/adm/sendmail_test.php +++ b/adm/sendmail_test.php @@ -1,5 +1,5 @@ [메일검사] 내용

이 내용이 제대로 보인다면 보내는 메일 서버에는 이상이 없는것입니다.

'.date("Y-m-d H:i:s").'

이 메일 주소로는 회신되지 않습니다.', 1); - echo "

"; - echo "

결과메세지

"; - echo "

"; - echo "다음 ".count($email)."개의 메일 주소로 테스트 메일 발송이 완료되었습니다."; - echo "

"; - echo "'; + echo '

'; + echo '해당 주소로 테스트 메일이 도착했는지 확인해 주십시오.
'; + echo '만약, 테스트 메일이 오지 않는다면 더 다양한 계정의 메일 주소로 메일을 보내 보십시오.
'; + echo '그래도 메일이 하나도 도착하지 않는다면 메일 서버(sendmail server)의 오류일 가능성이 높으니, 웹 서버관리자에게 문의하여 주십시오.
'; + echo '

'; + echo '
'; } ?> diff --git a/bbs/kcp/kcpcert_config.php b/bbs/kcp/kcpcert_config.php index 8c65bb7ff..eb2d030d6 100644 --- a/bbs/kcp/kcpcert_config.php +++ b/bbs/kcp/kcpcert_config.php @@ -1,13 +1,16 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + \ No newline at end of file diff --git a/bbs/kcp/kcpcert_result.php b/bbs/kcp/kcpcert_result.php index 578ede3ca..fe18c69a4 100644 --- a/bbs/kcp/kcpcert_result.php +++ b/bbs/kcp/kcpcert_result.php @@ -80,6 +80,9 @@ $ct_cert = new C_CT_CLI; $ct_cert->mf_clear(); +$g4['title'] = '휴대폰인증 결과'; +include_once(G4_PATH.'/head.sub.php'); + // 결과 처리 if( $cert_enc_use == "Y" ) @@ -145,9 +148,6 @@ else if( $cert_enc_use != "Y" ) } $ct_cert->mf_clear(); - -$g4['title'] = '휴대폰인증 결과'; -include_once(G4_PATH.'/head.sub.php'); ?> diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php index f70f9f273..1dbab9a60 100644 --- a/bbs/register_form_update.php +++ b/bbs/register_form_update.php @@ -51,16 +51,8 @@ $mb_8 = isset($_POST['mb_8']) ? escape_trim($_POST['mb_8']) $mb_9 = isset($_POST['mb_9']) ? escape_trim($_POST['mb_9']) : ""; $mb_10 = isset($_POST['mb_10']) ? escape_trim($_POST['mb_10']) : ""; -// 본인인증체크 -$cert_no = trim($_POST['cert_no']); -if(!$cert_no) - alert('휴대폰인증이 되지 않았습니다. 휴대폰인증을 해주세요.', true, true); - -// 본인인증 hash 체크 -$reg_hp = preg_replace("/[^0-9]/", "", $mb_hp); -$reg_hash = md5($reg_hp.$mb_name.$cert_no); -if(get_session('ss_kcpcert_hash') != $reg_hash) - alert('휴대폰인증 정보가 올바르지 않습니다. 정상적인 방법으로 이용해 주세요.', true, true); +// 사용자 코드 실행 +@include_once($member_skin_path.'/register_form_update.head.skin.php'); if ($w == '' || $w == 'u') { @@ -96,8 +88,8 @@ if ($w == '' || $w == 'u') { $old_email = $member['mb_email']; } - if ($msg = exist_mb_nick($mb_nick, $mb_id)) alert($msg); - if ($msg = exist_mb_email($mb_email, $mb_id)) alert($msg); + if ($msg = exist_mb_nick($mb_nick, $mb_id)) alert($msg, "", true, true); + if ($msg = exist_mb_email($mb_email, $mb_id)) alert($msg, "", true, true); } $mb_dir = G4_DATA_PATH.'/member/'.substr($mb_id,0,2); @@ -177,7 +169,6 @@ if ($w == '') { mb_sms = '{$mb_sms}', mb_open = '{$mb_open}', mb_open_date = '".G4_TIME_YMD."', - mb_hp_certify = '{$_POST['cert_time']}', mb_1 = '{$mb_1}', mb_2 = '{$mb_2}', mb_3 = '{$mb_3}', @@ -319,7 +310,7 @@ if ($w == '') { // 사용자 코드 실행 -@include_once ($member_skin_path.'/register_update.skin.php'); +@include_once ($member_skin_path.'/register_form_update.tail.skin.php'); if ($msg) diff --git a/bbs/write_comment_update.php b/bbs/write_comment_update.php index e8b15ba98..15e511198 100644 --- a/bbs/write_comment_update.php +++ b/bbs/write_comment_update.php @@ -317,5 +317,5 @@ else if ($w == 'cu') // 코멘트 수정 delete_cache_latest($bo_table); -goto_url('./board.php?bo_table='.$bo_table.'&wr_id='.$wr['wr_parent'].'&page='.$page.$qstr.'&#c_'.$comment_id); +goto_url('./board.php?bo_table='.$bo_table.'&wr_id='.$wr['wr_parent'].'&'.$qstr.'&#c_'.$comment_id); ?> diff --git a/common.php b/common.php index 100560775..403341ba1 100644 --- a/common.php +++ b/common.php @@ -186,65 +186,73 @@ $qstr = ''; if (isset($_REQUEST['sca'])) { $sca = escape_trim($_REQUEST['sca']); - $qstr .= '&sca=' . urlencode($sca); + if ($sca) + $qstr .= '&sca=' . urlencode($sca); } else { - $sca = ""; + $sca = ''; } if (isset($_REQUEST['sfl'])) { $sfl = escape_trim($_REQUEST['sfl']); - $qstr .= '&sfl=' . urlencode($sfl); // search field (검색 필드) + if ($sfl) + $qstr .= '&sfl=' . urlencode($sfl); // search field (검색 필드) } else { - $sfl = ""; + $sfl = ''; } if (isset($_REQUEST['stx'])) { // search text (검색어) $stx = escape_trim($_REQUEST['stx']); - $qstr .= '&stx=' . urlencode($stx); + if ($stx) + $qstr .= '&stx=' . urlencode($stx); } else { - $stx = ""; + $stx = ''; } if (isset($_REQUEST['sst'])) { $sst = escape_trim($_REQUEST['sst']); - $qstr .= '&sst=' . urlencode($sst); // search sort (검색 정렬 필드) + if ($sst) + $qstr .= '&sst=' . urlencode($sst); // search sort (검색 정렬 필드) } else { - $sst = ""; + $sst = ''; } if (isset($_REQUEST['sod'])) { // search order (검색 오름, 내림차순) $sod = preg_match("/^(asc|desc)$/i", $sod) ? $sod : ''; - $qstr .= '&sod=' . urlencode($sod); + if ($sod) + $qstr .= '&sod=' . urlencode($sod); } else { - $sod = ""; + $sod = ''; } if (isset($_REQUEST['sop'])) { // search operator (검색 or, and 오퍼레이터) $sop = preg_match("/^(or|and)$/i", $sop) ? $sop : ''; - $qstr .= '&sop=' . urlencode($sop); + if ($sop) + $qstr .= '&sop=' . urlencode($sop); } else { - $sop = ""; + $sop = ''; } if (isset($_REQUEST['spt'])) { // search part (검색 파트[구간]) $spt = (int)$spt; - $qstr .= '&spt=' . urlencode($spt); + if ($spt) + $qstr .= '&spt=' . urlencode($spt); } else { - $spt = ""; + $spt = ''; } if (isset($_REQUEST['page'])) { // 리스트 페이지 $page = (int)$_REQUEST['page']; - $qstr .= '&page=' . urlencode($page); + if ($page) + $qstr .= '&page=' . urlencode($page); } else { - $page = ""; + $page = ''; } if (isset($_REQUEST['w'])) { $w = substr($w, 0, 2); } else { - $w = ""; + $w = ''; } if (isset($_REQUEST['wr_id'])) { @@ -257,7 +265,7 @@ if (isset($_REQUEST['bo_table'])) { $bo_table = escape_trim($_REQUEST['bo_table']); $bo_table = substr($bo_table, 0, 20); } else { - $bo_table = ""; + $bo_table = ''; } // URL ENCODING @@ -265,14 +273,14 @@ if (isset($_REQUEST['url'])) { $url = escape_trim($_REQUEST['url']); $urlencode = urlencode($url); } else { - $url = ""; + $url = ''; $urlencode = urlencode(escape_trim($_SERVER['REQUEST_URI'])); } if (isset($_REQUEST['gr_id'])) { $gr_id = escape_trim($_REQUEST['gr_id']); } else { - $gr_id = ""; + $gr_id = ''; } //=================================== @@ -427,11 +435,11 @@ while ($entry = $tmp->read()) { // 자바스크립트에서 go(-1) 함수를 쓰면 폼값이 사라질때 해당 폼의 상단에 사용하면 // 캐쉬의 내용을 가져옴. 완전한지는 검증되지 않음 -header("Content-Type: text/html; charset=utf-8"); -$gmnow = gmdate("D, d M Y H:i:s") . " GMT"; -header("Expires: 0"); // rfc2616 - Section 14.21 -header("Last-Modified: " . $gmnow); -header("Cache-Control: no-store, no-cache, must-revalidate"); // HTTP/1.1 -header("Cache-Control: pre-check=0, post-check=0, max-age=0"); // HTTP/1.1 -header("Pragma: no-cache"); // HTTP/1.0 +header('Content-Type: text/html; charset=utf-8'); +$gmnow = gmdate('D, d M Y H:i:s') . ' GMT'; +header('Expires: 0'); // rfc2616 - Section 14.21 +header('Last-Modified: ' . $gmnow); +header('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1 +header('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1 +header('Pragma: no-cache'); // HTTP/1.0 ?> \ No newline at end of file diff --git a/install/gnuboard4s.sql b/install/gnuboard4s.sql index 20b471174..e517dd1ee 100644 --- a/install/gnuboard4s.sql +++ b/install/gnuboard4s.sql @@ -294,8 +294,8 @@ CREATE TABLE IF NOT EXISTS `g4s_group` ( `gr_subject` varchar(255) NOT NULL default '', `gr_admin` varchar(255) NOT NULL default '', `gr_use_access` tinyint(4) NOT NULL default '0', - `gr_show_menu` int(11) NOT NULL default '0', - `gr_order` tinyint(4) NOT NULL default '0', + `gr_show_menu` tinyint(4) NOT NULL default '0', + `gr_order` int(11) NOT NULL default '0', `gr_1_subj` varchar(255) NOT NULL default '', `gr_2_subj` varchar(255) NOT NULL default '', `gr_3_subj` varchar(255) NOT NULL default '', diff --git a/lib/common.lib.php b/lib/common.lib.php index 17f0e879e..3d92ea8c4 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -749,24 +749,24 @@ function subject_sort_link($col, $query_string='', $flag='asc') // 관리자 정보를 얻음 -function get_admin($admin='super') +function get_admin($admin='super', $fields='*') { global $config, $group, $board; global $g4; $is = false; if ($admin == 'board') { - $mb = sql_fetch("select * from {$g4['member_table']} where mb_id in ('{$board['bo_admin']}') limit 1 "); + $mb = sql_fetch("select {$fields} from {$g4['member_table']} where mb_id in ('{$board['bo_admin']}') limit 1 "); $is = true; } if (($is && !$mb['mb_id']) || $admin == 'group') { - $mb = sql_fetch("select * from {$g4['member_table']} where mb_id in ('{$group['gr_admin']}') limit 1 "); + $mb = sql_fetch("select {$fields} from {$g4['member_table']} where mb_id in ('{$group['gr_admin']}') limit 1 "); $is = true; } if (($is && !$mb['mb_id']) || $admin == 'super') { - $mb = sql_fetch("select * from {$g4['member_table']} where mb_id in ('{$config['cf_admin']}') limit 1 "); + $mb = sql_fetch("select {$fields} from {$g4['member_table']} where mb_id in ('{$config['cf_admin']}') limit 1 "); } return $mb; diff --git a/skin/member/basic/register_update.skin.php b/skin/member/basic/register_form_update.tail.skin.php similarity index 100% rename from skin/member/basic/register_update.skin.php rename to skin/member/basic/register_form_update.tail.skin.php diff --git a/skin/member/kcpcert/register_form.skin.php b/skin/member/kcpcert/register_form.skin.php index f399a13ff..ab3da3e7b 100644 --- a/skin/member/kcpcert/register_form.skin.php +++ b/skin/member/kcpcert/register_form.skin.php @@ -1,18 +1,13 @@
- - + + @@ -99,7 +94,8 @@ if(!$ordr_idxx = get_session('ss_uniqid')) " maxlength="20" value=""> - 휴대폰인증 + + @@ -219,43 +215,9 @@ if(!$ordr_idxx = get_session('ss_uniqid'))
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+