From d3bfd522f92ed5659e602d894a20d8e363807f53 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Fri, 3 May 2013 13:58:21 +0900 Subject: [PATCH 01/17] =?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 02/17] =?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 03/17] =?UTF-8?q?#448=20=EC=97=90=20=EB=94=B0=EB=A5=B8=20?= =?UTF-8?q?=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 04/17] =?UTF-8?q?#448=20=EC=97=90=20=EB=94=B0=EB=A5=B8=20?= =?UTF-8?q?=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 05/17] =?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 06/17] =?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 07/17] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC:=20=EA=B2=8C?= =?UTF-8?q?=EC=8B=9C=ED=8C=90=EC=8A=A4=ED=82=A8=20=EC=A0=84=EC=B2=B4?= =?UTF-8?q?=EC=84=A0=ED=83=9D=20=EB=A0=88=EC=9D=B4=EB=B8=94=20=EA=B0=90?= =?UTF-8?q?=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'); - -