From 0f0e3f21795c8ba7361462d12cc74774c74b8790 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 29 Jan 2013 17:45:30 +0900 Subject: [PATCH 1/5] =?UTF-8?q?sideview.js=20=EB=A5=BC=20head.sub.php=20?= =?UTF-8?q?=EC=97=90=20=ED=8F=AC=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/admin.head.php | 3 - adm/auth_list.php | 1 - adm/boardgroupmember_list.php | 2 - adm/member_list.php | 2 - adm/point_list.php | 1 - bbs/board.php | 2 - bbs/current_connect.php | 2 - bbs/memo.php | 2 - bbs/memo_view.php | 2 - bbs/new.php | 2 - bbs/poll_result.php | 2 - bbs/profile.php | 2 - bbs/search.php | 2 - head.sub.php | 1 + js/sideview.js | 568 +++++++++++------------ skin/member/basic/register_form.skin.php | 4 +- 16 files changed, 282 insertions(+), 316 deletions(-) diff --git a/adm/admin.head.php b/adm/admin.head.php index ca3674b0f..f19e6631d 100644 --- a/adm/admin.head.php +++ b/adm/admin.head.php @@ -69,9 +69,6 @@ function textarea_size(fld, size) } - - -
diff --git a/adm/auth_list.php b/adm/auth_list.php index 30150b3f1..2cf7c350a 100644 --- a/adm/auth_list.php +++ b/adm/auth_list.php @@ -55,7 +55,6 @@ include_once('./admin.head.php'); $colspan = 5; ?> - -
diff --git a/adm/member_list.php b/adm/member_list.php index 306fb6c4e..4f1ad3f34 100644 --- a/adm/member_list.php +++ b/adm/member_list.php @@ -69,8 +69,6 @@ $result = sql_query($sql); $colspan = 15; ?> - -
회원검색 diff --git a/adm/point_list.php b/adm/point_list.php index 0c6fcb63d..094aed2db 100644 --- a/adm/point_list.php +++ b/adm/point_list.php @@ -61,7 +61,6 @@ include_once ('./admin.head.php'); $colspan = 8; ?> - '; - // 게시물 아이디가 있다면 게시물 보기를 INCLUDE if (isset($wr_id) && $wr_id) { include_once('./view.php'); diff --git a/bbs/current_connect.php b/bbs/current_connect.php index b4ae414d9..a14b0029a 100644 --- a/bbs/current_connect.php +++ b/bbs/current_connect.php @@ -26,8 +26,6 @@ for ($i=0; $row=sql_fetch_array($result); $i++) { $list[$i]['num'] = sprintf('%03d',$i+1); } -echo ''; - include_once($connect_skin_path.'/current_connect.skin.php'); include_once('./_tail.php'); diff --git a/bbs/memo.php b/bbs/memo.php index 2003e5129..ad26d6e3e 100644 --- a/bbs/memo.php +++ b/bbs/memo.php @@ -74,8 +74,6 @@ for ($i=0; $row=sql_fetch_array($result); $i++) $list[$i]['del_href'] = './memo_delete.php?me_id='.$row['me_id'].'&kind='.$kind; } -echo ''; - include_once($member_skin_path.'/memo.skin.php'); include_once(G4_PATH.'/tail.sub.php'); diff --git a/bbs/memo_view.php b/bbs/memo_view.php index 9dc9da294..0c051a0a2 100644 --- a/bbs/memo_view.php +++ b/bbs/memo_view.php @@ -63,8 +63,6 @@ else $mb = get_member($memo['me_'.$unkind.'_mb_id']); -echo ''; - $member_skin_path = G4_PATH.'/skin/member/'.$config['cf_member_skin']; include_once($member_skin_path.'/memo_view.skin.php'); diff --git a/bbs/new.php b/bbs/new.php index 7efbff6f5..569446b2d 100644 --- a/bbs/new.php +++ b/bbs/new.php @@ -105,8 +105,6 @@ for ($i=0; $row=sql_fetch_array($result); $i++) { $write_pages = get_paging($config['cf_write_pages'], $page, $total_page, "?gr_id=$gr_id&view=$view&mb_id=$mb_id&page="); -echo ''.PHP_EOL; - include_once($new_skin_path.'/new.skin.php'); include_once('./_tail.php'); diff --git a/bbs/poll_result.php b/bbs/poll_result.php index 23468f977..57b7e3a46 100644 --- a/bbs/poll_result.php +++ b/bbs/poll_result.php @@ -86,8 +86,6 @@ for ($i=0; $row2=sql_fetch_array($result); $i++) { include_once(G4_PATH.'/head.sub.php'); -echo ''; - if (!file_exists($poll_skin_path.'/poll_result.skin.php')) die('skin error'); include_once ($poll_skin_path.'/poll_result.skin.php'); diff --git a/bbs/profile.php b/bbs/profile.php index c1aa1e8bd..32dfddaea 100644 --- a/bbs/profile.php +++ b/bbs/profile.php @@ -27,8 +27,6 @@ $mb_reg_after = $row['days']; $mb_homepage = set_http($mb['mb_homepage']); $mb_profile = $mb['mb_profile'] ? conv_content($mb['mb_profile'],0) : '소개 내용이 없습니다.'; -echo ''; - include_once($member_skin_path.'/profile.skin.php'); include_once(G4_PATH.'/tail.sub.php'); diff --git a/bbs/search.php b/bbs/search.php index 8ff0e2c5b..eaab6104e 100644 --- a/bbs/search.php +++ b/bbs/search.php @@ -211,8 +211,6 @@ if ($stx) { } $write_pages = get_paging($config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$search_query.'&gr_id='.$gr_id.'&srows='.$srows.'&onetable='.$onetable.'&page='); - - echo ''; } $group_select = ' @@ -551,7 +549,7 @@ function fregisterform_submit(f) ?> // 보안인증관련 코드로 반드시 포함되어야 합니다. - set_cookie("", "", 1, ""); + //set_cookie("", "", 1, ""); return true; } From fd6a62c218de2fd583dc05404eb95fa06171651a Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 29 Jan 2013 18:10:38 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20#215=20?= =?UTF-8?q?=EC=95=84=EC=9B=83=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=EC=95=84=EC=9D=B4=EB=94=94,=20=ED=8C=A8=EC=8A=A4?= =?UTF-8?q?=EC=9B=8C=EB=93=9C=20=EC=9E=85=EB=A0=A5=EC=B0=BD=20=EC=97=AC?= =?UTF-8?q?=EB=B0=B1=20=EC=84=A4=EC=A0=95=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 4 ++-- skin/outlogin/neo/outlogin.skin.1.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/css/default.css b/css/default.css index 7a43a20f7..3ad3b00d3 100644 --- a/css/default.css +++ b/css/default.css @@ -175,9 +175,9 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f .ol a {color:#000;text-decoration:none} #ol_before fieldset {position:relative} -#ol_id {display:block;margin:0 0 5px !important;margin:0 0 3px;width:188px;height:22px;border:1px solid #d1d1d1;background:#fff;line-height:1.6em} +#ol_id {display:block;margin:0 0 5px !important;margin:0 0 3px;padding:0 5px;width:178px;height:22px;border:1px solid #d1d1d1;background:#fff;line-height:1.6em} .ol_idlabel {position:absolute;top:6px;left:5px;color:#696969;font-size:0.9em} -#ol_pw {display:block;margin:0 0 5px !important;margin:0 0 3px;width:188px;height:22px;border:1px solid #d1d1d1;background:#fff;vertical-align:top;line-height:1.6em} +#ol_pw {display:block;margin:0 0 5px !important;margin:0 0 3px;padding:0 5px;width:178px;height:22px;border:1px solid #d1d1d1;background:#fff;vertical-align:top;line-height:1.6em} .ol_pwlabel {position:absolute;top:35px;left:5px;color:#696969;font-size:0.9em} #auto_login {} #auto_login_label {letter-spacing:-0.1em} diff --git a/skin/outlogin/neo/outlogin.skin.1.php b/skin/outlogin/neo/outlogin.skin.1.php index 81e43286b..bc93df792 100644 --- a/skin/outlogin/neo/outlogin.skin.1.php +++ b/skin/outlogin/neo/outlogin.skin.1.php @@ -27,7 +27,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 $omi = $('#ol_id'); $omp = $('#ol_pw'); $omp.css('display','inline-block'); -$omp.css('width',124); +$omp.css('width',114); $omi_label = $('#ol_idlabel'); $omp_label = $('#ol_pwlabel'); $omi_label.addClass('ol_idlabel'); From b5544f9f8c24dd19e9aa2400956dc427260ce1bc Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 29 Jan 2013 18:13:22 +0900 Subject: [PATCH 3/5] =?UTF-8?q?g4=5Fadmin=5Furl=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- head.sub.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/head.sub.php b/head.sub.php index 10849a19e..aa361b956 100644 --- a/head.sub.php +++ b/head.sub.php @@ -56,7 +56,8 @@ var g4_charset = ""; var g4_cookie_domain = ""; var g4_is_gecko = navigator.userAgent.toLowerCase().indexOf("gecko") != -1; var g4_is_ie = navigator.userAgent.toLowerCase().indexOf("msie") != -1; - + From 8aa9e0baae0ad04b6d26931e154e2a4218fc0234 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 29 Jan 2013 18:13:43 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=EC=AA=BD=EC=A7=80=EB=B3=B4=EB=82=B4?= =?UTF-8?q?=EA=B8=B0=20=EC=BA=A1=EC=B1=A0=EC=BD=94=EB=93=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/gcaptcha/gcaptcha.lib.php | 1 + bbs/gcaptcha/get.php | 2 +- bbs/memo_form.php | 2 +- bbs/memo_form_update.php | 2 +- skin/member/neo/memo_form.skin.php | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bbs/gcaptcha/gcaptcha.lib.php b/bbs/gcaptcha/gcaptcha.lib.php index 2f906328e..1f2ca7534 100644 --- a/bbs/gcaptcha/gcaptcha.lib.php +++ b/bbs/gcaptcha/gcaptcha.lib.php @@ -175,6 +175,7 @@ function captcha_html($class="captcha") $png_file_url = G4_CACHE_URL.'/'.$obj->captcha_filename.'.png'; $wav_file_url = G4_CACHE_URL.'/'.$obj->captcha_filename.'.wav'; + $html .= PHP_EOL.''; $html .= PHP_EOL.''; $html .= '
'; $html .= '스팸방지'; diff --git a/bbs/gcaptcha/get.php b/bbs/gcaptcha/get.php index e1b0e4a5e..fbc38bdf0 100644 --- a/bbs/gcaptcha/get.php +++ b/bbs/gcaptcha/get.php @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/bbs/memo_form.php b/bbs/memo_form.php index 3934ee4fa..0571f0ef2 100644 --- a/bbs/memo_form.php +++ b/bbs/memo_form.php @@ -1,6 +1,6 @@ function fmemoform_submit(f) { - + return true; } From d4204b9bc08efe211f3959ad831c9ae7fcff1779 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 29 Jan 2013 18:18:57 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=ED=8F=BC=EB=A9=94=EC=9D=BC=EB=B3=B4?= =?UTF-8?q?=EB=82=B4=EA=B8=B0=20=EC=BA=A1=EC=B1=A0=20=EC=BD=94=EB=93=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 --- bbs/formmail.php | 2 +- bbs/formmail_send.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bbs/formmail.php b/bbs/formmail.php index c98898246..b56175fbe 100644 --- a/bbs/formmail.php +++ b/bbs/formmail.php @@ -1,6 +1,6 @@ 1) alert_close('한번에 한사람에게만 메일을 발송할 수 있습니다.'); -if ($is_guest && !chk_captcha()) { +if (!chk_captcha()) { alert('스팸방지에 입력한 숫자가 틀렸습니다.'); }