From 2eefdd186d43030489049f8766670cee8be3cef4 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 28 Dec 2012 15:27:30 +0900
Subject: [PATCH] =?UTF-8?q?notice=20=EC=98=A4=EB=A5=98=20=ED=95=B4?=
 =?UTF-8?q?=EA=B2=B0=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/password.php                      | 49 +++++++++++++++------------
 head.sub.php                          |  4 +--
 plugin/tcaptcha/tcaptcha.lib.php      |  2 +-
 skin/board/neo/write.skin.php         | 25 ++++----------
 skin/member/neo/password.skin.php     |  4 +--
 skin/outlogin/neo/outlogin.skin.1.php | 17 +---------
 6 files changed, 38 insertions(+), 63 deletions(-)

diff --git a/bbs/password.php b/bbs/password.php
index 4740ea66c..e83083cf8 100644
--- a/bbs/password.php
+++ b/bbs/password.php
@@ -1,35 +1,40 @@
 <?
 include_once('./_common.php');
 
-if ($w == 'u')
-    $action = './write.php';
-else if ($w == 'd')
-    $action = './delete.php';
-else if ($w == 'x')
-    $action = './delete_comment.php';
-else if ($w == 's')
-{
-    // 패스워드 창에서 로그인 하는 경우 관리자 또는 자신의 글이면 바로 글보기로 감
-    if ($is_admin || ($member[mb_id] == $write[mb_id] && $write[mb_id]))
-        goto_url('./board.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id);
-    else
-        $action = './password_check.php';
-}
-else
-    alert('w 값이 제대로 넘어오지 않았습니다.');
-
 $g4['title'] = '패스워드 입력';
+
+switch ($w) {
+    case 'u' :
+        $action = './write.php';
+        break;
+    case 'd' :
+        $action = './delete.php';
+        break;
+    case 'x' :
+        $action = './delete_comment.php';
+        break;
+    case 's' :
+        // 패스워드 창에서 로그인 하는 경우 관리자 또는 자신의 글이면 바로 글보기로 감
+        if ($is_admin || ($member['mb_id'] == $write['mb_id'] && $write['mb_id']))
+            goto_url('./board.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id);
+        else
+            $action = './password_check.php';
+        break;
+    default : 
+        alert('w 값이 제대로 넘어오지 않았습니다.');
+}
+
 include_once($g4['path'].'/head.sub.php');
 
-if ($board[bo_include_head]) { @include ($board[bo_include_head]); }
-if ($board[bo_content_head]) { echo stripslashes($board[bo_content_head]); }
+if ($board['bo_include_head']) { @include ($board['bo_include_head']); }
+if ($board['bo_content_head']) { echo stripslashes($board['bo_content_head']); }
 
-$member_skin_path = $g4['path'].'/skin/member/'.$config[cf_member_skin];
+$member_skin_path = $g4['path'].'/skin/member/'.$config['cf_member_skin'];
 
 include_once($member_skin_path.'/password.skin.php');
 
-if ($board[bo_content_tail]) { echo stripslashes($board[bo_content_tail]); }
-if ($board[bo_include_tail]) { @include ($board[bo_include_tail]); }
+if ($board['bo_content_tail']) { echo stripslashes($board['bo_content_tail']); }
+if ($board['bo_include_tail']) { @include ($board['bo_include_tail']); }
 
 include_once($g4['path'].'/tail.sub.php');
 ?>
diff --git a/head.sub.php b/head.sub.php
index 7a07a2f8c..dee17caa8 100644
--- a/head.sub.php
+++ b/head.sub.php
@@ -59,8 +59,8 @@ var g4_path      = "<?=$g4['path']?>";
 var g4_bbs       = "<?=$g4['bbs']?>";
 var g4_bbs_img   = "<?=$g4['bbs_img']?>";
 var g4_url       = "<?=$g4['url']?>";
-var g4_is_member = "<?=$is_member?>";
-var g4_is_admin  = "<?=$is_admin?>";
+var g4_is_member = "<?=isset($is_member)?$is_member:'';?>";
+var g4_is_admin  = "<?=isset($is_admin)?$is_admin:'';?>";
 var g4_bo_table  = "<?=isset($bo_table)?$bo_table:'';?>";
 var g4_sca       = "<?=isset($sca)?$sca:'';?>";
 var g4_charset   = "<?=$g4['charset']?>";
diff --git a/plugin/tcaptcha/tcaptcha.lib.php b/plugin/tcaptcha/tcaptcha.lib.php
index c15f3d1d3..db510ec5a 100644
--- a/plugin/tcaptcha/tcaptcha.lib.php
+++ b/plugin/tcaptcha/tcaptcha.lib.php
@@ -353,7 +353,7 @@ function run_captcha($encoding='kr')
     $str .= "<div><a href=\"javascript:;\" id=\"tcaptcha\">".$captcha->run()."</a></div>\n";
     $str .= "<span>답은 반드시 숫자로 입력하세요.</span>\n";
     $str .= "<input type=\"text\" id=\"user_answer\" name=\"user_answer\" title=\"자동등록방지 숫자\" size=\"10\" required=\"required\" />\n";
-    $str .= "<input type=\"hidden\" id=\"user_token\" name=\"user_token\" />";
+    $str .= "<input type=\"hidden\" id=\"user_token\" name=\"user_token\" value=\"{$captcha->token}\" />";
     $str .=  "</fieldset>\n";
     return $str;
 }
diff --git a/skin/board/neo/write.skin.php b/skin/board/neo/write.skin.php
index 7421920a6..d2b3fc3fe 100644
--- a/skin/board/neo/write.skin.php
+++ b/skin/board/neo/write.skin.php
@@ -40,7 +40,7 @@ var char_max = parseInt(<?=$write_max?>); // 최대
 <? if ($is_email) { ?>
 <tr>
     <th scope="row"><label for="wr_email">이메일</label></th>
-    <td><input type="text" id="wr_email" name="wr_email" maxlength="100" value="<?=$email?>"></td>
+    <td><input type="text" id="wr_email" name="wr_email" class="email" value="<?=$email?>" title="이메일" maxlength="100"></td>
 </tr>
 <? } ?>
 
@@ -104,7 +104,7 @@ if ($option) {
 
 <tr>
     <th scope="row"><label for="wr_subject">제목</label></th>
-    <td><input id="wr_subject" name="wr_subject" required value="<?=$subject?>"></td>
+    <td><input id="wr_subject" name="wr_subject" required="required" value="<?=$subject?>" title="제목"></td>
 </tr>
 
 <tr>
@@ -173,8 +173,7 @@ if ($option) {
             // file_length 이하로는 필드가 삭제되지 않아야 합니다.
             var file_length = <?=(int)$file_length?>;
             var objTbl = document.getElementById("variableFiles");
-            if (objTbl.rows.length - 1 > file_length)
-            {
+            if (objTbl.rows.length - 1 > file_length) {
                 objTbl.deleteRow(objTbl.rows.length - 1);
                 flen--;
             }
@@ -189,18 +188,8 @@ if ($option) {
         <span onclick="del_file();" style="cursor:pointer;">파일감소</span>
     </td>
 </tr>
+<?}?>
 
-<? } ?>
-
-<? if ($is_trackback) { ?>
-<tr>
-    <th scope="row"><label for="wr_trackback">트랙백주소</label></th>
-    <td>
-        <input id="wr_trackback" name="wr_trackback" value="<?=$trackback?>">
-        <? if ($w=='u') { ?><input type="checkbox" id="re_trackback" name="re_trackback" value="1">핑 보냄<? } ?>
-    </td>
-</tr>
-<? } ?>
 </tbody>
 </table>
 
@@ -273,6 +262,7 @@ function fwrite_submit(f)
     }
     */
 
+    /*
     if (document.getElementById('char_count')) {
         if (char_min > 0 || char_max > 0) {
             var cnt = parseInt(document.getElementById('char_count').innerHTML);
@@ -286,6 +276,7 @@ function fwrite_submit(f)
             }
         }
     }
+    */
 
     if (document.getElementById('tx_wr_content')) {
         if (!ed_wr_content.outputBodyText()) {
@@ -295,10 +286,6 @@ function fwrite_submit(f)
         }
     }
 
-    <?
-    if ($is_dhtml_editor) echo cheditor3('wr_content');
-    ?>
-
     var subject = "";
     var content = "";
     $.ajax({
diff --git a/skin/member/neo/password.skin.php b/skin/member/neo/password.skin.php
index a66390e4e..5184d3e90 100644
--- a/skin/member/neo/password.skin.php
+++ b/skin/member/neo/password.skin.php
@@ -2,8 +2,6 @@
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 
 ?>
 
-<script src="<?=$g4[path]?>/js/capslock.js"></script>
-
 <form name="fboardpassword" method="post" onsubmit="return fboardpassword_submit(this);">
 <input type="hidden" name="w" value="<?=$w?>">
 <input type="hidden" name="bo_table" value="<?=$bo_table?>">
@@ -17,7 +15,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
     <legend>패스워드 확인</legend>
     <p>비밀글 기능으로 보호된 글입니다. 작성자와 관리자만 열람하실 수 있습니다. 작성자 본인이시라면 패스워드를 입력하세요.</p>
     <label for="password_wr_password">패스워드</label>
-    <input type="password" id="password_wr_password" name="wr_password" maxLength="20" size="15" required onkeypress="check_capslock(event, 'password_wr_password');">
+    <input type="password" id="password_wr_password" name="wr_password" maxLength="20" size="15" required="required" title="패스워드">
     <input type="submit" value="확인">
 </fieldset>
 
diff --git a/skin/outlogin/neo/outlogin.skin.1.php b/skin/outlogin/neo/outlogin.skin.1.php
index bbd041079..6cc3a1d48 100644
--- a/skin/outlogin/neo/outlogin.skin.1.php
+++ b/skin/outlogin/neo/outlogin.skin.1.php
@@ -48,24 +48,9 @@ else
 </fieldset>
 </form>
 
-<script src="<?=$g4[path]?>/js/capslock.js"></script>
-<script>
+<script type="text/javascript">
 function fhead_submit(f)
 {
-    /*
-    if (!f.mb_id.value) {
-        alert("회원아이디를 입력하십시오.");
-        f.mb_id.focus();
-        return false;
-    }
-
-    if (!f.mb_password.value) {
-        alert("패스워드를 입력하십시오.");
-        f.mb_password.focus();
-        return false;
-    }
-    */
-
     return true;
 }
 </script>