From b54a180479081655f54317041ac0974c54e0c2dc Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 22 Feb 2013 11:15:43 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=EC=BA=A1=EC=B0=A8=20=EC=B2=B4=ED=81=AC=20?= =?UTF-8?q?=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 --- bbs/write_comment_update.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bbs/write_comment_update.php b/bbs/write_comment_update.php index 1978b0c0b..e8b15ba98 100644 --- a/bbs/write_comment_update.php +++ b/bbs/write_comment_update.php @@ -1,6 +1,7 @@ 50) { @@ -20,6 +21,8 @@ if (!empty($_POST['wr_email'])) if ($is_guest) { if ($wr_name == '') alert('이름은 필히 입력하셔야 합니다.'); + if(!chk_captcha()) + alert('스팸방지에 입력한 숫자가 틀렸습니다.'); } if ($w == "c" || $w == "cu") { @@ -45,7 +48,7 @@ if (empty($wr['wr_id'])) // 이 옵션을 사용 안 함으로 설정할 경우 어떤 스크립트도 실행 되지 않습니다. //if (!trim($_POST["wr_content"])) die ("내용을 입력하여 주십시오."); -if ($member[mb_id]) +if ($member[mb_id]) { $mb_id = $member['mb_id']; // 4.00.13 - 실명 사용일때 코멘트에 별명으로 입력되던 오류를 수정 From f5f6d0e202c58f42e07f84a6a027e2f676a49cdd Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 22 Feb 2013 12:01:59 +0900 Subject: [PATCH 2/8] =?UTF-8?q?=EC=BA=A1=EC=B1=A0=20=EC=B2=B4=ED=81=AC=20?= =?UTF-8?q?=EC=97=90=EB=9F=AC=20=EC=B2=B4=ED=81=AC=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/wrest.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/wrest.js b/js/wrest.js index 60910cfe9..d87f8c94a 100644 --- a/js/wrest.js +++ b/js/wrest.js @@ -331,10 +331,10 @@ function wrestSubmit() return false; } - if (this.oldsubmit && this.oldsubmit == false) - return false; + if (this.oldsubmit && this.oldsubmit() == false) + return false; - return true; + return true; } From 15e38c3c034e8aa9944c5ebba0fcb1961a53222a Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 22 Feb 2013 12:02:16 +0900 Subject: [PATCH 3/8] =?UTF-8?q?=EC=BA=A1=EC=B1=A0=20=EC=B2=B4=ED=81=AC=20?= =?UTF-8?q?=EC=97=90=EB=9F=AC=20=EC=B2=B4=ED=81=AC=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/board/basic/view_comment.skin.php | 58 ++++++++------------------ 1 file changed, 18 insertions(+), 40 deletions(-) diff --git a/skin/board/basic/view_comment.skin.php b/skin/board/basic/view_comment.skin.php index e4c1ee17c..9c84ae6e1 100644 --- a/skin/board/basic/view_comment.skin.php +++ b/skin/board/basic/view_comment.skin.php @@ -73,9 +73,7 @@ var char_max = parseInt(); // 최대

등록된 댓글이 없습니다.

- - - @@ -93,44 +91,23 @@ var char_max = parseInt(); // 최대 - - - - - - - - - - - - - - - - - - - - - - - - - - - -
자동등록방지
내용 - 글자 - - -
- -
- +
+ 작성자 + + + + + + +
+ + 글자 +
+ + +
- @@ -293,3 +270,4 @@ var char_max = parseInt(); // 최대 comment_box('', 'c'); // 댓글 입력폼이 보이도록 처리하기위해서 추가 (root님) + From bc2cc36bbb3f0bf663ffe037dfa106e3b334f489 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 22 Feb 2013 12:05:03 +0900 Subject: [PATCH 4/8] =?UTF-8?q?=EB=8C=93=EA=B8=80=20=EC=9E=91=EC=84=B1?= =?UTF-8?q?=EC=8B=9C=20=EC=BA=A1=EC=B1=A0=20=EC=B2=B4=ED=81=AC=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=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_comment.skin.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/skin/board/basic/view_comment.skin.php b/skin/board/basic/view_comment.skin.php index 9c84ae6e1..6ef35d8e3 100644 --- a/skin/board/basic/view_comment.skin.php +++ b/skin/board/basic/view_comment.skin.php @@ -257,9 +257,6 @@ var char_max = parseInt(); // 최대 save_before = el_id; } - - if (typeof(wrestInitialized) != 'undefined') - wrestInitialized(); } function comment_delete(url) From 087a5d841b81fc86e6e502e7f682a03712c7357b Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 22 Feb 2013 13:12:18 +0900 Subject: [PATCH 5/8] =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/wrest.js | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/js/wrest.js b/js/wrest.js index d87f8c94a..11be188a1 100644 --- a/js/wrest.js +++ b/js/wrest.js @@ -350,20 +350,6 @@ function wrestInitialized() document.forms[i].oldsubmit = document.forms[i].onsubmit; } document.forms[i].onsubmit = wrestSubmit; - - // 이 부분은 CSS 로 대체를 합니다. github issue #282, 지운아빠 작업예정 - for (var j = 0; j < document.forms[i].elements.length; j++) { - // 필수 입력일 경우는 * 배경이미지를 준다. - if (document.forms[i].elements[j].getAttribute("required") != null || - regexp.test(document.forms[i].elements[j].className)) { - //if (regexp.test(document.forms[i].elements[j].className)) { - //document.forms[i].elements[j].style.backgroundColor = wrestFldDefaultColor; - //document.forms[i].elements[j].className = "wrest_required"; - document.forms[i].elements[j].style.backgroundImage = "url('"+g4_url+"/js/wrest.gif')"; - document.forms[i].elements[j].style.backgroundPosition = "top right"; - document.forms[i].elements[j].style.backgroundRepeat = "no-repeat"; - } - } } } From 0fb7826f8cff622e1b4399bd1abbd174c30e1a1b Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 22 Feb 2013 13:27:25 +0900 Subject: [PATCH 6/8] =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=A7=80?= =?UTF-8?q?=EC=A0=95=20=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C=ED=95=98?= =?UTF-8?q?=EB=A9=B4=EC=84=9C=20=EB=82=A8=EC=9D=80=20=EC=A0=95=EA=B7=9C?= =?UTF-8?q?=EC=8B=9D=20=ED=8C=A8=ED=84=B4=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/wrest.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/js/wrest.js b/js/wrest.js index 11be188a1..63f43c1cc 100644 --- a/js/wrest.js +++ b/js/wrest.js @@ -341,9 +341,6 @@ function wrestSubmit() // 초기에 onsubmit을 가로채도록 한다. function wrestInitialized() { - //var regexp = /required/; - var regexp = /\brequired\b/; - for (var i = 0; i < document.forms.length; i++) { // onsubmit 이벤트가 있다면 저장해 놓는다. if (document.forms[i].onsubmit) { From acba0a0b001eeb867895388184904955c45b0c3d Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 22 Feb 2013 14:31:53 +0900 Subject: [PATCH 7/8] =?UTF-8?q?confif=5Fform=EC=97=90=EC=84=9C=20cf=5Flink?= =?UTF-8?q?=5Ftarget=20=EA=B4=80=EB=A0=A8=20name=20=EC=9D=B4=20=EC=9E=88?= =?UTF-8?q?=EC=96=B4=EC=84=9C=20=EA=B0=92=EC=9D=B4=20=EC=A0=80=EC=9E=A5?= =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/config_form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/config_form.php b/adm/config_form.php index 7466a7902..349ccc563 100644 --- a/adm/config_form.php +++ b/adm/config_form.php @@ -215,7 +215,7 @@ $pg_anchor = " - From 713f19c8f4317b6d241a7dd5e8e61afcf195b85a Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 22 Feb 2013 14:36:46 +0900 Subject: [PATCH 8/8] =?UTF-8?q?url=5Fauto=5Flink=20=ED=95=A8=EC=88=98?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EB=AC=B8=EC=9E=90=EC=85=8B=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EC=A1=B0=EA=B1=B4=EB=AC=B8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index f5b33db44..17f0e879e 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -221,11 +221,8 @@ function url_auto_link($str) //$str = preg_replace("/([^(HREF=\"?'?)|(SRC=\"?'?)]|\(|^)((http|https|ftp|telnet|news|mms):\/\/[a-zA-Z0-9\.-]+\.[\xA1-\xFEa-zA-Z0-9\.:&#=_\?\/~\+%@;\-\|\,]+)/i", "\\1\\2", $str); // 100825 : () 추가 // 120315 : CHARSET 에 따라 링크시 글자 잘림 현상이 있어 수정 - if (strtoupper($g4['charset']) == 'UTF-8') { - $str = preg_replace("/([^(HREF=\"?'?)|(SRC=\"?'?)]|\(|^)((http|https|ftp|telnet|news|mms):\/\/[a-zA-Z0-9\.-]+\.[가-힣\xA1-\xFEa-zA-Z0-9\.:&#=_\?\/~\+%@;\-\|\,\(\)]+)/i", "\\1\\2", $str); - } else { - $str = preg_replace("/([^(HREF=\"?'?)|(SRC=\"?'?)]|\(|^)((http|https|ftp|telnet|news|mms):\/\/[a-zA-Z0-9\.-]+\.[\xA1-\xFEa-zA-Z0-9\.:&#=_\?\/~\+%@;\-\|\,\(\)]+)/i", "\\1\\2", $str); - } + $str = preg_replace("/([^(HREF=\"?'?)|(SRC=\"?'?)]|\(|^)((http|https|ftp|telnet|news|mms):\/\/[a-zA-Z0-9\.-]+\.[가-힣\xA1-\xFEa-zA-Z0-9\.:&#=_\?\/~\+%@;\-\|\,\(\)]+)/i", "\\1\\2", $str); + // 이메일 정규표현식 수정 061004 //$str = preg_replace("/(([a-z0-9_]|\-|\.)+@([^[:space:]]*)([[:alnum:]-]))/i", "\\1", $str); $str = preg_replace("/([0-9a-z]([-_\.]?[0-9a-z])*@[0-9a-z]([-_\.]?[0-9a-z])*\.[a-z]{2,4})/i", "\\1", $str);