diff --git a/adm/contentform.php b/adm/contentform.php index 8419ebdeb..de2c6315d 100644 --- a/adm/contentform.php +++ b/adm/contentform.php @@ -6,9 +6,18 @@ include_once(G5_EDITOR_LIB); auth_check($auth[$sub_menu], "w"); // 상단, 하단 파일경로 필드 추가 -$sql = " ALTER TABLE `{$g5['content_table']}` ADD `co_include_head` VARCHAR( 255 ) NOT NULL , - ADD `co_include_tail` VARCHAR( 255 ) NOT NULL "; -sql_query($sql, false); +if(!sql_query(" select co_include_head from {$g5['content_table']} limit 1 ", false)) { + $sql = " ALTER TABLE `{$g5['content_table']}` ADD `co_include_head` VARCHAR( 255 ) NOT NULL , + ADD `co_include_tail` VARCHAR( 255 ) NOT NULL "; + sql_query($sql, false); +} + +// html purifier 사용여부 필드 +if(!sql_query(" select co_tag_filter_use from {$g5['content_table']} limit 1 ", false)) { + sql_query(" ALTER TABLE `{$g5['content_table']}` + ADD `co_tag_filter_use` tinyint(4) NOT NULL DEFAULT '0' AFTER `co_content` ", true); + sql_query(" update {$g5['content_table']} set co_tag_filter_use = '1' "); +} $html_title = "내용"; $g5['title'] = $html_title.' 관리'; @@ -60,6 +69,16 @@ include_once (G5_ADMIN_PATH.'/admin.head.php'); 내용 + + + + + + + diff --git a/adm/contentformupdate.php b/adm/contentformupdate.php index a3313bcb1..4f9786ffd 100644 --- a/adm/contentformupdate.php +++ b/adm/contentformupdate.php @@ -16,11 +16,12 @@ else if ($co_himg_del) @unlink(G5_DATA_PATH."/content/{$co_id}_h"); if ($co_timg_del) @unlink(G5_DATA_PATH."/content/{$co_id}_t"); -$sql_common = " co_include_head = '$co_include_head', - co_include_tail = '$co_include_tail', - co_html = '$co_html', - co_subject = '$co_subject', - co_content = '$co_content' "; +$sql_common = " co_include_head = '$co_include_head', + co_include_tail = '$co_include_tail', + co_html = '$co_html', + co_tag_filter_use = '$co_tag_filter_use', + co_subject = '$co_subject', + co_content = '$co_content' "; if ($w == "") { diff --git a/adm/member_form.php b/adm/member_form.php index bd7032072..adf4708c1 100644 --- a/adm/member_form.php +++ b/adm/member_form.php @@ -122,6 +122,11 @@ if(!isset($mb['mb_addr3'])) { sql_query(" ALTER TABLE {$g5['member_table']} ADD `mb_addr3` varchar(255) NOT NULL DEFAULT '' AFTER `mb_addr2` ", false); } +// 중복가입 확인필드 추가 +if(!isset($mb['mb_dupinfo'])) { + sql_query(" ALTER TABLE {$g5['member_table']} ADD `mb_dupinfo` varchar(255) NOT NULL DEFAULT '' AFTER `mb_adult` ", false); +} + if ($mb['mb_intercept_date']) $g5['title'] = "차단된 "; else $g5['title'] .= ""; $g5['title'] .= '회원 '.$html_title; diff --git a/bbs/ajax.mb_hp.php b/bbs/ajax.mb_hp.php index 5f4c9ffb6..eeeef8816 100644 --- a/bbs/ajax.mb_hp.php +++ b/bbs/ajax.mb_hp.php @@ -6,5 +6,5 @@ $mb_hp = trim($_POST['reg_mb_hp']); $mb_id = trim($_POST['reg_mb_id']); if ($msg = valid_mb_hp($mb_hp)) die($msg); -if ($msg = exist_mb_hp($mb_hp, $mb_id)) die($msg); +//if ($msg = exist_mb_hp($mb_hp, $mb_id)) die($msg); ?> \ No newline at end of file diff --git a/bbs/content.php b/bbs/content.php index 76082013c..a8ba46f2a 100644 --- a/bbs/content.php +++ b/bbs/content.php @@ -6,6 +6,11 @@ if( !isset($g5['content_table']) ){ die('관리자 모드에서 게시판관리->내용 관리를 먼저 확인해 주세요.'); } +if (G5_IS_MOBILE) { + include_once(G5_MOBILE_PATH.'/content.php'); + return; +} + // 내용 $sql = " select * from {$g5['content_table']} where co_id = '$co_id' "; $co = sql_fetch($sql); @@ -19,7 +24,7 @@ if ($co['co_include_head']) else include_once('./_head.php'); -$str = conv_content($co['co_content'], $co['co_html']); +$str = conv_content($co['co_content'], $co['co_html'], $co['co_tag_filter_use']); // $src 를 $dst 로 변환 unset($src); diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php index b593792cc..4d57c6d76 100644 --- a/bbs/register_form_update.php +++ b/bbs/register_form_update.php @@ -148,12 +148,12 @@ if (isset($_FILES['mb_icon']) && is_uploaded_file($_FILES['mb_icon']['tmp_name'] // 본인확인 //--------------------------------------------------------------- $mb_hp = hyphen_hp_number($mb_hp); -if($_SESSION['ss_cert_type'] != 'hp' && $mb_hp) { - // 휴대폰번호 중복체크 - $sql = " select mb_id from {$g5['member_table']} where mb_id <> '{$member['mb_id']}' and mb_hp = '{$mb_hp}' "; +if($config['cf_cert_use'] && $_SESSION['ss_cert_type'] && $_SESSION['ss_cert_dupinfo']) { + // 중복체크 + $sql = " select mb_id from {$g5['member_table']} where mb_id <> '{$member['mb_id']}' and mb_dupinfo = '{$_SESSION['ss_cert_dupinfo']}' "; $row = sql_fetch($sql); if ($row['mb_id']) { - alert("이미 가입되어 있는 휴대폰번호 입니다.\\n회원아이디 : ".$row['mb_id']); + alert("입력하신 본인확인 정보로 가입된 내역이 존재합니다.\\n회원아이디 : ".$row['mb_id']); } } @@ -168,6 +168,7 @@ if ($config['cf_cert_use'] && $cert_type && $md5_cert_no) { $sql_certify .= " , mb_adult = '{$_SESSION['ss_cert_adult']}' "; $sql_certify .= " , mb_birth = '{$_SESSION['ss_cert_birth']}' "; $sql_certify .= " , mb_sex = '{$_SESSION['ss_cert_sex']}' "; + $sql_certify .= " , mb_dupinfo = '{$_SESSION['ss_cert_dupinfo']}' "; } else { $sql_certify .= " , mb_hp = '{$mb_hp}' "; $sql_certify .= " , mb_certify = '' "; diff --git a/install/gnuboard5.sql b/install/gnuboard5.sql index 580696a2b..6df6f7538 100644 --- a/install/gnuboard5.sql +++ b/install/gnuboard5.sql @@ -452,6 +452,7 @@ CREATE TABLE IF NOT EXISTS `g5_member` ( `mb_hp` varchar(255) NOT NULL default '', `mb_certify` varchar(20) NOT NULL default '', `mb_adult` tinyint(4) NOT NULL default '0', + `mb_dupinfo` varchar(255) NOT NULL default '', `mb_zip1` char(3) NOT NULL default '', `mb_zip2` char(3) NOT NULL default '', `mb_addr1` varchar(255) NOT NULL default '', @@ -800,6 +801,7 @@ CREATE TABLE IF NOT EXISTS `g5_content` ( `co_html` tinyint(4) NOT NULL DEFAULT '0', `co_subject` varchar(255) NOT NULL DEFAULT '', `co_content` longtext NOT NULL, + `co_tag_filter_use` tinyint(4) NOT NULL DEFAULT '0', `co_hit` int(11) NOT NULL DEFAULT '0', `co_include_head` varchar(255) NOT NULL, `co_include_tail` varchar(255) NOT NULL, diff --git a/lib/common.lib.php b/lib/common.lib.php index e2a52a832..80180937c 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -510,7 +510,7 @@ function conv_subject($subject, $len, $suffix='') } // 내용을 변환 -function conv_content($content, $html) +function conv_content($content, $html, $filter=true) { global $config, $board; @@ -536,7 +536,9 @@ function conv_content($content, $html) } $content = preg_replace($source, $target, $content); - $content = html_purifier($content); + + if($filter) + $content = html_purifier($content); } else // text 이면 { diff --git a/mobile/content.php b/mobile/content.php new file mode 100644 index 000000000..4ca181961 --- /dev/null +++ b/mobile/content.php @@ -0,0 +1,64 @@ + + + +
+
+

+
+ +
+ +
+ +
+ + + diff --git a/plugin/kcpcert/kcpcert_result.php b/plugin/kcpcert/kcpcert_result.php index fb642a557..a7e06a03f 100644 --- a/plugin/kcpcert/kcpcert_result.php +++ b/plugin/kcpcert/kcpcert_result.php @@ -134,11 +134,12 @@ if( $cert_enc_use == "Y" ) alert_close("정상적인 인증이 아닙니다. 올바른 방법으로 이용해 주세요."); $phone_no = hyphen_hp_number($phone_no); + $mb_dupinfo = $di; - $sql = " select mb_id from {$g5['member_table']} where mb_id <> '{$member['mb_id']}' and mb_hp = '{$phone_no}' "; + $sql = " select mb_id from {$g5['member_table']} where mb_id <> '{$member['mb_id']}' and mb_dupinfo = '{$mb_dupinfo}' "; $row = sql_fetch($sql); if ($row['mb_id']) { - alert_close("이미 가입되어 있는 휴대폰번호 입니다.\\n회원아이디 : ".$row['mb_id']); + alert_close("입력하신 본인학인 정보로 가입된 내역이 존재합니다.\\n회원아이디 : ".$row['mb_id']); } // hash 데이터 @@ -156,6 +157,7 @@ if( $cert_enc_use == "Y" ) set_session("ss_cert_adult", $adult); set_session("ss_cert_birth", $birth_day); set_session("ss_cert_sex", ($sex_code=="01"?"M":"F")); + set_session('ss_cert_dupinfo', $mb_dupinfo); } else if( $res_cd != "0000" ) { diff --git a/plugin/okname/hpcert2.php b/plugin/okname/hpcert2.php index 3f5ed6d72..5a53777f6 100644 --- a/plugin/okname/hpcert2.php +++ b/plugin/okname/hpcert2.php @@ -95,13 +95,14 @@ echo "리턴메시지 :$field[16]
"; $mb_name = $field[7]; $req_num = $field[12]; $mb_birth = $field[8]; - -// 휴대폰번호 중복체크 +$mb_dupinfo = $field[4]; $phone_no = hyphen_hp_number($req_num); -$sql = " select mb_id from {$g5['member_table']} where mb_id <> '{$member['mb_id']}' and mb_hp = '{$phone_no}' "; + +// 중복정보 체크 +$sql = " select mb_id from {$g5['member_table']} where mb_id <> '{$member['mb_id']}' and mb_dupinfo = '{$mb_dupinfo}' "; $row = sql_fetch($sql); if ($row['mb_id']) { - alert_close("이미 가입되어 있는 휴대폰번호 입니다.\\n회원아이디 : ".$row['mb_id']); + alert_close("입력하신 본인학인 정보로 가입된 내역이 존재합니다.\\n회원아이디 : ".$row['mb_id']); } // hash 데이터 @@ -119,6 +120,7 @@ set_session('ss_cert_hash', $hash_data); set_session('ss_cert_adult', $adult); set_session('ss_cert_birth', $mb_birth); set_session('ss_cert_sex', ($field[9] == 1 ? 'M' : 'F')); +set_session('ss_cert_dupinfo', $mb_dupinfo); $g5['title'] = 'KCB 휴대폰 본인확인'; include_once(G5_PATH.'/head.sub.php'); diff --git a/plugin/okname/ipin2.php b/plugin/okname/ipin2.php index 43dc61e02..dda65f104 100644 --- a/plugin/okname/ipin2.php +++ b/plugin/okname/ipin2.php @@ -67,6 +67,14 @@ $field_name_IPIN_DEC = array( $mb_name = $field[6]; $req_num = $field[7]; $mb_birth = $field[11]; +$mb_dupinfo = $field[0]; + +// 중복정보 체크 +$sql = " select mb_id from {$g5['member_table']} where mb_id <> '{$member['mb_id']}' and mb_dupinfo = '{$mb_dupinfo}' "; +$row = sql_fetch($sql); +if ($row['mb_id']) { + alert_close("입력하신 본인확인 정보로 가입된 내역이 존재합니다.\\n회원아이디 : ".$row['mb_id']); +} // hash 데이터 $cert_type = 'ipin'; @@ -82,6 +90,7 @@ set_session('ss_cert_hash', $hash_data); set_session('ss_cert_adult', $adult); set_session('ss_cert_birth', $mb_birth); set_session('ss_cert_sex', ($field[9] == 1 ? 'M' : 'F')); +set_session('ss_cert_dupinfo', $mb_dupinfo); $g5['title'] = 'KCB 아이핀 본인확인'; include_once(G5_PATH.'/head.sub.php');