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.'&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.'&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 .= "
\n"; $str .= "답은 반드시 숫자로 입력하세요.\n"; $str .= "\n"; - $str .= ""; + $str .= "token}\" />"; $str .= "\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) { ?>