From 8629ed963d165111e8ee4739ad036cd693e216e4 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 29 Apr 2013 19:21:05 +0900 Subject: [PATCH 01/16] =?UTF-8?q?bo=5Fuse=5Fcert=20=EC=9D=98=20default=20?= =?UTF-8?q?=EB=A5=BC=20none=20=EB=8C=80=EC=8B=A0=20=EA=B3=B5=EB=B0=B1?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/gnuboard4s.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/gnuboard4s.sql b/install/gnuboard4s.sql index 921665d7f..3b24e1ebc 100644 --- a/install/gnuboard4s.sql +++ b/install/gnuboard4s.sql @@ -96,7 +96,7 @@ CREATE TABLE IF NOT EXISTS `g4s_board` ( `bo_notice` text NOT NULL, `bo_upload_count` tinyint(4) NOT NULL default '0', `bo_use_email` tinyint(4) NOT NULL default '0', - `bo_use_cert` enum('','cert','adult') NOT NULL DEFAULT 'none', + `bo_use_cert` enum('','cert','adult') NOT NULL DEFAULT '', `bo_sort_field` varchar(255) NOT NULL default '', `bo_1_subj` varchar(255) NOT NULL default '', `bo_2_subj` varchar(255) NOT NULL default '', From 56d9c227903879c36b6573496d6eef6027e03984 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 30 Apr 2013 10:42:20 +0900 Subject: [PATCH 02/16] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=95=84?= =?UTF-8?q?=EC=9B=83=EB=A1=9C=EA=B7=B8=EC=9D=B8=EC=8A=A4=ED=82=A8=20?= =?UTF-8?q?=EB=A7=81=ED=81=AC=20=EA=B0=84=EA=B2=A9=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/outlogin/basic/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/skin/outlogin/basic/style.css b/skin/outlogin/basic/style.css index 143c1f590..8f9d777aa 100644 --- a/skin/outlogin/basic/style.css +++ b/skin/outlogin/basic/style.css @@ -16,6 +16,7 @@ #ol_submit {display:inline-block;width:60px;height:24px;border:0;background:#333;color:#fff;font-size:0.9em;font-weight:bold;vertical-align:top} #ol_before a {letter-spacing:-0.15em} #ol_svc {float:left;margin:5px 0 0} +#ol_password_lost {display:inline-block;margin:0 0 0 5px} #ol_auto {position:relative;float:right;margin:5px 0 0} #ol_auto label {letter-spacing:-0.1em} #ol_auto input {width:13px;height:13px;vertical-align:bottom} From 094ab17a3608868879380ae78de898b9134f3514 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 30 Apr 2013 10:54:46 +0900 Subject: [PATCH 03/16] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20web-kit-ap?= =?UTF-8?q?pearance=20=EB=B3=B5=EA=B5=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/css/default.css b/css/default.css index ad455d0e1..cdd76e26c 100644 --- a/css/default.css +++ b/css/default.css @@ -9,11 +9,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, header ul, nav ul, footer ul {margin:0;padding:0;list-style:none} label, input, select, img {vertical-align:middle} input {margin:0;padding:0;border-radius:0;font-family:"dotum"} -input[type=text], -input[type=password], -input[type=submit], -input[type=image] {-webkit-appearance:none} -button {border-radius:0;font-size:1em;-webkit-appearance:none} +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} From 29bb608a4520c3e64ed17468250ef87b2cf4e1cd Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 30 Apr 2013 11:37:13 +0900 Subject: [PATCH 04/16] =?UTF-8?q?=EC=B6=94=EC=B2=9C=EC=9D=B8=20=EA=B2=80?= =?UTF-8?q?=EC=82=AC=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/jquery.register_form.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/js/jquery.register_form.js b/js/jquery.register_form.js index ea6068020..223a58560 100644 --- a/js/jquery.register_form.js +++ b/js/jquery.register_form.js @@ -16,6 +16,25 @@ var reg_mb_id_check = function() { } +// 추천인 검사 +var reg_mb_recommend_check = function() { + var result = ""; + $.ajax({ + type: "POST", + url: g4_bbs_url+"/ajax.mb_recommend.php", + data: { + "reg_mb_recommend": encodeURIComponent($("#reg_mb_recommend").val()) + }, + cache: false, + async: false, + success: function(data) { + result = data; + } + }); + return result; +} + + var reg_mb_nick_check = function() { var result = ""; $.ajax({ From 7b1a799a72b0cb37493794edad94622d9c05de2f Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 30 Apr 2013 11:37:45 +0900 Subject: [PATCH 05/16] =?UTF-8?q?=EC=BA=A1=EC=B1=A0=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=9D=BC=EA=B4=84=EC=82=AD=EC=A0=9C=20=EB=A9=94=EB=89=B4=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 --- adm/admin.menu100.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adm/admin.menu100.php b/adm/admin.menu100.php index dfc91e73b..d65cb8fbf 100644 --- a/adm/admin.menu100.php +++ b/adm/admin.menu100.php @@ -7,7 +7,8 @@ $menu['menu100'] = array ( //array('100400', '버전정보', G4_ADMIN_URL.'/version.php', 'cf_version'), array('100800', '세션파일 일괄삭제',G4_ADMIN_URL.'/session_file_delete.php', 'cf_session', 1), array('100900', '캐쉬파일 일괄삭제',G4_ADMIN_URL.'/cache_file_delete.php', 'cf_cache', 1), - array('100920', '썸네일파일 일괄삭제',G4_ADMIN_URL.'/thumbnail_file_delete.php', 'cf_cache', 1), + array('100910', '캡챠파일 일괄삭제',G4_ADMIN_URL.'/gcaptcha_file_delete.php', 'cf_captcha', 1), + array('100920', '썸네일파일 일괄삭제',G4_ADMIN_URL.'/thumbnail_file_delete.php', 'cf_thumbnail', 1), array('100500', 'phpinfo()', G4_ADMIN_URL.'/phpinfo.php', 'cf_phpinfo'), //array('100600', '업그레이드', G4_ADMIN_URL.'/upgrade.php', 'cf_upgrade'), //array('100700', '복구/최적화', G4_ADMIN_URL.'/repair.php', 'cf_repair'), From 5a8fd327a90535a531652d01d3619cc75556b205 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 30 Apr 2013 11:42:34 +0900 Subject: [PATCH 06/16] =?UTF-8?q?bo=5Fuse=5Fcert=20enum=20=ED=95=AD?= =?UTF-8?q?=EB=AA=A9=EC=97=90=EC=84=9C=20none=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/board_form.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/adm/board_form.php b/adm/board_form.php index d9affee10..f090ceed7 100644 --- a/adm/board_form.php +++ b/adm/board_form.php @@ -46,9 +46,11 @@ if (!isset($board['bo_mobile_content_head'])) { } if (!isset($board['bo_use_cert'])) { - sql_query(" ALTER TABLE `{$g4['board_table']}` ADD `bo_use_cert` ENUM('','cert','adult') NOT NULL DEFAULT 'none' AFTER `bo_use_email` ", false); + sql_query(" ALTER TABLE `{$g4['board_table']}` ADD `bo_use_cert` ENUM('','cert','adult') NOT NULL DEFAULT '' AFTER `bo_use_email` ", false); } +sql_query(" ALTER TABLE `{$g4['board_table']}` CHANGE `bo_use_cert` `bo_use_cert` ENUM('','cert','adult') NOT NULL DEFAULT '' ", false); + $required = ""; $readonly = ""; if ($w == '') { From 3401866e75c03064751972c1ec614fb107bd6b38 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 30 Apr 2013 11:49:54 +0900 Subject: [PATCH 07/16] =?UTF-8?q?=EC=B6=94=EC=B2=9C=EC=9D=B8=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=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 --- bbs/register_form_update.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php index 297be4d4f..7cc1039f4 100644 --- a/bbs/register_form_update.php +++ b/bbs/register_form_update.php @@ -75,6 +75,8 @@ if ($w == '' || $w == 'u') { if ($w=='') { if ($msg = exist_mb_id($mb_id)) alert($msg); + if (!exist_mb_id($mb_recommend)) alert("추천인이 존재하지 않습니다."); + if (strtolower($mb_id) == strtolower($mb_recommend)) { alert('본인을 추천할 수 없습니다.'); } From 70d0e5b96e93aa7c215d80c971e4517460a77b89 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 30 Apr 2013 11:51:19 +0900 Subject: [PATCH 08/16] =?UTF-8?q?=EC=84=A4=EC=B9=98=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.php b/common.php index 37d8abf89..ce258eb7b 100644 --- a/common.php +++ b/common.php @@ -119,7 +119,7 @@ div a {display:block;margin:50px auto 10px;width:170px;text-align:center}

    • 프로그램 설치 후 실행하시기 바랍니다.

    - 그누보드4s 설치하기 + 그누보드4s 설치하기 From f32df6be5b79fa9050f5c715eb4083ef5709deb7 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 30 Apr 2013 11:52:43 +0900 Subject: [PATCH 09/16] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=95=84=EC=9D=B4?= =?UTF-8?q?=EB=94=94=20=EB=84=98=EC=96=B4=EC=98=A4=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EC=9D=84=20=EA=B2=BD=EC=9A=B0=EB=8A=94=20=EC=BF=BC=EB=A6=AC=20?= =?UTF-8?q?=EC=8B=A4=ED=96=89=ED=95=98=EC=A7=80=20=EC=95=8A=EC=9D=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/register.lib.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/register.lib.php b/lib/register.lib.php index 7d5d0309d..eabe40c86 100644 --- a/lib/register.lib.php +++ b/lib/register.lib.php @@ -28,6 +28,10 @@ function count_mb_id($reg_mb_id) function exist_mb_id($reg_mb_id) { global $g4; + + $reg_mb_id = trim($reg_mb_id); + if ($reg_mb_id == "") return ""; + $sql = " select count(*) as cnt from `{$g4['member_table']}` where mb_id = '$reg_mb_id' "; $row = sql_fetch($sql); if ($row['cnt']) From ab0d6dee1b946a016ab13648916f70530e5178e2 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 30 Apr 2013 11:53:33 +0900 Subject: [PATCH 10/16] =?UTF-8?q?=EC=B6=94=EC=B2=9C=EC=9D=B8=EC=9D=B4=20?= =?UTF-8?q?=EC=98=AC=EB=B0=94=EB=A5=B8=EC=A7=80=20=EA=B2=80=EC=82=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/member/basic/register_form.skin.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php index ee8ee5d1d..97f47a0e3 100644 --- a/skin/member/basic/register_form.skin.php +++ b/skin/member/basic/register_form.skin.php @@ -343,6 +343,13 @@ function fregisterform_submit(f) f.mb_recommend.focus(); return false; } + + var msg = reg_mb_recommend_check(); + if (msg) { + alert(msg); + f.mb_recommend.select(); + return false; + } } From 5358ead7912945e3f2d858e44f27933c0df1a79f Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 30 Apr 2013 11:59:04 +0900 Subject: [PATCH 11/16] =?UTF-8?q?=EC=B6=94=EC=B2=9C=EC=9D=B8=20=EA=B2=80?= =?UTF-8?q?=EC=82=AC=20ajax=20=ED=8C=8C=EC=9D=BC=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/ajax.mb_recommend.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 bbs/ajax.mb_recommend.php diff --git a/bbs/ajax.mb_recommend.php b/bbs/ajax.mb_recommend.php new file mode 100644 index 000000000..99c42480e --- /dev/null +++ b/bbs/ajax.mb_recommend.php @@ -0,0 +1,13 @@ + \ No newline at end of file From 11ffa1f16a554b41d9d50d39407bfce698053c97 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 30 Apr 2013 13:31:41 +0900 Subject: [PATCH 12/16] =?UTF-8?q?php=20notice=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/install_config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/install_config.php b/install/install_config.php index aca962e4f..aa41dd057 100644 --- a/install/install_config.php +++ b/install/install_config.php @@ -10,7 +10,7 @@ $title = "그누보드4s 설치 3단계 중 2단계 설정"; include_once ('../config.php'); include_once ('./install.inc.php'); -if ($_POST['agree'] != '동의함') { +if (isset($_POST['agree']) && $_POST['agree'] != '동의함') { echo "
    라이센스(License) 내용에 동의하셔야 설치를 계속하실 수 있습니다.
    ".PHP_EOL; echo "".PHP_EOL; exit; From 68c465672e17e54aa2cbc6fbb9ff1908b5dda567 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 30 Apr 2013 13:38:50 +0900 Subject: [PATCH 13/16] =?UTF-8?q?=EB=94=B0=EC=98=B4=ED=91=9C=EB=93=B1?= =?UTF-8?q?=EC=9D=98=20=EB=AC=B8=EC=A0=9C=EB=A1=9C=20=EC=9D=B8=ED=95=98?= =?UTF-8?q?=EC=97=AC=20mysql=5Freal=5Fescape=5Fstring=20=ED=95=B4=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/write_update.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bbs/write_update.php b/bbs/write_update.php index 2f65e9a4b..914e7bfe9 100644 --- a/bbs/write_update.php +++ b/bbs/write_update.php @@ -8,7 +8,7 @@ $msg = array(); $wr_subject = ''; if (isset($_POST['wr_subject'])) { - $wr_subject = substr(escape_trim($_POST['wr_subject']),0,255); + $wr_subject = substr(trim($_POST['wr_subject']),0,255); } if ($wr_subject == '') { $msg[] = '제목을 입력하세요.'; @@ -16,7 +16,7 @@ if ($wr_subject == '') { $wr_content = ''; if (isset($_POST['wr_content'])) { - $wr_content = escape_trim($_POST['wr_content']); + $wr_content = substr(trim($_POST['wr_content']),0,65536); } if ($wr_content == '') { $msg[] = '내용을 입력하세요.'; @@ -24,12 +24,12 @@ if ($wr_content == '') { $wr_link1 = ''; if (isset($_POST['wr_link1'])) { - $wr_link1 = substr(escape_trim($_POST['wr_link1']),0,1000); + $wr_link1 = substr($_POST['wr_link1'],0,1000); } $wr_link2 = ''; if (isset($_POST['wr_link2'])) { - $wr_link2 = substr(escape_trim($_POST['wr_link2']),0,1000); + $wr_link2 = substr($_POST['wr_link2'],0,1000); } $msg = implode('
    ', $msg); From 4ed5542a5d3e3efc66a3dcaa8c060de01abd4b3e Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 30 Apr 2013 13:39:13 +0900 Subject: [PATCH 14/16] =?UTF-8?q?=3F>=20=EC=95=9E=EC=97=90=20=EA=B3=B5?= =?UTF-8?q?=EB=B0=B1=20=ED=95=9C=EA=B0=9C=EB=A1=9C=20=EC=A1=B0=EC=A0=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/board/basic/list.skin.php | 52 ++++++++++++------------ skin/board/basic/view.skin.php | 46 ++++++++++----------- skin/board/basic/view_comment.skin.php | 32 +++++++-------- skin/board/basic/write.skin.php | 40 +++++++++--------- skin/board/gallery/list.skin.php | 50 +++++++++++------------ skin/board/gallery/view.skin.php | 46 ++++++++++----------- skin/board/gallery/view_comment.skin.php | 30 +++++++------- skin/board/gallery/write.skin.php | 40 +++++++++--------- 8 files changed, 168 insertions(+), 168 deletions(-) diff --git a/skin/board/basic/list.skin.php b/skin/board/basic/list.skin.php index 4f7b0531c..5bd5500d8 100644 --- a/skin/board/basic/list.skin.php +++ b/skin/board/basic/list.skin.php @@ -16,7 +16,7 @@ if ($is_nogood) $colspan++;
    - +
    - +
    @@ -35,11 +35,11 @@ if ($is_nogood) $colspan++; - +
    @@ -55,7 +55,7 @@ if ($is_nogood) $colspan++; 번호 - + @@ -65,8 +65,8 @@ if ($is_nogood) $colspan++; 글쓴이 날짜 조회 - 추천 - 비추천 + 추천 + 비추천 @@ -84,23 +84,23 @@ if ($is_nogood) $colspan++; echo $list[$i]['num']; ?> - + - + - + - 댓글개 + 댓글개 - - + + - 게시물이 없습니다.'; } ?> + 게시물이 없습니다.'; } ?>
    - +
    - + - + @@ -179,7 +179,7 @@ if ($is_nogood) $colspan++; - + - + diff --git a/skin/board/basic/view.skin.php b/skin/board/basic/view.skin.php index 559b729b3..3a8859118 100644 --- a/skin/board/basic/view.skin.php +++ b/skin/board/basic/view.skin.php @@ -16,7 +16,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');

    게시물 정보

    - 작성자 + 작성자 작성일 조회회 댓글건 @@ -32,7 +32,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); } ?> - +

    첨부파일

      @@ -56,7 +56,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); ?>
    - +
    - +
    -

    +

    - +
    - 추천 - 비추천 + 추천 + 비추천
    - + $(function() { $("a.view_file_download").click(function() { var msg = "파일을 다운로드 하시면 포인트가 차감(점)됩니다.\n\n포인트는 게시물당 한번만 차감되며 다음에 다시 다운로드 하셔도 중복하여 차감하지 않습니다.\n\n그래도 다운로드 하시겠습니까?"; diff --git a/skin/board/basic/view_comment.skin.php b/skin/board/basic/view_comment.skin.php index 7c8ee579e..d50db1d12 100644 --- a/skin/board/basic/view_comment.skin.php +++ b/skin/board/basic/view_comment.skin.php @@ -26,11 +26,11 @@ var char_max = parseInt(); // 최대

    님의 댓글

    - 댓글의 댓글 - + 댓글의 댓글 + 아이피 - + 작성일
    @@ -61,15 +61,15 @@ var char_max = parseInt(); // 최대 ?> - + -

    등록된 댓글이 없습니다.

    +

    등록된 댓글이 없습니다.

    @@ -93,7 +93,7 @@ var char_max = parseInt(); // 최대 - + @@ -102,24 +102,24 @@ var char_max = parseInt(); // 최대 - + - + - +
    자동등록방지
    내용 - 글자 + 글자 - + onkeyup="check_byte('wr_content', 'char_count');"> + - + diff --git a/skin/board/basic/write.skin.php b/skin/board/basic/write.skin.php index b61145c03..52cca5147 100644 --- a/skin/board/basic/write.skin.php +++ b/skin/board/basic/write.skin.php @@ -52,42 +52,42 @@ echo $option_hidden; - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -109,24 +109,24 @@ echo $option_hidden; - + - + - + @@ -138,7 +138,7 @@ echo $option_hidden; - +
    class="frm_input " maxlength="20">
    옵션
    @@ -97,11 +97,11 @@ echo $option_hidden;
    " id="wr_link" class="frm_input" size="50">
    파일 # - + - + - +
    diff --git a/skin/board/gallery/list.skin.php b/skin/board/gallery/list.skin.php index c08cfd6d6..eea67e427 100644 --- a/skin/board/gallery/list.skin.php +++ b/skin/board/gallery/list.skin.php @@ -10,7 +10,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
    - +
    - +
    @@ -29,11 +29,11 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); - +
    @@ -56,11 +56,11 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); $k += 1; if ($k % $bo_gallery_cols == 0) $style .= "margin:0 !important;"; ?> -
  • - +
  • + - + - + - 댓글개 + 댓글개 작성자
  • 작성일
  • 조회
    • -
  • 추천
    • -
  • 비추천
    • +
  • 추천
    • +
  • 비추천
    • - - 게시물이 없습니다."; } ?> + + 게시물이 없습니다."; } ?>
    - +
    - + - + @@ -176,7 +176,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); - + - + diff --git a/skin/board/gallery/view.skin.php b/skin/board/gallery/view.skin.php index 0f26a9b52..a889e4a88 100644 --- a/skin/board/gallery/view.skin.php +++ b/skin/board/gallery/view.skin.php @@ -16,7 +16,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');

    게시물 정보

    - 작성자 + 작성자 작성일 조회회 댓글건 @@ -32,7 +32,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); } ?> - +

    첨부파일

      @@ -56,7 +56,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); ?>
    - +
    - +
    -

    +

    - +
    - 추천 - 비추천 + 추천 + 비추천
    - + $(function() { $("a.view_file_download").click(function() { var msg = "파일을 다운로드 하시면 포인트가 차감(점)됩니다.\n\n포인트는 게시물당 한번만 차감되며 다음에 다시 다운로드 하셔도 중복하여 차감하지 않습니다.\n\n그래도 다운로드 하시겠습니까?"; diff --git a/skin/board/gallery/view_comment.skin.php b/skin/board/gallery/view_comment.skin.php index d9d2ef876..604c8b948 100644 --- a/skin/board/gallery/view_comment.skin.php +++ b/skin/board/gallery/view_comment.skin.php @@ -26,11 +26,11 @@ var char_max = parseInt(); // 최대

    님의 댓글

    - 댓글의 댓글 - + 댓글의 댓글 + 아이피 - + 작성일
    @@ -61,15 +61,15 @@ var char_max = parseInt(); // 최대 ?> -

    등록된 댓글이 없습니다.

    +

    등록된 댓글이 없습니다.

    @@ -94,7 +94,7 @@ var char_max = parseInt(); // 최대 - + @@ -103,24 +103,24 @@ var char_max = parseInt(); // 최대 - + - + - + @@ -288,4 +288,4 @@ var char_max = parseInt(); // 최대 comment_box('', 'c'); // 댓글 입력폼이 보이도록 처리하기위해서 추가 (root님) - + diff --git a/skin/board/gallery/write.skin.php b/skin/board/gallery/write.skin.php index 6d488a6cb..a5c6ec465 100644 --- a/skin/board/gallery/write.skin.php +++ b/skin/board/gallery/write.skin.php @@ -52,42 +52,42 @@ echo $option_hidden;
    자동등록방지
    내용 - 글자 + 글자 - + onkeyup="check_byte('wr_content', 'char_count');"> +
    - + - + - + - + - + - + - + - + - + - + - + - + @@ -109,24 +109,24 @@ echo $option_hidden; - + - + - + @@ -138,7 +138,7 @@ echo $option_hidden; - +
    class="frm_input " maxlength="20">
    옵션
    @@ -97,7 +97,7 @@ echo $option_hidden;
    " id="wr_link" class="frm_input" size="50">
    파일 # - + - + - +
    @@ -232,7 +232,7 @@ function fwrite_submit(f) return false; } - + return true; } From d43f4f53d5f8095cb0bd7bb38a54627ab8c2ae9d Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 30 Apr 2013 16:39:13 +0900 Subject: [PATCH 15/16] =?UTF-8?q?enum('Y','N')=20=EC=9D=84=20enum('N','Y')?= =?UTF-8?q?=20=EC=99=80=20=EA=B0=99=EC=9D=B4=20=EB=B3=80=EA=B2=BD=ED=95=A9?= =?UTF-8?q?=EB=8B=88=EB=8B=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/member_form.php | 6 ++++-- install/gnuboard4s.sql | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/adm/member_form.php b/adm/member_form.php index 0474d95dc..2ea7dad6b 100644 --- a/adm/member_form.php +++ b/adm/member_form.php @@ -83,10 +83,12 @@ if ($mb['mb_open']) { if(!isset($mb['mb_adult'])) { sql_query(" ALTER TABLE `{$g4['member_table']}` - ADD `mb_adult` ENUM('Y', 'N') 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); + 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; diff --git a/install/gnuboard4s.sql b/install/gnuboard4s.sql index 3b24e1ebc..e0566f117 100644 --- a/install/gnuboard4s.sql +++ b/install/gnuboard4s.sql @@ -411,7 +411,7 @@ 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('Y','N') NOT NULL default 'N', + `mb_adult` enum('N','Y') NOT NULL default 'N', `mb_tel` varchar(255) NOT NULL default '', `mb_hp` varchar(255) NOT NULL default '', `mb_zip1` char(3) NOT NULL default '', From 5532ddf1539e36aaaedd98b0d5a9b8ba2ccab039 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 30 Apr 2013 18:15:56 +0900 Subject: [PATCH 16/16] =?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