From 5532ddf1539e36aaaedd98b0d5a9b8ba2ccab039 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 30 Apr 2013 18:15:56 +0900 Subject: [PATCH 001/140] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=EB=AA=A8?= =?UTF-8?q?=EB=B0=94=EC=9D=BC:=20=EC=B5=9C=EC=8B=A0=EA=B8=80=20=EC=8A=A4?= =?UTF-8?q?=ED=82=A8=20lt=20=EB=A5=BC=20lat=20=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95,=20=EC=95=BD=EC=96=B4=20=EC=A0=95=EB=A6=AC=EC=97=90?= =?UTF-8?q?=20=EB=94=B0=EB=A5=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/skin/latest/basic/latest.skin.php | 6 +++--- mobile/skin/latest/basic/style.css | 12 ++++++------ skin/latest/basic/latest.skin.php | 6 +++--- skin/latest/basic/style.css | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/mobile/skin/latest/basic/latest.skin.php b/mobile/skin/latest/basic/latest.skin.php index ef2940f42..92d62c581 100644 --- a/mobile/skin/latest/basic/latest.skin.php +++ b/mobile/skin/latest/basic/latest.skin.php @@ -4,8 +4,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -
- +
+
  • @@ -37,5 +37,5 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
  • 게시물이 없습니다.
-
더보기
+
더보기
diff --git a/mobile/skin/latest/basic/style.css b/mobile/skin/latest/basic/style.css index 3d54a5288..76fc5a6df 100644 --- a/mobile/skin/latest/basic/style.css +++ b/mobile/skin/latest/basic/style.css @@ -1,7 +1,7 @@ /* 최근게시물 스킨 (latest) */ -.lt {position:relative;margin:0 0 1em;padding:0 1em 1.5em;border-bottom:1px solid #ddd} -.lt ul {margin:0 0 1em;padding:0;list-style:none} -.lt li {padding:0.2em 0} -.lt a {color:#000;text-decoration:none} -.lt_title {display:block;padding:1em 0} -.lt_more {position:absolute;top:1em;right:1em} \ No newline at end of file +.lat {position:relative;margin:0 0 1em;padding:0 1em 1.5em;border-bottom:1px solid #ddd} +.lat ul {margin:0 0 1em;padding:0;list-style:none} +.lat li {padding:0.2em 0} +.lat a {color:#000;text-decoration:none} +.lat_title {display:block;padding:1em 0} +.lat_more {position:absolute;top:1em;right:1em} \ No newline at end of file diff --git a/skin/latest/basic/latest.skin.php b/skin/latest/basic/latest.skin.php index df33929b4..068a84503 100644 --- a/skin/latest/basic/latest.skin.php +++ b/skin/latest/basic/latest.skin.php @@ -4,8 +4,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -
- +
+
  • @@ -37,5 +37,5 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
  • 게시물이 없습니다.
-
더보기
+
더보기
diff --git a/skin/latest/basic/style.css b/skin/latest/basic/style.css index 82f0b96d2..b51b1f1fd 100644 --- a/skin/latest/basic/style.css +++ b/skin/latest/basic/style.css @@ -1,7 +1,7 @@ /* 새글 스킨 (latest) */ -.lt_pc {float:left;margin-left:20px} -.lt {position:relative;float:left;margin-bottom:20px;padding-bottom:10px;width:354px;height:150px;border-bottom:1px solid #ddd} -.lt ul {margin:0 0 10px;padding:0;list-style:none} -.lt li {padding:3px 0} -.lt_title {display:block;padding:10px 0 8px} -.lt_more {position:absolute;top:10px;right:0} \ No newline at end of file +.lat_pc {float:left;margin-left:20px} +.lat {position:relative;float:left;margin-bottom:20px;padding-bottom:10px;width:354px;height:150px;border-bottom:1px solid #ddd} +.lat ul {margin:0 0 10px;padding:0;list-style:none} +.lat li {padding:3px 0} +.lat_title {display:block;padding:10px 0 8px} +.lat_more {position:absolute;top:10px;right:0} \ No newline at end of file From cdcb1a7bf3a74f76320b0a981558d6286aa8fb4f Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 2 May 2013 10:49:33 +0900 Subject: [PATCH 002/140] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85?= =?UTF-8?q?=EC=8B=9C=20=EC=B6=94=EC=B2=9C=EC=9D=B8=EC=9D=84=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=EC=97=90=EB=8F=84=20=EC=B6=94=EC=B2=9C=EC=9D=B8=20?= =?UTF-8?q?=EC=95=84=EC=9D=B4=EB=94=94=EA=B0=80=20=ED=8B=80=EB=A0=B8?= =?UTF-8?q?=EB=8B=A4=EB=8A=94=20=EC=98=A4=EB=A5=98=EA=B0=80=20=EB=82=98?= =?UTF-8?q?=EC=98=A4=EB=8A=94=20=EB=B6=80=EB=B6=84=EC=9D=84=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/register_form_update.php | 5 ++++- skin/member/basic/register_form.skin.php | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php index 7cc1039f4..55fc56700 100644 --- a/bbs/register_form_update.php +++ b/bbs/register_form_update.php @@ -75,7 +75,10 @@ if ($w == '' || $w == 'u') { if ($w=='') { if ($msg = exist_mb_id($mb_id)) alert($msg); - if (!exist_mb_id($mb_recommend)) alert("추천인이 존재하지 않습니다."); + if ($config['cf_use_recommend']) { + if (!exist_mb_id($mb_recommend)) + alert("추천인이 존재하지 않습니다."); + } if (strtolower($mb_id) == strtolower($mb_recommend)) { alert('본인을 추천할 수 없습니다.'); diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php index 97f47a0e3..d38367053 100644 --- a/skin/member/basic/register_form.skin.php +++ b/skin/member/basic/register_form.skin.php @@ -214,7 +214,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - + From 546cfe17c2a8f1dd251f245c94f4196f9d9d71a4 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 2 May 2013 11:10:42 +0900 Subject: [PATCH 003/140] =?UTF-8?q?insert=EC=8B=9C=20=EC=A4=91=EB=B3=B5?= =?UTF-8?q?=EB=90=98=EB=8A=94=20=EB=A0=88=EC=BD=94=EB=93=9C=EA=B0=80=20?= =?UTF-8?q?=EC=9E=88=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20=EC=98=A4=EB=A5=98?= =?UTF-8?q?=EB=A9=94=EC=84=B8=EC=A7=80=EB=A5=BC=20=EC=B6=9C=EB=A0=A5?= =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/syndi/include/include.bbs.delete.php | 2 +- plugin/syndi/include/include.bbs.delete_all.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/syndi/include/include.bbs.delete.php b/plugin/syndi/include/include.bbs.delete.php index 19aa2c417..a25e50bcb 100644 --- a/plugin/syndi/include/include.bbs.delete.php +++ b/plugin/syndi/include/include.bbs.delete.php @@ -28,7 +28,7 @@ $subject_row = sql_fetch($sql); $_link = './bbs/board.php?bo_table=%s&wr_id=%s'; $_sql = "insert into {$g4['syndi_log_table']} (content_id, bbs_id, title, link_alternative, delete_date) values('%s','%s','%s','%s','%s')"; -sql_query(sprintf($_sql, $row['wr_id'], $bo_table, addslashes($subject_row['wr_subject']), sprintf($_link, $bo_table, $row['wr_id']), date('YmdHis'))); +sql_query(sprintf($_sql, $row['wr_id'], $bo_table, addslashes($subject_row['wr_subject']), sprintf($_link, $bo_table, $row['wr_id']), date('YmdHis')), false); $oPing = new SyndicationPing; $oPing->setId(SyndicationHandler::getTag('channel', $bo_table)); diff --git a/plugin/syndi/include/include.bbs.delete_all.php b/plugin/syndi/include/include.bbs.delete_all.php index 248e9a7d4..9361a3e85 100644 --- a/plugin/syndi/include/include.bbs.delete_all.php +++ b/plugin/syndi/include/include.bbs.delete_all.php @@ -27,7 +27,7 @@ $subject_row = sql_fetch($sql); $_link = './bbs/board.php?bo_table=%s&wr_id=%s'; $_sql = "insert into {$g4['syndi_log_table']} (content_id, bbs_id, title, link_alternative, delete_date) values('%s','%s','%s','%s','%s')"; -sql_query(sprintf($_sql, $row['wr_id'], $bo_table, addslashes($subject_row['wr_subject']), sprintf($_link, $bo_table, $row['wr_id']), date('YmdHis'))); +sql_query(sprintf($_sql, $row['wr_id'], $bo_table, addslashes($subject_row['wr_subject']), sprintf($_link, $bo_table, $row['wr_id']), date('YmdHis')), false); $oPing = new SyndicationPing; $oPing->setId(SyndicationHandler::getTag('channel', $bo_table)); From d542924ab98a7e7435742df18ae8117ffa080b80 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 2 May 2013 11:13:46 +0900 Subject: [PATCH 004/140] =?UTF-8?q?=EB=8C=93=EA=B8=80=EA=B0=80=20->=20?= =?UTF-8?q?=EB=8C=93=EA=B8=80=EC=9D=B4=20=EB=AC=B8=EC=9E=A5=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/write_comment_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbs/write_comment_update.php b/bbs/write_comment_update.php index f4fdc3956..4ab8f50e0 100644 --- a/bbs/write_comment_update.php +++ b/bbs/write_comment_update.php @@ -81,7 +81,7 @@ if ($w == 'c') // 댓글 입력 where wr_id = '$comment_id' "; $reply_array = sql_fetch($sql); if (!$reply_array['wr_id']) - alert('답변할 댓글가 없습니다.\\n\\n답변하는 동안 댓글가 삭제되었을 수 있습니다.'); + alert('답변할 댓글이 없습니다.\\n\\n답변하는 동안 댓글이 삭제되었을 수 있습니다.'); $tmp_comment = $reply_array['wr_comment']; From 5057dc37f8761c8a7d0c6baf81fd5cc703afc54f Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 2 May 2013 14:40:57 +0900 Subject: [PATCH 005/140] =?UTF-8?q?cf=5Fkcpcert=5Fuse=20=ED=95=84=EB=93=9C?= =?UTF-8?q?=20=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/config_form.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/adm/config_form.php b/adm/config_form.php index 96e64cbb2..6756b5d0b 100644 --- a/adm/config_form.php +++ b/adm/config_form.php @@ -27,23 +27,25 @@ if (!isset($config['cf_mobile_new_skin'])) { if(!isset($config['cf_gcaptcha_mp3'])) { sql_query(" ALTER TABLE `{$g4['config_table']}` - ADD `cf_gcaptcha_mp3` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_mobile_member_skin` ", TRUE); + ADD `cf_gcaptcha_mp3` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_mobile_member_skin` ", true); } if(!isset($config['cf_kcpcert_site_cd'])) { sql_query(" ALTER TABLE `{$g4['config_table']}` - ADD `cf_kcpcert_site_cd` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_memo_send_point` ", TRUE); + ADD `cf_kcpcert_site_cd` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_memo_send_point` ", true); } if(!isset($config['cf_kcpcert_use'])) { sql_query(" ALTER TABLE `{$g4['config_table']}` - ADD `cf_kcpcert_use` ENUM('','test','service') NOT NULL DEFAULT '' AFTER `cf_memo_send_point` ", TRUE); + ADD `cf_kcpcert_use` ENUM('','test','service') NOT NULL DEFAULT '' AFTER `cf_memo_send_point` ", true); } +sql_query(" ALTER TABLE `{$g4['config_table']}` CHANGE `cf_kcpcert_use` `cf_kcpcert_use` ENUM('','test','service') NOT NULL DEFAULT '' ", false); + if(!isset($config['cf_mobile_pages'])) { sql_query(" ALTER TABLE `{$g4['config_table']}` - ADD `cf_mobile_pages` INT(11) NOT NULL DEFAULT '0' AFTER `cf_write_pages` ", TRUE); - sql_query(" UPDATE `{$g4['config_table']}` SET cf_mobile_pages = '5' ", TRUE); + ADD `cf_mobile_pages` INT(11) NOT NULL DEFAULT '0' AFTER `cf_write_pages` ", true); + sql_query(" UPDATE `{$g4['config_table']}` SET cf_mobile_pages = '5' ", true); } // uniqid 테이블이 없을 경우 생성 From b5cca60663e4d77afaa129be5e96a43a3bb6f041 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 2 May 2013 14:41:25 +0900 Subject: [PATCH 006/140] =?UTF-8?q?=EC=B6=94=EC=B2=9C=EC=9D=B8=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=8B=9C=20=EC=B6=94=EC=B2=9C=EC=9D=B8=20=EC=9E=85?= =?UTF-8?q?=EB=A0=A5=20=EC=97=86=EC=96=B4=EB=8F=84=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=B2=B4=ED=81=AC=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/register_form_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php index 55fc56700..0187e8358 100644 --- a/bbs/register_form_update.php +++ b/bbs/register_form_update.php @@ -75,7 +75,7 @@ if ($w == '' || $w == 'u') { if ($w=='') { if ($msg = exist_mb_id($mb_id)) alert($msg); - if ($config['cf_use_recommend']) { + if ($config['cf_use_recommend'] && $mb_recommend) { if (!exist_mb_id($mb_recommend)) alert("추천인이 존재하지 않습니다."); } From 60b7649f6ff62cf32a8a3fa02386c59e4e65593f Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 2 May 2013 14:41:50 +0900 Subject: [PATCH 007/140] =?UTF-8?q?=EC=B6=94=EC=B2=9C=EC=9D=B8=20=EC=9E=85?= =?UTF-8?q?=EB=A0=A5=EC=9D=B4=20=EC=9E=88=EB=8A=94=20=EA=B2=BD=EC=9A=B0?= =?UTF-8?q?=EC=97=90=EB=A7=8C=20=EA=B2=80=EC=82=AC=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/member/basic/register_form.skin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php index d38367053..613d353b5 100644 --- a/skin/member/basic/register_form.skin.php +++ b/skin/member/basic/register_form.skin.php @@ -214,7 +214,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - + @@ -337,7 +337,7 @@ function fregisterform_submit(f) } } - if (typeof(f.mb_recommend) != 'undefined') { + if (typeof(f.mb_recommend) != 'undefined' && f.mb_recommend.value) { if (f.mb_id.value == f.mb_recommend.value) { alert('본인을 추천할 수 없습니다.'); f.mb_recommend.focus(); From b9169822622527204e7acc5e478772b122f31ec8 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 2 May 2013 15:17:39 +0900 Subject: [PATCH 008/140] =?UTF-8?q?submit=20=ED=9B=84=20submit=20button=20?= =?UTF-8?q?=EC=9D=84=20disabled=20=EB=90=98=EA=B2=8C=20=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/board/basic/view_comment.skin.php | 6 ++++-- skin/board/basic/write.skin.php | 4 +++- skin/member/basic/register_form.skin.php | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/skin/board/basic/view_comment.skin.php b/skin/board/basic/view_comment.skin.php index d50db1d12..6021e4b4e 100644 --- a/skin/board/basic/view_comment.skin.php +++ b/skin/board/basic/view_comment.skin.php @@ -117,7 +117,7 @@ var char_max = parseInt(); // 최대 내용 글자 - diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php index 613d353b5..4cfda6087 100644 --- a/skin/member/basic/register_form.skin.php +++ b/skin/member/basic/register_form.skin.php @@ -228,7 +228,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

작성하신 내용를 발송하시려면 버튼을, 작성을 취소하고 창을 닫으시려면 취소 링크를 누르세요.

- + 취소
From 3323b802471923fb79b705d9ab6d43ca88d2be10 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 2 May 2013 15:37:35 +0900 Subject: [PATCH 009/140] =?UTF-8?q?timezone=20=EC=84=A0=EC=96=B8=ED=9B=84?= =?UTF-8?q?=20mysql=20=EC=97=90=EC=84=9C=EB=8F=84=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=EB=90=98=EA=B2=8C=20=ED=95=98=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common.php | 1 + config.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/common.php b/common.php index ce258eb7b..303b4be32 100644 --- a/common.php +++ b/common.php @@ -95,6 +95,7 @@ if (file_exists($dbconfig_file)) { $connect_db = sql_connect(G4_MYSQL_HOST, G4_MYSQL_USER, G4_MYSQL_PASSWORD) or die('MySQL Connect Error!!!'); $select_db = sql_select_db(G4_MYSQL_DB, $connect_db) or die('MySQL DB Error!!!'); @mysql_query(" set names utf8 "); + if (defined(G4_TIMEZONE)) @mysql_query(" set time_zone = '".G4_TIMEZONE."'"); } else { ?> diff --git a/config.php b/config.php index cfa9fd5a2..b7c1da162 100644 --- a/config.php +++ b/config.php @@ -6,9 +6,11 @@ // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음 define('_GNUBOARD_', true); +define('G4_TIMEZONE', 'Asia/Seoul'); + if (PHP_VERSION >= '5.3.0') { //if (function_exists("date_default_timezone_set")) date_default_timezone_set("Asia/Seoul"); - date_default_timezone_set("Asia/Seoul"); + date_default_timezone_set(G4_TIMEZONE); } //============================================================================== From 7b5d8f370026ba16df9ef409be3fec37a2948c44 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 2 May 2013 15:38:46 +0900 Subject: [PATCH 010/140] =?UTF-8?q?timezone=20=EC=84=A0=EC=96=B8=ED=9B=84?= =?UTF-8?q?=20mysql=20=EC=97=90=EC=84=9C=EB=8F=84=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=EB=90=98=EA=B2=8C=20=ED=95=98=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.php | 1 - 1 file changed, 1 deletion(-) diff --git a/config.php b/config.php index b7c1da162..32c6e5abf 100644 --- a/config.php +++ b/config.php @@ -9,7 +9,6 @@ define('_GNUBOARD_', true); define('G4_TIMEZONE', 'Asia/Seoul'); if (PHP_VERSION >= '5.3.0') { - //if (function_exists("date_default_timezone_set")) date_default_timezone_set("Asia/Seoul"); date_default_timezone_set(G4_TIMEZONE); } From 53e4399a40495cf15bf249ccabd9975156664955 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 2 May 2013 16:07:07 +0900 Subject: [PATCH 011/140] =?UTF-8?q?=EC=B6=94=EC=B2=9C=EC=9D=B8=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=8B=9C=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/skin/member/basic/register_form.skin.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/mobile/skin/member/basic/register_form.skin.php b/mobile/skin/member/basic/register_form.skin.php index e2fd41a87..f3dc61e54 100644 --- a/mobile/skin/member/basic/register_form.skin.php +++ b/mobile/skin/member/basic/register_form.skin.php @@ -226,7 +226,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

작성하신 내용을 제출하시려면 버튼을, 작성을 취소하고 목록으로 돌아가시려면 취소 링크를 누르세요.

- + 취소
@@ -336,12 +336,19 @@ function fregisterform_submit(f) } } - if (typeof(f.mb_recommend) != 'undefined') { + if (typeof(f.mb_recommend) != 'undefined' && f.mb_recommend.value) { if (f.mb_id.value == f.mb_recommend.value) { alert('본인을 추천할 수 없습니다.'); f.mb_recommend.focus(); return false; } + + var msg = reg_mb_recommend_check(); + if (msg) { + alert(msg); + f.mb_recommend.select(); + return false; + } } @@ -371,6 +378,8 @@ function fregisterform_submit(f) + document.getElementById("btn_submit").disabled = "disabled"; + return true; } From 4c573d0ab0d254c3b52084f130f6d74a8fd30456 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 2 May 2013 16:07:26 +0900 Subject: [PATCH 012/140] =?UTF-8?q?submit=20=ED=9B=84=20submit=20button=20?= =?UTF-8?q?=EC=9D=84=20disabled=20=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/skin/board/basic/view_comment.skin.php | 6 ++++-- mobile/skin/board/basic/write.skin.php | 2 ++ skin/member/basic/register_form.skin.php | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mobile/skin/board/basic/view_comment.skin.php b/mobile/skin/board/basic/view_comment.skin.php index 36e83a6b2..bb0fe5aec 100644 --- a/mobile/skin/board/basic/view_comment.skin.php +++ b/mobile/skin/board/basic/view_comment.skin.php @@ -116,7 +116,7 @@ var char_max = parseInt(); // 최대 내용 글자 - @@ -125,7 +125,7 @@ var char_max = parseInt(); // 최대
- +
@@ -233,6 +233,8 @@ var char_max = parseInt(); // 최대 + document.getElementById("btn_submit").disabled = "disabled"; + return true; } diff --git a/mobile/skin/board/basic/write.skin.php b/mobile/skin/board/basic/write.skin.php index a4cd5f2e4..c24f751b6 100644 --- a/mobile/skin/board/basic/write.skin.php +++ b/mobile/skin/board/basic/write.skin.php @@ -234,6 +234,8 @@ function fwrite_submit(f) + document.getElementById("btn_submit").disabled = "disabled"; + return true; } diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php index 4cfda6087..f4c21b340 100644 --- a/skin/member/basic/register_form.skin.php +++ b/skin/member/basic/register_form.skin.php @@ -379,6 +379,8 @@ function fregisterform_submit(f) + document.getElementById("btn_submit").disabled = "disabled"; + return true; } From d3bfd522f92ed5659e602d894a20d8e363807f53 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Fri, 3 May 2013 13:58:21 +0900 Subject: [PATCH 013/140] =?UTF-8?q?=ED=9C=B4=EB=8C=80=ED=8F=B0=EB=B2=88?= =?UTF-8?q?=ED=98=B8=EC=97=90=EC=84=9C=20-=20=EB=A5=BC=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0=ED=95=98=EC=97=AC=20=EC=A0=80=EC=9E=A5=EB=90=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8D=98=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/kcp/kcpcert.head.skin.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugin/kcp/kcpcert.head.skin.php b/plugin/kcp/kcpcert.head.skin.php index 0d34c64f0..d141b22b7 100644 --- a/plugin/kcp/kcpcert.head.skin.php +++ b/plugin/kcp/kcpcert.head.skin.php @@ -5,7 +5,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 if ($msg = valid_mb_hp($mb_hp)) alert($msg, "", true, true); if ($msg = exist_mb_hp($mb_hp, $mb_id)) alert($msg, "", true, true); -$reg_hp = preg_replace("/[^0-9]/", "", trim($_POST['mb_hp'])); +$reg_mb_hp = preg_replace("/[^0-9]/", "", trim($_POST['mb_hp'])); /* ======================================================================================================= */ /* = 휴대폰인증 및 성인인증 = */ @@ -17,7 +17,7 @@ if($w == '') { alert('휴대폰인증이 되지 않았습니다. 휴대폰인증을 해주세요.', '', true, true); // 본인인증 hash 체크 - $reg_hash = md5($reg_hp.$mb_name.$kcpcert_no); + $reg_hash = md5($reg_mb_hp.$mb_name.$kcpcert_no); if(get_session('ss_kcpcert_hash') != $reg_hash) alert('이름 또는 휴대폰번호가 올바르지 않습니다. 정상적인 방법으로 이용해 주세요.', '', true, true); @@ -25,14 +25,14 @@ if($w == '') { // 휴대폰번호 변경체크 $old_hp = preg_replace("/[^0-9]/", "", trim($_POST['old_mb_hp'])); - if($old_hp !== $reg_hp) { + if($old_hp !== $reg_mb_hp) { // 본인인증체크 $kcpcert_no = get_session('ss_kcpcert_no'); if(!$kcpcert_no) alert('휴대폰번호가 변경됐습니다. 휴대폰인증을 해주세요.', '', true, true); // 본인인증 hash 체크 - $reg_hash = md5($reg_hp.$mb_name.$kcpcert_no); + $reg_hash = md5($reg_mb_hp.$mb_name.$kcpcert_no); if(get_session('ss_kcpcert_hash') != $reg_hash) alert('이름 또는 휴대폰인증 정보가 올바르지 않습니다. 정상적인 방법으로 이용해 주세요.', '', true, true); } From d9420b458d7636aca42d98028814d4976ced2d58 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Fri, 3 May 2013 14:02:04 +0900 Subject: [PATCH 014/140] =?UTF-8?q?=ED=9C=B4=EB=8C=80=ED=8F=B0=EB=B2=88?= =?UTF-8?q?=ED=98=B8=EC=97=90=20-=20=EB=A5=BC=20=EC=82=BD=EC=9E=85?= =?UTF-8?q?=ED=95=98=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/register_form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbs/register_form.php b/bbs/register_form.php index d5c4930fd..43ad5c9a6 100644 --- a/bbs/register_form.php +++ b/bbs/register_form.php @@ -80,7 +80,7 @@ if ($w == "") { $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']); + $member['mb_hp'] = hyphen_hp_number(get_text($member['mb_hp'])); $member['mb_addr1'] = get_text($member['mb_addr1']); $member['mb_addr2'] = get_text($member['mb_addr2']); $member['mb_signature'] = get_text($member['mb_signature']); From 414de38f1f0eb1fdec57a670da74f3e089377020 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 3 May 2013 14:04:23 +0900 Subject: [PATCH 015/140] =?UTF-8?q?#448=20=EC=97=90=20=EB=94=B0=EB=A5=B8?= =?UTF-8?q?=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=A6=AC=EC=82=AC=EC=9D=B4?= =?UTF-8?q?=EC=A6=88=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/board/basic/view.skin.php | 43 ++++++++++++++++++++++++++++---- skin/board/gallery/view.skin.php | 43 ++++++++++++++++++++++++++++---- 2 files changed, 76 insertions(+), 10 deletions(-) diff --git a/skin/board/basic/view.skin.php b/skin/board/basic/view.skin.php index 3a8859118..7909e1dc7 100644 --- a/skin/board/basic/view.skin.php +++ b/skin/board/basic/view.skin.php @@ -217,6 +217,26 @@ $(window).load(function() { view_image_resize(); }); +var rtime = new Date(); +var timeout = false; +var delta = 200; +$(window).resize(function() { + rtime = new Date(); + if (timeout === false) { + timeout = true; + setTimeout(resizeend, delta); + } +}); + +function resizeend() { + if (new Date() - rtime < delta) { + setTimeout(resizeend, delta); + } else { + timeout = false; + view_image_resize(); + } +} + $(function() { $("a.view_image").click(function() { window.open(this.href, "large_image", "location=yes,links=no,toolbar=no,top=10,left=10,width=10,height=10,resizable=yes,scrollbars=no,status=no"); @@ -240,14 +260,27 @@ function view_image_resize() { var $img = $("#bo_v_atc img"); var img_wrap = $("#bo_v_atc").width(); + var win_width = $(window).width() - 35; + var res_width = 0; + + if(img_wrap < win_width) + res_width = img_wrap; + else + res_width = win_width; $img.each(function() { var img_width = $(this).width(); - $(this).data("width", img_width); // 원래 이미지 사이즈 - if (img_width > img_wrap) { - $(this).addClass("img_fix"); - } else if (img_width <= img_wrap && img_width >= $(this).data("width")) { - $(this).removeClass("img_fix"); + var this_width = $(this).data("width"); + + if(this_width == undefined) { + $(this).data("width", img_width); // 원래 이미지 사이즈 + this_width = img_width; + } + + if(this_width > res_width) { + $(this).width(res_width); + } else { + $(this).width(this_width); } }); } diff --git a/skin/board/gallery/view.skin.php b/skin/board/gallery/view.skin.php index a889e4a88..4c44a6e3c 100644 --- a/skin/board/gallery/view.skin.php +++ b/skin/board/gallery/view.skin.php @@ -215,6 +215,26 @@ $(window).load(function() { view_image_resize(); }); +var rtime = new Date(); +var timeout = false; +var delta = 200; +$(window).resize(function() { + rtime = new Date(); + if (timeout === false) { + timeout = true; + setTimeout(resizeend, delta); + } +}); + +function resizeend() { + if (new Date() - rtime < delta) { + setTimeout(resizeend, delta); + } else { + timeout = false; + view_image_resize(); + } +} + $(function() { $("a.view_image").click(function() { window.open(this.href, "large_image", "location=yes,links=no,toolbar=no,top=10,left=10,width=10,height=10,resizable=yes,scrollbars=no,status=no"); @@ -238,14 +258,27 @@ function view_image_resize() { var $img = $("#bo_v_atc img"); var img_wrap = $("#bo_v_atc").width(); + var win_width = $(window).width() - 35; + var res_width = 0; + + if(img_wrap < win_width) + res_width = img_wrap; + else + res_width = win_width; $img.each(function() { var img_width = $(this).width(); - $(this).data("width", img_width); // 원래 이미지 사이즈 - if (img_width > img_wrap) { - $(this).addClass("img_fix"); - } else if (img_width <= img_wrap && img_width >= $(this).data("width")) { - $(this).removeClass("img_fix"); + var this_width = $(this).data("width"); + + if(this_width == undefined) { + $(this).data("width", img_width); // 원래 이미지 사이즈 + this_width = img_width; + } + + if(this_width > res_width) { + $(this).width(res_width); + } else { + $(this).width(this_width); } }); } From e2bbf126250fc37a5e9d0b4eb2cc5734aebb56cd Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 3 May 2013 14:36:42 +0900 Subject: [PATCH 016/140] =?UTF-8?q?#448=20=EC=97=90=20=EB=94=B0=EB=A5=B8?= =?UTF-8?q?=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=A6=AC=EC=82=AC=EC=9D=B4?= =?UTF-8?q?=EC=A6=88=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=9E=AC?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/board/basic/view.skin.php | 23 ++++++++++++++++------- skin/board/gallery/view.skin.php | 23 ++++++++++++++++------- 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/skin/board/basic/view.skin.php b/skin/board/basic/view.skin.php index 7909e1dc7..316767c06 100644 --- a/skin/board/basic/view.skin.php +++ b/skin/board/basic/view.skin.php @@ -217,20 +217,29 @@ $(window).load(function() { view_image_resize(); }); -var rtime = new Date(); +var now = new Date(); var timeout = false; -var delta = 200; +var millisec = 200; +var tid; + $(window).resize(function() { - rtime = new Date(); + now = new Date(); if (timeout === false) { timeout = true; - setTimeout(resizeend, delta); + + if(tid != null) + clearTimeout(tid); + + tid = setTimeout(resize_check, millisec); } }); -function resizeend() { - if (new Date() - rtime < delta) { - setTimeout(resizeend, delta); +function resize_check() { + if (new Date() - now < millisec) { + if(tid != null) + clearTimeout(tid); + + tid = setTimeout(resize_check, millisec); } else { timeout = false; view_image_resize(); diff --git a/skin/board/gallery/view.skin.php b/skin/board/gallery/view.skin.php index 4c44a6e3c..19ecc715b 100644 --- a/skin/board/gallery/view.skin.php +++ b/skin/board/gallery/view.skin.php @@ -215,20 +215,29 @@ $(window).load(function() { view_image_resize(); }); -var rtime = new Date(); +var now = new Date(); var timeout = false; -var delta = 200; +var millisec = 200; +var tid; + $(window).resize(function() { - rtime = new Date(); + now = new Date(); if (timeout === false) { timeout = true; - setTimeout(resizeend, delta); + + if(tid != null) + clearTimeout(tid); + + tid = setTimeout(resize_check, millisec); } }); -function resizeend() { - if (new Date() - rtime < delta) { - setTimeout(resizeend, delta); +function resize_check() { + if (new Date() - now < millisec) { + if(tid != null) + clearTimeout(tid); + + tid = setTimeout(resize_check, millisec); } else { timeout = false; view_image_resize(); From 1e9ffe3901c8a19daf3be030b81ec4a70158691f Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 3 May 2013 14:54:38 +0900 Subject: [PATCH 017/140] =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=EC=97=90?= =?UTF-8?q?=EC=84=9C=20Animated=20GIF=20=EB=85=B8=EC=B6=9C=EB=90=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8D=98=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/thumbnail.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php index b395e0734..c7991dbef 100644 --- a/lib/thumbnail.lib.php +++ b/lib/thumbnail.lib.php @@ -184,7 +184,7 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h // Animated GIF는 썸네일 생성하지 않음 if($size[2] == 1) { if(is_animated_gif($source_file)) - return; + return basename($source_file); } $thumb_time = @filemtime($thumb_file); From 3c5d68a8007a7690c6323b14b6336b528fa6b197 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Fri, 3 May 2013 16:01:25 +0900 Subject: [PATCH 018/140] =?UTF-8?q?=ED=9C=B4=EB=8C=80=ED=8F=B0=20=EB=B3=B8?= =?UTF-8?q?=EC=9D=B8=ED=99=95=EC=9D=B8=20=EB=B0=8F=20=EC=84=B1=EC=9D=B8?= =?UTF-8?q?=EC=9D=B8=EC=A6=9D=20=ED=95=84=EB=93=9C=EB=A5=BC=20enum=20?= =?UTF-8?q?=EC=97=90=EC=84=9C=20tinyint=20=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/member_form.php | 87 +++++++++++++++++++------------- adm/member_form_update.php | 4 +- bbs/board.php | 6 +-- bbs/write.php | 6 +-- install/gnuboard4s.sql | 4 +- lib/common.lib.php | 7 --- plugin/kcp/kcpcert.tail.skin.php | 15 ++---- plugin/kcp/kcpcert_config.php | 3 -- plugin/kcp/kcpcert_result.php | 8 +-- 9 files changed, 71 insertions(+), 69 deletions(-) diff --git a/adm/member_form.php b/adm/member_form.php index 2ea7dad6b..5ccb22501 100644 --- a/adm/member_form.php +++ b/adm/member_form.php @@ -57,38 +57,41 @@ else if ($w == 'u') else alert('제대로 된 값이 넘어오지 않았습니다.'); -$mailling_no_checked = ''; -$sms_no_checked = ''; -$open_no_checked = ''; -if ($mb['mb_mailling'] == 1) { - $mailling_checked = 'checked="checked"'; //메일수신 +// 휴대폰 본인확인 +$mb_hp_certify_yes = $mb['mb_hp_certify'] ? 'checked="checked"' : ''; +$mb_hp_certify_no = !$mb['mb_hp_certify'] ? 'checked="checked"' : ''; + +// 휴대폰 성인인증 +$mb_adult_yes = $mb['mb_adult'] ? 'checked="checked"' : ''; +$mb_adult_no = !$mb['mb_adult'] ? 'checked="checked"' : ''; + +//메일수신 +$mb_mailling_yes = $mb['mb_mailling'] ? 'checked="checked"' : ''; +$mb_mailling_no = !$mb['mb_mailling'] ? 'checked="checked"' : ''; + +// SMS 수신 +$mb_sms_yes = $mb['mb_sms'] ? 'checked="checked"' : ''; +$mb_sms_no = !$mb['mb_sms'] ? 'checked="checked"' : ''; + +// 정보 공개 +$mb_open_yes = $mb['mb_open'] ? 'checked="checked"' : ''; +$mb_open_no = !$mb['mb_open'] ? 'checked="checked"' : ''; + +if (isset($mb['mb_hp_certify'])) { + // 날짜시간형이라면 drop 시킴 + if (preg_match("/-/", $mb['mb_hp_certify'])) { + sql_query(" ALTER TABLE `{$g4['member_table']}` DROP `mb_hp_certify` ", false); + } } else { - $mailing_checked = ''; - $mailling_no_checked = 'checked="checked"'; + sql_query(" ALTER TABLE `{$g4['member_table']}` ADD `mb_hp_certify` TINYINT NOT NULL DEFAULT '0' AFTER `mb_hp` ", false); } -if ($mb['mb_sms']) { - $sms_checked = 'checked="checked"'; // SMS 수신 +if(isset($mb['mb_adult'])) { + sql_query(" ALTER TABLE `{$g4['member_table']}` CHANGE `mb_adult` `mb_adult` TINYINT NOT NULL DEFAULT '0' ", false); } else { - $sms_checked = ''; - $sms_no_checked = 'checked="checked"'; + sql_query(" ALTER TABLE `{$g4['member_table']}` ADD `mb_adult` TINYINT NOT NULL DEFAULT '0' AFTER `mb_hp_certify` ", false); } -if ($mb['mb_open']) { - $open_checked = 'checked="checked"'; // 정보 공개 -} else { - $open_checked = ''; - $open_no_checked = 'checked="checked"'; -} - -if(!isset($mb['mb_adult'])) { - sql_query(" ALTER TABLE `{$g4['member_table']}` - ADD `mb_adult` ENUM('N', 'Y') NOT NULL DEFAULT 'N' AFTER `mb_birth`, - ADD `mb_hp_certify` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `mb_lost_certify` ", false); -} - -sql_query(" ALTER TABLE `{$g4['member_table']}` CHANGE `mb_adult` `mb_adult` ENUM('N','Y') NOT NULL DEFAULT 'N' ", false); - if ($mb['mb_intercept_date']) $g4['title'] = "차단된 "; else $g4['title'] .= ""; $g4['title'] .= '회원 '.$html_title; @@ -141,10 +144,26 @@ include_once('./admin.head.php'); - - + + + + + 휴대폰 본인확인 + + > + + > + + + + + > + + > + + @@ -181,25 +200,25 @@ include_once('./admin.head.php'); 메일 수신 - > + > - > + > - > + > - > + > - > + > - > + > diff --git a/adm/member_form_update.php b/adm/member_form_update.php index d1be76a99..a081eef61 100644 --- a/adm/member_form_update.php +++ b/adm/member_form_update.php @@ -29,7 +29,9 @@ $sql_common = " mb_name = '{$_POST['mb_name']}', mb_email = '{$_POST['mb_email']}', mb_homepage = '{$_POST['mb_homepage']}', mb_tel = '{$_POST['mb_tel']}', - mb_hp = '$mb_hp', + mb_hp = '{$_POST['mb_hp']}', + mb_hp_certify = '{$_POST['mb_hp_certify']}', + mb_adult = '{$_POST['mb_adult']}', mb_zip1 = '{$_POST['mb_zip1']}', mb_zip2 = '{$_POST['mb_zip2']}', mb_addr1 = '{$_POST['mb_addr1']}', diff --git a/bbs/board.php b/bbs/board.php index 67c83f706..bad53d552 100644 --- a/bbs/board.php +++ b/bbs/board.php @@ -59,12 +59,12 @@ if (isset($wr_id) && $wr_id) { alert('이 게시판은 휴대폰 본인확인 하신 회원님만 글읽기가 가능합니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', './login.php?wr_id='.$wr_id.$qstr.'&url='.urlencode(G4_BBS_URL.'/board.php?bo_table='.$bo_table.'&wr_id='.$wr_id.$qstr)); } - if ($board['bo_use_cert'] == 'cert' && hp_certify($member) != 'Y') { + if ($board['bo_use_cert'] == 'cert' && !$member['mb_hp_certfy']) { alert('이 게시판은 휴대폰 본인확인 하신 회원님만 글읽기가 가능합니다.\\n\\n회원정보 수정에서 휴대폰 본인확인을 해주시기 바랍니다.', G4_URL); } - if ($board['bo_use_cert'] == 'adult' && $member['mb_adult'] != 'Y') { - alert('이 게시판은 휴대폰 본인확인으로 성인 인증된 회원님만 글읽기가 가능합니다.\\n\\n성인인데 글읽기가 안된다면 회원정보 수정에서 휴대폰 본인확인을\\n다시 해주시기 바랍니다.', G4_URL); + if ($board['bo_use_cert'] == 'adult' && !$member['mb_adult']) { + alert('이 게시판은 휴대폰 본인확인으로 성인인증 된 회원님만 글읽기가 가능합니다.\\n\\n성인인데 글읽기가 안된다면 회원정보 수정에서 휴대폰 본인확인을\\n다시 해주시기 바랍니다.', G4_URL); } } diff --git a/bbs/write.php b/bbs/write.php index 27a7ac8c0..198e58be9 100644 --- a/bbs/write.php +++ b/bbs/write.php @@ -183,12 +183,12 @@ if ($config['cf_kcpcert_use'] != '' && !$is_admin) { alert('이 게시판은 휴대폰 본인확인 하신 회원님만 글쓰기가 가능합니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', 'login.php?'.$qstr.'&url='.urlencode($_SERVER['PHP_SELF'].'?bo_table='.$bo_table)); } - if ($board['bo_use_cert'] == 'cert' && hp_certify($member) != 'Y') { + if ($board['bo_use_cert'] == 'cert' && !$member['mb_hp_certfy']) { alert('이 게시판은 휴대폰 본인확인 하신 회원님만 글쓰기가 가능합니다.\\n\\n회원정보 수정에서 휴대폰 본인확인을 해주시기 바랍니다.', G4_URL); } - if ($board['bo_use_cert'] == 'adult' && $member['mb_adult'] != 'Y') { - alert('이 게시판은 휴대폰 본인확인으로 성인 인증된 회원님만 글쓰기가 가능합니다.\\n\\n성인인데 글읽기가 안된다면 회원정보 수정에서 휴대폰 본인확인을\\n다시 해주시기 바랍니다.', G4_URL); + if ($board['bo_use_cert'] == 'adult' && !$member['mb_adult']) { + alert('이 게시판은 휴대폰 본인확인으로 성인인증 된 회원님만 글쓰기가 가능합니다.\\n\\n성인인데 글읽기가 안된다면 회원정보 수정에서 휴대폰 본인확인을\\n다시 해주시기 바랍니다.', G4_URL); } } diff --git a/install/gnuboard4s.sql b/install/gnuboard4s.sql index e0566f117..b80e3bd63 100644 --- a/install/gnuboard4s.sql +++ b/install/gnuboard4s.sql @@ -411,9 +411,10 @@ CREATE TABLE IF NOT EXISTS `g4s_member` ( `mb_jumin` varchar(255) NOT NULL default '', `mb_sex` char(1) NOT NULL default '', `mb_birth` varchar(255) NOT NULL default '', - `mb_adult` enum('N','Y') NOT NULL default 'N', `mb_tel` varchar(255) NOT NULL default '', `mb_hp` varchar(255) NOT NULL default '', + `mb_hp_certify` tinyint(4) NOT NULL default '0', + `mb_adult` tinyint(4) NOT NULL default '0', `mb_zip1` char(3) NOT NULL default '', `mb_zip2` char(3) NOT NULL default '', `mb_addr1` varchar(255) NOT NULL default '', @@ -430,7 +431,6 @@ CREATE TABLE IF NOT EXISTS `g4s_member` ( `mb_email_certify` datetime NOT NULL default '0000-00-00 00:00:00', `mb_memo` text NOT NULL, `mb_lost_certify` varchar(255) NOT NULL, - `mb_hp_certify` datetime NOT NULL default '0000-00-00 00:00:00', `mb_mailling` tinyint(4) NOT NULL default '0', `mb_sms` tinyint(4) NOT NULL default '0', `mb_open` tinyint(4) NOT NULL default '0', diff --git a/lib/common.lib.php b/lib/common.lib.php index 71c9c08c9..65ae17d2f 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1982,11 +1982,4 @@ function hyphen_hp_number($hp) $hp = preg_replace("/[^0-9]/", "", $hp); return preg_replace("/([0-9]{3})([0-9]{3,4})([0-9]{4})$/", "\\1-\\2-\\3", $hp); } - - -// 휴대폰 본인확인을 받은 회원인지를 가린다. -function hp_certify($member) -{ - return substr($member['mb_hp_certify'],0,1) == '0' ? 'N' : 'Y'; -} ?> \ No newline at end of file diff --git a/plugin/kcp/kcpcert.tail.skin.php b/plugin/kcp/kcpcert.tail.skin.php index 815097eec..49621ee8b 100644 --- a/plugin/kcp/kcpcert.tail.skin.php +++ b/plugin/kcp/kcpcert.tail.skin.php @@ -3,27 +3,18 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 // 휴대폰번호 포맷(010-0000-0000) 변경해서 기록 // $reg_mb_hp 는 rigister_form_update.head.skin.php 파일 -$sql = " update {$g4['member_table']} - set mb_hp = '$reg_mb_hp' - where mb_id = '$mb_id' "; +$sql = " update {$g4['member_table']} set mb_hp = '$reg_mb_hp' where mb_id = '$mb_id' "; sql_query($sql); /* =========================================================================== */ /* = 휴대폰인증 및 성인인증 = */ /* =========================================================================== */ if(get_session('ss_kcpcert_no')) { - $mb_adult = 'N'; - if(get_session('ss_adult_check') == 'Y') - $mb_adult = 'Y'; - - $mb_hp_certify = get_session('ss_kcpcert_time'); $sql = " update {$g4['member_table']} - set mb_hp_certify = '$mb_hp_certify', - mb_adult = '$mb_adult' + set mb_hp_certify = '".get_session('ss_hp_certify')."', + mb_adult = '".get_session('ss_adult')."' where mb_id = '$mb_id' "; sql_query($sql); } /* =========================================================================== */ - -//set_session('ss_adult_check', ''); ?> \ No newline at end of file diff --git a/plugin/kcp/kcpcert_config.php b/plugin/kcp/kcpcert_config.php index c5a7d5824..2bf313cbd 100644 --- a/plugin/kcp/kcpcert_config.php +++ b/plugin/kcp/kcpcert_config.php @@ -48,7 +48,4 @@ function f_get_parm_int( $val ) return $ret_val; } /* ============================================================================== */ - -// ss_adult_check clear -//if(get_session('ss_adult_check')) set_session('ss_adult_check', ''); ?> \ No newline at end of file diff --git a/plugin/kcp/kcpcert_result.php b/plugin/kcp/kcpcert_result.php index abc99cf14..3c66df1b4 100644 --- a/plugin/kcp/kcpcert_result.php +++ b/plugin/kcp/kcpcert_result.php @@ -2,9 +2,9 @@ include_once('./kcpcert_config.php'); set_session('ss_kcpcert_no', ''); -set_session('ss_kcpcert_time', ''); set_session('ss_kcpcert_hash', ''); -set_session('ss_adult_check', ''); +set_session('ss_hp_certify', ''); +set_session('ss_adult', ''); $site_cd = ""; $ordr_idxx = ""; @@ -139,13 +139,13 @@ if( $cert_enc_use == "Y" ) $md5_cert_no = md5($cert_no); $hash_data = md5($phone_no.$user_name.$md5_cert_no); set_session("ss_kcpcert_no", $md5_cert_no); - set_session("ss_kcpcert_time", G4_TIME_YMDHIS); set_session("ss_kcpcert_hash", $hash_data); + set_session("ss_hp_certify", "1"); // 성인인증결과 $adult_day = date("Ymd", strtotime("-19 years", G4_SERVER_TIME)); if((int)$birth_day <= (int)$adult_day) - set_session("ss_adult_check", "Y"); + set_session("ss_adult", "1"); } else if( $res_cd != "0000" ) { From abcc1441f5a8c0cbe3ad1ad4c4395a0bb6684690 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 3 May 2013 16:02:22 +0900 Subject: [PATCH 019/140] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC:=20?= =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=EC=8A=A4=ED=82=A8=20=EC=A0=84?= =?UTF-8?q?=EC=B2=B4=EC=84=A0=ED=83=9D=20=EB=A0=88=EC=9D=B4=EB=B8=94=20?= =?UTF-8?q?=EA=B0=90=EC=B6=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.php | 153 ++++++++++++++------------ mobile/skin/board/basic/style.css | 12 +- mobile/skin/board/basic/view.skin.php | 8 +- 3 files changed, 89 insertions(+), 84 deletions(-) diff --git a/config.php b/config.php index 32c6e5abf..161e1dd22 100644 --- a/config.php +++ b/config.php @@ -1,20 +1,21 @@ = '5.3.0') { - date_default_timezone_set(G4_TIMEZONE); + //if (function_exists("date_default_timezone_set")) date_default_timezone_set("Asia/Seoul"); + date_default_timezone_set("Asia/Seoul"); } - //============================================================================== -// 경로 상수 -//------------------------------------------------------------------------------ + +/******************** + 경로 상수 +********************/ /* 보안서버 도메인 @@ -30,25 +31,26 @@ define('G4_HTTPS_DOMAIN', ''); www.sir.co.kr 과 sir.co.kr 도메인은 서로 다른 도메인으로 인식합니다. 쿠키를 공유하려면 .sir.co.kr 과 같이 입력하세요. 이곳에 입력이 없다면 www 붙은 도메인과 그렇지 않은 도메인은 쿠키를 공유하지 않으므로 로그인이 풀릴 수 있습니다. */ -define('G4_COOKIE_DOMAIN', ''); +define('G4_COOKIE_DOMAIN', '.sirgle.com'); -define('G4_DBCONFIG_FILE', 'dbconfig.php'); +define('G4_DBCONFIG_FILE', 'dbconfig.php'); -define('G4_ADMIN_DIR', 'adm'); -define('G4_BBS_DIR', 'bbs'); -define('G4_CSS_DIR', 'css'); -define('G4_DATA_DIR', 'data'); -define('G4_EXTEND_DIR', 'extend'); -define('G4_IMG_DIR', 'img'); -define('G4_JS_DIR', 'js'); -define('G4_LIB_DIR', 'lib'); -define('G4_PLUGIN_DIR', 'plugin'); -define('G4_SKIN_DIR', 'skin'); -define('G4_GCAPTCHA_DIR', 'gcaptcha'); -define('G4_CKEDITOR_DIR', 'ckeditor'); -define('G4_MOBILE_DIR', 'mobile'); -define('G4_KCP_DIR', 'kcp'); -define('G4_SYNDI_DIR', 'syndi'); +define('G4_ADMIN_DIR', 'adm'); +define('G4_BBS_DIR', 'bbs'); +define('G4_CSS_DIR', 'css'); +define('G4_DATA_DIR', 'data'); +define('G4_EXTEND_DIR', 'extend'); +define('G4_IMG_DIR', 'img'); +define('G4_JS_DIR', 'js'); +define('G4_LIB_DIR', 'lib'); +define('G4_PLUGIN_DIR', 'plugin'); +define('G4_SKIN_DIR', 'skin'); +define('G4_GCAPTCHA_DIR', 'gcaptcha'); +define('G4_CKEDITOR_DIR', 'ckeditor'); +define('G4_MOBILE_DIR', 'mobile'); +define('G4_KCP_DIR', 'kcp'); +define('G4_SNS_DIR', 'sns'); +define('G4_SYNDI_DIR', 'syndi'); // URL 은 브라우저상에서의 경로 (도메인으로 부터의) if (G4_DOMAIN) { @@ -66,67 +68,80 @@ if (isset($g4_path['path'])) { define('G4_PATH', ''); } -define('G4_ADMIN_URL', G4_URL.'/'.G4_ADMIN_DIR); -define('G4_BBS_URL', G4_URL.'/'.G4_BBS_DIR); -define('G4_CSS_URL', G4_URL.'/'.G4_CSS_DIR); -define('G4_DATA_URL', G4_URL.'/'.G4_DATA_DIR); -define('G4_IMG_URL', G4_URL.'/'.G4_IMG_DIR); -define('G4_JS_URL', G4_URL.'/'.G4_JS_DIR); -define('G4_SKIN_URL', G4_URL.'/'.G4_SKIN_DIR); -define('G4_PLUGIN_URL', G4_URL.'/'.G4_PLUGIN_DIR); -define('G4_GCAPTCHA_URL', G4_PLUGIN_URL.'/'.G4_GCAPTCHA_DIR); -define('G4_CKEDITOR_URL', G4_PLUGIN_URL.'/'.G4_CKEDITOR_DIR); // CKEDITOR 의 라이브러리 경로 -define('G4_KCP_URL', G4_PLUGIN_URL.'/'.G4_KCP_DIR); -define('G4_SYNDI_URL', G4_PLUGIN_URL.'/'.G4_SYNDI_DIR); -define('G4_MOBILE_URL', G4_URL.'/'.G4_MOBILE_DIR); +define('G4_ADMIN_URL', G4_URL.'/'.G4_ADMIN_DIR); +define('G4_BBS_URL', G4_URL.'/'.G4_BBS_DIR); +define('G4_CSS_URL', G4_URL.'/'.G4_CSS_DIR); +define('G4_DATA_URL', G4_URL.'/'.G4_DATA_DIR); +define('G4_IMG_URL', G4_URL.'/'.G4_IMG_DIR); +define('G4_JS_URL', G4_URL.'/'.G4_JS_DIR); +define('G4_SKIN_URL', G4_URL.'/'.G4_SKIN_DIR); +define('G4_PLUGIN_URL', G4_URL.'/'.G4_PLUGIN_DIR); +define('G4_GCAPTCHA_URL', G4_PLUGIN_URL.'/'.G4_GCAPTCHA_DIR); +define('G4_CKEDITOR_URL', G4_PLUGIN_URL.'/'.G4_CKEDITOR_DIR); // CKEDITOR 의 라이브러리 경로 +define('G4_KCP_URL', G4_PLUGIN_URL.'/'.G4_KCP_DIR); +define('G4_SNS_URL', G4_PLUGIN_URL.'/'.G4_SNS_DIR); +define('G4_SYNDI_URL', G4_PLUGIN_URL.'/'.G4_SYNDI_DIR); +define('G4_MOBILE_URL', G4_URL.'/'.G4_MOBILE_DIR); // PATH 는 서버상에서의 절대경로 -define('G4_ADMIN_PATH', G4_PATH.'/'.G4_ADMIN_DIR); -define('G4_BBS_PATH', G4_PATH.'/'.G4_BBS_DIR); -define('G4_DATA_PATH', G4_PATH.'/'.G4_DATA_DIR); -define('G4_EXTEND_PATH', G4_PATH.'/'.G4_EXTEND_DIR); -define('G4_LIB_PATH', G4_PATH.'/'.G4_LIB_DIR); -define('G4_PLUGIN_PATH', G4_PATH.'/'.G4_PLUGIN_DIR); -define('G4_SKIN_PATH', G4_PATH.'/'.G4_SKIN_DIR); -define('G4_GCAPTCHA_PATH', G4_PLUGIN_PATH.'/'.G4_GCAPTCHA_DIR); -define('G4_CKEDITOR_PATH', G4_PLUGIN_PATH.'/'.G4_CKEDITOR_DIR); -define('G4_KCP_PATH', G4_PLUGIN_PATH.'/'.G4_KCP_DIR); -define('G4_SYNDI_PATH', G4_PLUGIN_PATH.'/'.G4_SYNDI_DIR); -define('G4_MOBILE_PATH', G4_PATH.'/'.G4_MOBILE_DIR); +define('G4_ADMIN_PATH', G4_PATH.'/'.G4_ADMIN_DIR); +define('G4_BBS_PATH', G4_PATH.'/'.G4_BBS_DIR); +define('G4_DATA_PATH', G4_PATH.'/'.G4_DATA_DIR); +define('G4_EXTEND_PATH', G4_PATH.'/'.G4_EXTEND_DIR); +define('G4_LIB_PATH', G4_PATH.'/'.G4_LIB_DIR); +define('G4_PLUGIN_PATH', G4_PATH.'/'.G4_PLUGIN_DIR); +define('G4_SKIN_PATH', G4_PATH.'/'.G4_SKIN_DIR); +define('G4_GCAPTCHA_PATH', G4_PLUGIN_PATH.'/'.G4_GCAPTCHA_DIR); +define('G4_CKEDITOR_PATH', G4_PLUGIN_PATH.'/'.G4_CKEDITOR_DIR); +define('G4_KCP_PATH', G4_PLUGIN_PATH.'/'.G4_KCP_DIR); +define('G4_SNS_PATH', G4_PLUGIN_PATH.'/'.G4_SNS_DIR); +define('G4_SYNDI_PATH', G4_PLUGIN_PATH.'/'.G4_SYNDI_DIR); +define('G4_MOBILE_PATH', G4_PATH.'/'.G4_MOBILE_DIR); //============================================================================== -define('G4_USE_CACHE', true); // 최신글등에 cache 기능 사용 여부 +define('G4_USE_CACHE', true); // 최신글등에 cache 기능 사용 여부 -// 시간 상수 +/******************** + 시간 상수 +********************/ // 서버의 시간과 실제 사용하는 시간이 틀린 경우 수정하세요. // 하루는 86400 초입니다. 1시간은 3600초 // 6시간이 빠른 경우 time() + (3600 * 6); // 6시간이 느린 경우 time() - (3600 * 6); -define('G4_SERVER_TIME', time()); -define('G4_TIME_YMDHIS', date('Y-m-d H:i:s', G4_SERVER_TIME)); -define('G4_TIME_YMD', substr(G4_TIME_YMDHIS, 0, 10)); -define('G4_TIME_HIS', substr(G4_TIME_YMDHIS, 11, 8)); +define('G4_SERVER_TIME', time()); +define('G4_TIME_YMDHIS', date('Y-m-d H:i:s', G4_SERVER_TIME)); +define('G4_TIME_YMD', substr(G4_TIME_YMDHIS, 0, 10)); +define('G4_TIME_HIS', substr(G4_TIME_YMDHIS, 11, 8)); // 입력값 검사 상수 (숫자를 변경하시면 안됩니다.) -define('G4_ALPHAUPPER', 1); // 영대문자 -define('G4_ALPHALOWER', 2); // 영소문자 -define('G4_ALPHABETIC', 4); // 영대,소문자 -define('G4_NUMERIC', 8); // 숫자 -define('G4_HANGUL', 16); // 한글 -define('G4_SPACE', 32); // 공백 -define('G4_SPECIAL', 64); // 특수문자 +define('G4_ALPHAUPPER', 1); // 영대문자 +define('G4_ALPHALOWER', 2); // 영소문자 +define('G4_ALPHABETIC', 4); // 영대,소문자 +define('G4_NUMERIC', 8); // 숫자 +define('G4_HANGUL', 16); // 한글 +define('G4_SPACE', 32); // 공백 +define('G4_SPECIAL', 64); // 특수문자 // 모바일 인지 결정 $_SERVER['HTTP_USER_AGENT'] -define('G4_MOBILE_AGENT', 'phone|samsung|lgtel|mobile|skt|nokia|blackberry|android|sony'); +define('G4_MOBILE_AGENT', 'phone|samsung|lgtel|mobile|skt|nokia|blackberry|android|sony'); -// -// 기타 -// + +/******************** + SNS 상수 +********************/ + +define('G4_FACEBOOK_APPID', '119146498278078'); +define('G4_FACEBOOK_SECRET', '311e0d6ff8ff43cfe0e75fe82d71777c'); +define('G4_FACEBOOK_CALLBACK', G4_SNS_URL.'/facebook/callback.php'); + + +/******************** + 기타 상수 +********************/ // 게시판에서 링크의 기본갯수를 말합니다. // 필드를 추가하면 이 숫자를 필드수에 맞게 늘려주십시오. -//$g4['link_count'] = 2; define('G4_LINK_COUNT', 2); ?> \ No newline at end of file diff --git a/mobile/skin/board/basic/style.css b/mobile/skin/board/basic/style.css index 413feb58a..e240c53d4 100644 --- a/mobile/skin/board/basic/style.css +++ b/mobile/skin/board/basic/style.css @@ -11,17 +11,9 @@ #bo_cate a:active {text-decoration:none} #bo_cate #bo_cate_on {z-index:2;border:1px solid #565e60;background:#fff;color:#565e60;font-weight:bold} -.bo_list table {margin-bottom:1.5em;width:100%;border-collapse:collapse;border-spacing:0} - -.bo_list th {} -.bo_list th a {color:#fff;text-decoration:none} - -.bo_list td {border-bottom:1px solid #ddd} - -.bo_list img {margin-right:4px} -.bo_list img:nth-last-of-type(1) {margin-right:0} - /* 관리자일 때 */ +#bo_list_admin th label {position:absolute;font-size:0;line-height:0;overflow:hidden} + #bo_list_admin th:nth-of-type(1) {width:40px} #bo_list_admin th:nth-of-type(3) {width:100px} diff --git a/mobile/skin/board/basic/view.skin.php b/mobile/skin/board/basic/view.skin.php index 93fda82d9..3c3d32917 100644 --- a/mobile/skin/board/basic/view.skin.php +++ b/mobile/skin/board/basic/view.skin.php @@ -115,7 +115,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); ?> -
+

본문

@@ -182,8 +182,6 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); - - - set_cookie("device_width", screen.width, 6, g4_cookie_domain); '.PHP_EOL; } -echo $config['cf_add_script']; +if(!defined('G4_IS_ADMIN')) + echo $config['cf_add_script']; ?> From 8bc71997f4f20e50ad3afe05b3ce58290c17af0d Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 6 May 2013 21:06:39 +0900 Subject: [PATCH 035/140] =?UTF-8?q?=ED=9C=B4=EB=8C=80=ED=8F=B0=20=EB=B3=B8?= =?UTF-8?q?=EC=9D=B8=ED=99=95=EC=9D=B8=20=EA=B4=80=EB=A0=A8=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/register_form.php | 11 +- bbs/register_form_update.php | 27 +++- plugin/kcp/kcpcert.ajax.php | 25 ---- plugin/kcp/kcpcert.head.skin.php | 41 ------ plugin/kcp/kcpcert.tail.skin.php | 20 --- plugin/kcp/kcpcert_form.php | 2 +- plugin/kcp/kcpcert_result.php | 25 ++-- skin/member/basic/register_form.skin.php | 118 +++++++----------- .../basic/register_form_update.head.skin.php | 7 -- .../basic/register_form_update.tail.skin.php | 7 -- 10 files changed, 91 insertions(+), 192 deletions(-) delete mode 100644 plugin/kcp/kcpcert.ajax.php delete mode 100644 plugin/kcp/kcpcert.head.skin.php delete mode 100644 plugin/kcp/kcpcert.tail.skin.php delete mode 100644 skin/member/basic/register_form_update.head.skin.php delete mode 100644 skin/member/basic/register_form_update.tail.skin.php diff --git a/bbs/register_form.php b/bbs/register_form.php index 43ad5c9a6..2764b026e 100644 --- a/bbs/register_form.php +++ b/bbs/register_form.php @@ -7,6 +7,9 @@ include_once(G4_LIB_PATH.'/register.lib.php'); $token = md5(uniqid(rand(), true)); set_session("ss_token", $token); +set_session("ss_kcpcert_no", ""); +set_session("ss_kcpcert_hash", ""); + if ($w == "") { // 회원 로그인을 한 경우 회원가입 할 수 없다 @@ -74,13 +77,16 @@ if ($w == "") { $g4['title'] = '회원 정보 수정'; + set_session("ss_reg_mb_name", $member['mb_name']); + set_session("ss_reg_mb_hp", $member['mb_hp']); + $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'] = hyphen_hp_number(get_text($member['mb_hp'])); + $member['mb_hp'] = hyphen_hp_number($member['mb_hp']); $member['mb_addr1'] = get_text($member['mb_addr1']); $member['mb_addr2'] = get_text($member['mb_addr2']); $member['mb_signature'] = get_text($member['mb_signature']); @@ -103,7 +109,8 @@ if ($w == "") { include_once('./_head.php'); // 회원아이콘 경로 -$mb_icon = G4_DATA_PATH.'/member/'.substr($member['mb_id'],0,2).'/'.$member['mb_id'].'.gif'; +$mb_icon_path = G4_DATA_PATH.'/member/'.substr($member['mb_id'],0,2).'/'.$member['mb_id'].'.gif'; +$mb_icon_url = G4_DATA_URL.'/member/'.substr($member['mb_id'],0,2).'/'.$member['mb_id'].'.gif'; $register_action_url = G4_HTTPS_BBS_URL.'/register_form_update.php'; $req_nick = !isset($member['mb_nick_date']) || (isset($member['mb_nick_date']) && $member['mb_nick_date'] <= date("Y-m-d", G4_SERVER_TIME - ($config['cf_nick_modify'] * 86400))); diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php index 0187e8358..ad48fb7ff 100644 --- a/bbs/register_form_update.php +++ b/bbs/register_form_update.php @@ -264,7 +264,30 @@ if ($w == '') { if ($old_email != $mb_email && $config['cf_use_email_certify']) $sql_email_certify = " , mb_email_certify = '' "; - // set mb_name = '$mb_name', 제거 + ///////////////////////////////////////////////////////////////// + // 휴대폰 본인확인 + ///////////////////////////////////////////////////////////////// + $sql_hp_certify = ""; + $md5_cert_no = get_session("ss_kcpcert_no"); + $hidden_hp = preg_replace("/[^0-9]/", "", $mb_hp); + if ($config['cf_kcpcert_use'] && $md5_cert_no) { + $hash_data = md5($hidden_hp.$mb_name.$md5_cert_no); + // 해시값이 틀린 경우에는 휴대폰 인증 값을 무효화 한다. + if (get_session("ss_kcpcert_hash") != $hash_data) { + $sql_hp_certify .= " , mb_hp = '' "; + $sql_hp_certify .= " , mb_hp_certify = 0 "; + $sql_hp_certify .= " , mb_adult = 0 "; + } + } else { + if (get_session("ss_reg_mb_name") != $mb_name || + get_session("ss_reg_mb_hp") != $hidden_hp) { + $sql_hp_certify .= " , mb_hp = '{$mb_hp}' "; + $sql_hp_certify .= " , mb_hp_certify = 0 "; + $sql_hp_certify .= " , mb_adult = 0 "; + } + } + ///////////////////////////////////////////////////////////////// + $sql = " update {$g4['member_table']} set mb_nick = '{$mb_nick}', mb_mailling = '{$mb_mailling}', @@ -273,7 +296,6 @@ if ($w == '') { mb_email = '{$mb_email}', mb_homepage = '{$mb_homepage}', mb_tel = '{$mb_tel}', - mb_hp = '{$mb_hp}', mb_zip1 = '{$mb_zip1}', mb_zip2 = '{$mb_zip2}', mb_addr1 = '{$mb_addr1}', @@ -296,6 +318,7 @@ if ($w == '') { {$sql_open_date} {$sql_sex} {$sql_email_certify} + {$sql_hp_certify} where mb_id = '$mb_id' "; sql_query($sql); diff --git a/plugin/kcp/kcpcert.ajax.php b/plugin/kcp/kcpcert.ajax.php deleted file mode 100644 index 159a58e47..000000000 --- a/plugin/kcp/kcpcert.ajax.php +++ /dev/null @@ -1,25 +0,0 @@ - \ No newline at end of file diff --git a/plugin/kcp/kcpcert.head.skin.php b/plugin/kcp/kcpcert.head.skin.php deleted file mode 100644 index d141b22b7..000000000 --- a/plugin/kcp/kcpcert.head.skin.php +++ /dev/null @@ -1,41 +0,0 @@ - \ No newline at end of file diff --git a/plugin/kcp/kcpcert.tail.skin.php b/plugin/kcp/kcpcert.tail.skin.php deleted file mode 100644 index 49621ee8b..000000000 --- a/plugin/kcp/kcpcert.tail.skin.php +++ /dev/null @@ -1,20 +0,0 @@ - \ No newline at end of file diff --git a/plugin/kcp/kcpcert_form.php b/plugin/kcp/kcpcert_form.php index 07e5e04cd..3cb772a7e 100644 --- a/plugin/kcp/kcpcert_form.php +++ b/plugin/kcp/kcpcert_form.php @@ -52,7 +52,7 @@ if(!$ordr_idxx) function auth_type_check(user_name) { var auth_form = document.form_auth; - auth_form.user_name.value = encodeURIComponent(user_name); + //auth_form.user_name.value = encodeURIComponent(user_name); if( auth_form.ordr_idxx.value == "" ) { diff --git a/plugin/kcp/kcpcert_result.php b/plugin/kcp/kcpcert_result.php index 3c66df1b4..8295e44ae 100644 --- a/plugin/kcp/kcpcert_result.php +++ b/plugin/kcp/kcpcert_result.php @@ -3,8 +3,6 @@ include_once('./kcpcert_config.php'); set_session('ss_kcpcert_no', ''); set_session('ss_kcpcert_hash', ''); -set_session('ss_hp_certify', ''); -set_session('ss_adult', ''); $site_cd = ""; $ordr_idxx = ""; @@ -130,22 +128,28 @@ if( $cert_enc_use == "Y" ) $dec_res_cd = $ct_cert->mf_get_key_value("res_cd" ); // 암호화된 결과코드 $dec_mes_msg = $ct_cert->mf_get_key_value("res_msg" ); // 암호화된 결과메시지 - // 정상인증인지 체크 if(!$phone_no) alert_close("정상적인 인증이 아닙니다. 올바른 방법으로 이용해 주세요."); + $sql = " select count(*) as cnt from {$g4['member_table']} where mb_id <> '{$member['mb_id']}' and mb_hp = '{$phone_no}' "; + $row = sql_fetch($sql); + if ($row['cnt']) { + alert_close("이미 가입되어 있는 휴대폰번호 입니다."); + } + // hash 데이터 $md5_cert_no = md5($cert_no); $hash_data = md5($phone_no.$user_name.$md5_cert_no); set_session("ss_kcpcert_no", $md5_cert_no); set_session("ss_kcpcert_hash", $hash_data); - set_session("ss_hp_certify", "1"); // 성인인증결과 $adult_day = date("Ymd", strtotime("-19 years", G4_SERVER_TIME)); - if((int)$birth_day <= (int)$adult_day) - set_session("ss_adult", "1"); + $adult = ((int)$birth_day <= (int)$adult_day) ? 1 : 0; + + $sql = " update {$g4['member_table']} set mb_name = '$user_name', mb_hp = '$phone_no', mb_hp_certify = 1, mb_adult = $adult where mb_id = '{$member['mb_id']}' "; + sql_query($sql); } else if( $res_cd != "0000" ) { @@ -157,12 +161,11 @@ if( $cert_enc_use == "Y" ) else if( $cert_enc_use != "Y" ) { // 암호화 인증 안함 + alert_close("휴대폰 본인확인을 취소 하셨습니다."); + exit; } $ct_cert->mf_clear(); - -// 휴대폰번호 포맷변경 -$phone_no = hyphen_hp_number($phone_no); ?> - + @@ -142,14 +140,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - + - += $config['cf_icon_level']) { ?> @@ -160,13 +158,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 gif만 가능하며 용량 바이트 이하만 등록됩니다. - + + 회원아이콘 - + - + @@ -184,7 +183,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 휴대폰 문자메세지를 받겠습니다. - + @@ -209,14 +208,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - + - + @@ -238,15 +237,11 @@ if ($config['cf_kcpcert_use']) { // 휴대폰인증 form include_once(G4_KCP_PATH.'/kcpcert_form.php'); ?> - '; if ($w == "") { - goto_url(G4_BBS_URL.'/register_result.php'); + goto_url(G4_HTTP_BBS_URL.'/register_result.php'); } else if ($w == 'u') { $row = sql_fetch(" select mb_password from {$g4['member_table']} where mb_id = '{$member['mb_id']}' "); $tmp_password = $row['mb_password']; diff --git a/bbs/write.php b/bbs/write.php index 198e58be9..7a9e329b7 100644 --- a/bbs/write.php +++ b/bbs/write.php @@ -377,7 +377,7 @@ $editor_html = editor_html('wr_content', $content, $is_dhtml_editor); include_once(G4_PATH.'/head.sub.php'); include_once('./board_head.php'); -$action_url = G4_HTTPS_BBS_URL."/write_update.php"; +$action_url = https_url(G4_BBS_DIR)."/write_update.php"; echo ''; include_once ($board_skin_path.'/write.skin.php'); diff --git a/bbs/write_update.php b/bbs/write_update.php index 914e7bfe9..32831a68d 100644 --- a/bbs/write_update.php +++ b/bbs/write_update.php @@ -623,7 +623,7 @@ if (!($w == 'u' || $w == 'cu') && $config['cf_email_use'] && $board['bo_use_emai delete_cache_latest($bo_table); if ($file_upload_msg) - alert($file_upload_msg, G4_HTTPS_BBS_URL.'/board.php?bo_table='.$bo_table.'&wr_id='.$wr_id.'&page='.$page.$qstr); + alert($file_upload_msg, G4_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&wr_id='.$wr_id.'&page='.$page.$qstr); else - goto_url(G4_HTTPS_BBS_URL.'/board.php?bo_table='.$bo_table.'&wr_id='.$wr_id.$qstr); + goto_url(G4_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&wr_id='.$wr_id.$qstr); ?> diff --git a/common.php b/common.php index 303b4be32..e2559c44e 100644 --- a/common.php +++ b/common.php @@ -163,14 +163,8 @@ ini_set("session.cookie_domain", G4_COOKIE_DOMAIN); @session_start(); -// 보안서버주소 설정 -if (G4_HTTPS_DOMAIN) { - define('G4_HTTPS_URL', G4_HTTPS_DOMAIN); - define('G4_HTTPS_BBS_URL', G4_HTTPS_DOMAIN.'/'.G4_BBS_DIR); -} else { - define('G4_HTTPS_URL', G4_URL); - define('G4_HTTPS_BBS_URL', G4_BBS_URL); -} +define('G4_HTTP_BBS_URL', https_url(G4_BBS_DIR, false)); +define('G4_HTTPS_BBS_URL', https_url(G4_BBS_DIR, true)); //============================================================================== // Mobile 모바일 설정 diff --git a/config.php b/config.php index f006b663f..0d74b2afa 100644 --- a/config.php +++ b/config.php @@ -24,8 +24,8 @@ if (PHP_VERSION >= '5.3.0') { 보안서버주소가 없다면 공란으로 두시면 되며 보안서버주소 뒤에 / 는 붙이지 않습니다. 입력예) https://www.domain.com:443/gnuboard4s */ -define('G4_DOMAIN', ''); // 사용하지 않습니다. -define('G4_HTTPS_DOMAIN', ''); +define('G4_DOMAIN', 'http://sir.co.kr:80/g4s'); +define('G4_HTTPS_DOMAIN', 'https://sir.co.kr/g4s'); /* www.sir.co.kr 과 sir.co.kr 도메인은 서로 다른 도메인으로 인식합니다. 쿠키를 공유하려면 .sir.co.kr 과 같이 입력하세요. @@ -53,26 +53,13 @@ define('G4_SNS_DIR', 'sns'); define('G4_SYNDI_DIR', 'syndi'); // URL 은 브라우저상에서의 경로 (도메인으로 부터의) + if (G4_DOMAIN) { define('G4_URL', G4_DOMAIN); } else { - if (isset($g4_path['url'])) - define('G4_URL', $g4_path['url']); - else - define('G4_URL', ''); -} - -if (G4_HTTPS_DOMAIN) { - define('G4_URL', G4_HTTPS_DOMAIN); -} else { - define('G4_URL', G4_DOMAIN); -} - -if (isset($g4_path['path'])) { - define('G4_PATH', $g4_path['path']); -} else { - define('G4_PATH', ''); + define('G4_URL', $g4_path['url']); } +define('G4_PATH', $g4_path['path']); define('G4_ADMIN_URL', G4_URL.'/'.G4_ADMIN_DIR); define('G4_BBS_URL', G4_URL.'/'.G4_BBS_DIR); diff --git a/lib/common.lib.php b/lib/common.lib.php index b4999e858..708774565 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1981,4 +1981,32 @@ function hyphen_hp_number($hp) $hp = preg_replace("/[^0-9]/", "", $hp); return preg_replace("/([0-9]{3})([0-9]{3,4})([0-9]{4})$/", "\\1-\\2-\\3", $hp); } + + +function login_url($url='') +{ + if (!$url) $url = G4_URL; + $p = parse_url($url); + return $url.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", urlencode($_SERVER['REQUEST_URI']))); +} + + +function https_url($dir, $https=true) +{ + if ($https) { + if (G4_HTTPS_DOMAIN) { + $url = G4_HTTPS_DOMAIN.'/'.$dir; + } else { + $url = G4_URL.'/'.$dir; + } + } else { + if (G4_DOMAIN) { + $url = G4_DOMAIN.'/'.$dir; + } else { + $url = G4_URL.'/'.$dir; + } + } + + return $url; +} ?> \ No newline at end of file diff --git a/lib/outlogin.lib.php b/lib/outlogin.lib.php index f5621c13d..077a4bd5a 100644 --- a/lib/outlogin.lib.php +++ b/lib/outlogin.lib.php @@ -34,29 +34,7 @@ function outlogin($skin_dir='basic') $is_auth = true; } - if (G4_HTTPS_DOMAIN) { - $outlogin_url = $_GET['url']; - if ($outlogin_url) { - if (preg_match("/^\.\.\//", $outlogin_url)) { - $outlogin_url = urlencode(G4_URL."/".preg_replace("/^\.\.\//", "", $outlogin_url)); - } - else { - $purl = parse_url(G4_URL); - if ($purl['path']) { - $path = urlencode($purl['path']); - $urlencode = preg_replace("/".$path."/", "", $urlencode); - } - $outlogin_url = $urlencode; - } - } - else { - $outlogin_url = G4_URL; - } - } - else { - $outlogin_url = $urlencode; - } - + $outlogin_url = login_url(); $outlogin_action_url = G4_HTTPS_BBS_URL.'/login_check.php'; ob_start(); diff --git a/plugin/ckeditor/ckeditor.lib.php b/plugin/ckeditor/ckeditor.lib.php index ed4cf6013..6543f6513 100644 --- a/plugin/ckeditor/ckeditor.lib.php +++ b/plugin/ckeditor/ckeditor.lib.php @@ -36,7 +36,7 @@ function editor_html($id, $content, $ckeditor=true, $class="") } $ckeditor_class = $ckeditor ? "ckeditor" : ""; - $html .= "\n"; + $html .= "\n"; $html .= "\n웹 에디터 끝"; return $html; } diff --git a/skin/member/basic/memo_form.skin.php b/skin/member/basic/memo_form.skin.php index 36e7dca11..9463b6634 100644 --- a/skin/member/basic/memo_form.skin.php +++ b/skin/member/basic/memo_form.skin.php @@ -13,7 +13,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
  • 쪽지쓰기
    • - +
    자동등록방지
    From 5e27cc489158ed2d5686e6486b85cf6b61551b83 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 9 May 2013 15:49:36 +0900 Subject: [PATCH 048/140] =?UTF-8?q?=EB=B3=B4=EC=95=88=EC=84=9C=EB=B2=84=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.php b/config.php index 0d74b2afa..67c8e511c 100644 --- a/config.php +++ b/config.php @@ -24,8 +24,8 @@ if (PHP_VERSION >= '5.3.0') { 보안서버주소가 없다면 공란으로 두시면 되며 보안서버주소 뒤에 / 는 붙이지 않습니다. 입력예) https://www.domain.com:443/gnuboard4s */ -define('G4_DOMAIN', 'http://sir.co.kr:80/g4s'); -define('G4_HTTPS_DOMAIN', 'https://sir.co.kr/g4s'); +define('G4_DOMAIN', ''); +define('G4_HTTPS_DOMAIN', ''); /* www.sir.co.kr 과 sir.co.kr 도메인은 서로 다른 도메인으로 인식합니다. 쿠키를 공유하려면 .sir.co.kr 과 같이 입력하세요. From ccd7a9ff90ff537ea5fe0d7f77439b75ac50b1ac Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 9 May 2013 15:58:21 +0900 Subject: [PATCH 049/140] =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=20=ED=8C=8C=EC=9D=BC=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/kcp/kcpcert_request.php | 148 --------------------------------- 1 file changed, 148 deletions(-) delete mode 100644 plugin/kcp/kcpcert_request.php diff --git a/plugin/kcp/kcpcert_request.php b/plugin/kcp/kcpcert_request.php deleted file mode 100644 index 003e2b983..000000000 --- a/plugin/kcp/kcpcert_request.php +++ /dev/null @@ -1,148 +0,0 @@ -mf_clear(); - -// request 로 넘어온 값 처리 -$key = array_keys($_POST); -$sbParam =""; - -for($i=0; $i"; -} - -if ( $req_tx == "cert" ) -{ - // !!up_hash 데이터 생성시 주의 사항 - // year , month , day 가 비어 있는 경우 "00" , "00" , "00" 으로 설정이 됩니다 - // 그외의 값은 없을 경우 ""(null) 로 세팅하시면 됩니다. - // up_hash 데이터 생성시 site_cd 와 ordr_idxx 는 필수 값입니다. - $hash_data = $site_cd . - $ordr_idxx . - $user_name . - f_get_parm_int ( $year ) . - f_get_parm_int ( $month ) . - f_get_parm_int ( $day ) . - $sex_code . - $local_code; - - $up_hash = $ct_cert->make_hash_data( $home_dir, $hash_data ); - - // 인증창으로 넘기는 form 데이터 생성 필드 ( up_hash ) - $sbParam .= ""; -} - -$ct_cert->mf_clear(); -?> - - - - - - *** KCP Online Payment System [PHP Version] *** - - - - - - - - - - \ No newline at end of file From e9ba14f8427491847d645ee21a589b04f82b2ddc Mon Sep 17 00:00:00 2001 From: gnuboard Date: Fri, 10 May 2013 09:40:24 +0900 Subject: [PATCH 050/140] config.php update --- .gitignore | 1 - config.php | 9 --------- 2 files changed, 10 deletions(-) diff --git a/.gitignore b/.gitignore index 132ef02f0..6429cb325 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ .htaccess data -config.php test sirgle sr_* diff --git a/config.php b/config.php index 67c8e511c..eb8e86cc3 100644 --- a/config.php +++ b/config.php @@ -121,15 +121,6 @@ define('G4_SPECIAL', 64); // 특수문자 define('G4_MOBILE_AGENT', 'phone|samsung|lgtel|mobile|skt|nokia|blackberry|android|sony'); -/******************** - SNS 상수 -********************/ - -define('G4_FACEBOOK_APPID', '119146498278078'); -define('G4_FACEBOOK_SECRET', '311e0d6ff8ff43cfe0e75fe82d71777c'); -define('G4_FACEBOOK_CALLBACK', G4_SNS_URL.'/facebook/callback.php'); - - /******************** 기타 상수 ********************/ From ba75e3dea44abad5ded50bdefb8d6d1ed0d78e38 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Fri, 10 May 2013 09:41:11 +0900 Subject: [PATCH 051/140] =?UTF-8?q?config.php=20=EB=A5=BC=20=EB=B0=98?= =?UTF-8?q?=EC=98=81=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6429cb325..7d1e324ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .htaccess data test +config.php sirgle sr_* google* From 0709558615beb8ec17da9833e6c7aec8b92729bc Mon Sep 17 00:00:00 2001 From: gnuboard Date: Fri, 10 May 2013 11:06:48 +0900 Subject: [PATCH 052/140] =?UTF-8?q?=20=EA=B3=B5=EC=A7=80=EC=82=AC=ED=95=AD?= =?UTF-8?q?=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/delete.php | 3 +++ bbs/delete_all.php | 3 +++ bbs/write_update.php | 7 ++++++- lib/common.lib.php | 22 ++++++++++++++++++++++ 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/bbs/delete.php b/bbs/delete.php index 166c198af..21ec46c15 100644 --- a/bbs/delete.php +++ b/bbs/delete.php @@ -117,6 +117,7 @@ sql_query(" delete from {$g4['board_new_table']} where bo_table = '$bo_table' an // 스크랩 삭제 sql_query(" delete from {$g4['scrap_table']} where bo_table = '$bo_table' and wr_id = '{$write['wr_id']}' "); +/* // 공지사항 삭제 $notice_array = explode("\n", trim($board['bo_notice'])); $bo_notice = ""; @@ -124,6 +125,8 @@ for ($k=0; $k=0; $i--) // 스크랩 삭제 sql_query(" delete from {$g4['scrap_table']} where bo_table = '$bo_table' and wr_id = '{$write['wr_id']}' "); + /* // 공지사항 삭제 $notice_array = explode(',', trim($board['bo_notice'])); $bo_notice = ""; @@ -137,6 +138,8 @@ for ($i=count($tmp_array)-1; $i>=0; $i--) if ((int)$write['wr_id'] != (int)$notice_array[$k]) $bo_notice .= $notice_array[$k].','; $bo_notice = trim($bo_notice); + */ + $bo_notice = board_notice($board['bo_notice'], $write['wr_id']); sql_query(" update {$g4['board_table']} set bo_notice = '$bo_notice' where bo_table = '$bo_table' "); $board['bo_notice'] = $bo_notice; } diff --git a/bbs/write_update.php b/bbs/write_update.php index 32831a68d..a7491103c 100644 --- a/bbs/write_update.php +++ b/bbs/write_update.php @@ -53,7 +53,7 @@ $w = $_POST['w']; $wr_link1 = escape_trim(strip_tags($_POST['wr_link1'])); $wr_link2 = escape_trim(strip_tags($_POST['wr_link2'])); -$notice_array = explode(',', trim($board['bo_notice'])); +$notice_array = explode(",", $board['bo_notice']); if ($w == 'u' || $w == 'r') { $wr = get_write($write_table, $wr_id); @@ -454,6 +454,7 @@ if ($w == '' || $w == 'r') { $sql = " update {$write_table} set ca_name = '{$ca_name}' where wr_parent = '{$wr['wr_id']}' "; sql_query($sql); + /* if ($notice) { //if (!preg_match("/[^0-9]{0,1}{$wr_id}[\r]{0,1}/",$board['bo_notice'])) if (!in_array((int)$wr_id, $notice_array)) { @@ -469,6 +470,10 @@ if ($w == '' || $w == 'r') { //$bo_notice = preg_replace("/^".$wr_id."[\n]?$/m", "", $board['bo_notice']); sql_query(" update {$g4['board_table']} set bo_notice = '{$bo_notice}' where bo_table = '{$bo_table}' "); } + */ + + $bo_notice = board_notice($board['bo_notice'], $wr_id, $notice); + sql_query(" update {$g4['board_table']} set bo_notice = '{$bo_notice}' where bo_table = '{$bo_table}' "); } // syndication ping diff --git a/lib/common.lib.php b/lib/common.lib.php index 708774565..2cc4c0874 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1983,6 +1983,7 @@ function hyphen_hp_number($hp) } +// 로그인 후 이동할 URL function login_url($url='') { if (!$url) $url = G4_URL; @@ -1991,6 +1992,7 @@ function login_url($url='') } +// $dir 을 포함하여 https 또는 http 주소를 반환한다. function https_url($dir, $https=true) { if ($https) { @@ -2009,4 +2011,24 @@ function https_url($dir, $https=true) return $url; } + + +// 게시판의 공지사항을 , 로 구분하여 업데이트 한다. +function board_notice($bo_notice, $wr_id, $insert=false) +{ + $notice_array = explode(",", trim($bo_notice)); + $notice_array = array_merge(array($wr_id), $notice_array); + $notice_array = array_unique($notice_array); + foreach ($notice_array as $key=>$value) { + if (!trim($value)) + unset($notice_array[$key]); + } + if (!$insert) { + foreach ($notice_array as $key=>$value) { + if ((int)$value == (int)$wr_id) + unset($notice_array[$key]); + } + } + return implode(",", $notice_array); +} ?> \ No newline at end of file From a1e0486d5ea85858378b228448346c3126b03074 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Fri, 10 May 2013 11:07:34 +0900 Subject: [PATCH 053/140] =?UTF-8?q?ckeditor=20=EC=97=90=20requried=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/ckeditor/ckeditor.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/ckeditor/ckeditor.lib.php b/plugin/ckeditor/ckeditor.lib.php index 6543f6513..ed4cf6013 100644 --- a/plugin/ckeditor/ckeditor.lib.php +++ b/plugin/ckeditor/ckeditor.lib.php @@ -36,7 +36,7 @@ function editor_html($id, $content, $ckeditor=true, $class="") } $ckeditor_class = $ckeditor ? "ckeditor" : ""; - $html .= "\n"; + $html .= "\n"; $html .= "\n웹 에디터 끝"; return $html; } From 35d98add7bda5f442879e5d14fc57645c380a27b Mon Sep 17 00:00:00 2001 From: gnuboard Date: Fri, 10 May 2013 13:45:39 +0900 Subject: [PATCH 054/140] =?UTF-8?q?type=20=EA=B3=BC=20name=20=EC=82=AC?= =?UTF-8?q?=EC=9D=B4=EC=97=90=20=EA=B3=B5=EB=B0=B1=EC=A3=BC=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/member/basic/formmail.skin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skin/member/basic/formmail.skin.php b/skin/member/basic/formmail.skin.php index ada849559..bc635db3e 100644 --- a/skin/member/basic/formmail.skin.php +++ b/skin/member/basic/formmail.skin.php @@ -21,7 +21,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - + From b86a0cf51a1977bd95bf58287659550dad6c3f46 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 13 May 2013 11:31:01 +0900 Subject: [PATCH 055/140] .gitignore is now working --- config.php | 131 -------------------------------- extend/.htaccess | 0 plugin/gcaptcha/fonts/.htaccess | 4 - 3 files changed, 135 deletions(-) delete mode 100644 config.php delete mode 100644 extend/.htaccess delete mode 100644 plugin/gcaptcha/fonts/.htaccess diff --git a/config.php b/config.php deleted file mode 100644 index eb8e86cc3..000000000 --- a/config.php +++ /dev/null @@ -1,131 +0,0 @@ -= '5.3.0') { - //if (function_exists("date_default_timezone_set")) date_default_timezone_set("Asia/Seoul"); - date_default_timezone_set("Asia/Seoul"); -} - - -/******************** - 경로 상수 -********************/ - -/* -보안서버 도메인 -회원가입, 글쓰기에 사용되는 https 로 시작되는 주소를 말합니다. -포트가 있다면 도메인 뒤에 :443 과 같이 입력하세요. -보안서버주소가 없다면 공란으로 두시면 되며 보안서버주소 뒤에 / 는 붙이지 않습니다. -입력예) https://www.domain.com:443/gnuboard4s -*/ -define('G4_DOMAIN', ''); -define('G4_HTTPS_DOMAIN', ''); - -/* -www.sir.co.kr 과 sir.co.kr 도메인은 서로 다른 도메인으로 인식합니다. 쿠키를 공유하려면 .sir.co.kr 과 같이 입력하세요. -이곳에 입력이 없다면 www 붙은 도메인과 그렇지 않은 도메인은 쿠키를 공유하지 않으므로 로그인이 풀릴 수 있습니다. -*/ -define('G4_COOKIE_DOMAIN', ''); - -define('G4_DBCONFIG_FILE', 'dbconfig.php'); - -define('G4_ADMIN_DIR', 'adm'); -define('G4_BBS_DIR', 'bbs'); -define('G4_CSS_DIR', 'css'); -define('G4_DATA_DIR', 'data'); -define('G4_EXTEND_DIR', 'extend'); -define('G4_IMG_DIR', 'img'); -define('G4_JS_DIR', 'js'); -define('G4_LIB_DIR', 'lib'); -define('G4_PLUGIN_DIR', 'plugin'); -define('G4_SKIN_DIR', 'skin'); -define('G4_GCAPTCHA_DIR', 'gcaptcha'); -define('G4_CKEDITOR_DIR', 'ckeditor'); -define('G4_MOBILE_DIR', 'mobile'); -define('G4_KCP_DIR', 'kcp'); -define('G4_SNS_DIR', 'sns'); -define('G4_SYNDI_DIR', 'syndi'); - -// URL 은 브라우저상에서의 경로 (도메인으로 부터의) - -if (G4_DOMAIN) { - define('G4_URL', G4_DOMAIN); -} else { - define('G4_URL', $g4_path['url']); -} -define('G4_PATH', $g4_path['path']); - -define('G4_ADMIN_URL', G4_URL.'/'.G4_ADMIN_DIR); -define('G4_BBS_URL', G4_URL.'/'.G4_BBS_DIR); -define('G4_CSS_URL', G4_URL.'/'.G4_CSS_DIR); -define('G4_DATA_URL', G4_URL.'/'.G4_DATA_DIR); -define('G4_IMG_URL', G4_URL.'/'.G4_IMG_DIR); -define('G4_JS_URL', G4_URL.'/'.G4_JS_DIR); -define('G4_SKIN_URL', G4_URL.'/'.G4_SKIN_DIR); -define('G4_PLUGIN_URL', G4_URL.'/'.G4_PLUGIN_DIR); -define('G4_GCAPTCHA_URL', G4_PLUGIN_URL.'/'.G4_GCAPTCHA_DIR); -define('G4_CKEDITOR_URL', G4_PLUGIN_URL.'/'.G4_CKEDITOR_DIR); // CKEDITOR 의 라이브러리 경로 -define('G4_KCP_URL', G4_PLUGIN_URL.'/'.G4_KCP_DIR); -define('G4_SNS_URL', G4_PLUGIN_URL.'/'.G4_SNS_DIR); -define('G4_SYNDI_URL', G4_PLUGIN_URL.'/'.G4_SYNDI_DIR); -define('G4_MOBILE_URL', G4_URL.'/'.G4_MOBILE_DIR); - -// PATH 는 서버상에서의 절대경로 -define('G4_ADMIN_PATH', G4_PATH.'/'.G4_ADMIN_DIR); -define('G4_BBS_PATH', G4_PATH.'/'.G4_BBS_DIR); -define('G4_DATA_PATH', G4_PATH.'/'.G4_DATA_DIR); -define('G4_EXTEND_PATH', G4_PATH.'/'.G4_EXTEND_DIR); -define('G4_LIB_PATH', G4_PATH.'/'.G4_LIB_DIR); -define('G4_PLUGIN_PATH', G4_PATH.'/'.G4_PLUGIN_DIR); -define('G4_SKIN_PATH', G4_PATH.'/'.G4_SKIN_DIR); -define('G4_GCAPTCHA_PATH', G4_PLUGIN_PATH.'/'.G4_GCAPTCHA_DIR); -define('G4_CKEDITOR_PATH', G4_PLUGIN_PATH.'/'.G4_CKEDITOR_DIR); -define('G4_KCP_PATH', G4_PLUGIN_PATH.'/'.G4_KCP_DIR); -define('G4_SNS_PATH', G4_PLUGIN_PATH.'/'.G4_SNS_DIR); -define('G4_SYNDI_PATH', G4_PLUGIN_PATH.'/'.G4_SYNDI_DIR); -define('G4_MOBILE_PATH', G4_PATH.'/'.G4_MOBILE_DIR); -//============================================================================== - - -define('G4_USE_CACHE', true); // 최신글등에 cache 기능 사용 여부 - - -/******************** - 시간 상수 -********************/ -// 서버의 시간과 실제 사용하는 시간이 틀린 경우 수정하세요. -// 하루는 86400 초입니다. 1시간은 3600초 -// 6시간이 빠른 경우 time() + (3600 * 6); -// 6시간이 느린 경우 time() - (3600 * 6); -define('G4_SERVER_TIME', time()); -define('G4_TIME_YMDHIS', date('Y-m-d H:i:s', G4_SERVER_TIME)); -define('G4_TIME_YMD', substr(G4_TIME_YMDHIS, 0, 10)); -define('G4_TIME_HIS', substr(G4_TIME_YMDHIS, 11, 8)); - -// 입력값 검사 상수 (숫자를 변경하시면 안됩니다.) -define('G4_ALPHAUPPER', 1); // 영대문자 -define('G4_ALPHALOWER', 2); // 영소문자 -define('G4_ALPHABETIC', 4); // 영대,소문자 -define('G4_NUMERIC', 8); // 숫자 -define('G4_HANGUL', 16); // 한글 -define('G4_SPACE', 32); // 공백 -define('G4_SPECIAL', 64); // 특수문자 - -// 모바일 인지 결정 $_SERVER['HTTP_USER_AGENT'] -define('G4_MOBILE_AGENT', 'phone|samsung|lgtel|mobile|skt|nokia|blackberry|android|sony'); - - -/******************** - 기타 상수 -********************/ - -// 게시판에서 링크의 기본갯수를 말합니다. -// 필드를 추가하면 이 숫자를 필드수에 맞게 늘려주십시오. -define('G4_LINK_COUNT', 2); -?> \ No newline at end of file diff --git a/extend/.htaccess b/extend/.htaccess deleted file mode 100644 index e69de29bb..000000000 diff --git a/plugin/gcaptcha/fonts/.htaccess b/plugin/gcaptcha/fonts/.htaccess deleted file mode 100644 index 55fa648e1..000000000 --- a/plugin/gcaptcha/fonts/.htaccess +++ /dev/null @@ -1,4 +0,0 @@ - - Order allow,deny - Deny from all - \ No newline at end of file From 911425a0654be330869da43f87ba44b0888e3da2 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 13 May 2013 11:36:01 +0900 Subject: [PATCH 056/140] .gitignore is now working --- config.php | 131 -------------------------------- extend/.htaccess | 0 plugin/gcaptcha/fonts/.htaccess | 4 - 3 files changed, 135 deletions(-) delete mode 100644 config.php delete mode 100644 extend/.htaccess delete mode 100644 plugin/gcaptcha/fonts/.htaccess diff --git a/config.php b/config.php deleted file mode 100644 index eb8e86cc3..000000000 --- a/config.php +++ /dev/null @@ -1,131 +0,0 @@ -= '5.3.0') { - //if (function_exists("date_default_timezone_set")) date_default_timezone_set("Asia/Seoul"); - date_default_timezone_set("Asia/Seoul"); -} - - -/******************** - 경로 상수 -********************/ - -/* -보안서버 도메인 -회원가입, 글쓰기에 사용되는 https 로 시작되는 주소를 말합니다. -포트가 있다면 도메인 뒤에 :443 과 같이 입력하세요. -보안서버주소가 없다면 공란으로 두시면 되며 보안서버주소 뒤에 / 는 붙이지 않습니다. -입력예) https://www.domain.com:443/gnuboard4s -*/ -define('G4_DOMAIN', ''); -define('G4_HTTPS_DOMAIN', ''); - -/* -www.sir.co.kr 과 sir.co.kr 도메인은 서로 다른 도메인으로 인식합니다. 쿠키를 공유하려면 .sir.co.kr 과 같이 입력하세요. -이곳에 입력이 없다면 www 붙은 도메인과 그렇지 않은 도메인은 쿠키를 공유하지 않으므로 로그인이 풀릴 수 있습니다. -*/ -define('G4_COOKIE_DOMAIN', ''); - -define('G4_DBCONFIG_FILE', 'dbconfig.php'); - -define('G4_ADMIN_DIR', 'adm'); -define('G4_BBS_DIR', 'bbs'); -define('G4_CSS_DIR', 'css'); -define('G4_DATA_DIR', 'data'); -define('G4_EXTEND_DIR', 'extend'); -define('G4_IMG_DIR', 'img'); -define('G4_JS_DIR', 'js'); -define('G4_LIB_DIR', 'lib'); -define('G4_PLUGIN_DIR', 'plugin'); -define('G4_SKIN_DIR', 'skin'); -define('G4_GCAPTCHA_DIR', 'gcaptcha'); -define('G4_CKEDITOR_DIR', 'ckeditor'); -define('G4_MOBILE_DIR', 'mobile'); -define('G4_KCP_DIR', 'kcp'); -define('G4_SNS_DIR', 'sns'); -define('G4_SYNDI_DIR', 'syndi'); - -// URL 은 브라우저상에서의 경로 (도메인으로 부터의) - -if (G4_DOMAIN) { - define('G4_URL', G4_DOMAIN); -} else { - define('G4_URL', $g4_path['url']); -} -define('G4_PATH', $g4_path['path']); - -define('G4_ADMIN_URL', G4_URL.'/'.G4_ADMIN_DIR); -define('G4_BBS_URL', G4_URL.'/'.G4_BBS_DIR); -define('G4_CSS_URL', G4_URL.'/'.G4_CSS_DIR); -define('G4_DATA_URL', G4_URL.'/'.G4_DATA_DIR); -define('G4_IMG_URL', G4_URL.'/'.G4_IMG_DIR); -define('G4_JS_URL', G4_URL.'/'.G4_JS_DIR); -define('G4_SKIN_URL', G4_URL.'/'.G4_SKIN_DIR); -define('G4_PLUGIN_URL', G4_URL.'/'.G4_PLUGIN_DIR); -define('G4_GCAPTCHA_URL', G4_PLUGIN_URL.'/'.G4_GCAPTCHA_DIR); -define('G4_CKEDITOR_URL', G4_PLUGIN_URL.'/'.G4_CKEDITOR_DIR); // CKEDITOR 의 라이브러리 경로 -define('G4_KCP_URL', G4_PLUGIN_URL.'/'.G4_KCP_DIR); -define('G4_SNS_URL', G4_PLUGIN_URL.'/'.G4_SNS_DIR); -define('G4_SYNDI_URL', G4_PLUGIN_URL.'/'.G4_SYNDI_DIR); -define('G4_MOBILE_URL', G4_URL.'/'.G4_MOBILE_DIR); - -// PATH 는 서버상에서의 절대경로 -define('G4_ADMIN_PATH', G4_PATH.'/'.G4_ADMIN_DIR); -define('G4_BBS_PATH', G4_PATH.'/'.G4_BBS_DIR); -define('G4_DATA_PATH', G4_PATH.'/'.G4_DATA_DIR); -define('G4_EXTEND_PATH', G4_PATH.'/'.G4_EXTEND_DIR); -define('G4_LIB_PATH', G4_PATH.'/'.G4_LIB_DIR); -define('G4_PLUGIN_PATH', G4_PATH.'/'.G4_PLUGIN_DIR); -define('G4_SKIN_PATH', G4_PATH.'/'.G4_SKIN_DIR); -define('G4_GCAPTCHA_PATH', G4_PLUGIN_PATH.'/'.G4_GCAPTCHA_DIR); -define('G4_CKEDITOR_PATH', G4_PLUGIN_PATH.'/'.G4_CKEDITOR_DIR); -define('G4_KCP_PATH', G4_PLUGIN_PATH.'/'.G4_KCP_DIR); -define('G4_SNS_PATH', G4_PLUGIN_PATH.'/'.G4_SNS_DIR); -define('G4_SYNDI_PATH', G4_PLUGIN_PATH.'/'.G4_SYNDI_DIR); -define('G4_MOBILE_PATH', G4_PATH.'/'.G4_MOBILE_DIR); -//============================================================================== - - -define('G4_USE_CACHE', true); // 최신글등에 cache 기능 사용 여부 - - -/******************** - 시간 상수 -********************/ -// 서버의 시간과 실제 사용하는 시간이 틀린 경우 수정하세요. -// 하루는 86400 초입니다. 1시간은 3600초 -// 6시간이 빠른 경우 time() + (3600 * 6); -// 6시간이 느린 경우 time() - (3600 * 6); -define('G4_SERVER_TIME', time()); -define('G4_TIME_YMDHIS', date('Y-m-d H:i:s', G4_SERVER_TIME)); -define('G4_TIME_YMD', substr(G4_TIME_YMDHIS, 0, 10)); -define('G4_TIME_HIS', substr(G4_TIME_YMDHIS, 11, 8)); - -// 입력값 검사 상수 (숫자를 변경하시면 안됩니다.) -define('G4_ALPHAUPPER', 1); // 영대문자 -define('G4_ALPHALOWER', 2); // 영소문자 -define('G4_ALPHABETIC', 4); // 영대,소문자 -define('G4_NUMERIC', 8); // 숫자 -define('G4_HANGUL', 16); // 한글 -define('G4_SPACE', 32); // 공백 -define('G4_SPECIAL', 64); // 특수문자 - -// 모바일 인지 결정 $_SERVER['HTTP_USER_AGENT'] -define('G4_MOBILE_AGENT', 'phone|samsung|lgtel|mobile|skt|nokia|blackberry|android|sony'); - - -/******************** - 기타 상수 -********************/ - -// 게시판에서 링크의 기본갯수를 말합니다. -// 필드를 추가하면 이 숫자를 필드수에 맞게 늘려주십시오. -define('G4_LINK_COUNT', 2); -?> \ No newline at end of file diff --git a/extend/.htaccess b/extend/.htaccess deleted file mode 100644 index e69de29bb..000000000 diff --git a/plugin/gcaptcha/fonts/.htaccess b/plugin/gcaptcha/fonts/.htaccess deleted file mode 100644 index 55fa648e1..000000000 --- a/plugin/gcaptcha/fonts/.htaccess +++ /dev/null @@ -1,4 +0,0 @@ - - Order allow,deny - Deny from all - \ No newline at end of file From 1da2113f93373330e0bd1bddec890a406de25e7f Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 13 May 2013 13:39:49 +0900 Subject: [PATCH 057/140] =?UTF-8?q?$qstr=20=EC=97=86=EC=9D=84=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=20&=20=EB=A5=BC=20=EB=B6=99=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EC=9D=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/board.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbs/board.php b/bbs/board.php index ff0bc72b2..3e7f32f6d 100644 --- a/bbs/board.php +++ b/bbs/board.php @@ -134,7 +134,7 @@ if (isset($wr_id) && $wr_id) { if ($member['mb_id']) alert('목록을 볼 권한이 없습니다.', G4_URL); else - alert('목록을 볼 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', './login.php?'.$qstr.'&url='.urlencode(G4_BBS_URL.'/board.php?bo_table='.$bo_table.'&'.$qstr)); + alert('목록을 볼 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', './login.php?'.$qstr.'&url='.urlencode(G4_BBS_URL.'/board.php?bo_table='.$bo_table.($qstr?'&':''))); } if (!isset($page) || (isset($page) && $page == 0)) $page = 1; From c51c20532463758f8accb1b505bef2bc0704142a Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 13 May 2013 13:40:09 +0900 Subject: [PATCH 058/140] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=ED=9B=84=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99=ED=95=A0=20url=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/common.lib.php b/lib/common.lib.php index 2cc4c0874..781f5c89a 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1987,8 +1987,12 @@ function hyphen_hp_number($hp) function login_url($url='') { if (!$url) $url = G4_URL; + /* $p = parse_url($url); + echo urlencode($_SERVER['REQUEST_URI']); return $url.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", urlencode($_SERVER['REQUEST_URI']))); + */ + return $url; } From 18b950634ed30dff655bfe0e33cbf12546aa901c Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 13 May 2013 14:23:52 +0900 Subject: [PATCH 059/140] =?UTF-8?q?G4=5FDOMAIN=20=EA=B0=92=EC=9D=B4=20?= =?UTF-8?q?=EC=9E=88=EB=8A=94=20=EA=B2=BD=EC=9A=B0=20urlencode=20=EC=97=90?= =?UTF-8?q?=20=EB=8F=84=EB=A9=94=EC=9D=B8=EC=9D=84=20=EB=B6=99=EC=97=AC?= =?UTF-8?q?=EC=84=9C=20=EB=B0=98=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common.php b/common.php index e2559c44e..c2525c5e4 100644 --- a/common.php +++ b/common.php @@ -288,7 +288,11 @@ if (isset($_REQUEST['url'])) { $urlencode = urlencode($url); } else { $url = ''; - $urlencode = urlencode(escape_trim($_SERVER['REQUEST_URI'])); + $urlencode = urlencode($_SERVER['REQUEST_URI']); + if (G4_DOMAIN) { + $p = parse_url(G4_DOMAIN); + $urlencode = G4_DOMAIN.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", $urlencode)); + } } if (isset($_REQUEST['gr_id'])) { From 42b7c3a3cfd537772fda6e0947eae920f58cb337 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 13 May 2013 14:38:07 +0900 Subject: [PATCH 060/140] =?UTF-8?q?config.php=20=EB=A5=BC=20push=20?= =?UTF-8?q?=ED=95=98=EA=B8=B0=20=EC=9C=84=ED=95=98=EC=97=AC=20.gitignore?= =?UTF-8?q?=20=EC=97=90=EC=84=9C=20config.php=20=EB=A5=BC=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 - config.php | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 config.php diff --git a/.gitignore b/.gitignore index 7d1e324ce..6429cb325 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ .htaccess data test -config.php sirgle sr_* google* diff --git a/config.php b/config.php new file mode 100644 index 000000000..19b01847c --- /dev/null +++ b/config.php @@ -0,0 +1,132 @@ += '5.3.0') { + //if (function_exists("date_default_timezone_set")) date_default_timezone_set("Asia/Seoul"); + date_default_timezone_set("Asia/Seoul"); +} + + +/******************** + 경로 상수 +********************/ + +/* +보안서버 도메인 +회원가입, 글쓰기에 사용되는 https 로 시작되는 주소를 말합니다. +포트가 있다면 도메인 뒤에 :443 과 같이 입력하세요. +보안서버주소가 없다면 공란으로 두시면 되며 보안서버주소 뒤에 / 는 붙이지 않습니다. +입력예) https://www.domain.com:443/gnuboard4s +주의) G4_DOMAIN 과 G4_HTTPS_DOMAIN 은 둘다 입력하지 않거나, 둘다 입력해야 합니다. +*/ +define('G4_DOMAIN', ''); +define('G4_HTTPS_DOMAIN', ''); + +/* +www.sir.co.kr 과 sir.co.kr 도메인은 서로 다른 도메인으로 인식합니다. 쿠키를 공유하려면 .sir.co.kr 과 같이 입력하세요. +이곳에 입력이 없다면 www 붙은 도메인과 그렇지 않은 도메인은 쿠키를 공유하지 않으므로 로그인이 풀릴 수 있습니다. +*/ +define('G4_COOKIE_DOMAIN', ''); + +define('G4_DBCONFIG_FILE', 'dbconfig.php'); + +define('G4_ADMIN_DIR', 'adm'); +define('G4_BBS_DIR', 'bbs'); +define('G4_CSS_DIR', 'css'); +define('G4_DATA_DIR', 'data'); +define('G4_EXTEND_DIR', 'extend'); +define('G4_IMG_DIR', 'img'); +define('G4_JS_DIR', 'js'); +define('G4_LIB_DIR', 'lib'); +define('G4_PLUGIN_DIR', 'plugin'); +define('G4_SKIN_DIR', 'skin'); +define('G4_GCAPTCHA_DIR', 'gcaptcha'); +define('G4_CKEDITOR_DIR', 'ckeditor'); +define('G4_MOBILE_DIR', 'mobile'); +define('G4_KCP_DIR', 'kcp'); +define('G4_SNS_DIR', 'sns'); +define('G4_SYNDI_DIR', 'syndi'); + +// URL 은 브라우저상에서의 경로 (도메인으로 부터의) + +if (G4_DOMAIN) { + define('G4_URL', G4_DOMAIN); +} else { + define('G4_URL', $g4_path['url']); +} +define('G4_PATH', $g4_path['path']); + +define('G4_ADMIN_URL', G4_URL.'/'.G4_ADMIN_DIR); +define('G4_BBS_URL', G4_URL.'/'.G4_BBS_DIR); +define('G4_CSS_URL', G4_URL.'/'.G4_CSS_DIR); +define('G4_DATA_URL', G4_URL.'/'.G4_DATA_DIR); +define('G4_IMG_URL', G4_URL.'/'.G4_IMG_DIR); +define('G4_JS_URL', G4_URL.'/'.G4_JS_DIR); +define('G4_SKIN_URL', G4_URL.'/'.G4_SKIN_DIR); +define('G4_PLUGIN_URL', G4_URL.'/'.G4_PLUGIN_DIR); +define('G4_GCAPTCHA_URL', G4_PLUGIN_URL.'/'.G4_GCAPTCHA_DIR); +define('G4_CKEDITOR_URL', G4_PLUGIN_URL.'/'.G4_CKEDITOR_DIR); // CKEDITOR 의 라이브러리 경로 +define('G4_KCP_URL', G4_PLUGIN_URL.'/'.G4_KCP_DIR); +define('G4_SNS_URL', G4_PLUGIN_URL.'/'.G4_SNS_DIR); +define('G4_SYNDI_URL', G4_PLUGIN_URL.'/'.G4_SYNDI_DIR); +define('G4_MOBILE_URL', G4_URL.'/'.G4_MOBILE_DIR); + +// PATH 는 서버상에서의 절대경로 +define('G4_ADMIN_PATH', G4_PATH.'/'.G4_ADMIN_DIR); +define('G4_BBS_PATH', G4_PATH.'/'.G4_BBS_DIR); +define('G4_DATA_PATH', G4_PATH.'/'.G4_DATA_DIR); +define('G4_EXTEND_PATH', G4_PATH.'/'.G4_EXTEND_DIR); +define('G4_LIB_PATH', G4_PATH.'/'.G4_LIB_DIR); +define('G4_PLUGIN_PATH', G4_PATH.'/'.G4_PLUGIN_DIR); +define('G4_SKIN_PATH', G4_PATH.'/'.G4_SKIN_DIR); +define('G4_GCAPTCHA_PATH', G4_PLUGIN_PATH.'/'.G4_GCAPTCHA_DIR); +define('G4_CKEDITOR_PATH', G4_PLUGIN_PATH.'/'.G4_CKEDITOR_DIR); +define('G4_KCP_PATH', G4_PLUGIN_PATH.'/'.G4_KCP_DIR); +define('G4_SNS_PATH', G4_PLUGIN_PATH.'/'.G4_SNS_DIR); +define('G4_SYNDI_PATH', G4_PLUGIN_PATH.'/'.G4_SYNDI_DIR); +define('G4_MOBILE_PATH', G4_PATH.'/'.G4_MOBILE_DIR); +//============================================================================== + + +define('G4_USE_CACHE', true); // 최신글등에 cache 기능 사용 여부 + + +/******************** + 시간 상수 +********************/ +// 서버의 시간과 실제 사용하는 시간이 틀린 경우 수정하세요. +// 하루는 86400 초입니다. 1시간은 3600초 +// 6시간이 빠른 경우 time() + (3600 * 6); +// 6시간이 느린 경우 time() - (3600 * 6); +define('G4_SERVER_TIME', time()); +define('G4_TIME_YMDHIS', date('Y-m-d H:i:s', G4_SERVER_TIME)); +define('G4_TIME_YMD', substr(G4_TIME_YMDHIS, 0, 10)); +define('G4_TIME_HIS', substr(G4_TIME_YMDHIS, 11, 8)); + +// 입력값 검사 상수 (숫자를 변경하시면 안됩니다.) +define('G4_ALPHAUPPER', 1); // 영대문자 +define('G4_ALPHALOWER', 2); // 영소문자 +define('G4_ALPHABETIC', 4); // 영대,소문자 +define('G4_NUMERIC', 8); // 숫자 +define('G4_HANGUL', 16); // 한글 +define('G4_SPACE', 32); // 공백 +define('G4_SPECIAL', 64); // 특수문자 + +// 모바일 인지 결정 $_SERVER['HTTP_USER_AGENT'] +define('G4_MOBILE_AGENT', 'phone|samsung|lgtel|mobile|skt|nokia|blackberry|android|sony'); + + +/******************** + 기타 상수 +********************/ + +// 게시판에서 링크의 기본갯수를 말합니다. +// 필드를 추가하면 이 숫자를 필드수에 맞게 늘려주십시오. +define('G4_LINK_COUNT', 2); +?> \ No newline at end of file From 71f80330e74dc4b2a4c9423f162f4a6f1a91b740 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 13 May 2013 14:39:18 +0900 Subject: [PATCH 061/140] =?UTF-8?q?config.php=20=EB=A5=BC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6429cb325..7d1e324ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .htaccess data test +config.php sirgle sr_* google* From 237a91a8ad477485fd54ca68062fe3f13ea636e0 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 13 May 2013 15:39:24 +0900 Subject: [PATCH 062/140] =?UTF-8?q?#457=20G4=5FUSE=5FMOBILE=20=EC=83=81?= =?UTF-8?q?=EC=88=98=20=EC=B6=94=EA=B0=80=EC=97=90=20=EB=94=B0=EB=A5=B8=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/common.php b/common.php index c2525c5e4..b4cf0bac6 100644 --- a/common.php +++ b/common.php @@ -173,14 +173,16 @@ define('G4_HTTPS_BBS_URL', https_url(G4_BBS_DIR, true)); // G4_MOBILE_AGENT : config.php 에서 선언 //------------------------------------------------------------------------------ $is_mobile = false; -if ($_REQUEST['device']=='pc') - $is_mobile = false; -else if ($_REQUEST['device']=='mobile') - $is_mobile = true; -else if (isset($_SESSION['ss_is_mobile'])) - $is_mobile = $_SESSION['ss_is_mobile']; -else if (is_mobile()) - $is_mobile = true; +if (G4_USE_MOBILE) { + if ($_REQUEST['device']=='pc') + $is_mobile = false; + else if ($_REQUEST['device']=='mobile') + $is_mobile = true; + else if (isset($_SESSION['ss_is_mobile'])) + $is_mobile = $_SESSION['ss_is_mobile']; + else if (is_mobile()) + $is_mobile = true; +} $_SESSION['ss_is_mobile'] = $is_mobile; define('G4_IS_MOBILE', $is_mobile); From 9bb8d7256162849542d86552082f1c0edeb4e3f8 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 13 May 2013 16:09:42 +0900 Subject: [PATCH 063/140] =?UTF-8?q?=EB=B3=B8=EC=9D=B8=ED=99=95=EC=9D=B8?= =?UTF-8?q?=ED=9B=84=20=EC=83=9D=EB=85=84=EC=9B=94=EC=9D=BC,=20=EC=84=B1?= =?UTF-8?q?=EB=B3=84=20=EC=A0=80=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/kcp/kcpcert_result.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/kcp/kcpcert_result.php b/plugin/kcp/kcpcert_result.php index 8e112bf2f..e6306d68c 100644 --- a/plugin/kcp/kcpcert_result.php +++ b/plugin/kcp/kcpcert_result.php @@ -150,7 +150,7 @@ if( $cert_enc_use == "Y" ) $adult_day = date("Ymd", strtotime("-19 years", G4_SERVER_TIME)); $adult = ((int)$birth_day <= (int)$adult_day) ? 1 : 0; - $sql = " update {$g4['member_table']} set mb_name = '$user_name', mb_hp = '$phone_no', mb_hp_certify = 1, mb_adult = $adult where mb_id = '{$member['mb_id']}' "; + $sql = " update {$g4['member_table']} set mb_name = '$user_name', mb_hp = '$phone_no', mb_hp_certify = 1, mb_adult = $adult, mb_birth = '$birth_day', mb_sex = '$sex_code' where mb_id = '{$member['mb_id']}' "; sql_query($sql); } else if( $res_cd != "0000" ) From 0bfb110bdff8420b4ee33db8ea99d1c8f48f79a4 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 13 May 2013 16:10:01 +0900 Subject: [PATCH 064/140] =?UTF-8?q?Yes=20No=20=EB=A5=BC=20checkbox=20?= =?UTF-8?q?=EB=A1=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/member_list.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/adm/member_list.php b/adm/member_list.php index e866a0dec..6058e3ef3 100644 --- a/adm/member_list.php +++ b/adm/member_list.php @@ -131,9 +131,9 @@ $colspan = 15; + - @@ -211,14 +211,14 @@ $colspan = 15; - - - - + + + + From ecc3a2838d806fb2146b1d5aba1651d26b5fb345 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 13 May 2013 16:10:22 +0900 Subject: [PATCH 065/140] .gitignore is now working --- config.php | 132 ----------------------------------------------------- 1 file changed, 132 deletions(-) delete mode 100644 config.php diff --git a/config.php b/config.php deleted file mode 100644 index 19b01847c..000000000 --- a/config.php +++ /dev/null @@ -1,132 +0,0 @@ -= '5.3.0') { - //if (function_exists("date_default_timezone_set")) date_default_timezone_set("Asia/Seoul"); - date_default_timezone_set("Asia/Seoul"); -} - - -/******************** - 경로 상수 -********************/ - -/* -보안서버 도메인 -회원가입, 글쓰기에 사용되는 https 로 시작되는 주소를 말합니다. -포트가 있다면 도메인 뒤에 :443 과 같이 입력하세요. -보안서버주소가 없다면 공란으로 두시면 되며 보안서버주소 뒤에 / 는 붙이지 않습니다. -입력예) https://www.domain.com:443/gnuboard4s -주의) G4_DOMAIN 과 G4_HTTPS_DOMAIN 은 둘다 입력하지 않거나, 둘다 입력해야 합니다. -*/ -define('G4_DOMAIN', ''); -define('G4_HTTPS_DOMAIN', ''); - -/* -www.sir.co.kr 과 sir.co.kr 도메인은 서로 다른 도메인으로 인식합니다. 쿠키를 공유하려면 .sir.co.kr 과 같이 입력하세요. -이곳에 입력이 없다면 www 붙은 도메인과 그렇지 않은 도메인은 쿠키를 공유하지 않으므로 로그인이 풀릴 수 있습니다. -*/ -define('G4_COOKIE_DOMAIN', ''); - -define('G4_DBCONFIG_FILE', 'dbconfig.php'); - -define('G4_ADMIN_DIR', 'adm'); -define('G4_BBS_DIR', 'bbs'); -define('G4_CSS_DIR', 'css'); -define('G4_DATA_DIR', 'data'); -define('G4_EXTEND_DIR', 'extend'); -define('G4_IMG_DIR', 'img'); -define('G4_JS_DIR', 'js'); -define('G4_LIB_DIR', 'lib'); -define('G4_PLUGIN_DIR', 'plugin'); -define('G4_SKIN_DIR', 'skin'); -define('G4_GCAPTCHA_DIR', 'gcaptcha'); -define('G4_CKEDITOR_DIR', 'ckeditor'); -define('G4_MOBILE_DIR', 'mobile'); -define('G4_KCP_DIR', 'kcp'); -define('G4_SNS_DIR', 'sns'); -define('G4_SYNDI_DIR', 'syndi'); - -// URL 은 브라우저상에서의 경로 (도메인으로 부터의) - -if (G4_DOMAIN) { - define('G4_URL', G4_DOMAIN); -} else { - define('G4_URL', $g4_path['url']); -} -define('G4_PATH', $g4_path['path']); - -define('G4_ADMIN_URL', G4_URL.'/'.G4_ADMIN_DIR); -define('G4_BBS_URL', G4_URL.'/'.G4_BBS_DIR); -define('G4_CSS_URL', G4_URL.'/'.G4_CSS_DIR); -define('G4_DATA_URL', G4_URL.'/'.G4_DATA_DIR); -define('G4_IMG_URL', G4_URL.'/'.G4_IMG_DIR); -define('G4_JS_URL', G4_URL.'/'.G4_JS_DIR); -define('G4_SKIN_URL', G4_URL.'/'.G4_SKIN_DIR); -define('G4_PLUGIN_URL', G4_URL.'/'.G4_PLUGIN_DIR); -define('G4_GCAPTCHA_URL', G4_PLUGIN_URL.'/'.G4_GCAPTCHA_DIR); -define('G4_CKEDITOR_URL', G4_PLUGIN_URL.'/'.G4_CKEDITOR_DIR); // CKEDITOR 의 라이브러리 경로 -define('G4_KCP_URL', G4_PLUGIN_URL.'/'.G4_KCP_DIR); -define('G4_SNS_URL', G4_PLUGIN_URL.'/'.G4_SNS_DIR); -define('G4_SYNDI_URL', G4_PLUGIN_URL.'/'.G4_SYNDI_DIR); -define('G4_MOBILE_URL', G4_URL.'/'.G4_MOBILE_DIR); - -// PATH 는 서버상에서의 절대경로 -define('G4_ADMIN_PATH', G4_PATH.'/'.G4_ADMIN_DIR); -define('G4_BBS_PATH', G4_PATH.'/'.G4_BBS_DIR); -define('G4_DATA_PATH', G4_PATH.'/'.G4_DATA_DIR); -define('G4_EXTEND_PATH', G4_PATH.'/'.G4_EXTEND_DIR); -define('G4_LIB_PATH', G4_PATH.'/'.G4_LIB_DIR); -define('G4_PLUGIN_PATH', G4_PATH.'/'.G4_PLUGIN_DIR); -define('G4_SKIN_PATH', G4_PATH.'/'.G4_SKIN_DIR); -define('G4_GCAPTCHA_PATH', G4_PLUGIN_PATH.'/'.G4_GCAPTCHA_DIR); -define('G4_CKEDITOR_PATH', G4_PLUGIN_PATH.'/'.G4_CKEDITOR_DIR); -define('G4_KCP_PATH', G4_PLUGIN_PATH.'/'.G4_KCP_DIR); -define('G4_SNS_PATH', G4_PLUGIN_PATH.'/'.G4_SNS_DIR); -define('G4_SYNDI_PATH', G4_PLUGIN_PATH.'/'.G4_SYNDI_DIR); -define('G4_MOBILE_PATH', G4_PATH.'/'.G4_MOBILE_DIR); -//============================================================================== - - -define('G4_USE_CACHE', true); // 최신글등에 cache 기능 사용 여부 - - -/******************** - 시간 상수 -********************/ -// 서버의 시간과 실제 사용하는 시간이 틀린 경우 수정하세요. -// 하루는 86400 초입니다. 1시간은 3600초 -// 6시간이 빠른 경우 time() + (3600 * 6); -// 6시간이 느린 경우 time() - (3600 * 6); -define('G4_SERVER_TIME', time()); -define('G4_TIME_YMDHIS', date('Y-m-d H:i:s', G4_SERVER_TIME)); -define('G4_TIME_YMD', substr(G4_TIME_YMDHIS, 0, 10)); -define('G4_TIME_HIS', substr(G4_TIME_YMDHIS, 11, 8)); - -// 입력값 검사 상수 (숫자를 변경하시면 안됩니다.) -define('G4_ALPHAUPPER', 1); // 영대문자 -define('G4_ALPHALOWER', 2); // 영소문자 -define('G4_ALPHABETIC', 4); // 영대,소문자 -define('G4_NUMERIC', 8); // 숫자 -define('G4_HANGUL', 16); // 한글 -define('G4_SPACE', 32); // 공백 -define('G4_SPECIAL', 64); // 특수문자 - -// 모바일 인지 결정 $_SERVER['HTTP_USER_AGENT'] -define('G4_MOBILE_AGENT', 'phone|samsung|lgtel|mobile|skt|nokia|blackberry|android|sony'); - - -/******************** - 기타 상수 -********************/ - -// 게시판에서 링크의 기본갯수를 말합니다. -// 필드를 추가하면 이 숫자를 필드수에 맞게 늘려주십시오. -define('G4_LINK_COUNT', 2); -?> \ No newline at end of file From 9098bed592375f5692e6f0fe8f7c98a9eb8c87f7 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 13 May 2013 16:49:45 +0900 Subject: [PATCH 066/140] =?UTF-8?q?#454=20=EB=A9=94=EC=9D=BC=EC=88=98?= =?UTF-8?q?=EC=8B=A0=EB=93=B1=EC=9D=84=20checkbox=20=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/member_list_update.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/adm/member_list_update.php b/adm/member_list_update.php index a64979f4c..23aea4b1f 100644 --- a/adm/member_list_update.php +++ b/adm/member_list_update.php @@ -28,7 +28,11 @@ if ($_POST['act_button'] == "선택수정") { } else { $sql = " update {$g4['member_table']} set mb_level = '{$_POST['mb_level'][$k]}', - mb_intercept_date = '{$_POST['mb_intercept_date'][$k]}' + mb_intercept_date = '{$_POST['mb_intercept_date'][$k]}', + mb_mailling = '{$_POST['mb_mailling'][$k]}', + mb_open = '{$_POST['mb_open'][$k]}', + mb_hp_certify = '{$_POST['mb_hp_certify'][$k]}', + mb_adult = '{$_POST['mb_adult'][$k]}' where mb_id = '{$_POST['mb_id'][$k]}' "; sql_query($sql); } From 351d5ef1d8d70e13039881c826e5aaabe85104ba Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 13 May 2013 16:58:10 +0900 Subject: [PATCH 067/140] =?UTF-8?q?=ED=95=98=EB=8B=A8=EC=9D=98=20=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=EC=B6=94=EA=B0=80=20=EB=B2=84=ED=8A=BC=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/member_list.php | 1 - 1 file changed, 1 deletion(-) diff --git a/adm/member_list.php b/adm/member_list.php index 6058e3ef3..12b8b2a3e 100644 --- a/adm/member_list.php +++ b/adm/member_list.php @@ -235,7 +235,6 @@ $colspan = 15;
    - 회원추가
    From 243c53fbb2c87ec2a937b43b47aff821b27d0c96 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 13 May 2013 16:58:56 +0900 Subject: [PATCH 068/140] =?UTF-8?q?=ED=95=98=EB=8B=A8=EC=9D=98=20=EA=B2=8C?= =?UTF-8?q?=EC=8B=9C=ED=8C=90=20=EC=B6=94=EA=B0=80=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/board_list.php | 1 - 1 file changed, 1 deletion(-) diff --git a/adm/board_list.php b/adm/board_list.php index 1ab007b9e..a0c4fcd12 100644 --- a/adm/board_list.php +++ b/adm/board_list.php @@ -167,7 +167,6 @@ $colspan = 15; - 게시판추가 From 53e8455674efc82c01e87ce4b25162e3c772badf Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 13 May 2013 18:30:58 +0900 Subject: [PATCH 069/140] =?UTF-8?q?remote=20=EC=97=90=20=EC=82=AD=EC=A0=9C?= =?UTF-8?q?=EB=90=9C=20config.php=20=ED=8C=8C=EC=9D=BC=20=EB=B3=B5?= =?UTF-8?q?=EC=9B=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 - config.php | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 config.php diff --git a/.gitignore b/.gitignore index 7d1e324ce..6429cb325 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ .htaccess data test -config.php sirgle sr_* google* diff --git a/config.php b/config.php new file mode 100644 index 000000000..eb8e86cc3 --- /dev/null +++ b/config.php @@ -0,0 +1,131 @@ += '5.3.0') { + //if (function_exists("date_default_timezone_set")) date_default_timezone_set("Asia/Seoul"); + date_default_timezone_set("Asia/Seoul"); +} + + +/******************** + 경로 상수 +********************/ + +/* +보안서버 도메인 +회원가입, 글쓰기에 사용되는 https 로 시작되는 주소를 말합니다. +포트가 있다면 도메인 뒤에 :443 과 같이 입력하세요. +보안서버주소가 없다면 공란으로 두시면 되며 보안서버주소 뒤에 / 는 붙이지 않습니다. +입력예) https://www.domain.com:443/gnuboard4s +*/ +define('G4_DOMAIN', ''); +define('G4_HTTPS_DOMAIN', ''); + +/* +www.sir.co.kr 과 sir.co.kr 도메인은 서로 다른 도메인으로 인식합니다. 쿠키를 공유하려면 .sir.co.kr 과 같이 입력하세요. +이곳에 입력이 없다면 www 붙은 도메인과 그렇지 않은 도메인은 쿠키를 공유하지 않으므로 로그인이 풀릴 수 있습니다. +*/ +define('G4_COOKIE_DOMAIN', ''); + +define('G4_DBCONFIG_FILE', 'dbconfig.php'); + +define('G4_ADMIN_DIR', 'adm'); +define('G4_BBS_DIR', 'bbs'); +define('G4_CSS_DIR', 'css'); +define('G4_DATA_DIR', 'data'); +define('G4_EXTEND_DIR', 'extend'); +define('G4_IMG_DIR', 'img'); +define('G4_JS_DIR', 'js'); +define('G4_LIB_DIR', 'lib'); +define('G4_PLUGIN_DIR', 'plugin'); +define('G4_SKIN_DIR', 'skin'); +define('G4_GCAPTCHA_DIR', 'gcaptcha'); +define('G4_CKEDITOR_DIR', 'ckeditor'); +define('G4_MOBILE_DIR', 'mobile'); +define('G4_KCP_DIR', 'kcp'); +define('G4_SNS_DIR', 'sns'); +define('G4_SYNDI_DIR', 'syndi'); + +// URL 은 브라우저상에서의 경로 (도메인으로 부터의) + +if (G4_DOMAIN) { + define('G4_URL', G4_DOMAIN); +} else { + define('G4_URL', $g4_path['url']); +} +define('G4_PATH', $g4_path['path']); + +define('G4_ADMIN_URL', G4_URL.'/'.G4_ADMIN_DIR); +define('G4_BBS_URL', G4_URL.'/'.G4_BBS_DIR); +define('G4_CSS_URL', G4_URL.'/'.G4_CSS_DIR); +define('G4_DATA_URL', G4_URL.'/'.G4_DATA_DIR); +define('G4_IMG_URL', G4_URL.'/'.G4_IMG_DIR); +define('G4_JS_URL', G4_URL.'/'.G4_JS_DIR); +define('G4_SKIN_URL', G4_URL.'/'.G4_SKIN_DIR); +define('G4_PLUGIN_URL', G4_URL.'/'.G4_PLUGIN_DIR); +define('G4_GCAPTCHA_URL', G4_PLUGIN_URL.'/'.G4_GCAPTCHA_DIR); +define('G4_CKEDITOR_URL', G4_PLUGIN_URL.'/'.G4_CKEDITOR_DIR); // CKEDITOR 의 라이브러리 경로 +define('G4_KCP_URL', G4_PLUGIN_URL.'/'.G4_KCP_DIR); +define('G4_SNS_URL', G4_PLUGIN_URL.'/'.G4_SNS_DIR); +define('G4_SYNDI_URL', G4_PLUGIN_URL.'/'.G4_SYNDI_DIR); +define('G4_MOBILE_URL', G4_URL.'/'.G4_MOBILE_DIR); + +// PATH 는 서버상에서의 절대경로 +define('G4_ADMIN_PATH', G4_PATH.'/'.G4_ADMIN_DIR); +define('G4_BBS_PATH', G4_PATH.'/'.G4_BBS_DIR); +define('G4_DATA_PATH', G4_PATH.'/'.G4_DATA_DIR); +define('G4_EXTEND_PATH', G4_PATH.'/'.G4_EXTEND_DIR); +define('G4_LIB_PATH', G4_PATH.'/'.G4_LIB_DIR); +define('G4_PLUGIN_PATH', G4_PATH.'/'.G4_PLUGIN_DIR); +define('G4_SKIN_PATH', G4_PATH.'/'.G4_SKIN_DIR); +define('G4_GCAPTCHA_PATH', G4_PLUGIN_PATH.'/'.G4_GCAPTCHA_DIR); +define('G4_CKEDITOR_PATH', G4_PLUGIN_PATH.'/'.G4_CKEDITOR_DIR); +define('G4_KCP_PATH', G4_PLUGIN_PATH.'/'.G4_KCP_DIR); +define('G4_SNS_PATH', G4_PLUGIN_PATH.'/'.G4_SNS_DIR); +define('G4_SYNDI_PATH', G4_PLUGIN_PATH.'/'.G4_SYNDI_DIR); +define('G4_MOBILE_PATH', G4_PATH.'/'.G4_MOBILE_DIR); +//============================================================================== + + +define('G4_USE_CACHE', true); // 최신글등에 cache 기능 사용 여부 + + +/******************** + 시간 상수 +********************/ +// 서버의 시간과 실제 사용하는 시간이 틀린 경우 수정하세요. +// 하루는 86400 초입니다. 1시간은 3600초 +// 6시간이 빠른 경우 time() + (3600 * 6); +// 6시간이 느린 경우 time() - (3600 * 6); +define('G4_SERVER_TIME', time()); +define('G4_TIME_YMDHIS', date('Y-m-d H:i:s', G4_SERVER_TIME)); +define('G4_TIME_YMD', substr(G4_TIME_YMDHIS, 0, 10)); +define('G4_TIME_HIS', substr(G4_TIME_YMDHIS, 11, 8)); + +// 입력값 검사 상수 (숫자를 변경하시면 안됩니다.) +define('G4_ALPHAUPPER', 1); // 영대문자 +define('G4_ALPHALOWER', 2); // 영소문자 +define('G4_ALPHABETIC', 4); // 영대,소문자 +define('G4_NUMERIC', 8); // 숫자 +define('G4_HANGUL', 16); // 한글 +define('G4_SPACE', 32); // 공백 +define('G4_SPECIAL', 64); // 특수문자 + +// 모바일 인지 결정 $_SERVER['HTTP_USER_AGENT'] +define('G4_MOBILE_AGENT', 'phone|samsung|lgtel|mobile|skt|nokia|blackberry|android|sony'); + + +/******************** + 기타 상수 +********************/ + +// 게시판에서 링크의 기본갯수를 말합니다. +// 필드를 추가하면 이 숫자를 필드수에 맞게 늘려주십시오. +define('G4_LINK_COUNT', 2); +?> \ No newline at end of file From 0a65cb82c44a6ab4e0810c2d498270a442eb60b3 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 13 May 2013 18:31:36 +0900 Subject: [PATCH 070/140] =?UTF-8?q?config.php=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=97=85=EB=A1=9C=EB=93=9C=20=ED=95=98=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6429cb325..7d1e324ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .htaccess data test +config.php sirgle sr_* google* From e6ca195cd1a3290e9de3611d82367e9800d49391 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 14 May 2013 17:17:04 +0900 Subject: [PATCH 071/140] =?UTF-8?q?=EB=B9=88=ED=8C=8C=EC=9D=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B8=EC=8B=9D=ED=95=98=EC=97=AC=20=EC=82=AC=EB=9D=BC?= =?UTF-8?q?=EC=A7=84=20.htaccess=20=EB=A5=BC=20=EB=B3=B5=EC=9B=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 - extend/.htaccess | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 extend/.htaccess diff --git a/.gitignore b/.gitignore index 7d1e324ce..b5218f397 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -.htaccess data test config.php diff --git a/extend/.htaccess b/extend/.htaccess new file mode 100644 index 000000000..792d60054 --- /dev/null +++ b/extend/.htaccess @@ -0,0 +1 @@ +# From 86c24d0091e2b3f974ab4fe9562ee576bb60e181 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 14 May 2013 17:17:40 +0900 Subject: [PATCH 072/140] =?UTF-8?q?.htaccess=20=EC=98=AC=EB=A6=AC=EC=A7=80?= =?UTF-8?q?=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b5218f397..7d1e324ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.htaccess data test config.php From a9c4c60db978d6b2419f682e2c112b72fd6ebc64 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 14 May 2013 17:23:15 +0900 Subject: [PATCH 073/140] =?UTF-8?q?it=5Fimg=5Fthumb=20=ED=95=A8=EC=88=98?= =?UTF-8?q?=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/thumbnail.lib.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php index c7991dbef..04702a590 100644 --- a/lib/thumbnail.lib.php +++ b/lib/thumbnail.lib.php @@ -3,11 +3,6 @@ if (!defined('_GNUBOARD_')) exit; @ini_set('memory_limit', '512M'); -function it_img_thumb($filename, $filepath, $thumb_width, $thumb_height, $is_create=false) -{ - return thumbnail($filename, $filepath, $filepath, $thumb_width, $thumb_height, $is_create); -} - // 게시글리스트 썸네일 생성 function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_create=false, $is_crop=true, $crop_mode='center', $is_sharpen=true, $um_value='80/0.5/3') { From 864d41f1c08e9fb2c5fdd97d2291ff6b43515142 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 14 May 2013 17:51:52 +0900 Subject: [PATCH 074/140] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20gnb=20?= =?UTF-8?q?=EC=9C=84=EC=B9=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 5 +- plugin/kcp/kcpcert_request.php | 148 --------------------------------- 2 files changed, 3 insertions(+), 150 deletions(-) delete mode 100644 plugin/kcp/kcpcert_request.php diff --git a/css/default.css b/css/default.css index a79ff359b..b36abfeef 100644 --- a/css/default.css +++ b/css/default.css @@ -48,7 +48,7 @@ a:active {color:#000;text-decoration:underline} .cke_sc_def dd {width:30%} /* 상단 레이아웃 */ -#hd {height:73px;border-top:3px solid #151515;background:#fff} +#hd {height:107px;border-top:3px solid #151515;background:#fff} #hd h1 {position:absolute;font-size:0;line-height:0;overflow:hidden} #hd_wrapper {position:relative;margin:0 auto;width:980px} @@ -69,7 +69,8 @@ a:active {color:#000;text-decoration:underline} #mb_nb img {margin-right:3px} /* gnb js off */ -#gnb {z-index:10;margin:-1px 0 0;border-top:1px solid #e7f1ed;border-bottom:1px solid #c3c7c5;background:#f0f4f8} +#gnb {z-index:10;margin:-1px 0 0;border-top:1px solid #e7f1ed;border-bottom:1px solid #c3c7c5;background:#f0f4f8;zoom:1} +#gnb:after {display:block;visibility:hidden;clear:both;content:""} #gnb h2 {position:absolute;margin:0;padding:0;font-size:0;line-height:0;overflow:hidden} #gnb_1dul {margin:0 auto;padding:0;width:980px;zoom:1} #gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""} diff --git a/plugin/kcp/kcpcert_request.php b/plugin/kcp/kcpcert_request.php deleted file mode 100644 index 003e2b983..000000000 --- a/plugin/kcp/kcpcert_request.php +++ /dev/null @@ -1,148 +0,0 @@ -mf_clear(); - -// request 로 넘어온 값 처리 -$key = array_keys($_POST); -$sbParam =""; - -for($i=0; $i"; -} - -if ( $req_tx == "cert" ) -{ - // !!up_hash 데이터 생성시 주의 사항 - // year , month , day 가 비어 있는 경우 "00" , "00" , "00" 으로 설정이 됩니다 - // 그외의 값은 없을 경우 ""(null) 로 세팅하시면 됩니다. - // up_hash 데이터 생성시 site_cd 와 ordr_idxx 는 필수 값입니다. - $hash_data = $site_cd . - $ordr_idxx . - $user_name . - f_get_parm_int ( $year ) . - f_get_parm_int ( $month ) . - f_get_parm_int ( $day ) . - $sex_code . - $local_code; - - $up_hash = $ct_cert->make_hash_data( $home_dir, $hash_data ); - - // 인증창으로 넘기는 form 데이터 생성 필드 ( up_hash ) - $sbParam .= ""; -} - -$ct_cert->mf_clear(); -?> - - - - - - *** KCP Online Payment System [PHP Version] *** - - - -
    - - - - - - \ No newline at end of file From fca0483d33dc22d95e176d72e14f35f34b9638a4 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 14 May 2013 18:07:46 +0900 Subject: [PATCH 075/140] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20#hd=20he?= =?UTF-8?q?ight=20=EA=B0=92=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 2 +- head.php | 56 ++++++++++++++++++++++++------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/css/default.css b/css/default.css index b36abfeef..b1bec0aff 100644 --- a/css/default.css +++ b/css/default.css @@ -48,7 +48,7 @@ a:active {color:#000;text-decoration:underline} .cke_sc_def dd {width:30%} /* 상단 레이아웃 */ -#hd {height:107px;border-top:3px solid #151515;background:#fff} +#hd {border-top:3px solid #151515;background:#fff} #hd h1 {position:absolute;font-size:0;line-height:0;overflow:hidden} #hd_wrapper {position:relative;margin:0 auto;width:980px} diff --git a/head.php b/head.php index 18f66bd95..28cc1f6a6 100644 --- a/head.php +++ b/head.php @@ -125,38 +125,38 @@ if ($config['cf_include_head']) { +
    + + +
    - - -
    -
    - - -
    - -
    쪽지쓰기
    별명 상태/권한 전화번호메일
    인증    		 메일
    수신    		 정보
    공개    		메일
    인증    		 본인
    확인    		 성인
    인증    		 접근
    차단    		 Yes':'No'; ?>Yes':'No'; ?> Yes':'No'; ?>Yes':'No'; ?>Yes':'No'; ?> value="1"> value="1"> value="1"> value="1"> - value="" id="mb_intercept_date_" title=""> + value="" id="mb_intercept_date_" title="">
    - -
    - -
    - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + +
    자동등록방지
    내용 + 글자 + + + +
    + +
    + +
    + + + + + + diff --git a/skin/outlogin/basic/style.css b/skin/outlogin/basic/style.css index 231b1fd64..6ef6e350a 100644 --- a/skin/outlogin/basic/style.css +++ b/skin/outlogin/basic/style.css @@ -31,8 +31,8 @@ #ol_after_private a:focus strong, #ol_after_private a:hover strong {color:#fff;text-decoration:none} #ol_after_memo {width:50px;margin-right:1px} -#ol_after_pt {width:80px;margin-right:1px} +#ol_after_pt {width:79px;margin-right:1px} #ol_after_scrap {width:48px;line-height:2.6em !important} #ol_after_ft {text-align:justify} -#ol_after_ft a {display:inline-block;width:88px;height:22px;background:#333;color:#fff;text-align:center;line-height:1.8em} +#ol_after_ft a {display:inline-block;width:87px;height:22px;background:#333;color:#fff;text-align:center;line-height:1.8em} #ol_after_ft a:focus, #ol_after_ft a:hover {text-decoration:none !important} \ No newline at end of file From 538719405316b3aa937b34b1d782bc2ab1555641 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 15 May 2013 16:24:56 +0900 Subject: [PATCH 108/140] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20#459=20?= =?UTF-8?q?=EB=A7=88=ED=81=AC=EC=97=85=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?= =?UTF-8?q?=EA=B0=9C=EC=84=A0=20=EC=9E=91=EC=97=85=20=EC=8B=9C=EC=9E=91=20?= =?UTF-8?q?=EC=A0=84=EC=9C=BC=EB=A1=9C=20=EB=B3=B5=EA=B5=AC,=20tail.php=20?= =?UTF-8?q?=EC=9D=98=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=EB=A7=8C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 238 ++++++++++++++++-------------- head.php | 145 +++++++++++------- index.php | 1 + skin/board/basic/style.css | 29 ++-- skin/board/basic/view.skin.php | 54 +++---- skin/board/basic/write.skin.php | 2 +- skin/board/gallery/write.skin.php | 2 +- skin/latest/basic/latest.skin.php | 6 +- 8 files changed, 267 insertions(+), 210 deletions(-) diff --git a/css/default.css b/css/default.css index cac027693..a79ff359b 100644 --- a/css/default.css +++ b/css/default.css @@ -13,99 +13,27 @@ button {border-radius:0;font-size:1em} p {margin:0;padding:10px 0;line-height:1.7em;word-break:break-all} hr {display:none} pre {overflow-x:scroll;font-size:1.1em} -a:link, a:visited {color:#000;text-decoration:none} -a:hover, a:focus, a:active {color:#000;text-decoration:underline} +a:link, +a:visited {color:#000;text-decoration:none} +a:hover, +a:focus, +a:active {color:#000;text-decoration:underline} -/* 상단 레이아웃 */ -#hd {border-bottom:1px solid #c6d3da;background:#fff} -#hd h1 {position:absolute;font-size:0;line-height:0;overflow:hidden} -#hd_wrapper {position:relative;margin:0 auto;width:980px} - -/* 로고 */ -#logo {padding:20px 0} - -#mb_nb {position:absolute;top:25px;left:70px;zoom:1} -#mb_nb:after {display:block;visibility:hidden;clear:both;content:""} -#mb_nb li {float:left} -#mb_nb a {display:block;padding:5px 10px;color:#333;letter-spacing:-0.1em} -#mb_nb a:focus, #mb_nb a:hover, #mb_nb a:active {text-decoration:none} -#mb_nb img {margin-right:3px} - -/* 텍스트 크기 조절 */ -#text_size {z-index:10;position:absolute;top:23px;right:220px} -#text_size button {padding:0 10px;height:28px;border:0;background:#333;color:#fff;cursor:pointer} - -/* 전체 검색 */ -#sch_all {position:absolute;top:23px;right:0;margin:0;padding:0;border:1px solid #333} -#sch_all legend {position:absolute;font-size:0;line-height:0;overflow:hidden} -#sch_all_stx {padding-left:5px;width:165px;height:24px;border:0;background:#fff;line-height:1.9em !important;line-height:1.6em} -#sch_all_submit {padding:0 5px;height:26px;border:0;background:#333;color:#fff} - -/* gnb js off */ -#gnb {z-index:10;margin:-1px 0 0;background:#f5f6fa;zoom:1} -#gnb:after {display:block;visibility:hidden;clear:both;content:""} -#gnb h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} -#gnb_1dul {margin:0 auto;padding:0;width:980px;zoom:1} -#gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""} -.gnb_1dli {z-index:10;clear:both;zoom:1} -.gnb_1dli:after {display:block;visibility:hidden;clear:both;content:""} -.gnb_1da {display:block;float:left;width:80px;height:35px;font-weight:bold;line-height:2.95em;text-decoration:none} -.gnb_1da:focus, .gnb_1da:hover {text-decoration:none} -.gnb_2dul {float:left;width:auto} -.gnb_2dli {float:left} -.gnb_2da {display:block;float:left;width:80px;height:35px;line-height:2.95em;text-decoration:none} -.gnb_2da:focus, .gnb_2da:hover {text-decoration:none} -/* gnb js on */ -.gnb_js {} -.gnb_js #gnb_1dul {zoom:1} -.gnb_js #gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""} -.gnb_js .gnb_1dli {clear:none;position:relative;float:left} -.gnb_js .gnb_1da {text-align:center} -.gnb_js .gnb_1dli_air a {float:none;background:#333;color:#fff} -.gnb_js .gnb_1dli_on a {float:none;background:#333;color:#fff} -.gnb_js .gnb_2dul {position:absolute;top:35px;width:1px;height:1px;overflow:hidden} -.gnb_js .gnb_2da {display:inline-block;float:none !important;padding:0 10px;width:161px;text-align:left} -.gnb_1dli_over .gnb_2dul {left:0;width:181px;height:auto} -.gnb_1dli_over2 .gnb_2dul {right:0;width:181px;height:auto} - -.gnb_empty {width:100%;height:35px;text-align:center;line-height:2.95em} - -/* 중간 레이아웃 */ -#wrapper {z-index:5;margin:50px auto;width:980px;zoom:1} -#wrapper:after {display:block;visibility:hidden;clear:both;content:""} - -#aside {float:right;width:208px;border:1px solid #d9e1e5;background:#fff} - -#container {z-index:4;position:relative;float:left;padding:25px 14px 15px;width:728px;min-height:500px;height:auto !important;height:500px;border:1px solid #d9e1e5;background:#fff;zoom:1} -#container:after {display:block;visibility:hidden;clear:both;content:""} -#container_title {margin-bottom:20px;font-size:1.2em} - -/* 하단 레이아웃 */ -#ft {background:#484848} -#ft h1 {position:absolute;font-size:0;line-height:0;overflow:hidden} - -#ft_catch {position:relative;margin:0 auto;padding:20px 0;width:980px;text-align:center} - -#ft_copy {background:#414141} -#ft_copy p {position:relative;margin:0 auto;width:980px;color:#4a9ab8} -#ft_copy b {color:#fff} -#ft_copy a {color:#fff} - -/* 기본 스타일 */ /* 화면낭독기 사용자용 */ #hd_login_msg {position:absolute;top:0;left:0;font-size:0;line-height:0;overflow:hidden} .msg_sound_only, .sound_only {display:inline-block !important;position:absolute;top:0;left:0;margin:0 !important;padding:0 !important;font-size:0;line-height:0;border:0 !important;overflow:hidden !important} /* 본문 바로가기 */ #to_content a {z-index:100000;position:absolute;top:0;left:0;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden} -#to_content a:focus, #to_content a:active {width:100%;height:75px;background:#21272e;color:#fff;font-size:2em;font-weight:bold;text-align:center;text-decoration:none;line-height:3.3em} +#to_content a:focus, +#to_content a:active {width:100%;height:75px;background:#21272e;color:#fff;font-size:2em;font-weight:bold;text-align:center;text-decoration:none;line-height:3.3em} /* 이미지 등비율 리사이징 */ .img_fix {width:100%;height:auto} /* 캡챠 자동등록(입력)방지 기본 */ -#captcha img {border:1px solid #d9d9d9;border-right:0} -#captcha_mp3 img {border:1px solid #d9d9d9;border-left:0;background:#494949} +#captcha img {border:1px solid #cfded8;border-right:0} +#captcha_mp3 img {border:1px solid #cfded8;border-left:0;background:#494949} #mp3_embed {position:absolute;top:0;left:0;width:1px;height:1px;overflow:hidden} /* 익스 8 이하에서 음성캡챠 실행 스타일 */ /* ckeditor 단축키 */ @@ -119,35 +47,118 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} .cke_sc_def dt {width:20%;font-weight:bold} .cke_sc_def dd {width:30%} +/* 상단 레이아웃 */ +#hd {height:73px;border-top:3px solid #151515;background:#fff} +#hd h1 {position:absolute;font-size:0;line-height:0;overflow:hidden} +#hd_wrapper {position:relative;margin:0 auto;width:980px} + +#logo {padding:17px 0} + +#sch_all {position:absolute;top:22px;left:70px;margin:0;padding:0;letter-spacing:-5px} +#sch_all legend {position:absolute;font-size:0;line-height:0;overflow:hidden} +#sch_all_stx {padding-left:5px;width:156px;height:24px;border:1px solid #aaa;border-right:0;background:#fff;line-height:1.9em !important;line-height:1.6em} +#sch_all_submit {border:1px solid #aaa;border-left:0} + +#mb_nb {position:absolute;top:18px;right:0;zoom:1} +#mb_nb:after {display:block;visibility:hidden;clear:both;content:""} +#mb_nb li {float:left} +#mb_nb a {display:block;padding:5px 10px;color:#333;letter-spacing:-0.1em} +#mb_nb a:focus, +#mb_nb a:hover, +#mb_nb a:active {text-decoration:none} +#mb_nb img {margin-right:3px} + +/* gnb js off */ +#gnb {z-index:10;margin:-1px 0 0;border-top:1px solid #e7f1ed;border-bottom:1px solid #c3c7c5;background:#f0f4f8} +#gnb h2 {position:absolute;margin:0;padding:0;font-size:0;line-height:0;overflow:hidden} +#gnb_1dul {margin:0 auto;padding:0;width:980px;zoom:1} +#gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""} +.gnb_1dli {z-index:10;clear:both;zoom:1} +.gnb_1dli:after {display:block;visibility:hidden;clear:both;content:""} +.gnb_1da {display:block;float:left;width:80px;height:35px;font-weight:bold;line-height:2.95em;text-decoration:none} +.gnb_1da:focus, +.gnb_1da:hover {text-decoration:none} +.gnb_2dul {float:left;width:auto} +.gnb_2dli {float:left} +.gnb_2da {display:block;float:left;width:80px;height:35px;line-height:2.95em;text-decoration:none} +.gnb_2da:focus, +.gnb_2da:hover {text-decoration:none} +/* gnb js on */ +.gnb_js {} +.gnb_js #gnb_1dul {zoom:1} +.gnb_js #gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""} +.gnb_js .gnb_1dli {clear:none;position:relative;float:left} +.gnb_js .gnb_1da {text-align:center} +.gnb_js .gnb_1dli_air a {float:none;background:#f7f7f2;color:#000} +.gnb_js .gnb_1dli_on a {float:none;border-color:#e0e5e9;background:#fff;color:#000} +.gnb_js .gnb_2dul {position:absolute;top:35px;width:1px;height:1px;overflow:hidden} +.gnb_js .gnb_2da {display:inline-block;float:none !important;padding:0 10px;width:161px;text-align:left} +.gnb_1dli_over .gnb_2dul {left:-1px;width:181px;height:auto;border:1px solid #c3c7c5;border-top:0;background:#fff} +.gnb_1dli_over2 .gnb_2dul {right:-1px;width:181px;height:auto;border:1px solid #c3c7c5;border-top:0;background:#fff} + +.gnb_empty {width:100%;height:35px;text-align:center;line-height:2.95em} + +/* 중간 레이아웃 */ +#wrapper {z-index:5;margin:50px auto;width:980px;zoom:1} +#wrapper:after {display:block;visibility:hidden;clear:both;content:""} +#wrapper_title {margin-bottom:20px;font-size:1.2em} + +#wrapper #aside {float:right;width:209px;border:1px solid #cfded8;background:#fff} + +#container {z-index:4;position:relative;float:left;padding:25px 15px 15px;width:728px;min-height:500px;height:auto !important;height:500px;border:1px solid #cfded8;background:#fff;zoom:1} +#container:after {display:block;visibility:hidden;clear:both;content:""} + +/* 텍스트 크기 조절 */ +#text_size {position:absolute;top:-31px;left:-1px} +#text_size button {padding:0 10px;height:30px;border:1px solid #cfded8;border-bottom:0;background:#000;color:#fff;cursor:pointer} + +/* 하단 레이아웃 */ +#ft {background:#484848} +#ft h1 {position:absolute;font-size:0;line-height:0;overflow:hidden} + +#ft_catch {position:relative;margin:0 auto;padding:20px 0;width:980px;text-align:center} + +#ft_copy {background:#414141} +#ft_copy p {position:relative;margin:0 auto;width:980px;color:#4a9ab8} +#ft_copy b {color:#fff} +#ft_copy a {position:absolute;top:10px;right:0;color:#fff} + /* Mobile화면으로 */ #device_change {display:block;margin:0.3em;padding:0.5em 0;border:1px solid #eee;border-radius:2em;background:#fff;color:#000;font-size:2em;text-decoration:none;text-align:center} /* 콘텐츠별 스타일 */ .cnt_cmt {display:inline-block;margin:0 0 0 3px;font-weight:bold} /* 버튼 */ -.btn01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #d9d9d9;background:#f5f6fa;color:#000;text-decoration:none;line-height:2.15em;vertical-align:middle} -.btn01:focus, .btn01:hover {text-decoration:none} -.btn02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #333;background:#333;color:#fff !important;text-decoration:none;line-height:2.15em;vertical-align:middle} -.btn02:focus, .btn02:hover {text-decoration:none} -.btn_confirm {margin:20px 0;text-align:center} /* 서식단계 진행 */ +.btn01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #ccc !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} +.btn01:focus, +.btn01:hover {text-decoration:none !important} +.btn02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #333 !important;background:#333 !important;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} +.btn02:focus, +.btn02:hover {text-decoration:none !important} +.btn_confirm {text-align:center} /* 서식단계 진행 */ .btn_submit {padding:0 10px;height:24px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer} button.btn_submit {height:22px !important;font-size:1em} fieldset .btn_submit {height:22px;font-size:1em} .btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em} button.btn_cancel {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc;background:#fafafa;line-height:2em} -.btn_cancel:focus, .btn_cancel:hover {text-decoration:none !important} +.btn_cancel:focus, +.btn_cancel:hover {text-decoration:none !important} .btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff !important;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */ button.btn_frmline {font-size:1em} .btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */ .btn_win a {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em;cursor:pointer} -.btn_win a:focus, .btn_win a:hover {text-decoration:none} +.btn_win a:focus, +.btn_win a:hover {text-decoration:none} /* 게시판용 버튼 */ -.btn_b01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #d9d9d9;background:#f5f6fa;color:#000;text-decoration:none;line-height:2.15em;vertical-align:middle} -.btn_b01:focus, .btn_b01:hover {text-decoration:none} -.btn_b02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #333;background:#333;color:#fff !important;text-decoration:none;line-height:2.15em;vertical-align:middle} -.btn_b02:focus, .btn_b02:hover {text-decoration:none} -.btn_admin {display:inline-block;padding:0 10px;height:23px;border:1px solid #e8180c;background:#e8180c;color:#fff !important;text-decoration:none;line-height:2.15em;vertical-align:middle} /* 관리자 전용 버튼 */ -.btn_admin:focus, .btn_admin:hover {text-decoration:none} +.btn_b01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #eee !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} +.btn_b01:focus, +.btn_b01:hover {text-decoration:none !important} +.btn_b02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #eee !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} +.btn_b02:focus, +.btn_b02:hover {text-decoration:none !important} +.btn_admin {display:inline-block;padding:0 10px;height:23px;border:1px solid #e8180c !important;background:#e8180c !important;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} /* 관리자 전용 버튼 */ +.btn_admin:focus, +.btn_admin:hover {text-decoration:none !important} /* 기본테이블 */ .basic_tbl {margin-bottom:10px;width:100%;border-collapse:collapse;border-spacing:0} @@ -157,7 +168,7 @@ button.btn_frmline {font-size:1em} .basic_tbl thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */ .basic_tbl tfoot th {border-top:1px solid #666;border-bottom:1px solid #666;background:#484848;color:#fff} .basic_tbl tfoot td {border-color:#666;background:#484848;color:#fff;font-weight:bold;text-align:center} -.basic_tbl td {padding:8px 5px 6px;border-top:1px solid #d9d9d9;border-bottom:1px solid #d9d9d9;line-height:1.5em;word-break:break-all} +.basic_tbl td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;line-height:1.5em;word-break:break-all} .basic_tbl a {} .bo_sideview td {padding:6px 4px} /* 사이드뷰 사용하는 테이블 셀 패딩값 */ td.empty_table {padding:85px 0;text-align:center} @@ -165,15 +176,17 @@ td.empty_table {padding:85px 0;text-align:center} .empty_list {padding:85px 0;text-align:center} /* 필수입력 */ -.required {background:url('../img/wrest.gif') #fff top right no-repeat !important} +.required {background:url('../img/wrest.gif') #f7f7f7 top right no-repeat !important} /* 폼 테이블 */ -.frm_tbl {width:100%;border-collapse:collapse;border-spacing:0} +.frm_tbl {margin-bottom:20px;width:100%;border-collapse:collapse;border-spacing:0} .frm_tbl caption {padding:10px 0;font-weight:bold;text-align:left} -.frm_tbl th {width:100px;padding:7px 13px;border:1px solid #e9e9e9;border-left:0;background:#f5f6fa;text-align:left;vertical-align:top} -.frm_tbl td {padding:7px 10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent;vertical-align:top} +.frm_tbl th {padding-left:10px;width:100px;border-top:1px solid #eee;border-bottom:1px solid #eee;font-weight:normal;text-align:left} +.frm_tbl td {padding:7px 10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent} .frm_tbl textarea, -.frm_input {padding:2px 2px 3px;border:1px solid #ccc;background:#fff;vertical-align:middle} +.frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:middle} +.frm_input:focus, +input.required:focus {padding:3px 3px 4px;border:0;background:#21272e !important;color:#fff} .frm_tbl textarea {width:90%;height:150px} .frm_address {display:block;margin-top:5px} .frm_file {display:block;margin-bottom:5px} @@ -181,7 +194,7 @@ td.empty_table {padding:85px 0;text-align:center} .frm_tbl #captcha input {margin-left:5px;text-align:center} .frm_tbl a {text-decoration:none} -.frm_info {display:block;padding:0 0 5px;font-size:0.95em;line-height:1.2em} +.frm_info {display:block;padding:0 0 5px;line-height:1.4em} /* 테이블 항목별 정의 */ .td_chk {width:30px;text-align:center} @@ -198,7 +211,7 @@ td.empty_table {padding:85px 0;text-align:center} /* 새창 기본 스타일 */ .new_win {} -.new_win h1 {margin-bottom:20px;padding:0 20px;height:60px;border-top:3px solid #4e5d60;border-bottom:1px solid #d9d9d9;background:#fff;font-size:1.2em;line-height:5em} +.new_win h1 {margin-bottom:20px;padding:0 20px;height:60px;border-top:3px solid #4e5d60;border-bottom:1px solid #e9e9e9;background:#fff;font-size:1.2em;line-height:5em} .new_win .basic_tbl {margin:0 auto 20px !important;width:93% !important;background:#fff !important} .new_win_ul {margin:-20px 0 20px 0;padding:0 0 0 20px;border-bottom:1px solid #455255;background:#484848;list-style:none;zoom:1} .new_win_ul:after {display:block;visibility:hidden;clear:both;content:""} @@ -209,22 +222,29 @@ td.empty_table {padding:85px 0;text-align:center} /* 자바스크립트 alert 대안 */ #validation_check {margin:100px auto;width:500px} #validation_check h1 {margin-bottom:20px;font-size:1.3em} -#validation_check p {margin-bottom:20px;padding:30px 20px;border:1px solid #d9d9d9;background:#fff} +#validation_check p {margin-bottom:20px;padding:30px 20px;border:1px solid #e9e9e9;background:#fff} /* 사이드뷰 */ .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;background:#111} .sv_wrap .sv a {display:inline-block !important;margin:0 !important;padding:3px !important;width:94px;border-bottom:1px solid #283646;color:#fff !important} -.sv_wrap a:focus, .sv_wrap a:hover, .sv_wrap a:active {text-decoration:none !important} +.sv_wrap a:focus, +.sv_wrap a:hover, +.sv_wrap a:active {text-decoration:none !important} .sv_on {display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto !important} .sv_nojs .sv {display:block} /* pagination */ .pg_wrap {clear:both;margin:0 0 20px;padding-top:20px;text-align:center} -.pg {display:inline-block;border:1px solid #d9d9d9;letter-spacing:-4px} -.pg a:focus, .pg a:hover, .pg a:active {text-decoration:none} -.pg_page, .pg_current {display:inline-block;padding:0 12px;height:30px;color:#000;letter-spacing:0;line-height:2.6em;vertical-align:middle} +.pg {display:inline-block;border:1px solid #cfded8;letter-spacing:-4px} +.pg a:focus, +.pg a:hover, +.pg a:active {text-decoration:none} +.pg_page, +.pg_current {display:inline-block;padding:0 12px;height:30px;color:#000;letter-spacing:0;line-height:2.6em;vertical-align:middle} .pg_page {background:#f9f9f9;text-decoration:none} -.pg_start, .pg_prev {border-right:1px solid #d9d9d9} -.pg_end, .pg_next {border-left:1px solid #d9d9d9} +.pg_start, +.pg_prev {border-right:1px solid #cfded8} +.pg_end, +.pg_next {border-left:1px solid #cfded8} .pg_current {background:#333;color:#fff;font-weight:bold} \ No newline at end of file diff --git a/head.php b/head.php index b3d12d0d8..18f66bd95 100644 --- a/head.php +++ b/head.php @@ -34,36 +34,14 @@ if ($config['cf_include_head']) { 처음으로 - - -
    - 본문 영역 글자 크기 조절 - - - -
    -
    사이트 내 전체검색 -
    + - +
    - - -
    - - + +
    + + +
    +
    -
    - - -
    +
    -

    \ No newline at end of file +

    +
    + + + +
    \ No newline at end of file diff --git a/index.php b/index.php index 24f9dc480..7642bfcde 100644 --- a/index.php +++ b/index.php @@ -28,6 +28,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) { else $lt_style = ""; ?>
    +

    최신글

    환경설정의 최신글 스킨경로를 기본 스킨으로 합니다. diff --git a/skin/board/basic/style.css b/skin/board/basic/style.css index b9cd7675c..e9b257b52 100644 --- a/skin/board/basic/style.css +++ b/skin/board/basic/style.css @@ -3,6 +3,7 @@ /* 게시판 목록 */ #bo_list_title {margin-bottom:20px;font-size:1.2em;letter-spacing:-0.1em} +#bo_cate h2 {width:1px;height:1px;font-size:0;line-height:0;overflow:hidden} #bo_cate ul {margin-bottom:10px;padding-left:1px;width:728px;zoom:1} #bo_cate ul:after {display:block;visibility:hidden;clear:both;content:""} #bo_cate li {float:left;margin-bottom:-1px} @@ -24,7 +25,7 @@ .btn_bo_adm {float:left} .btn_bo_adm li {float:left;margin-right:5px} .btn_bo_adm input {padding:0 10px;height:25px;border:1px solid #e8180c !important;background:#e8180c;color:#fff;text-decoration:none;vertical-align:middle;cursor:pointer} -.bo_notice td {background:#f5f6fa} +.bo_notice td {background:#f7f7f2} .bo_notice td a {font-weight:bold} .td_num strong {color:#000} .bo_cate_link {display:inline-block;margin:0 3px 0 0;padding:0 6px 0 0;border-right:1px solid #e7f1ed;color:#999 !important;font-weight:bold;text-decoration:none} /* 글제목줄 분류스타일 */ @@ -32,15 +33,14 @@ .cnt_cmt {font-weight:bold} #bo_sch {margin-bottom:10px;padding-top:5px;text-align:center} -#bo_sch legend {position:absolute;font-size:0;line-height:0;overflow:hidden} +#bo_sch legend {width:1px;height:1px;font-size:0;line-height:0;overflow:hidden} /* 게시판 읽기 */ #bo_v {margin-bottom:20px;padding-bottom:20px} -#bo_v_titlecate {position:absolute;top:0;right:0;padding:15px 0;width:100%;border-bottom:1px solid #d9e1e5;background:#f9fafe;text-align:center} -#bo_v_titlecate span {display:inline-block;margin:0 0 0 20px} +#bo_v_cate {position:absolute;top:0;right:15px;margin:0;padding:0 5px;height:25px;background:#565e60;color:#fff;font-weight:bold;line-height:2.2em} -#bo_v_h1 {margin:35px 0 0;padding:10px 0;font-size:1.2em} +#bo_v_h1 {padding:10px 0;font-size:1.2em} #bo_v_info {padding:0 0 10px;border-bottom:1px solid #ddd} #bo_v_info h2 {margin:0;padding:0;height:0;overflow:hidden} @@ -53,7 +53,7 @@ #bo_v_file {} #bo_v_file h2 {margin:0;padding:0;height:0;overflow:hidden} #bo_v_file ul {margin:0;padding:0;list-style:none} -#bo_v_file li {padding:0 10px;border-bottom:1px solid #eee;background:#f5f6fa} +#bo_v_file li {padding:0 10px;border-bottom:1px solid #eee;background:#f7f7f2} #bo_v_file a {display:inline-block;padding:8px 0 7px;color:#000} #bo_v_file a:focus, #bo_v_file a:hover, @@ -63,7 +63,7 @@ #bo_v_link {} #bo_v_link h2 {margin:0;padding:0;height:0;overflow:hidden} #bo_v_link ul {margin:0;padding:0;list-style:none} -#bo_v_link li {padding:0 10px;border-bottom:1px solid #eee;background:#f5f6fa} +#bo_v_link li {padding:0 10px;border-bottom:1px solid #eee;background:#f7f7f2} #bo_v_link a {display:inline-block;padding:8px 0 7px;color:#000} #bo_v_link a:focus, #bo_v_link a:hover, @@ -73,7 +73,7 @@ #bo_v_top {margin:0 0 10px;padding:10px 0;zoom:1} #bo_v_top:after {display:block;visibility:hidden;clear:both;content:""} #bo_v_top h2 {margin:0;padding:0;height:0;overflow:hidden} -#bo_v_top ul {margin:0;padding:0;list-style:none} +#bo_v_top ul {list-style:none} #bo_v_bot {zoom:1} #bo_v_bot:after {display:block;visibility:hidden;clear:both;content:""} @@ -86,7 +86,7 @@ .bo_v_com li {float:left;margin-left:5px} #bo_v_atc {min-height:200px;height:auto !important;height:200px} -#bo_v_atc header h1 {position:absolute;font-size:0;line-height:0;overflow:hidden} +#bo_v_atc header h1 {margin:0;padding:0;width:1px;height:1px;overflow:hidden} #bo_v_img {margin:0 0 10px;width:100%;overflow:hidden:zoom:1} #bo_v_img:after {display:block;visibility:hidden;clear:both;content:""} @@ -106,19 +106,22 @@ #bo_v form {padding-top:20px} /* 게시판 댓글 */ -#bo_vc {margin:0 0 10px;padding:20px 20px 10px;border-top:1px solid #d9e1e5;border-bottom:1px solid #d9e1e5;background:#f5f6fa} +#bo_vc {margin:0 0 10px;padding:20px 20px 10px;border-top:1px solid #cfded8;border-bottom:1px solid #cfded8;background:#f7f7f2} #bo_vc h2 {margin-bottom:10px} #bo_vc article {padding:0 0 10px;border-top:1px dotted #ccc} #bo_vc header {position:relative;padding:15px 0 5px} #bo_vc header .icon_reply {position:absolute;top:15px;left:-20px} #bo_vc .sv_wrap {margin-right:15px} -#bo_vc .member, #bo_vc .guest, #bo_vc .sv_member, #bo_vc .sv_guest {font-weight:bold} +#bo_vc .member, +#bo_vc .guest, +#bo_vc .sv_member, +#bo_vc .sv_guest {font-weight:bold} .bo_vc_hdinfo {display:inline-block;margin:0 15px 0 5px} #bo_vc h1 {width:1px;height:1px;font-size:0;line-height:0;overflow:hidden} #bo_vc a {color:#000;text-decoration:none} #bo_vc p {padding:0 0 5px;line-height:1.8em} #bo_vc p a {text-decoration:underline} -#bo_vc_empty {margin:0;padding:20px !important;text-align:center} +#bo_vc_empty {margin:0;padding:20px !important;border-bottom:1px dotted #ccc;text-align:center} #bo_vc fieldset {margin:0 0 10px;padding:0} #bo_vc #bo_vc_winfo {float:left} #bo_vc footer {zoom:1} @@ -128,7 +131,7 @@ .bo_vc_act:after {display:block;visibility:hidden;clear:both;content:""} .bo_vc_act li {float:left;margin-left:5px} -#bo_vc_w {position:relative;margin-bottom:10px;padding:0 0 20px;border-bottom:1px solid #d9d9d9} +#bo_vc_w {position:relative;margin-bottom:10px;padding:0 20px 20px;border-bottom:1px solid #cfded8} #bo_vc_w h2 {padding:15px 0 5px} #bo_vc_w #char_cnt {display:block;margin-bottom:5px} diff --git a/skin/board/basic/view.skin.php b/skin/board/basic/view.skin.php index 4537effe9..7873cf3bd 100644 --- a/skin/board/basic/view.skin.php +++ b/skin/board/basic/view.skin.php @@ -5,27 +5,22 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); -
    - - - - -
    +
    -
    +

    + + +

    -
    - 작성자 - - 작성일 - - 조회 - 회 - 댓글 - 건 -
    +
    +

    게시물 정보

    + 작성자 + 작성일 + 조회회 + 댓글건 +
    -
    +
    + + + -
    +
    + + +
    + -
    +

    홈페이지 메인메뉴

    +
      + 'mobile' order by gr_order "; + $result = sql_query($sql); + for ($gi=0; $row=sql_fetch_array($result); $gi++) { // gi 는 group index + ?> +
    • + +
        + 'mobile' order by bo_order "; + $result2 = sql_query($sql2); + for ($bi=0; $row2=sql_fetch_array($result2); $bi++) { // bi 는 board index + ?> +
        • + +
      +
      • + +
    • 생성된 메뉴가 없습니다.
      • +
    + +
    - - -
    -
    ", $str); - ?> -
    style="margin-left:px;border-top-color:#e0e0e0"> + ?> +
    style="margin-left:px;border-top-color:#e0e0e0">

    님의 댓글

    @@ -44,7 +44,7 @@ var char_max = parseInt(); // 최대 - " id="secret_comment_"> + " id="secret_comment_"> ); // 최대 - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + +
    자동등록방지
    내용 + 글자 + + + +
    + +
    + +
    + + + + + + From cdd42a7a4067a92ec4120541c465e79819d6b900 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 16 May 2013 09:21:03 +0900 Subject: [PATCH 124/140] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC:=20#459=20?= =?UTF-8?q?=EB=A7=88=ED=81=AC=EC=97=85=20=EC=A0=95=EB=A6=AC=20=EB=B0=8F=20?= =?UTF-8?q?=ED=97=A4=EB=94=A9=20=EB=8B=A4=EC=9D=B4=EC=96=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 2 +- css/mobile.css | 8 +- mobile/skin/board/basic/style.css | 22 ++--- mobile/skin/board/basic/view.skin.php | 98 +++++++----------- mobile/skin/board/gallery/view.skin.php | 99 +++++++------------ .../skin/outlogin/basic/outlogin.skin.1.php | 4 +- .../skin/outlogin/basic/outlogin.skin.2.php | 4 +- mobile/skin/poll/basic/poll.skin.php | 4 +- mobile/skin/poll/basic/poll_result.skin.php | 4 +- mobile/skin/popular/basic/popular.skin.php | 4 +- mobile/skin/search/basic/search.skin.php | 2 +- mobile/skin/visit/basic/visit.skin.php | 4 +- skin/board/basic/view.skin.php | 4 +- 13 files changed, 101 insertions(+), 158 deletions(-) diff --git a/css/default.css b/css/default.css index a6ae9dbe5..0500ae77c 100644 --- a/css/default.css +++ b/css/default.css @@ -175,7 +175,7 @@ td.empty_table {padding:85px 0;text-align:center} /* 폼 테이블 */ .frm_tbl {margin-bottom:20px;width:100%;border-collapse:collapse;border-spacing:0} .frm_tbl caption {padding:10px 0;font-weight:bold;text-align:left} -.frm_tbl th {width:100px;padding:7px 13px;border:1px solid #e9e9e9;border-left:0;background:#f7f7f7;text-align:left;vertical-align:top} +.frm_tbl th {width:100px;padding:7px 13px;border:1px solid #e9e9e9;border-left:0;background:#f7f7f7;vertical-align:top;text-align:left} .frm_tbl td {padding:7px 10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent;vertical-align:top} .frm_tbl textarea, .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:middle} .frm_input:focus, input.required:focus {padding:3px 3px 4px;border:0;background:#21272e !important;color:#fff} diff --git a/css/mobile.css b/css/mobile.css index 8fa47438b..42d6367f9 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -142,12 +142,10 @@ td.empty_table {padding:5em 0;text-align:center} /* 폼 테이블 */ .frm_tbl {margin-bottom:1.5em;width:100%;border-collapse:collapse;border-spacing:0} .frm_tbl caption {padding:1em;color:#4b8b99;font-weight:bold;text-align:left} -.frm_tbl th {padding-left:1em;width:110px;border-top:1px solid #eee;border-bottom:1px solid #eee;font-weight:normal;text-align:left} +.frm_tbl th {padding:0.4em;width:110px;border:1px solid #e9e9e9;border-left:0;vertical-align:top;text-align:left} .frm_tbl td {padding:0.4em 0.5em;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent} -.frm_tbl textarea, -.frm_input {border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:middle;line-height:1.8em;-webkit-appearance:none} -.frm_input:focus, -input.required:focus {border:0;background:#21272e !important;color:#fff;line-height:1.8em} +.frm_tbl textarea, .frm_input {border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:middle;line-height:1.8em;-webkit-appearance:none} +.frm_input:focus, input.required:focus {border:1px solid #b8c9c2;background:#21272e !important;color:#fff;line-height:1.8em} .frm_tbl textarea {width:90%;height:150px} .frm_address {display:block;margin-top:0.3em} .frm_file {display:block;margin-bottom:0.3em} diff --git a/mobile/skin/board/basic/style.css b/mobile/skin/board/basic/style.css index e240c53d4..a9604c46a 100644 --- a/mobile/skin/board/basic/style.css +++ b/mobile/skin/board/basic/style.css @@ -50,7 +50,7 @@ #bo_v_cate {padding:0 1em;color:#999;font-size:0.9em;font-weight:bold} -#bo_v_h1 {padding:0 0.7em 0.5em;font-size:1.2em} +#bo_v_title {padding:0 0.7em 0.5em;font-size:1.2em} #bo_v_info {padding:0 0.9em 1em;border-bottom:1px solid #ddd} #bo_v_info h2 {margin:0;padding:0;height:0;overflow:hidden} @@ -61,20 +61,16 @@ #bo_v_file h2 {margin:0;padding:0;height:0;overflow:hidden} #bo_v_file ul {margin:0;padding:0;list-style:none} #bo_v_file li {padding:0 1em;border-bottom:1px solid #eee;background:#f7f7f7} -#bo_v_file a {display:inline-block;padding:0.5em 0;color:#000} -#bo_v_file a:focus, -#bo_v_file a:hover, -#bo_v_file a:active {text-decoration:none} +#bo_v_file a {display:inline-block;padding:0.5em 0;color:#000;text-decoration:none} +#bo_v_file a:focus, #bo_v_file a:hover, #bo_v_file a:active {text-decoration:none} .bo_v_file_cnt {display:inline-block;margin:0 1em} #bo_v_link {} #bo_v_link h2 {margin:0;padding:0;height:0;overflow:hidden} #bo_v_link ul {margin:0;padding:0;list-style:none} #bo_v_link li {padding:0 1em;border-bottom:1px solid #eee;background:#f7f7f7} -#bo_v_link a {display:inline-block;padding:0.5em 0;color:#000} -#bo_v_link a:focus, -#bo_v_link a:hover, -#bo_v_link a:active {text-decoration:none} +#bo_v_link a {display:inline-block;padding:0.5em 0;color:#000;text-decoration:none} +#bo_v_link a:focus, #bo_v_link a:hover, #bo_v_link a:active {text-decoration:none} .bo_v_link_cnt {display:inline-block;margin:0 1em} #bo_v_top {margin:0 0 1em;padding:1em} @@ -93,7 +89,7 @@ .bo_v_com li {float:left;margin-left:0.3em} #bo_v_atc {min-height:200px;padding:0 1em;min-height:200px} -#bo_v_atc h1 {margin:0;padding:0;height:0;overflow:hidden} +#bo_v_atc_title {margin:0;padding:0;height:0;overflow:hidden} #bo_v_img {margin:0 0 1em;width:100%;overflow:hidden:zoom:1} #bo_v_img:after {display:block;visibility:hidden;clear:both;content:""} @@ -107,8 +103,7 @@ #bo_v_act a {margin-right:0.3em;vertical-align:top} #bo_v_act span {display:inline-block;margin-right:0.3em;padding:0 1em;border:1px solid #eee !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:2em;vertical-align:top} #bo_v_act strong {color:#ff3061} -#bo_v_act_good, -#bo_v_act_nogood {display:inline-block;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden} +#bo_v_act_good, #bo_v_act_nogood {display:inline-block;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden} #bo_v form {padding-top:1.5em} @@ -118,8 +113,7 @@ #bo_vc article {padding:0 0 0.5em;border-top:1px dotted #ccc} #bo_vc header {position:relative;padding:1.3em 0 0.3em} #bo_vc header .icon_reply {position:absolute;top:1.5em;left:-1.3em} -#bo_vc .sv_member, -#bo_vc .sv_guest {font-weight:bold} +#bo_vc .sv_member, #bo_vc .sv_guest {font-weight:bold} .bo_vc_hdinfo {display:inline-block;margin:0 1em 0 0.3em} #bo_vc h1 {width:0;height:0;font-size:0;line-height:0;overflow:hidden} #bo_vc a {color:#000;text-decoration:none} diff --git a/mobile/skin/board/basic/view.skin.php b/mobile/skin/board/basic/view.skin.php index 3c3d32917..99bd40c2e 100644 --- a/mobile/skin/board/basic/view.skin.php +++ b/mobile/skin/board/basic/view.skin.php @@ -5,21 +5,24 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); -
    +
    -

    - - -

    - -

    +
    +
    +

    + +

    +
    -

    게시물 정보

    - 작성자
    - 작성일
    - 조회 회
    - 댓글 건 +

    페이지 정보

    + 작성자 + 작성일 + 조회회 + 댓글건
    + ?>
    @@ -40,12 +43,12 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); // 가변 파일 for ($i=0; $i + ?>
  • - - 첨부파일 + + 첨부 - () + () 회 다운로드 DATE : @@ -53,14 +56,14 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); + ?>
    • + ?> - + ?> +
    -
    -
    -

    본문

    -
    +
    +

    본문

    \n"; } - ?> + ?>
    @@ -145,7 +145,6 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
    스크랩 - 추천 @@ -166,21 +165,19 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); } } ?> -
    + - - + - +
    @@ -61,34 +61,33 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
    - - -
    -
    에 대한 검색 결과입니다.
    -
    -
      -
    • 개의 게시판
      • -
    • 개의 게시물
      • -
    • 현재 / 페이지 열람 중
      • -
    -
    -
    - - + +
    +

    전체검색 결과

    +
    +
    게시판
    +
    개
    +
    게시물
    +
    개
    +
    +

    / 페이지 열람 중

    +
    + -
    -
    검색결과가 있는 게시판 목록
    -
    - -
    -
    + @@ -97,37 +96,37 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
    -
    +
    -
    에서
    -
    -
      - 댓글"; - $comment_href = "#c_".$list[$idx][$i][wr_id]; - } - ?> -
    • - - 새창 -

      - - -
      • - -
    -
    더보기
    -
    +

    게시판 내 결과

    +
      + 댓글"; + $comment_href = "#c_".$list[$idx][$i][wr_id]; + } + ?> +
    • + + 새창 +

      + + +
      • + +
    +
    더보기
    + +
    -
    + diff --git a/skin/search/basic/style.css b/skin/search/basic/style.css index d93a308e9..74b077e8c 100644 --- a/skin/search/basic/style.css +++ b/skin/search/basic/style.css @@ -1,33 +1,23 @@ /* 전체검색결과 스킨 */ -#sch_result_detail {margin:0;padding:15px 0;border:0;text-align:right} -#sch_result {padding:10px 0 0 0;border-top:1px solid #d9d9d9;background:url('../img/sch_result_bg.jpg') repeat-y} -#sch_result ul {margin:0;padding:0;list-style:none} -#sch_result p {margin:5px 0;padding:0} -#sch_result_hd {margin:0;padding:0;zoom:1} -#sch_result_hd:after {display:block;visibility:hidden;clear:both;content:""} -#sch_result_hd dt {float:left;padding:10px 0 15px} -#sch_result_hd dd {float:right;margin:0;padding:10px 0 15px} -#sch_result_hd ul {float:left} -#sch_result_hd li {float:left;padding:0 10px;border-right:1px solid #d9d9d9} -#sch_result_bo {float:left;margin:-1px 0 0;padding:0;width:170px} -#sch_result_bo dt {margin:0;padding:0;border:0;font-size:0;line-height:0;overflow:hidden} -#sch_result_bo dd {margin:0;padding:0} -#sch_result_bo ul {margin-top:1px} -#sch_result_bo li {position:relative;margin-top:-1px;height:40px} -#sch_result_bo a {position:absolute;padding:0 10px;width:149px;height:40px;border:1px solid #618588;border-right:0;background:#151515;color:#fff;text-decoration:none;line-height:3.4em} -#sch_result_bo .sch_on {width:150px;border-color:#d9d9d9;border-right:0;background:#fff;color:#000;font-weight:bold} -#sch_result_bo .cnt_cmt {color:#fff} -#sch_result_bo .sch_on .cnt_cmt {color:#000} -#sch_result_atc {float:left;margin:-1px 0 0;padding:15px 25px;width:506px;border:1px solid #d9d9d9;background:#fff} -#sch_result_atc dt a {display:inline-block;margin-bottom:15px;color:#000;font-size:1.2em;font-weight:bold;text-decoration:none} -#sch_result_atc dd {margin:0 0 15px} -#sch_result_atc dd a {} -#sch_result_atc .sch_result_title {display:inline-block;margin-bottom:5px;font-size:1.1em;font-weight:bold;text-decoration:underline} -#sch_result_atc li {padding:13px 0;border-bottom:1px solid #f0f0f0} -#sch_result_atc p {padding:0 0 5px} -#sch_result_atc a {display:inline-block;margin:0 10px 0 0} -#sch_result_atc .cmt_def {display:inline-block;margin:0 10px 0 0} -.sch_more {padding:10px 0 15px;text-align:right} -.sch_more a {} -.sch_datetime {display:inline-block;margin-right:15px;color:#999} -.sch_word {font-weight:bold} /* 검색어 강조 */ \ No newline at end of file +#sch_res_detail {padding:0 0 10px;border-bottom:1px solid #e9e9e9;text-align:center} +#sch_res_detail legend {position:absolute;font-size:0;line-height:0;overflow:hidden} +#sch_res_ov {margin:0 0 10px;padding:10px;border-bottom:1px solid #e9e9e9;background:#f5f6fa;zoom:1} +#sch_res_ov:after {display:block;visibility:hidden;clear:both;content:""} +#sch_res_ov h2 {float:left} +#sch_res_ov dl {float:left;margin:0 0 0 10px} +#sch_res_ov dt {float:left} +#sch_res_ov dd {float:left;margin:0 10px 0 5px} +#sch_res_ov p {float:right;margin:0;padding:0;line-height:1em} + +#sch_res_board {margin:0 0 10px;padding-left:1px;width:728px;list-style:none;zoom:1} +#sch_res_board:after {display:block;visibility:hidden;clear:both;content:""} +#sch_res_board li {float:left;margin-bottom:-1px} +#sch_res_board a {display:block;position:relative;margin-left:-1px;padding:6px 0 5px;width:181px;border:1px solid #ddd;text-align:center;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer} +#sch_res_board a:focus, #sch_res_board a:hover, #sch_res_board a:active {text-decoration:none} +#sch_res_board .cnt_cmt {font-weight:normal !important} + +.sch_res_list {margin:0 0 10px;padding:10px 0 15px} +.sch_res_list h2 {margin:0 0 15px;font-size:1.2em} +.sch_res_list ul {margin:0;padding:0;list-style:none} +.sch_res_list li {margin:0 0 10px;padding:0 0 10px;border-bottom:1px solid #e9e9e9} +.sch_more {text-align:right} \ No newline at end of file From d8ad6a903a82025cee0d519f97a00a66eb46a241 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 16 May 2013 11:22:19 +0900 Subject: [PATCH 128/140] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20?= =?UTF-8?q?=EA=B2=80=EC=83=89=EA=B2=B0=EA=B3=BC=EC=8A=A4=ED=82=A8=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EB=B3=B4=EC=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/search/basic/search.skin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skin/search/basic/search.skin.php b/skin/search/basic/search.skin.php index a9c832d4e..0b6119911 100644 --- a/skin/search/basic/search.skin.php +++ b/skin/search/basic/search.skin.php @@ -122,7 +122,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 -
    더보기
    +
    결과 더보기
    From 52f90683724bff12ec1060e5fb127b72612a6bd7 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 16 May 2013 11:38:40 +0900 Subject: [PATCH 129/140] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC:=20?= =?UTF-8?q?=EA=B2=80=EC=83=89=EA=B2=B0=EA=B3=BC=EC=8A=A4=ED=82=A8=20?= =?UTF-8?q?=EB=A7=88=ED=81=AC=EC=97=85=20=EB=B0=8F=20=EC=8A=A4=ED=83=80?= =?UTF-8?q?=EC=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/skin/search/basic/search.skin.php | 199 ++++++++++++----------- mobile/skin/search/basic/style.css | 47 +++--- 2 files changed, 126 insertions(+), 120 deletions(-) diff --git a/mobile/skin/search/basic/search.skin.php b/mobile/skin/search/basic/search.skin.php index 30b9ebf74..23d3c58b1 100644 --- a/mobile/skin/search/basic/search.skin.php +++ b/mobile/skin/search/basic/search.skin.php @@ -2,129 +2,136 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 ?> + +
    -
    +
    상세검색 - - +
    + + - - + + +
    +
    + + + - - + - > - - > - + +
    +
    + id="sop_or" name="sop"> + + id="sop_and" name="sop"> + +
    - - -
    -
    검색어
    -
    -
      -
    • 게시판 개
      • -
    • 게시물 개
      • -
    • / 페이지
      • -
    -
    -
    - - - -
    -
    검색결과가 있는 게시판 목록
    -
    - -
    -
    +
    +

    전체검색 결과

    +
    +
    게시판
    +
    개
    +
    게시물
    +
    개
    +
    +

    / 페이지 열람 중

    +
    + + + + + ?>

    검색된 자료가 하나도 없습니다.

    - +
    -
    +
    -
    에서
    -
    -
      - 댓글"; - $comment_href = "#c_".$list[$idx][$i][wr_id]; - } - ?> -
    • - - 새창 -

      - - -
      • - -
    -
    더보기
    -
    - -
    + ?> +

    게시판 내 결과

    +
      + 댓글"; + $comment_href = "#c_".$list[$idx][$i][wr_id]; + } + ?> +
    • + + 새창 +

      + + +
      • + +
    +
    결과 더보기
    + +
    + + diff --git a/mobile/skin/search/basic/style.css b/mobile/skin/search/basic/style.css index f63ae26b6..61f4860f0 100644 --- a/mobile/skin/search/basic/style.css +++ b/mobile/skin/search/basic/style.css @@ -1,28 +1,27 @@ /* 전체검색결과 스킨 */ -#sch_result_detail {margin:0;padding:0.5em 1em;border:0} -#sch_result {padding:0 1em} +#sch_res_detail {padding:0 0 1em;border-bottom:1px solid #e9e9e9;text-align:center} +#sch_res_detail legend {position:absolute;font-size:0;line-height:0;overflow:hidden} +#sch_res_detail div {margin:0 0 0.5em} +#sch_res_detail .frm_input {height:2.5em;line-height:2.5em} -#sch_result_hd dt {width:0;height:0;overflow:hidden} -#sch_result_hd dd {margin:0} -#sch_result_hd ul {margin:0;padding:0;border-top:1px solid #eee;border-bottom:1px solid #eee;list-style:none} -#sch_result_hd ul:after {display:block;visibility:hidden;clear:both;content:""} -#sch_result_hd li {float:left;padding:0.5em 0;width:33%;text-align:center} +#sch_res_ov {padding:1em;border-bottom:1px solid #e9e9e9;background:#f5f6fa;zoom:1} +#sch_res_ov:after {display:block;visibility:hidden;clear:both;content:""} +#sch_res_ov h2 {margin:0 0 0.5em} +#sch_res_ov dl {margin:0 0 0.5em;zoom:1} +#sch_res_ov dl:after {display:block;visibility:hidden;clear:both;content:""} +#sch_res_ov dt {float:left} +#sch_res_ov dd {float:left;margin:0 1em 0 0.5em} +#sch_res_ov p {margin:0;padding:0} -#sch_result_bo dt {width:0;height:0;overflow:hidden} -#sch_result_bo dd {margin:0} -#sch_result_bo ul {margin:0;padding:0;list-style:none} -#sch_result_bo li {border-bottom:1px solid #fff;background:#f7f7f7} -#sch_result_bo a {display:block;padding:0.5em;color:#000;text-decoration:none} -#sch_result_bo .cnt_cmt {display:inline-block;margin:0 0 0 0.5em;color:#ff3061} +#sch_res_board {margin:0 0 1em;padding:0;list-style:none;zoom:1} +#sch_res_board:after {display:block;visibility:hidden;clear:both;content:""} +#sch_res_board a {display:block;position:relative;margin-left:-1px;padding:0.5em 1em;border-bottom:1px solid #e9e9e9;text-decoration:none;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer} +#sch_res_board a:focus, #sch_res_board a:hover, #sch_res_board a:active {text-decoration:none} +#sch_res_board .cnt_cmt {font-weight:normal !important} -#sch_result_atc a {color:#000} -#sch_result_atc dt {padding:0.5em 1em;background:#484848;color:#fff} -#sch_result_atc dt a {color:#fff;text-decoration:none} -#sch_result_atc dd {margin:0} -#sch_result_atc ul {margin:0;padding:0;list-style:none} -#sch_result_atc li {padding:1em;border-bottom:1px solid #eee} - -.sch_more {padding:10px 0 15px;text-align:right} -.sch_more a {} -.sch_datetime {display:inline-block;margin-right:15px;color:#999} -.sch_word {font-weight:bold} /* 검색어 강조 */ +.sch_res_list {margin:0 0 1em;padding:1em 0} +.sch_res_list h2 {margin:0 0 1em;padding:0 1em;font-size:1.2em} +.sch_res_list ul {margin:0;padding:0;list-style:none} +.sch_res_list li {margin:0 0 1em;padding:0 1em 1em;border-bottom:1px solid #e9e9e9} +.sch_res_list a {text-decoration:none} +.sch_more {padding:0 1em;text-align:right} \ No newline at end of file From 468bf9c36985e559d35bb2455f2e594be6af9103 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 16 May 2013 15:24:38 +0900 Subject: [PATCH 130/140] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20?= =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=EC=8A=A4=ED=82=A8=20=EC=B2=A8?= =?UTF-8?q?=EB=B6=80=ED=8C=8C=EC=9D=BC,=20=EA=B4=80=EB=A0=A8=EB=A7=81?= =?UTF-8?q?=ED=81=AC,=20=EA=B8=B4=20=ED=8C=8C=EC=9D=BC=EB=AA=85=20?= =?UTF-8?q?=EB=A7=81=ED=81=AC=EB=AA=85=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/board/basic/style.css | 17 +++++++---------- skin/board/gallery/style.css | 17 +++++++---------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/skin/board/basic/style.css b/skin/board/basic/style.css index 7223dbebb..f2f48e0d3 100644 --- a/skin/board/basic/style.css +++ b/skin/board/basic/style.css @@ -52,21 +52,18 @@ #bo_v_file h2 {margin:0;padding:0;height:0;overflow:hidden} #bo_v_file ul {margin:0;padding:0;list-style:none} #bo_v_file li {padding:0 10px;border-bottom:1px solid #eee;background:#f5f6fa} -#bo_v_file a {display:inline-block;padding:8px 0 7px;color:#000} -#bo_v_file a:focus, -#bo_v_file a:hover, -#bo_v_file a:active {text-decoration:none} -.bo_v_file_cnt {display:inline-block;margin:0 10px} +#bo_v_file a {display:inline-block;padding:8px 0 7px;width:100%;color:#000;word-wrap:break-word} +#bo_v_file a:focus, #bo_v_file a:hover, #bo_v_file a:active {text-decoration:none} +#bo_v_file img {float:left;margin:0 10px 0 0} +.bo_v_file_cnt {display:inline-block;margin:0 0 3px 22px} #bo_v_link {} #bo_v_link h2 {margin:0;padding:0;height:0;overflow:hidden} #bo_v_link ul {margin:0;padding:0;list-style:none} #bo_v_link li {padding:0 10px;border-bottom:1px solid #eee;background:#f5f6fa} -#bo_v_link a {display:inline-block;padding:8px 0 7px;color:#000} -#bo_v_link a:focus, -#bo_v_link a:hover, -#bo_v_link a:active {text-decoration:none} -.bo_v_link_cnt {display:inline-block;margin:0 10px} +#bo_v_link a {display:inline-block;padding:8px 0 7px;width:100%;color:#000;word-wrap:break-word} +#bo_v_link a:focus, #bo_v_link a:hover, #bo_v_link a:active {text-decoration:none} +.bo_v_link_cnt {display:inline-block;margin:0 0 3px 22px} #bo_v_top {margin:0 0 10px;padding:10px 0;zoom:1} #bo_v_top:after {display:block;visibility:hidden;clear:both;content:""} diff --git a/skin/board/gallery/style.css b/skin/board/gallery/style.css index 4a3c1c0bf..2a1dfc769 100644 --- a/skin/board/gallery/style.css +++ b/skin/board/gallery/style.css @@ -76,21 +76,18 @@ #bo_v_file h2 {margin:0;padding:0;height:0;overflow:hidden} #bo_v_file ul {margin:0;padding:0;list-style:none} #bo_v_file li {padding:0 10px;border-bottom:1px solid #eee;background:#f5f6fa} -#bo_v_file a {display:inline-block;padding:8px 0 7px;color:#000} -#bo_v_file a:focus, -#bo_v_file a:hover, -#bo_v_file a:active {text-decoration:none} -.bo_v_file_cnt {display:inline-block;margin:0 10px} +#bo_v_file a {display:inline-block;padding:8px 0 7px;width:100%;color:#000;word-wrap:break-word} +#bo_v_file a:focus, #bo_v_file a:hover, #bo_v_file a:active {text-decoration:none} +#bo_v_file img {float:left;margin:0 10px 0 0} +.bo_v_file_cnt {display:inline-block;margin:0 0 3px 22px} #bo_v_link {} #bo_v_link h2 {margin:0;padding:0;height:0;overflow:hidden} #bo_v_link ul {margin:0;padding:0;list-style:none} #bo_v_link li {padding:0 10px;border-bottom:1px solid #eee;background:#f5f6fa} -#bo_v_link a {display:inline-block;padding:8px 0 7px;color:#000} -#bo_v_link a:focus, -#bo_v_link a:hover, -#bo_v_link a:active {text-decoration:none} -.bo_v_link_cnt {display:inline-block;margin:0 10px} +#bo_v_link a {display:inline-block;padding:8px 0 7px;width:100%;color:#000;word-wrap:break-word} +#bo_v_link a:focus, #bo_v_link a:hover, #bo_v_link a:active {text-decoration:none} +.bo_v_link_cnt {display:inline-block;margin:0 0 3px 22px} #bo_v_top {margin:0 0 10px;padding:10px 0;zoom:1} #bo_v_top:after {display:block;visibility:hidden;clear:both;content:""} From d39d0c7c0c72c484665b67cf49d4298884772c97 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 16 May 2013 17:00:35 +0900 Subject: [PATCH 131/140] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20?= =?UTF-8?q?=EC=84=A4=EB=AC=B8=EC=A1=B0=EC=82=AC=EA=B2=B0=EA=B3=BC=20?= =?UTF-8?q?=EC=8A=A4=ED=82=A8=20h1=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/poll/basic/poll_result.skin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skin/poll/basic/poll_result.skin.php b/skin/poll/basic/poll_result.skin.php index bc3be8625..d833afb97 100644 --- a/skin/poll/basic/poll_result.skin.php +++ b/skin/poll/basic/poll_result.skin.php @@ -5,7 +5,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
    -

    +

    결과

    From 764c3dd33a509d3f4dc81ef34d1e3edea3ea3257 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 20 May 2013 10:18:51 +0900 Subject: [PATCH 132/140] =?UTF-8?q?=EC=8D=B8=EB=84=A4=EC=9D=BC=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=EC=8B=9C=20=ED=81=AC=EB=A1=AD=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=95=88=ED=95=A8=EC=9D=BC=20=EB=95=8C=EB=8F=84=20=ED=81=AC?= =?UTF-8?q?=EB=A1=AD=EB=90=98=EB=8D=98=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/thumbnail.lib.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php index 04702a590..1c8b2f6e6 100644 --- a/lib/thumbnail.lib.php +++ b/lib/thumbnail.lib.php @@ -254,12 +254,6 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h } break; } - } else { - if($size[1] / $size[0] >= $ratio) { - $src_h = round($src_w * $ratio); - } else { - $src_w = round($size[1] / $ratio); - } } $dst = imagecreatetruecolor($dst_w, $dst_h); From 79cdc228e4208ea1ad7957895cb4bf2ac53f17d2 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 15 May 2013 09:30:55 +0900 Subject: [PATCH 133/140] =?UTF-8?q?G4=5FKCP=20=EB=A5=BC=20G4=5FKCPCERT=20?= =?UTF-8?q?=EB=A1=9C=20=EC=83=81=EC=88=98=EB=AA=85=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?=EB=B0=8F=20kcp=20=ED=8F=B4=EB=8D=94=EB=A5=BC=20kcpcert=20?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.php | 8 ++++---- mobile/skin/member/basic/register_form.skin.php | 2 +- .../member/basic/register_form_update.head.skin.php | 7 ------- .../member/basic/register_form_update.tail.skin.php | 7 ------- plugin/{kcp => kcpcert}/_common.php | 0 plugin/{kcp => kcpcert}/bin/ct_cli | Bin plugin/{kcp => kcpcert}/kcpcert_config.php | 2 +- plugin/{kcp => kcpcert}/kcpcert_form.php | 4 ++-- plugin/{kcp => kcpcert}/kcpcert_result.php | 0 plugin/{kcp => kcpcert}/lib/ct_cli_lib.php | 0 skin/member/basic/register_form.skin.php | 2 +- 11 files changed, 9 insertions(+), 23 deletions(-) delete mode 100644 mobile/skin/member/basic/register_form_update.head.skin.php delete mode 100644 mobile/skin/member/basic/register_form_update.tail.skin.php rename plugin/{kcp => kcpcert}/_common.php (100%) rename plugin/{kcp => kcpcert}/bin/ct_cli (100%) rename plugin/{kcp => kcpcert}/kcpcert_config.php (95%) rename plugin/{kcp => kcpcert}/kcpcert_form.php (97%) rename plugin/{kcp => kcpcert}/kcpcert_result.php (100%) rename plugin/{kcp => kcpcert}/lib/ct_cli_lib.php (100%) diff --git a/config.php b/config.php index ebd759b78..6a0ae943a 100644 --- a/config.php +++ b/config.php @@ -1,4 +1,4 @@ -