From 1f773795b869de7ad46804758c13cd304471e4e1 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 1 Feb 2013 14:07:38 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85?=
 =?UTF-8?q?=EC=8B=9C=20=EC=95=84=EC=9D=B4=EB=94=94=ED=95=84=EB=93=9C?=
 =?UTF-8?q?=EC=97=90=20readonly=20=EC=B6=94=EA=B0=80=EB=90=98=EB=8D=98=20?=
 =?UTF-8?q?=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/register_form.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bbs/register_form.php b/bbs/register_form.php
index 0b5cc73aa..c204af0e1 100644
--- a/bbs/register_form.php
+++ b/bbs/register_form.php
@@ -44,7 +44,7 @@ if ($w == "") {
 
 } else if ($w == 'u') {
 
-    if ($is_admin) 
+    if ($is_admin)
         alert('관리자의 회원정보는 관리자 화면에서 수정해 주십시오.', $g4['url']);
 
     if (!$member[mb_id])
@@ -108,9 +108,9 @@ $mb_icon = G4_PATH.'/data/member/'.substr($member['mb_id'],0,2).'/'.$member['mb_
 $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)));
 $required = ($w=='') ? 'required' : '';
-$readonly = ($w=='') ? 'readonly' : '';
+$readonly = ($w=='u') ? 'readonly' : '';
 
-$captcha_html = captcha_html(); 
+$captcha_html = captcha_html();
 
 include_once($member_skin_path.'/register_form.skin.php');
 include_once('./_tail.php');

From c48b3f4ddc60829cb7c6f464e6132a7d2a9e8eec Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 1 Feb 2013 14:17:43 +0900
Subject: [PATCH 2/2] =?UTF-8?q?alert=20=EC=BD=94=EB=93=9C=EB=A5=BC=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=ED=95=98=EC=97=AC=20=EC=9E=90=EB=B0=94?=
 =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20off=20=EC=83=81=ED=83=9C?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20post=20=EB=8B=A4=EC=8B=9C=20=EA=B0=92?=
 =?UTF-8?q?=EC=9D=84=20=EB=84=98=EA=B2=A8=EC=A4=84=20=EC=88=98=20=EC=9E=88?=
 =?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

---
 bbs/alert.php                          | 35 ++++++++++++++++++++------
 bbs/register_form_update.php           | 20 +++++++--------
 lib/common.lib.php                     |  2 +-
 skin/member/neo/register_form.skin.php |  2 ++
 4 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/bbs/alert.php b/bbs/alert.php
index bf770f081..2ec19e92e 100644
--- a/bbs/alert.php
+++ b/bbs/alert.php
@@ -1,8 +1,14 @@
 <?
 global $lo_location;
 global $lo_url;
-$g4['title'] = "오류가 있습니다.";
+
 include_once('./_common.php');
+
+if($error) {
+    $g4['title'] = "오류가 있습니다.";
+} else {
+    $g4['title'] = "내용을 확인해 주세요.";
+}
 include_once(G4_PATH.'/head.sub.php');
 // 필수 입력입니다.
 // 양쪽 공백 없애기
@@ -32,9 +38,6 @@ if($error) {
     $header2 = "다음 내용을 확인해 주세요.";
 }
 ?>
-<div id="validation_check">
-
-    <h1><?=$header2?></h1>
 
 <script>
 alert("<? echo $msg; ?>");
@@ -42,12 +45,32 @@ document.location.href = "<? echo $url; ?>";
 </script>
 
 <noscript>
+<div id="validation_check">
+    <h1><?=$header2?></h1>
     <p class="cbg">
         <?=$msg2?>
     </p>
+    <? if($post) { ?>
+    <form method="post" action="<?=$url?>">
+    <?
+    foreach($_POST as $key => $value) {
+        if(strlen($value) < 1)
+            continue;
+
+        if(preg_match("/pass|pwd|capt|url/", $key))
+            continue;
+    ?>
+    <input type="hidden" name="<?=$key?>" value="<?=$value?>">
+    <?
+    }
+    ?>
+    <input type="submit" value="돌아가기">
+    </form>
+    <? } else { ?>
     <div class="btn_confirm">
         <a href="<?=$url?>">돌아가기</a>
     </div>
+    <? } ?>
 
 <? /*
 <article id="validation_check">
@@ -70,10 +93,8 @@ document.location.href = "<? echo $url; ?>";
 <a href="<?=$url?>">돌아가기</a>
 </article>
 */ ?>
-
-</noscript>
-
 </div>
+</noscript>
 
 <?
 include_once(G4_PATH.'/tail.sub.php');
diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php
index 58b553e3f..78145349c 100644
--- a/bbs/register_form_update.php
+++ b/bbs/register_form_update.php
@@ -53,22 +53,22 @@ $mb_10          = isset($_POST['mb_10'])        ? escape_trim($_POST['mb_10'])
 
 if ($w == '' || $w == 'u') {
 
-    if ($msg = empty_mb_id($mb_id))         alert($msg);
+    if ($msg = empty_mb_id($mb_id))         alert($msg, "", true, true); // alert($msg, $url, $error, $post);
 
     if ($w == '' && !$mb_password)
         alert('패스워드가 넘어오지 않았습니다.');
     if($w == '' && $mb_password != $mb_password_re)
         alert('패스워드가 일치하지 않습니다.');
 
-    if ($msg = empty_mb_name($mb_id))       alert($msg);
-    if ($msg = empty_mb_nick($mb_nick))     alert($msg);
-    if ($msg = empty_mb_email($mb_email))   alert($msg);
-    if ($msg = reserve_mb_id($mb_id))       alert($msg);
-    if ($msg = reserve_mb_nick($mb_nick))   alert($msg);
-    if ($msg = valid_mb_name($mb_name))     alert($msg);
-    if ($msg = valid_mb_nick($mb_nick))     alert($msg);
-    if ($msg = valid_mb_email($mb_email))   alert($msg);
-    if ($msg = prohibit_mb_email($mb_email))alert($msg);
+    if ($msg = empty_mb_name($mb_id))       alert($msg, "", true, true);
+    if ($msg = empty_mb_nick($mb_nick))     alert($msg, "", true, true);
+    if ($msg = empty_mb_email($mb_email))   alert($msg, "", true, true);
+    if ($msg = reserve_mb_id($mb_id))       alert($msg, "", true, true);
+    if ($msg = reserve_mb_nick($mb_nick))   alert($msg, "", true, true);
+    if ($msg = valid_mb_name($mb_name))     alert($msg, "", true, true);
+    if ($msg = valid_mb_nick($mb_nick))     alert($msg, "", true, true);
+    if ($msg = valid_mb_email($mb_email))   alert($msg, "", true, true);
+    if ($msg = prohibit_mb_email($mb_email))alert($msg, "", true, true);
 
     if ($w=='') {
         if ($msg = exist_mb_id($mb_id))     alert($msg);
diff --git a/lib/common.lib.php b/lib/common.lib.php
index 1c11bc3ce..47c1a7e5b 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -128,7 +128,7 @@ function get_cookie($cookie_name)
 
 
 // 경고메세지를 경고창으로
-function alert($msg='', $url='', $error=true)
+function alert($msg='', $url='', $error=true, $post=false)
 {
     global $g4, $config, $member;
     global $is_admin;
diff --git a/skin/member/neo/register_form.skin.php b/skin/member/neo/register_form.skin.php
index 751d371c5..039b0874e 100644
--- a/skin/member/neo/register_form.skin.php
+++ b/skin/member/neo/register_form.skin.php
@@ -10,6 +10,8 @@ var member_skin_url = "<?=$member_skin_url?>";
 <form id="fregisterform" name="fregisterform" method="post" action="<?=$register_action_url?>" onsubmit="return fregisterform_submit(this);" enctype="multipart/form-data" autocomplete="off">
 <input type="hidden" name="w" value="<?=$w?>">
 <input type="hidden" name="url" value="<?=$urlencode?>">
+<input type="hidden" name="agree" value="<?=$agree?>">
+<input type="hidden" name="agree2" value="<?=$agree2?>">
 <? if (isset($member['mb_sex'])) { ?><input type="hidden" name="mb_sex" value="<?=$member['mb_sex']?>"><? } ?>
 <? if (isset($member['mb_nick_date']) && $member['mb_nick_date'] <= date("Y-m-d", $g4['server_time'] - ($config['cf_nick_modify'] * 86400))) { // 별명수정일이 지나지 않았다면 ?>
 <input type="hidden" name="mb_nick_default" value="<?=$member['mb_nick']?>">