diff --git a/adm/admin.lib.php b/adm/admin.lib.php
index 1f1245cff..44ea31f1f 100644
--- a/adm/admin.lib.php
+++ b/adm/admin.lib.php
@@ -72,7 +72,7 @@ function member_delete($mb_id)
}
// 회원자료는 정보만 없앤 후 아이디는 보관하여 다른 사람이 사용하지 못하도록 함 : 061025
- $sql = " update {$g5['member_table']} set mb_jumin = '', mb_password = '', mb_level = 1, mb_email = '', mb_homepage = '', mb_password_q = '', mb_password_a = '', mb_tel = '', mb_hp = '', mb_zip1 = '', mb_zip2 = '', mb_addr1 = '', mb_addr2 = '', mb_birth = '', mb_sex = '', mb_signature = '', mb_memo = '".date('Ymd', G5_SERVER_TIME)." 삭제함\n{$mb['mb_memo']}', mb_leave_date = '".date('Ymd', G5_SERVER_TIME)."' where mb_id = '{$mb_id}' ";
+ $sql = " update {$g5['member_table']} set mb_password = '', mb_level = 1, mb_email = '', mb_homepage = '', mb_tel = '', mb_hp = '', mb_zip1 = '', mb_zip2 = '', mb_addr1 = '', mb_addr2 = '', mb_birth = '', mb_sex = '', mb_signature = '', mb_memo = '".date('Ymd', G5_SERVER_TIME)." 삭제함\n{$mb['mb_memo']}', mb_leave_date = '".date('Ymd', G5_SERVER_TIME)."' where mb_id = '{$mb_id}' ";
sql_query($sql);
}
diff --git a/adm/board_copy_update.php b/adm/board_copy_update.php
index b17a19b91..45d856d51 100644
--- a/adm/board_copy_update.php
+++ b/adm/board_copy_update.php
@@ -51,7 +51,6 @@ $sql = " insert into {$g5['board_table']}
bo_download_point = '{$board[bo_download_point]}',
bo_use_category = '{$board[bo_use_category]}',
bo_category_list = '{$board['bo_category_list']}',
- bo_disable_tags = '{$board['bo_disable_tags']}',
bo_use_sideview = '{$board[bo_use_sideview]}',
bo_use_file_content = '{$board[bo_use_file_content]}',
bo_use_secret = '{$board[bo_use_secret]}',
diff --git a/adm/config_form_update.php b/adm/config_form_update.php
index 58fbfec9e..07dd74f20 100644
--- a/adm/config_form_update.php
+++ b/adm/config_form_update.php
@@ -29,7 +29,6 @@ $sql = " update {$g5['config_table']}
cf_add_script = '{$_POST['cf_add_script']}',
cf_use_point = '{$_POST['cf_use_point']}',
cf_point_term = '{$_POST['cf_point_term']}',
- cf_use_norobot = '{$_POST['cf_use_norobot']}',
cf_use_copy_log = '{$_POST['cf_use_copy_log']}',
cf_use_email_certify = '{$_POST['cf_use_email_certify']}',
cf_login_point = '{$_POST['cf_login_point']}',
@@ -44,7 +43,6 @@ $sql = " update {$g5['config_table']}
cf_write_point = '{$_POST['cf_write_point']}',
cf_comment_point = '{$_POST['cf_comment_point']}',
cf_download_point = '{$_POST['cf_download_point']}',
- cf_search_bgcolor = '{$_POST['cf_search_bgcolor']}',
cf_search_color = '{$_POST['cf_search_color']}',
cf_write_pages = '{$_POST['cf_write_pages']}',
cf_mobile_pages = '{$_POST['cf_mobile_pages']}',
@@ -90,7 +88,6 @@ $sql = " update {$g5['config_table']}
cf_memo_del = '{$_POST['cf_memo_del']}',
cf_visit_del = '{$_POST['cf_visit_del']}',
cf_popular_del = '{$_POST['cf_popular_del']}',
- cf_use_jumin = '{$_POST['cf_use_jumin']}',
cf_use_member_icon = '{$_POST['cf_use_member_icon']}',
cf_member_icon_size = '{$_POST['cf_member_icon_size']}',
cf_member_icon_width = '{$_POST['cf_member_icon_width']}',
diff --git a/adm/member_form.php b/adm/member_form.php
index 6f9421de6..3410c242b 100644
--- a/adm/member_form.php
+++ b/adm/member_form.php
@@ -33,8 +33,6 @@ else if ($w == 'u')
$mb['mb_email'] = get_text($mb['mb_email']);
$mb['mb_homepage'] = get_text($mb['mb_homepage']);
- $mb['mb_password_q'] = get_text($mb['mb_password_q']);
- $mb['mb_password_a'] = get_text($mb['mb_password_a']);
$mb['mb_birth'] = get_text($mb['mb_birth']);
$mb['mb_tel'] = get_text($mb['mb_tel']);
$mb['mb_hp'] = get_text($mb['mb_hp']);
@@ -320,15 +318,15 @@ include_once('./admin.head.php');
|
- " id="mb_leave_date_set_today" onclick="if (this.form.mb_leave_date.value==this.form.mb_leave_date.defaultValue) {
+ " id="mb_leave_date_set_today" onclick="if (this.form.mb_leave_date.value==this.form.mb_leave_date.defaultValue) {
this.form.mb_leave_date.value=this.value; } else { this.form.mb_leave_date.value=this.form.mb_leave_date.defaultValue; }">
|
접근차단일자 |
- " id="mb_intercept_date_set_today" onclick="if
-(this.form.mb_intercept_date.value==this.form.mb_intercept_date.defaultValue) { this.form.mb_intercept_date.value=this.value; } else {
+ " id="mb_intercept_date_set_today" onclick="if
+(this.form.mb_intercept_date.value==this.form.mb_intercept_date.defaultValue) { this.form.mb_intercept_date.value=this.value; } else {
this.form.mb_intercept_date.value=this.form.mb_intercept_date.defaultValue; }">
|
diff --git a/bbs/register_form.php b/bbs/register_form.php
index c4919bf73..4b815617d 100644
--- a/bbs/register_form.php
+++ b/bbs/register_form.php
@@ -83,8 +83,6 @@ if ($w == "") {
$member['mb_email'] = get_text($member['mb_email']);
$member['mb_homepage'] = get_text($member['mb_homepage']);
- $member['mb_password_q'] = get_text($member['mb_password_q']);
- $member['mb_password_a'] = get_text($member['mb_password_a']);
$member['mb_birth'] = get_text($member['mb_birth']);
$member['mb_tel'] = get_text($member['mb_tel']);
$member['mb_hp'] = get_text($member['mb_hp']);
diff --git a/css/default.css b/css/default.css
index c06d8bdab..a735e1c72 100644
--- a/css/default.css
+++ b/css/default.css
@@ -266,6 +266,9 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
#ctt_con {padding:10px 0}
.ctt_img {text-align:center}
+/* 검색결과 색상 */
+.sch_word {color:#ff3061}
+
/* 자바스크립트 alert 대안 */
#validation_check {margin:100px auto;width:500px}
#validation_check h1 {margin-bottom:20px;font-size:1.3em}
diff --git a/css/mobile.css b/css/mobile.css
index e8226f218..9d2b3328a 100644
--- a/css/mobile.css
+++ b/css/mobile.css
@@ -232,6 +232,9 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
#ctt_con {padding:10px 0}
.ctt_img {text-align:center}
+/* 검색결과 색상 */
+.sch_word {color:#ff3061}
+
/* 사이드뷰 */
.sv_wrap {display:inline-block;position:relative;font-weight:normal}
.sv_wrap .sv {z-index:1000;display:none;margin:5px 0 0;border:1px solid #283646}
diff --git a/install/gnuboard5.sql b/install/gnuboard5.sql
index 6df6f7538..8961381fc 100644
--- a/install/gnuboard5.sql
+++ b/install/gnuboard5.sql
@@ -43,7 +43,6 @@ CREATE TABLE IF NOT EXISTS `g5_board` (
`bo_download_point` int(11) NOT NULL DEFAULT '0',
`bo_use_category` tinyint(4) NOT NULL DEFAULT '0',
`bo_category_list` text NOT NULL,
- `bo_disable_tags` text NOT NULL,
`bo_use_sideview` tinyint(4) NOT NULL DEFAULT '0',
`bo_use_file_content` tinyint(4) NOT NULL DEFAULT '0',
`bo_use_secret` tinyint(4) NOT NULL DEFAULT '0',
@@ -67,8 +66,6 @@ CREATE TABLE IF NOT EXISTS `g5_board` (
`bo_image_width` int(11) NOT NULL DEFAULT '0',
`bo_skin` varchar(255) NOT NULL DEFAULT '',
`bo_mobile_skin` varchar(255) NOT NULL DEFAULT '',
- `bo_image_head` varchar(255) NOT NULL DEFAULT '',
- `bo_image_tail` varchar(255) NOT NULL DEFAULT '',
`bo_include_head` varchar(255) NOT NULL DEFAULT '',
`bo_include_tail` varchar(255) NOT NULL DEFAULT '',
`bo_content_head` text NOT NULL,
@@ -196,14 +193,12 @@ CREATE TABLE IF NOT EXISTS `g5_config` (
`cf_add_script` text NOT NULL,
`cf_use_point` tinyint(4) NOT NULL DEFAULT '0',
`cf_point_term` int(11) NOT NULL DEFAULT '0',
- `cf_use_norobot` tinyint(4) NOT NULL DEFAULT '0',
`cf_use_copy_log` tinyint(4) NOT NULL DEFAULT '0',
`cf_use_email_certify` tinyint(4) NOT NULL DEFAULT '0',
`cf_login_point` int(11) NOT NULL DEFAULT '0',
`cf_cut_name` tinyint(4) NOT NULL DEFAULT '0',
`cf_nick_modify` int(11) NOT NULL DEFAULT '0',
`cf_new_skin` varchar(255) NOT NULL DEFAULT '',
- `cf_login_skin` varchar(255) NOT NULL DEFAULT '',
`cf_new_rows` int(11) NOT NULL DEFAULT '0',
`cf_search_skin` varchar(255) NOT NULL DEFAULT '',
`cf_connect_skin` varchar(255) NOT NULL DEFAULT '',
@@ -211,7 +206,6 @@ CREATE TABLE IF NOT EXISTS `g5_config` (
`cf_write_point` int(11) NOT NULL DEFAULT '0',
`cf_comment_point` int(11) NOT NULL DEFAULT '0',
`cf_download_point` int(11) NOT NULL DEFAULT '0',
- `cf_search_bgcolor` varchar(255) NOT NULL DEFAULT '',
`cf_search_color` varchar(255) NOT NULL DEFAULT '',
`cf_write_pages` int(11) NOT NULL DEFAULT '0',
`cf_mobile_pages` int(11) NOT NULL DEFAULT '0',
@@ -222,7 +216,6 @@ CREATE TABLE IF NOT EXISTS `g5_config` (
`cf_intercept_ip` text NOT NULL,
`cf_analytics` text NOT NULL,
`cf_add_meta` text NOT NULL,
- `cf_register_skin` varchar(255) NOT NULL DEFAULT 'basic',
`cf_member_skin` varchar(255) NOT NULL DEFAULT '',
`cf_use_homepage` tinyint(4) NOT NULL DEFAULT '0',
`cf_req_homepage` tinyint(4) NOT NULL DEFAULT '0',
@@ -258,7 +251,6 @@ CREATE TABLE IF NOT EXISTS `g5_config` (
`cf_memo_del` int(11) NOT NULL DEFAULT '0',
`cf_visit_del` int(11) NOT NULL DEFAULT '0',
`cf_popular_del` int(11) NOT NULL DEFAULT '0',
- `cf_use_jumin` tinyint(4) NOT NULL DEFAULT '0',
`cf_use_member_icon` tinyint(4) NOT NULL DEFAULT '0',
`cf_member_icon_size` int(11) NOT NULL DEFAULT '0',
`cf_member_icon_width` int(11) NOT NULL DEFAULT '0',
@@ -442,10 +434,7 @@ CREATE TABLE IF NOT EXISTS `g5_member` (
`mb_nick_date` date NOT NULL default '0000-00-00',
`mb_email` varchar(255) NOT NULL default '',
`mb_homepage` varchar(255) NOT NULL default '',
- `mb_password_q` varchar(255) NOT NULL default '',
- `mb_password_a` varchar(255) NOT NULL default '',
`mb_level` tinyint(4) NOT NULL default '0',
- `mb_jumin` varchar(255) NOT NULL default '',
`mb_sex` char(1) NOT NULL default '',
`mb_birth` varchar(255) NOT NULL default '',
`mb_tel` varchar(255) NOT NULL default '',
diff --git a/install/install_db.php b/install/install_db.php
index dbadfa2f3..4e44dc2cf 100644
--- a/install/install_db.php
+++ b/install/install_db.php
@@ -93,7 +93,6 @@ $sql = " insert into `{$table_prefix}config`
cf_admin = '$admin_id',
cf_admin_email = '$admin_email',
cf_use_point = '1',
- cf_use_norobot = '1',
cf_use_copy_log = '1',
cf_login_point = '100',
cf_memo_send_point = '500',
@@ -107,7 +106,6 @@ $sql = " insert into `{$table_prefix}config`
cf_write_point = '$write_point',
cf_comment_point = '$comment_point',
cf_download_point = '$download_point',
- cf_search_bgcolor = 'YELLOW',
cf_search_color = 'RED',
cf_write_pages = '10',
cf_mobile_pages = '5',
diff --git a/mobile/skin/search/basic/search.skin.php b/mobile/skin/search/basic/search.skin.php
index 55cd5cd57..f32f8ef6f 100644
--- a/mobile/skin/search/basic/search.skin.php
+++ b/mobile/skin/search/basic/search.skin.php
@@ -75,9 +75,9 @@ add_stylesheet('',
전체검색 결과
- 게시판
- - 개
+ - 개
- 게시물
- - 개
+ - 개
/ 페이지 열람 중
diff --git a/plugin/kcaptcha/kcaptcha.lib.php b/plugin/kcaptcha/kcaptcha.lib.php
index 26c2bd532..74d9054fb 100644
--- a/plugin/kcaptcha/kcaptcha.lib.php
+++ b/plugin/kcaptcha/kcaptcha.lib.php
@@ -239,7 +239,7 @@ function captcha_html($class="captcha")
//$html .= "\n".'';
$html .= "\n".'';
$html .= "\n".'