Merge branch 'master' of github.com:gnuboard/g4s

adm/board_form.php

@@ -558,7 +558,7 @@ if (!preg_match("/([m|M])$/", $upload_max_filesize)) {
 <tr>
     <th scope="row"><label for="tx_bo_content_head">상단 내용</label></th>
     <td>
-        <?=editor_textarea("bo_content_head", $board['bo_content_head']);?>
+        <?=editor("bo_content_head", $board['bo_content_head']);?>
     </td>
     <td class="group_setting">
         <input type="checkbox" id="chk_content_head" name="chk_content_head" value="1">
@@ -568,7 +568,7 @@ if (!preg_match("/([m|M])$/", $upload_max_filesize)) {
 <tr>
     <th scope="row"><label for="tx_bo_content_tail">하단 내용</label></th>
     <td>
-        <?=editor_textarea("bo_content_tail", $board['bo_content_tail']);?>
+        <?=editor("bo_content_tail", $board['bo_content_tail']);?>
     </td>
     <td class="group_setting">
         <input type="checkbox" id="chk_content_tail" name="chk_content_tail" value="1">

bbs/board.php

@@ -1,5 +1,4 @@
 <?
-define('_CAPTCHA_', true);
 include_once('./_common.php');
 
 if (!$board['bo_table']) {

bbs/point.php

@@ -41,7 +41,7 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
     <h1><?=$g4['title']?></h1>
 
     <table>
-    <caption>포인트내역 목록</caption>
+    <caption>포인트 사용내역 목록</caption>
     <thead>
     <tr>
         <th scope="col">일시</th>
@@ -52,10 +52,14 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
     </thead>
     <tfoot>
     <tr>
-        <td colspan="2">소계</td>
+        <th scope="row" colspan="2">소계</td>
         <td><?=number_format($sum_point1)?></td>
         <td><?=number_format($sum_point2)?></td>
     </tr>
+    <tr>
+        <th scope="row" colspan="2">보유포인트</th>
+        <td colspan="2"><?=number_format($member[mb_point])?></td>
+    </tr>
     </tfoot>
     <tbody>
     <?
@@ -97,8 +101,6 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
     </tbody>
     </table>
 
-    <p>보유 포인트 <?=number_format($member[mb_point])?>점</p>
-
     <div class="pg">
         <?=get_paging($config[cf_write_pages], $page, $total_page, $_SERVER[PHP_SELF].'?'.$qstr.'&amp;page=');?>
     </div>

bbs/register_form.php

@@ -1,7 +1,7 @@
 <?
+define('_CAPTCHA_', true);
 include_once('./_common.php');
 include_once($g4['path'].'/lib/register.lib.php');
-if ($captcha->lib) include_once($captcha->lib);
 
 // 불법접근을 막도록 토큰생성
 $token = md5(uniqid(rand(), true));
@@ -102,7 +102,6 @@ if ($w == "") {
 // 회원아이콘 경로
 $mb_icon = $g4['path'].'/data/member/'.substr($member['mb_id'],0,2).'/'.$member['mb_id'].'.gif';
 $member_skin_path = $g4['path'].'/skin/member/'.$config['cf_member_skin'];
-$g4['js_file'][] = "{$g4['path']}/plugin/captcha/captcha.js";
 
 include_once('./_head.php');
 

bbs/write.php

@@ -1,5 +1,4 @@
 <?
-define('_CAPTCHA_', true);
 include_once('./_common.php');
 
 set_session('ss_bo_table', $bo_table);
@@ -11,7 +10,7 @@ if (!$board['bo_table']) {
 }
 
 if (!$bo_table) {
-    alert('bo_table 값이 넘어오지 않았습니다.'.PHP_EOL.PHP_EOL.'write.php?bo_table=code 와 같은 방식으로 넘겨 주세요.', $g4['path']);
+    alert("bo_table 값이 넘어오지 않았습니다.\\nwrite.php?bo_table=code 와 같은 방식으로 넘겨 주세요.", $g4['path']);
 }
 
 @include_once ($g4['path'].'/skin/board/write.head.skin.php');
@@ -198,16 +197,9 @@ if ($member['mb_level'] >= $board['bo_html_level'])
 
 $is_secret = $board['bo_use_secret'];
 
+$is_dhtml_editor = false;
 if ($board['bo_use_dhtml_editor'] && $member['mb_level'] >= $board['bo_html_level']) {
-    define('_EDITOR_', true);
     $is_dhtml_editor = true;
-} else {
-    $is_dhtml_editor = false;
-}
-
-$captcha_html = "";
-if ($is_guest) {
-    $captcha_html = captcha_html('wr_key');
 }
 
 $is_mail = false;
@@ -369,4 +361,4 @@ include_once('./board_tail.php');
 include_once($g4['path'].'/tail.sub.php');
 
 @include_once ($board_skin_path.'/write.tail.skin.php');
-?>
+?>

bbs/write_comment_update.php

@@ -1,4 +1,5 @@
 <?
+define('_CAPTCHA_', true);
 include_once('./_common.php');
 
 // 090710
@@ -9,22 +10,20 @@ if (substr_count($wr_content, "&#") > 50) {
 
 @include_once($board_skin_path.'/write_comment_update.head.skin.php');
 
-$g4['title'] = $wr_subject.'코멘트입력';
-
 $w = $_POST["w"];
-$wr_name  = strip_tags($_POST["wr_name"]);
-$wr_email = strip_tags($_POST["wr_email"]);
+$wr_name  = escape_trim($_POST['wr_name']);
+$wr_email = '';
+if (!empty($_POST['wr_email'])) 
+    $wr_email = escape_trim($_POST['wr_email']);
 
 // 비회원의 경우 이름이 누락되는 경우가 있음
-if (!$is_member)
-{
-    if (!trim($wr_name))
+if ($is_guest) {
+    if ($wr_name == '')
         alert('이름은 필히 입력하셔야 합니다.');
 }
 
-if ($w == "c" || $w == "cu") 
-{
-    if ($member[mb_level] < $board[bo_comment_level]) 
+if ($w == "c" || $w == "cu") {
+    if ($member['mb_level'] < $board['bo_comment_level']) 
         alert('코멘트를 쓸 권한이 없습니다.');
 } 
 else
@@ -32,29 +31,14 @@ else
 
 // 세션의 시간 검사
 // 4.00.15 - 코멘트 수정시 연속 게시물 등록 메시지로 인한 오류 수정
-if ($w == 'c' && $_SESSION["ss_datetime"] >= ($g4[server_time] - $config[cf_delay_sec]) && !$is_admin) 
+if ($w == 'c' && $_SESSION['ss_datetime'] >= ($g4['server_time'] - $config['cf_delay_sec']) && !$is_admin) 
     alert('너무 빠른 시간내에 게시물을 연속해서 올릴 수 없습니다.');
 
-set_session("ss_datetime", $g4[server_time]);
-
-// 동일내용 연속 등록 불가
-$sql = " select MD5(CONCAT(wr_ip, wr_subject, wr_content)) as prev_md5 from {$write_table} ";
-if ($w == 'cu')
-    $sql .= " where wr_id <> '{$comment_id}' ";
-$sql .= " order by wr_id desc limit 1 ";
-$row = sql_fetch($sql);
-$curr_md5 = md5($_SERVER[REMOTE_ADDR].$wr_subject.$wr_content);
-// 코멘트 수정의 경우에는 동일한 내용을 등록할 수 없는 오류 수정
-//if ($row[prev_md5] == $curr_md5 && !$is_admin)
-if ($row[prev_md5] == $curr_md5 && $w != 'cu' && !$is_admin)
-    alert('동일한 내용을 연속해서 등록할 수 없습니다.');
+set_session('ss_datetime', $g4['server_time']);
 
 $wr = get_write($write_table, $wr_id);
-if (!$wr[wr_id]) 
-    alert('글이 존재하지 않습니다.'.PHP_EOL.PHP_EOL.'글이 삭제되었거나 이동하였을 수 있습니다.'); 
-
-// 자동등록방지 검사
-//include_once ("./norobot_check.inc.php");
+if (empty($wr['wr_id'])) 
+    alert("글이 존재하지 않습니다.\\n글이 삭제되었거나 이동하였을 수 있습니다."); 
 
 if (!$is_member) {
     if ($w=='' || $w=='c') {

bbs/write_update.php

@@ -1,11 +1,8 @@
 <?
-define('_CAPTCHA_', true);
 include_once('./_common.php');
 
 $g4['title'] = '게시글 저장';
 
-if (isset($captcha->lib)) include_once($captcha->lib);
-
 $msg = array();
 
 $wr_subject = '';
@@ -151,8 +148,10 @@ if ($w == '' || $w == 'u') {
     alert('w 값이 제대로 넘어오지 않았습니다.'); 
 }
 
-if (!chk_captcha('wr_key')) {
-    alert('자동등록방지의 답변으로 입력한 숫자가 틀렸습니다.');
+if (defined('_CAPTCHA_')) {
+    if ($is_guest && !chk_captcha()) {
+        alert('스팸방지의 답변으로 입력한 숫자가 틀렸습니다.');
+    }
 }
 
 if ($w == '' || $w == 'r') {
@@ -283,8 +282,8 @@ if ($w == '' || $w == 'r') {
     } else {
         $mb_id = '';
         // 비회원의 경우 이름이 누락되는 경우가 있음
-        $wr_name = strip_tags(mysql_escape_string($_POST['wr_name']));
-        if (!trim($wr_name))
+        $wr_name = escape_trim($_POST['wr_name']);
+        if (!$wr_name)
             alert('이름은 필히 입력하셔야 합니다.');
         $wr_password = sql_password($wr_password);
     }

config.php

@@ -13,6 +13,10 @@ $g4['bbs_path']       = $g4['path'] . '/' . $g4['bbs'];
 $g4['bbs_img']        = 'img';
 $g4['bbs_img_path']   = $g4['path'] . '/' . $g4['bbs'] . '/' . $g4['bbs_img'];
 
+$g4['data_dir']       = 'data';
+$g4['cache_dir']      = 'cache';
+$g4['captcha_dir']    = 'captcha';
+
 $g4['admin']          = 'adm';
 $g4['admin_path']     = $g4['path'] . '/' . $g4['admin'];
 

css/def.css

@@ -2,7 +2,7 @@
 
 /* 초기화 */
 html {overflow-y:scroll}
-body {margin:0;padding:0;background:#fff;font-size:1em} 
+body {margin:0;padding:0;background:#fff;font-size:1em}
 html, body, h1, h2, h3, h4, h5, h6 {margin:0 0 0;padding:0}
 h1, h2, h3, h4, h5, h6 {font-family:"verdana","dotum"}
 article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block}
@@ -23,12 +23,13 @@ hr {display:none}
 
 /* 기본테이블 */
 table {margin-bottom:20px;width:100%;border-collapse:collapse;border-spacing:0}
-tfoot td {background:#f9f9f5;font-weight:bold;text-align:center}
+tfoot th {border-top:1px solid #c9c9c9;border-bottom:1px solid #c9c9c9}
+tfoot td {border-color:#c9c9c9;background:#f9f9f5;font-weight:bold;text-align:center}
 caption {padding:0 0 10px;text-align:left}
 .caption_desc {font-size:0.75em}
 th {padding:12px 0 8px;border-top:3px solid #666;border-bottom:1px solid #a9a9a9;font-size:0.75em}
 th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
-td {padding:10px 0;border-top:1px solid #d9d9d9;border-bottom:1px solid #d9d9d9;font-size:0.75em}
+td {padding:10px 0;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;font-size:0.75em}
 .empty_table {padding:50px 0;text-align:center}
 
 /* 필드셋 */
@@ -73,33 +74,33 @@ a {color:#000;text-decoration:none}
 #header h1 {margin:0;height:0;overflow:hidden}
 
 /* 로고 */
-#logo {background:#333;text-align:center}
-#logo a {display:inline-block;padding:20px 30px}
+#logo {border-bottom:3px solid #888;background:#333;text-align:center}
+#logo a {display:inline-block;padding:55px 30px 20px}
 
 /* 상단메뉴 */
-#tnb {padding-left:30px;border-bottom:1px solid #ccc;background:#ebebe9;zoom:1}
+#tnb {position:absolute;top:0;left:0;width:100%;border-bottom:1px solid #bbb;background:#fff;zoom:1}
 #tnb:after {display:block;visibility:hidden;clear:both;content:""}
-#tnb li {float:left;margin-left:-1px}
-#tnb a {display:inline-block;padding:0 20px;height:35px;border-right:1px solid #ddd;border-left:1px solid #ddd;color:#595959;font-family:"dotum";font-size:0.75em;font-weight:bold;text-decoration:none;line-height:3em}
+#tnb li {float:left}
+#tnb a {display:inline-block;padding:0 10px;height:30px;border-right:1px solid #eee;font-family:"dotum";font-size:0.7em;text-decoration:none;line-height:2.7em}
 #tnb a:hover,
 #tnb a:focus {background:#f9f9f5}
 
 /* 전체검색 */
-#hdsch {z-index:3;position:absolute;top:77px;right:0;margin:0;padding:0;width:219px;border:1px solid #ccc;border-top:0;border-right:0;background:#fff}
+#hdsch {z-index:3;position:absolute;top:0;right:0;margin:0;padding:0;width:220px;border:0;border-left:1px solid #eee;background:#fff}
 #hdsch legend {position:absolute;padding:0;width:0;height:0;border:0;overflow:hidden}
-#hdsch_stx {margin:5px 0 5px 5px;padding:0 5px;height:25px;width:176px;border:0;background:transparent;font-size:1em;line-height:1.4em}
+#hdsch_stx {margin:5px 0 5px 5px;padding:0 5px;height:20px;width:170px;border:0;background:transparent;font-size:1em;line-height:1.4em}
 #hdsch_stx:focus {background:#464649;color:#fff}
 #hdsch_submit {position:relative;margin-left:-5px}
 
 /* 사이드 네비게이션: 아웃로그인, 설문조사 등 */
-#snb {z-index:3;position:absolute;top:113px;right:0;font-family:"verdana","dotum"}
+#snb {z-index:3;position:absolute;top:116px;right:0;font-family:"verdana","dotum"}
 #snb ul {margin:0;padding:0;list-style:none}
 
 /* 아웃로그인 */
-.outlogin {position:relative;border-bottom:1px solid #dedace;border-left:1px solid #ddd;background:#f9faf5;line-height:1em}
+.outlogin {position:relative;border-bottom:1px solid #bbb;border-left:1px solid #bbb;background:#f0f3f6;line-height:1em}
 .outlogin h2 {margin:0;padding:0;height:0;overflow:hidden}
-/* 로그인 전 */
-#ol_before {padding:15px 10px 0;width:199px;background:#f9f9f5;font-size:0.7em}
+/* 아웃로그인 전 */
+#ol_before {padding:15px 10px 0;width:199px;font-size:0.7em}
 #ol_before fieldset {margin:0;padding:0;border:0;background:transparent}
 #ol_before legend {position:absolute;padding:0;width:0;height:0;border:0;background:transparent;overflow:hidden}
 #ol_before input:focus {background:#333;color:#fff}
@@ -114,24 +115,33 @@ a {color:#000;text-decoration:none}
 #ol_before li {float:left;margin-right:5px}
 #ol_before a {color:#696969;letter-spacing:-0.1em}
 #ol_submit {position:absolute;top:42px;right:12px;width:60px;height:24px;border:1px solid #b7b7b7;background:#fff;font-size:1em;font-weight:bold;letter-spacing:-0.1em;line-height:2em}
-/* 로그인 후 */
-#ol_after {padding-top:15px;width:219px;background:#f9f9f5;color:#000;font-size:0.75em}
-#ol_after header {padding:0 0 13px;border-bottom:1px solid #dedace;text-align:center}
-#ol_after ul {padding:5px 0;background:#fff}
-#ol_after li a {display:block;position:relative;padding:7px 20px 7px 19px}
-#ol_after li span {position:absolute;top:7px;right:19px;color:#ff3061}
-#ol_after footer {padding:7px 0 10px;border-top:1px solid #dedace;text-align:center}
-#ol_after footer a {display:inline-block;padding:0 10px}
+/* 아웃로그인 후 */
+#ol_after {width:219px;color:#000;font-size:0.75em}
+#ol_after_hd {padding:15px 0 13px;border-bottom:1px solid #efeada;text-align:center}
+#ol_after_hd a {color:#ff3061}
+#ol_after ul {margin:0;padding:0;zoom:1}
+#ol_after ul:after {display:block;visibility:hidden;clear:both;content:""}
+#ol_after li {float:left}
+#ol_after_rec {background:#fff}
+#ol_after_rec a {display:inline-block;position:relative;width:60px;height:60px;vertical-align:top}
+#ol_after_rec span {position:absolute;top:0;left:0;width:100%;height:100%;background:#fff}
+#ol_after_rec strong {position:absolute;top:35px;left:0;width:100%;color:#777;text-align:center}
+#ol_after_rec #ol_after_pt {width:97px;border-right:1px solid #efeada;border-left:1px solid #efeada}
+#ol_after_ft {border-top:1px solid #efeada;text-align:center}
+#ol_after_ft a {display:inline-block;padding:7px 0 !important;text-align:center}
+#ol_after_info {width:109px;border-right:1px solid #efeada}
+#ol_after_logout {width:109px}
 
 /* 설문조사 */
-#poll {width:219px;border-bottom:1px solid #dedace;border-left:1px solid #ddd;background:#fff;font-size:0.75em}
-#poll header {padding:10px 10px 1px;border-bottom:1px solid #efeada;background:#f9f9f5}
+#poll {width:219px;border-bottom:1px solid #bbb;border-left:1px solid #bbb;background:#fff;font-size:0.75em}
+#poll header {padding:10px 10px 1px;border-bottom:1px solid #efeada;background:#f0f3f6}
+#poll header a {color:#ff3061}
 #poll h2 {display:inline-block;margin:0;font-size:1em}
 #poll p {padding:0}
 #poll ul {margin:10px}
 #poll li {margin:7px 0}
-#poll footer {padding:10px;border-top:1px solid #efeada;text-align:center}
-#poll footer input {padding:0 15px;height:24px;border:0;background:#ff3061;color:#fff;font-size:0.9em;letter-spacing:-0.1em;vertical-align:top}
+#poll footer {padding:10px 10px 15px;text-align:center}
+#poll footer input {padding:0 15px;height:24px;border:0;background:#494936;color:#fff;font-size:0.9em;letter-spacing:-0.1em;vertical-align:top}
 #poll footer a {display:inline-block;padding:0 5px;height:22px;border:1px solid #b7b7b7;background:#fff;font-size:0.9em;vertical-align:top;letter-spacing:-0.1em;line-height:2.1em}
 /* 설문조사 결과 (새창) */
 #poll_result section {margin:0 auto 20px;padding:10px;width:90%}
@@ -159,13 +169,13 @@ a {color:#000;text-decoration:none}
 #poll_result_another a {display:block;padding:5px 0}
 
 /* 레이아웃 중간 */
-#wrapper {z-index:2;clear:both;position:relative;margin:-2px 0 0 0;padding:15px 250px 30px 30px;min-height:520px;height:auto !important;height:520px;background:url("../img/wrapper_bg.jpg") top right repeat-y}
-#wrapper h1 {margin-top:30px}
+#wrapper {z-index:2;clear:both;position:relative;margin:-2px 0 0 0;padding:1px 240px 30px 20px;min-height:520px;height:auto !important;height:520px;background:url("../img/wrapper_bg.jpg") top right repeat-y}
+#wrapper h1 {margin-top:20px}
 
 /* 레이아웃 하단 */
-#footer {z-index:1;position:relative;padding:15px 0 20px;border-top:1px solid #ddd;color:#595959;font-size:0.75em}
+#footer {z-index:1;position:relative;padding:15px 0 20px;border-top:1px solid #bbb;color:#595959;font-size:0.75em}
 #footer h1 {margin:0;height:0;overflow:hidden}
-#footer section {margin-left:30px}
+#footer section {margin-left:20px}
 #footer h2 {margin:0;width:100px;color:#000;font-size:1em}
 #footer a {color:#595959}
 
@@ -193,9 +203,12 @@ a {color:#000;text-decoration:none}
 #popular li {float:left;margin-right:20px}
 
 /* 카피라이트 */
-#footer p {position:absolute;top:25px;right:30px}
+#footer p {padding-left:20px}
 
 /* ##################################################################### 스킨 및 컨텐츠 */
+/* 공통 */
+.cnt_cmt {display:inline-block;margin-left:10px;color:#ff3061}
+
 /* 버튼 */
 .btn01 {display:inline-block;padding:0 10px;height:24px;border:1px solid #ff5e1c;background:#ff3061;color:#fff;font-size:0.75em;text-decoration:none;line-height:2.2em}
 .btn01:hover,
@@ -206,11 +219,17 @@ a {color:#000;text-decoration:none}
 .btn03 {display:inline-block;padding:0 10px;height:24px;border:1px solid #555;background:#555;color:#fff;font-size:0.75em;text-decoration:none;line-height:2.2em}
 .btn02:hover,
 .btn02:focus {}
+.btn_confirm {text-align:center} /* 서식단계 진행 */
+.btn_submit {padding:0 15px;height:30px;border:0;background:#ff3061;color:#fff;font-size:0.9em;letter-spacing:-0.1em;vertical-align:top}
+.btn_cancel {display:inline-block;padding:0 10px;height:28px;border:1px solid #ccc;background:#fafafa;color:#000;font-size:0.75em;text-decoration:none;line-height:2.5em}
+.btn_window {padding:10px 5% 20px;background:#494949;text-align:right} /* 새창용 */
+.btn_window a {display:inline-block;padding:0 10px;height:28px;border:1px solid #ccc;background:#fafafa;color:#000;font-size:0.75em;text-decoration:none;line-height:2.5em}
+
 
 /* 폼 테이블 */
 .frm_tbl {}
-.frm_tbl caption {padding-top:10px;border-bottom:1px solid #aaa;font-size:0.75em;font-weight:bold}
-.frm_tbl th {padding-left:10px;width:160px;border-top:1px solid #d9d9d9;border-bottom:1px solid #d9d9d9;background:#f9f9f9;text-align:left}
+.frm_tbl caption {padding-top:10px;color:#ff3061;font-size:0.75em;font-weight:bold}
+.frm_tbl th {padding-left:10px;width:160px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;text-align:left}
 .frm_tbl td {padding:7px 10px}
 .frm_tbl textarea,
 .frm_tbl .frm_input,
@@ -279,7 +298,7 @@ a {color:#000;text-decoration:none}
 .btn_bo_user li {float:left;margin-left:5px}
 .btn_bo_adm {float:left}
 .btn_bo_adm li {float:left;margin-right:5px}
-#bo_sch {text-align:center}
+#bo_sch {padding:0;border:0;text-align:center}
 #bo_sch legend {margin:0;padding:0;width:0;height:0;border:0;overflow:hidden}
 #bo_sch form {display:inline-block}
 #bo_sch .fieldset_submit {border:1px solid #ccc;background:#fafafa;color:#000}
@@ -287,6 +306,7 @@ a {color:#000;text-decoration:none}
 #bo_list td {line-height:1em}
 #bo_list img {vertical-align:top}
 .bo_cate_link {display:inline-block;margin:0 10px 0 0;font-weight:bold;text-decoration:none}
+.bo_current {color:#ff3061}
 .td_subject img {margin-left:5px}
 
 /* 게시판 쓰기 */
@@ -362,9 +382,6 @@ a {color:#000;text-decoration:none}
 #bo_vc_warea textarea {width:100%;height:50px}
 #bo_vc_warea .bo_vc_submit {position:absolute;top:0;right:-90px !important;right:10px;width:75px;height:57px;border:1px solid #666;background:#555;color:#fff;letter-spacing:-0.1em}
 
-
-#bo_sch {display:hidden;visibility:hidden;height:0;overflow:hidden}
-
 /* 우편번호 검색 */
 #post_num dl {margin:0 auto 10px;padding:0;width:90%}
 #post_num dt {margin-bottom:15px}
@@ -374,12 +391,13 @@ a {color:#000;text-decoration:none}
 #post_num p {margin:0 auto 30px;width:90%}
 
 /* 회원가입 약관 */
-#fregister {padding:20px;background:#f5f5f2}
-#fregister h2 {padding-top:10px;text-align:center}
-#fregister_term {float:left;width:49%}
-#fregister_private {float:right;width:49%}
-#fregister textarea {display:block;margin-bottom:10px;width:99%;height:200px;border:1px solid #ddd}
-#fregister label {display:inline-block;margin-right:10px}
+#fregister {}
+#fregister section {margin-bottom:20px}
+#fregister h2 {font-size:0.875em}
+#fregister textarea {display:block;margin-bottom:10px;padding:5px;width:98%;height:150px;border:1px solid #ddd;background:#f7f7f7}
+#fregister textarea:focus {background:#333;color:#fff}
+.fregister_agree {text-align:right}
+.fregister_agree label {display:inline-block;margin-right:10px;font-size:0.75em;vertical-align:middle}
 
 /* 회원 패스워드 확인 */
 #member_confirm {padding:150px 0;background:#fcfcfc;text-align:center}
@@ -392,22 +410,26 @@ a {color:#000;text-decoration:none}
 #password_confirm legend {margin:0;padding:0;width:0;height:0;border:0;overflow:hidden}
 #password_confirm p {margin-bottom:20px;font-size:0.75em}
 
+/* 최근게시물 */
+#new_search {margin:0 0 10px;padding:0;border:0;text-align:right}
+#new_search legend {margin:0;padding:0;width:0;height:0;border:0;overflow:hidden}
+
 /* 새창 공통 */
-.new_win h1 {padding:10px 30px;background:#393936;color:#fff;font-size:1.2em}
+.new_win h1 {padding:20px 30px 10px;background:#494949;color:#fff;font-size:1em}
 .new_win h1 a {color:#fff}
 .new_win article h1 {background:transparent;color:#000}
 .new_win h2 {font-size:1em}
 .new_win table {margin:0 auto 30px;width:90%}
 .new_win fieldset {margin:0 auto 30px;width:90%}
-.new_win_ul {margin:-30px 0 20px 0;padding:0 0 0 30px;border-bottom:1px solid #ddd;background:#fff;font-size:0.75em;list-style:none;zoom:1}
+.new_win_ul {margin:-20px 0 20px 0;padding:0 0 0 30px;border-bottom:1px solid #ddd;background:#fff;font-size:0.75em;list-style:none;zoom:1}
 .new_win_ul:after {display:block;visibility:hidden;clear:both;content:""}
 .new_win_ul li {float:left;margin-left:-1px}
-.new_win_ul a {display:block;padding:10px;border-right:1px solid #eee;border-left:1px solid #eee;color:#595959;font-family:"dotum";font-size:0.875em;font-weight:bold}
+.new_win_ul a {display:block;padding:10px;border-right:1px solid #eee;border-left:1px solid #eee;color:#595959;font-family:"dotum";font-size:1em;font-weight:bold}
 .new_win_ul a:hover,
 .new_win_ul a:focus {background:#faf9f5}
 
 /* 포인트 내역 */
-#point p {text-align:center}
+#point table {margin-bottom:0}
 #point .td_datetime {width:150px}
 
 /* 쪽지 */
@@ -434,10 +456,10 @@ a {color:#000;text-decoration:none}
 #memo_write textarea {height:100px}
 
 /* pagination */
-.pg {clear:both;margin:0 0 10px;padding-top:20px;font-size:0.75em;text-align:center}
+.pg {clear:both;margin:0 0 20px;padding-top:20px;font-size:0.75em;text-align:center}
 .pg_wrap {display:inline-block;border:1px solid #ddd;letter-spacing:-4px}
 .pg_page, .pg_current {display:inline-block;padding:0 12px;height:30px;background:#fff;color:#000;letter-spacing:0;line-height:2.6em;vertical-align:middle}
 .pg_page {background:#f9f9f9;text-decoration:none}
 .pg_start, .pg_prev {border-right:1px solid #ddd}
 .pg_end, .pg_next {border-left:1px solid #ddd}
-.pg_current {background:#595959;color:#fff}
+.pg_current {background:#333;color:#fff}

extend/captcha.extend.php

@@ -1,14 +0,0 @@
-<?
-if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
-
-if (defined('_CAPTCHA_')) {
-    $captcha = (object)array(
-        'lib' => $g4['path']."/plugin/captcha/captcha.lib.php",
-        'js'  => $g4['path']."/plugin/captcha/captcha.js"
-    );
-
-    include_once($captcha->lib);
-} else {
-    unset($_SESSION['ss_captcha_use']);
-}
-?>

extend/ckeditor.extend.php

@@ -1,12 +1,20 @@
 <?
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
-$editor = (object)array(
-    'lib'       => $g4['path']."/plugin/ckeditor/ckeditor.lib.php",
-    'js'        => $g4['path']."/plugin/ckeditor/ckeditor.js",
-    'config_js' => $g4['path']."/plugin/ckeditor/config.js",
-    'data'      => "data/editor"
-);
+// _EDITOR_ 의 값에 상관없이 선언 되었는지의 여부만 따짐
+// if (defined('_EDITOR_')) true;
+define('_EDITOR_', 1);
 
-include_once($editor->lib);
+if (defined('_EDITOR_')) {
+    $ckeditor = new stdClass;
+    $ckeditor->url  = $g4['url']."/extend/ckeditor";
+    $ckeditor->path = $g4['path']."/extend/ckeditor";
+    $ckeditor->data = "data/editor";
+
+    include_once($ckeditor->path."/ckeditor.lib.php");
+
+    $g4['js_code'][] = "var g4_ckeditor_path = \"{$ckeditor->path}\";";
+    $g4['js_file'][] = $ckeditor->url."/ckeditor.js";
+    $g4['js_file'][] = $ckeditor->url."/config.js";
+}
 ?>

extend/ckeditor/ckeditor.lib.php

@@ -0,0 +1,23 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+function editor($id, $content="", $class="") 
+{
+    global $g4;
+    $str  = "<textarea id=\"$id\" name=\"$id\" class=\"ckeditor $class\" rows=\"10\" style=\"width:100%;\">$content</textarea>\n";
+    //if (_EDITOR_) $str .= "<script>CKEDITOR.replace('$id',{height:'500px'});</script>\n";
+    return $str;
+}
+
+// textarea 로 값을 넘김
+function editor_getdata($id)
+{
+    return "var {$id}_data = CKEDITOR.instances.{$id}.getData();\n";
+}
+
+// textarea 의 값이 비어 있는지 검사
+function editor_empty($id, $textarea_name="내용을")
+{
+    return "if (!{$id}_data) { alert(\"$textarea_name 입력해 주십시오.\"); CKEDITOR.instances.{$id}.focus(); return false; }\n";
+}
+?>

extend/ckeditor/config.js

@@ -26,5 +26,5 @@ CKEDITOR.editorConfig = function( config ) {
     config.fontSize_sizes = "7pt/9px;8pt/11px;9pt/12px;10pt/13px;11pt/15px;14pt/19px;18pt/24px;24pt/32px;36/48px;";
     config.enterMode = CKEDITOR.ENTER_BR;
     config.shiftEnterMode = CKEDITOR.ENTER_P;
-    config.filebrowserUploadUrl = g4_path+"/plugin/ckeditor/upload.php?type=Images";
+    config.filebrowserUploadUrl = g4_ckeditor_path+"/upload.php?type=Images";
 };