diff --git a/adm/board_copy.php b/adm/board_copy.php
index 645a6ff57..a41648e88 100644
--- a/adm/board_copy.php
+++ b/adm/board_copy.php
@@ -1,7 +1,6 @@
$sub_menu = "300100";
include_once("./_common.php");
-include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
auth_check($auth[$sub_menu], 'w');
@@ -40,10 +39,6 @@ include_once(G4_PATH.'/head.sub.php');
-
- | 자동등록방지 |
- =captcha_html();?> |
-
@@ -63,8 +58,6 @@ function fboardcopy_check(f)
return false;
}
- echo chk_captcha_js(); ?>
-
return true;
}
diff --git a/adm/board_copy_update.php b/adm/board_copy_update.php
index ea39c49e5..b153dba7d 100644
--- a/adm/board_copy_update.php
+++ b/adm/board_copy_update.php
@@ -1,14 +1,9 @@
$sub_menu = '300100';
include_once('./_common.php');
-include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
auth_check($auth[$sub_menu], 'w');
-if (!chk_captcha()) {
- alert('스팸방지에 입력한 숫자가 틀렸습니다.');
-}
-
$target_table = escape_trim($_POST['target_table']);
$target_subject = escape_trim($_POST['target_subject']);
@@ -32,78 +27,87 @@ $file_copy = array();
// 게시판 정보
$sql = " insert into {$g4['board_table']}
set bo_table = '$target_table',
- bo_subject = '$target_subject',
- gr_id = '{$board['gr_id']}',
- bo_admin = '{$board['bo_admin']}',
- bo_list_level = '{$board[bo_list_level]}',
- bo_read_level = '{$board[bo_read_level]}',
- bo_write_level = '{$board[bo_write_level]}',
- bo_reply_level = '{$board[bo_reply_level]}',
- bo_comment_level = '{$board[bo_comment_level]}',
- bo_upload_level = '{$board[bo_upload_level]}',
- bo_download_level = '{$board[bo_download_level]}',
- bo_html_level = '{$board[bo_html_level]}',
- bo_link_level = '{$board[bo_link_level]}',
- bo_count_modify = '{$board[bo_count_modify]}',
- bo_count_delete = '{$board[bo_count_delete]}',
- bo_read_point = '{$board[bo_read_point]}',
- bo_write_point = '{$board[bo_write_point]}',
- bo_comment_point = '{$board[bo_comment_point]}',
- 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_secret = '{$board[bo_use_secret]}',
- bo_use_dhtml_editor = '{$board[bo_use_dhtml_editor]}',
- bo_use_sideview = '{$board[bo_use_sideview]}',
- bo_use_good = '{$board[bo_use_good]}',
- bo_use_nogood = '{$board[bo_use_nogood]}',
- bo_use_signature = '{$board[bo_use_signature]}',
- bo_use_ip_view = '{$board[bo_use_ip_view]}',
- bo_use_list_view = '{$board['o_use_list_view']}',
- bo_use_list_content = '{$board[bo_use_list_content]}',
- bo_table_width = '{$board[bo_table_width]}',
- bo_subject_len = '{$board[bo_subject_len]}',
- bo_page_rows = '{$board[bo_page_rows]}',
- bo_new = '{$board[bo_new]}',
- bo_hot = '{$board[bo_hot]}',
- bo_image_width = '{$board[bo_image_width]}',
- bo_skin = '{$board['bo_skin']}',
- bo_include_head = '{$board['bo_include_head']}',
- bo_include_tail = '{$board['bo_include_tail']}',
- bo_content_head = '".addslashes($board['bo_content_head'])."',
- bo_content_tail = '".addslashes($board['bo_content_tail'])."',
- bo_insert_content = '".addslashes($board['bo_insert_content'])."',
- bo_gallery_cols = '{$board[bo_gallery_cols]}',
- bo_upload_size = '{$board[bo_upload_size]}',
- bo_reply_order = '{$board[bo_reply_order]}',
- bo_use_search = '{$board[bo_use_search]}',
- bo_show_menu = '{$board[bo_show_menu]}',
- bo_order = '{$board[bo_order]}',
- bo_notice = '{$board['bo_notice']}',
- bo_upload_count = '{$board[bo_upload_count]}',
- bo_use_email = '{$board[bo_use_email]}',
- bo_sort_field = '{$board['bo_sort_field']}',
- bo_1_subj = '{$board['bo_1_subj']}',
- bo_2_subj = '{$board['bo_2_subj']}',
- bo_3_subj = '{$board['bo_3_subj']}',
- bo_4_subj = '{$board['bo_4_subj']}',
- bo_5_subj = '{$board['bo_5_subj']}',
- bo_6_subj = '{$board['bo_6_subj']}',
- bo_7_subj = '{$board['bo_7_subj']}',
- bo_8_subj = '{$board['bo_8_subj']}',
- bo_9_subj = '{$board['bo_9_subj']}',
- bo_10_subj = '{$board['bo_10_subj']}',
- bo_1 = '{$board['bo_1']}',
- bo_2 = '{$board['bo_2']}',
- bo_3 = '{$board['bo_3']}',
- bo_4 = '{$board['bo_4']}',
- bo_5 = '{$board['bo_5']}',
- bo_6 = '{$board['bo_6']}',
- bo_7 = '{$board['bo_7']}',
- bo_8 = '{$board['bo_8']}',
- bo_9 = '{$board['bo_9']}',
- bo_10 = '{$board['bo_10']}' ";
+ gr_id = '{$board['gr_id']}',
+ bo_subject = '$target_subject',
+ bo_device = '{$board['bo_device']}',
+ bo_admin = '{$board['bo_admin']}',
+ bo_list_level = '{$board[bo_list_level]}',
+ bo_read_level = '{$board[bo_read_level]}',
+ bo_write_level = '{$board[bo_write_level]}',
+ bo_reply_level = '{$board[bo_reply_level]}',
+ bo_comment_level = '{$board[bo_comment_level]}',
+ bo_upload_level = '{$board[bo_upload_level]}',
+ bo_download_level = '{$board[bo_download_level]}',
+ bo_html_level = '{$board[bo_html_level]}',
+ bo_link_level = '{$board[bo_link_level]}',
+ bo_trackback_level = '{$board[bo_trackback_level]}',
+ bo_count_modify = '{$board[bo_count_modify]}',
+ bo_count_delete = '{$board[bo_count_delete]}',
+ bo_read_point = '{$board[bo_read_point]}',
+ bo_write_point = '{$board[bo_write_point]}',
+ bo_comment_point = '{$board[bo_comment_point]}',
+ 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]}',
+ bo_use_dhtml_editor = '{$board[bo_use_dhtml_editor]}',
+ bo_use_rss_view = '{$board[bo_use_rss_view]}',
+ bo_use_good = '{$board[bo_use_good]}',
+ bo_use_nogood = '{$board[bo_use_nogood]}',
+ bo_use_signature = '{$board[bo_use_signature]}',
+ bo_use_ip_view = '{$board[bo_use_ip_view]}',
+ bo_use_list_view = '{$board['o_use_list_view']}',
+ bo_use_list_content = '{$board[bo_use_list_content]}',
+ bo_table_width = '{$board[bo_table_width]}',
+ bo_subject_len = '{$board[bo_subject_len]}',
+ bo_page_rows = '{$board[bo_page_rows]}',
+ bo_new = '{$board[bo_new]}',
+ bo_hot = '{$board[bo_hot]}',
+ bo_image_width = '{$board[bo_image_width]}',
+ bo_skin = '{$board['bo_skin']}',
+ bo_include_head = '{$board['bo_include_head']}',
+ bo_include_tail = '{$board['bo_include_tail']}',
+ bo_content_head = '".addslashes($board['bo_content_head'])."',
+ bo_content_tail = '".addslashes($board['bo_content_tail'])."',
+ bo_insert_content = '".addslashes($board['bo_insert_content'])."',
+ bo_gallery_cols = '{$board[bo_gallery_cols]}',
+ bo_gallery_width = '{$board[bo_gallery_width]}',
+ bo_gallery_height = '{$board[bo_gallery_height]}',
+ bo_mobile_gallery_cols = '{$board[bo_mobile_gallery_cols]}',
+ bo_mobile_gallery_width = '{$board[bo_mobile_gallery_width]}',
+ bo_mobile_gallery_height = '{$board[bo_mobile_gallery_height]}',
+ bo_upload_size = '{$board[bo_upload_size]}',
+ bo_reply_order = '{$board[bo_reply_order]}',
+ bo_use_search = '{$board[bo_use_search]}',
+ bo_show_menu = '{$board[bo_show_menu]}',
+ bo_order = '{$board[bo_order]}',
+ bo_notice = '{$board['bo_notice']}',
+ bo_upload_count = '{$board[bo_upload_count]}',
+ bo_use_email = '{$board[bo_use_email]}',
+ bo_sort_field = '{$board['bo_sort_field']}',
+ bo_1_subj = '{$board['bo_1_subj']}',
+ bo_2_subj = '{$board['bo_2_subj']}',
+ bo_3_subj = '{$board['bo_3_subj']}',
+ bo_4_subj = '{$board['bo_4_subj']}',
+ bo_5_subj = '{$board['bo_5_subj']}',
+ bo_6_subj = '{$board['bo_6_subj']}',
+ bo_7_subj = '{$board['bo_7_subj']}',
+ bo_8_subj = '{$board['bo_8_subj']}',
+ bo_9_subj = '{$board['bo_9_subj']}',
+ bo_10_subj = '{$board['bo_10_subj']}',
+ bo_1 = '{$board['bo_1']}',
+ bo_2 = '{$board['bo_2']}',
+ bo_3 = '{$board['bo_3']}',
+ bo_4 = '{$board['bo_4']}',
+ bo_5 = '{$board['bo_5']}',
+ bo_6 = '{$board['bo_6']}',
+ bo_7 = '{$board['bo_7']}',
+ bo_8 = '{$board['bo_8']}',
+ bo_9 = '{$board['bo_9']}',
+ bo_10 = '{$board['bo_10']}' ";
sql_query($sql);
// 게시판 폴더 생성
diff --git a/adm/board_form.php b/adm/board_form.php
index 325a1a5a4..2a739257b 100644
--- a/adm/board_form.php
+++ b/adm/board_form.php
@@ -53,7 +53,7 @@ if ($w == '') {
$board['bo_mobile_gallery_cols'] = 2;
$board['bo_mobile_gallery_width'] = 160;
$board['bo_mobile_gallery_height'] = 120;
- $board['bo_table_width'] = 97;
+ $board['bo_table_width'] = 100;
$board['bo_page_rows'] = $config['cf_page_rows'];
$board['bo_subject_len'] = 60;
$board['bo_new'] = 24;
@@ -765,7 +765,7 @@ $pg_anchor = "
- |
+ |
=help('100 이하는 %')?>
diff --git a/adm/board_form_update.php b/adm/board_form_update.php
index f5ac45e21..0d2e5cf81 100644
--- a/adm/board_form_update.php
+++ b/adm/board_form_update.php
@@ -173,16 +173,23 @@ if ($w == '') {
$bo_count_comment = $row['cnt'];
// 글수 조정
+ /*
+ 엔피씨님의 팁으로 교체합니다. 130308
+ http://sir.co.kr/bbs/board.php?bo_table=g4_tiptech&wr_id=27207
+ */
if (isset($_POST['proc_count'])) {
// 원글을 얻습니다.
- $sql = " select wr_id from {$g4['write_prefix']}{$bo_table} where wr_is_comment = 0 ";
+ //$sql = " select wr_id from {$g4['write_prefix']}{$bo_table} where wr_is_comment = 0 ";
+ $sql = " select a.wr_id, (count(b.wr_parent) - 1) as cnt from {$g4['write_prefix']}{$bo_table} a, {$g4['write_prefix']}{$bo_table} b where a.wr_id=b.wr_parent and a.wr_is_comment=0 group by a.wr_id ";
$result = sql_query($sql);
for ($i=0; $row=sql_fetch_array($result); $i++) {
+ /*
// 코멘트수를 얻습니다.
$sql2 = " select count(*) as cnt from {$g4['write_prefix']}$bo_table where wr_parent = '{$row['wr_id']}' and wr_is_comment = 1 ";
$row2 = sql_fetch($sql2);
+ */
- sql_query(" update {$g4['write_prefix']}{$bo_table} set wr_comment = '{$row2['cnt']}' where wr_id = '{$row['wr_id']}' ");
+ sql_query(" update {$g4['write_prefix']}{$bo_table} set wr_comment = '{$row['cnt']}' where wr_id = '{$row['wr_id']}' ");
}
}
diff --git a/adm/config_form.php b/adm/config_form.php
index 67d4cc8b8..0433353c1 100644
--- a/adm/config_form.php
+++ b/adm/config_form.php
@@ -475,7 +475,7 @@ $pg_anchor = "
|
|
- =help('hanmail.net과 같은 메일 주소는 입력을 못합니다. 엔터로 구분')?>
+ =help('hotmail.com과 같은 메일 주소는 사용하지 못하도록 못합니다. 엔터로 구분')?>
|
diff --git a/bbs/formmail_send.php b/bbs/formmail_send.php
index 7b239cf41..2ce11c8bf 100644
--- a/bbs/formmail_send.php
+++ b/bbs/formmail_send.php
@@ -16,7 +16,7 @@ if (substr_count($to, "@") > 1)
if (!chk_captcha()) {
- alert('스팸방지에 입력한 숫자가 틀렸습니다.');
+ alert('자동등록방지 숫자가 틀렸습니다.');
}
diff --git a/bbs/gcaptcha/gcaptcha.js b/bbs/gcaptcha/gcaptcha.js
index b6b8bd722..536dcd7bf 100644
--- a/bbs/gcaptcha/gcaptcha.js
+++ b/bbs/gcaptcha/gcaptcha.js
@@ -17,7 +17,7 @@ function chk_captcha()
}
});
if (!captcha_result) {
- alert("스팸방지 숫자가 틀렸습니다.");
+ alert("자동등록방지 숫자가 틀렸습니다.");
captcha_key.select();
return false;
}
diff --git a/bbs/gcaptcha/gcaptcha.lib.php b/bbs/gcaptcha/gcaptcha.lib.php
index b95ec845d..9eb3fcc05 100644
--- a/bbs/gcaptcha/gcaptcha.lib.php
+++ b/bbs/gcaptcha/gcaptcha.lib.php
@@ -178,11 +178,11 @@ function captcha_html($class='captcha')
$html .= PHP_EOL.'';
$html .= PHP_EOL.'';
$html .= '';
return $html;
}
diff --git a/bbs/memo_form_update.php b/bbs/memo_form_update.php
index 92e8cdbfe..4f8c0fe3b 100644
--- a/bbs/memo_form_update.php
+++ b/bbs/memo_form_update.php
@@ -6,7 +6,7 @@ if ($is_guest)
alert('회원만 이용하실 수 있습니다.');
if (!chk_captcha()) {
- alert('스팸방지에 입력한 숫자가 틀렸습니다.');
+ alert('자동등록방지 숫자가 틀렸습니다.');
}
$recv_list = explode(',', trim($_POST['me_recv_mb_id']));
diff --git a/bbs/password_lost2.php b/bbs/password_lost2.php
index eb28b4fdd..c606e17bb 100644
--- a/bbs/password_lost2.php
+++ b/bbs/password_lost2.php
@@ -3,11 +3,11 @@ include_once('./_common.php');
include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
if ($is_member) {
- alert("이미 로그인중입니다.");
+ alert('이미 로그인중입니다.');
}
if (!chk_captcha()) {
- alert('스팸방지에 입력한 숫자가 틀렸습니다.');
+ alert('자동등록방지 숫자가 틀렸습니다.');
}
include_once($member_skin_path.'/password_lost2.skin.php');
diff --git a/bbs/poll_update.php b/bbs/poll_update.php
index 0a2c81b68..f05a5fdfb 100644
--- a/bbs/poll_update.php
+++ b/bbs/poll_update.php
@@ -1,12 +1,5 @@
include_once('./_common.php');
-/*
-include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
-
-if ($is_guest && !chk_captcha()) {
- alert('스팸방지에 입력한 숫자가 틀렸습니다.');
-}
-*/
$po = sql_fetch(" select * from {$g4['poll_table']} where po_id = '{$_POST['po_id']}' ");
if (!$po['po_id'])
diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php
index 9ef55dd9f..47526889e 100644
--- a/bbs/register_form_update.php
+++ b/bbs/register_form_update.php
@@ -17,7 +17,7 @@ if ($w == 'u' && $is_admin == 'super') {
}
if (!chk_captcha()) {
- alert('스팸방지에 입력한 숫자가 틀렸습니다.');
+ alert('자동등록방지 숫자가 틀렸습니다.');
}
$mb_id = escape_trim($_POST['mb_id']);
diff --git a/bbs/register_form_update_mail2.php b/bbs/register_form_update_mail2.php
index e05ba30d7..802c659c1 100644
--- a/bbs/register_form_update_mail2.php
+++ b/bbs/register_form_update_mail2.php
@@ -27,7 +27,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
회원 별명 : =$mb_nick?>
추천인아이디 : =$mb_recommend?>
- 관리자에서 회원정보 확인하기
+ 관리자에서 회원정보 확인하기
diff --git a/bbs/write_comment_update.php b/bbs/write_comment_update.php
index 3edbe59ca..754b85371 100644
--- a/bbs/write_comment_update.php
+++ b/bbs/write_comment_update.php
@@ -22,7 +22,7 @@ if ($is_guest) {
if ($wr_name == '')
alert('이름은 필히 입력하셔야 합니다.');
if(!chk_captcha())
- alert('스팸방지에 입력한 숫자가 틀렸습니다.');
+ alert('자동등록방지 숫자가 틀렸습니다.');
}
if ($w == "c" || $w == "cu") {
diff --git a/bbs/write_update.php b/bbs/write_update.php
index 8e7d12270..57f4fae6b 100644
--- a/bbs/write_update.php
+++ b/bbs/write_update.php
@@ -149,7 +149,7 @@ if ($w == '' || $w == 'u') {
}
if ($is_guest && !chk_captcha()) {
- alert('스팸방지에 입력한 숫자가 틀렸습니다.');
+ alert('자동등록방지 숫자가 틀렸습니다.');
}
if ($w == '' || $w == 'r') {
diff --git a/css/default.css b/css/default.css
index f697bd2ae..c56e0c922 100644
--- a/css/default.css
+++ b/css/default.css
@@ -314,7 +314,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#333;color:#fff;
#mb_login .login_id {position:absolute;top:26px;left:95px}
#mb_login .login_pw {position:absolute;top:52px;left:95px}
#mb_login .frm_input {display:block;margin:0 0 5px 80px}
-#mb_login .btn_submit {position:absolute;top:20px;left:335px;height:53px}
+#mb_login .btn_submit {position:absolute;top:20px;left:335px;height:49px}
#mb_login section {margin:0 0 30px;padding:20px;border:1px solid #cfded8;background:#f7f7f2}
#mb_login section div {text-align:right}
diff --git a/install/gnuboard4s.sql b/install/gnuboard4s.sql
index 76ea526f0..f6f6d9caf 100644
--- a/install/gnuboard4s.sql
+++ b/install/gnuboard4s.sql
@@ -49,7 +49,6 @@ CREATE TABLE IF NOT EXISTS `g4s_board` (
`bo_use_secret` tinyint(4) NOT NULL default '0',
`bo_use_dhtml_editor` tinyint(4) NOT NULL default '0',
`bo_use_rss_view` tinyint(4) NOT NULL default '0',
- `bo_use_comment` tinyint(4) NOT NULL default '0',
`bo_use_good` tinyint(4) NOT NULL default '0',
`bo_use_nogood` tinyint(4) NOT NULL default '0',
`bo_use_name` tinyint(4) NOT NULL default '0',
diff --git a/install/index.php b/install/index.php
index 405056142..bf0a46041 100644
--- a/install/index.php
+++ b/install/index.php
@@ -1,5 +1,5 @@
-$title = "그누보드4S 설치 3단계 중 1단계 라이센스 확인";
+$title = "그누보드4s 설치 3단계 중 1단계 라이센스 확인";
include_once ('../config.php');
include_once ('./install.inc.php');
?>
diff --git a/install/install.inc.php b/install/install.inc.php
index 0e8c51e0f..3de1ecf34 100644
--- a/install/install.inc.php
+++ b/install/install.inc.php
@@ -2,7 +2,7 @@
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
$data_path = '../'.G4_DATA_DIR;
-if (!$title) $title = "그누보드4S 설치";
+if (!$title) $title = "그누보드4s 설치";
?>
@@ -13,17 +13,18 @@ if (!$title) $title = "그누보드4S 설치";