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

adm/admin.head.php

@@ -69,9 +69,6 @@ function textarea_size(fld, size)
 }
 </script>
 
-<script src="<?=G4_URL?>/js/common.js"></script>
-<script src="<?=G4_URL?>/js/sideview.js"></script>
-
 <header>
 
     <div id="to_content"><a href="#wrapper">본문 바로가기</a></div>

adm/auth_list.php

@@ -55,7 +55,6 @@ include_once('./admin.head.php');
 $colspan = 5;
 ?>
 
-<script src="<?=$g4['path']?>/js/sideview.js"></script>
 <script>
 var list_update_php = '';
 var list_delete_php = 'auth_list_delete.php';

adm/boardgroupmember_list.php

@@ -55,8 +55,6 @@ include_once('./admin.head.php');
 $colspan = 7;
 ?>
 
-<script src="<?=$g4['path']?>/js/sideview.js"></script>
-
 <form id="fsearch" name="fsearch" method="get">
 <input type="hidden" name="gr_id" value="<?=$gr_id?>">
 <fieldset>

adm/member_list.php

@@ -69,8 +69,6 @@ $result = sql_query($sql);
 $colspan = 15;
 ?>
 
-<script src="<?=$g4['path']?>/js/sideview.js"></script>
-
 <form id="fsearch" name="fsearch" method="get">
 <fieldset>
     <legend>회원검색</legend>

adm/point_list.php

@@ -61,7 +61,6 @@ include_once ('./admin.head.php');
 $colspan = 8;
 ?>
 
-<script src="<?=$g4['path']?>/js/sideview.js"></script>
 <script>
 var list_update_php = '';
 var list_delete_php = 'point_list_delete.php';

bbs/board.php

@@ -180,8 +180,6 @@ if ($member['mb_id'] && ($is_admin == 'super' || $group['gr_admin'] == $member['
 
 include_once('./board_head.php');
 
-echo '<script src="'.G4_JS_URL.'/sideview.js"></script>';
-
 // 게시물 아이디가 있다면 게시물 보기를 INCLUDE
 if (isset($wr_id) && $wr_id) {
     include_once('./view.php');

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 '<script src="'.G4_PATH.'/js/sideview.js"></script>';
-
 include_once($connect_skin_path.'/current_connect.skin.php');
 
 include_once('./_tail.php');

bbs/formmail.php

@@ -1,6 +1,6 @@
 <?
-define('G4_CAPTCHA', 1);
 include_once('./_common.php');
+include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
 
 if (!$config['cf_email_use'])
     alert_close('환경설정에서 \"메일발송 사용\"에 체크하셔야 메일을 발송할 수 있습니다.\\n\\n관리자에게 문의하시기 바랍니다.');

bbs/formmail_send.php

@@ -1,7 +1,7 @@
 <?
-define('G4_CAPTCHA', 1);
 include_once('./_common.php');
-include_once("{G4_PATH}/lib/mailer.lib.php");
+include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
+include_once(G4_LIB_PATH.'/mailer.lib.php');
 
 if (!$config['cf_email_use'])
     alert('환경설정에서 "메일발송 사용"에 체크하셔야 메일을 발송할 수 있습니다.\\n\\n관리자에게 문의하시기 바랍니다.');
@@ -15,7 +15,7 @@ if (substr_count($to, "@") > 1)
     alert_close('한번에 한사람에게만 메일을 발송할 수 있습니다.');
 
 
-if ($is_guest && !chk_captcha()) {
+if (!chk_captcha()) {
     alert('스팸방지에 입력한 숫자가 틀렸습니다.');
 }
 

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.'<script>var g4_gcaptcha_url = "'.G4_GCAPTCHA_URL.'";</script>'; 
     $html .= PHP_EOL.'<script src="'.G4_GCAPTCHA_URL.'/gcaptcha.js"></script>'; 
     $html .= '<fieldset id="captcha" class="'.$class.'">';
     $html .= '<legend class="sound_only">스팸방지</legend>';

bbs/gcaptcha/get.php

@@ -1,6 +1,6 @@
 <?php
-define('G4_CAPTCHA', 1);
 include_once("./_common.php");
+include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
 
 echo chk_captcha();
 ?>

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 '<script src="'.G4_PATH.'/js/sideview.js"></script>';
-
 include_once($member_skin_path.'/memo.skin.php');
 
 include_once(G4_PATH.'/tail.sub.php');

bbs/memo_form.php

@@ -1,6 +1,6 @@
 <?
-define('G4_CAPTCHA', 1);
 include_once('./_common.php');
+include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
 
 if ($is_guest)
     alert_close('회원만 이용하실 수 있습니다.');

bbs/memo_form_update.php

@@ -1,6 +1,6 @@
 <?
-define('G4_CAPTCHA', 1);
 include_once('./_common.php');
+include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
 
 if ($is_guest)
     alert('회원만 이용하실 수 있습니다.');

bbs/memo_view.php

@@ -63,8 +63,6 @@ else
 
 $mb = get_member($memo['me_'.$unkind.'_mb_id']);
 
-echo '<script src="'.G4_PATH.'/js/sideview.js"></script>';
-
 $member_skin_path = G4_PATH.'/skin/member/'.$config['cf_member_skin'];
 
 include_once($member_skin_path.'/memo_view.skin.php');

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 '<script src="'.G4_PATH.'/js/sideview.js"></script>'.PHP_EOL;
-
 include_once($new_skin_path.'/new.skin.php');
 
 include_once('./_tail.php');

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 '<script src="'.G4_PATH.'/js/sideview.js"></script>';
-
 if (!file_exists($poll_skin_path.'/poll_result.skin.php')) die('skin error');
 include_once ($poll_skin_path.'/poll_result.skin.php');
 

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 '<script src="'.G4_PATH.'/js/sideview.js"></script>';
-
 include_once($member_skin_path.'/profile.skin.php');
 
 include_once(G4_PATH.'/tail.sub.php');

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 '<script src="'.G4_PATH.'/js/sideview.js"></script>';
 }
 
 $group_select = '<select id="gr_id" name="gr_id" class="select" title="그룹선택"><option value="">전체 분류';

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}

head.sub.php

@@ -56,11 +56,13 @@ var g4_charset   = "<?=$g4['charset']?>";
 var g4_cookie_domain = "<?=$g4['cookie_domain']?>";
 var g4_is_gecko  = navigator.userAgent.toLowerCase().indexOf("gecko") != -1;
 var g4_is_ie     = navigator.userAgent.toLowerCase().indexOf("msie") != -1;
-<? if ($is_admin) { echo "var g4_admin = '{$g4['admin']}';"; } ?>
+<? if ($is_admin) { echo 'var g4_admin_url = "'.G4_ADMIN_URL.'";'; } 
+?>
 </script>
 <script src="<?=G4_JS_URL?>/jquery-1.8.3.min.js"></script>
 <script src="<?=G4_JS_URL?>/common.js"></script>
 <script src="<?=G4_JS_URL?>/wrest.js"></script>
+<script src="<?=G4_JS_URL?>/sideview.js"></script>
 </head>
 <body>
 <a id="g4_head"></a>

js/sideview.js

@@ -1,10 +1,3 @@
-if (typeof(SIDEVIEW_JS) == 'undefined') // 한번만 실행
-{
-    if (typeof g4_is_member == 'undefined')
-        alert('g4_is_member 변수가 선언되지 않았습니다. js/sideview.js');
-
-    var SIDEVIEW_JS = true;
-
 // 아래의 소스코드는 daum.net 카페의 자바스크립트를 참고하였습니다.
 // 회원이름 클릭시 회원정보등을 보여주는 레이어
 function insertHead(name, text, evt)
@@ -323,4 +316,3 @@ if (typeof(SIDEVIEW_JS) == 'undefined') // 한번만 실행
     else
         clickAreaCheck = false;
 }
-}

skin/member/basic/register_form.skin.php

@@ -77,8 +77,6 @@ jQuery(function($){
 var member_skin_path = "<?=$member_skin_path?>";
 </script>
 <script type="text/javascript" src="<?=$member_skin_path?>/ajax_register_form.jquery.js"></script>
-<script type="text/javascript" src="<?=$g4[path]?>/js/md5.js"></script>
-<script type="text/javascript" src="<?=$g4[path]?>/js/sideview.js"></script>
 
 <form id="fregisterform" name=fregisterform method=post onsubmit="return fregisterform_submit(this);" enctype="multipart/form-data" autocomplete="off">
 <input type=hidden name=w                value="<?=$w?>">
@@ -551,7 +549,7 @@ function fregisterform_submit(f)
     ?>
 
     // 보안인증관련 코드로 반드시 포함되어야 합니다.
-    set_cookie("<?=md5($token)?>", "<?=base64_encode($token)?>", 1, "<?=$g4['cookie_domain']?>");
+    //set_cookie("<?=md5($token)?>", "<?=base64_encode($token)?>", 1, "<?=$g4['cookie_domain']?>");
 
     return true;
 }

skin/member/neo/memo_form.skin.php

@@ -45,7 +45,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 <script>
 function fmemoform_submit(f)
 {
-    <? if ($is_guest) { echo chk_captcha_js(); } ?>
+    <? echo chk_captcha_js(); ?>
 
     return true;
 }

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');