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

This commit is contained in:
whitedot
2013-06-12 11:20:58 +09:00
25 changed files with 142 additions and 56 deletions

View File

@ -115,8 +115,8 @@ $colspan = 15;
<tbody>
<?php
for ($i=0; $row=sql_fetch_array($result); $i++) {
$one_update = '<a href="./board_form.php?w=u&amp;bo_table='.$row['bo_table'].'&amp;'.$qstr.'">수정</a>';
$one_copy = '<a href="./board_copy.php?bo_table='.$row['bo_table'].'" class="board_copy" target="win_board_copy">복사</a>';
$one_update = '<li class="sel_li"><a href="./board_form.php?w=u&amp;bo_table='.$row['bo_table'].'&amp;'.$qstr.'" class="sel_a">수정</a></li>';
$one_copy = '<li class="sel_li"><a href="./board_copy.php?bo_table='.$row['bo_table'].'" class="board_copy sel_a" target="win_board_copy">복사</a></li>';
?>
<tr>
@ -156,7 +156,15 @@ $colspan = 15;
<option value="mobile"<?php echo get_selected($row['bo_device'], 'mobile'); ?>>모바일</option>
</select>
</td>
<td><?php echo $one_update ?> <?php echo $one_copy ?></td>
<td class="td_mng sv_use">
<div class="sel_wrap">
<button type="button" class="sel_btn">관리하기</button>
<ul class="sel_ul">
<?php echo $one_update ?>
<?php echo $one_copy ?>
</ul>
</div>
</td>
</tr>
<?php
}

View File

@ -127,7 +127,7 @@ $colspan = 8;
$sql2 = " select count(*) as cnt from {$g4['board_table']} where gr_id = '{$row['gr_id']}' ";
$row2 = sql_fetch($sql2);
$s_upd = '<a href="./boardgroup_form.php?'.$qstr.'&amp;w=u&amp;gr_id='.$row['gr_id'].'">수정</a>';
$s_upd = '<li class="sel_li"><a href="./boardgroup_form.php?'.$qstr.'&amp;w=u&amp;gr_id='.$row['gr_id'].'" class="sel_a">수정</a></li>';
?>
<tr>
@ -160,7 +160,14 @@ $colspan = 8;
<option value="mobile"<?php echo get_selected($row['gr_device'], 'mobile'); ?>>모바일</option>
</select>
</td>
<td class="td_smallmng"><?php echo $s_upd ?></td>
<td class="td_mng sv_use">
<div class="sel_wrap">
<button type="button" class="sel_btn">관리하기</button>
<ul class="sel_ul">
<?php echo $s_upd ?>
</ul>
</div>
</td>
</tr>
<?php

View File

@ -155,10 +155,10 @@ $colspan = 15;
$s_mod = '';
$s_del = '';
} else {
$s_mod = '<a href="./member_form.php?'.$qstr.'&amp;w=u&amp;mb_id='.$row['mb_id'].'">수정</a>';
//$s_del = '<a href="javascript:post_delete(\'member_delete.php\', \''.$row['mb_id'].'\');">삭제</a>';
$s_mod = '<li class="sel_li"><a href="./member_form.php?'.$qstr.'&amp;w=u&amp;mb_id='.$row['mb_id'].'" class="sel_a">수정</a></li>';
//$s_del = '<li class="sel_li"><a href="javascript:post_delete(\'member_delete.php\', \''.$row['mb_id'].'\');" class="sel_a">삭제</a></li>';
}
$s_grp = '<a href="./boardgroupmember_form.php?mb_id='.$row['mb_id'].'">그룹</a>';
$s_grp = '<li class="sel_li"><a href="./boardgroupmember_form.php?mb_id='.$row['mb_id'].'" class="sel_a">그룹</a></li>';
$leave_date = $row['mb_leave_date'] ? $row['mb_leave_date'] : date('Ymd', G4_SERVER_TIME);
$intercept_date = $row['mb_intercept_date'] ? $row['mb_intercept_date'] : date('Ymd', G4_SERVER_TIME);
@ -199,7 +199,15 @@ $colspan = 15;
<td colspan="6" class="td_addr"><?php echo $address; ?></td>
<td><?php echo substr($row['mb_today_login'],2,8); ?></td>
<td class="td_bignum"><a href="point_list.php?sfl=mb_id&amp;stx=<?php echo $row['mb_id'] ?>"><?php echo number_format($row['mb_point']) ?></a></td>
<td rowspan="2"><?php echo $s_mod ?><br><?php echo $s_grp ?></td>
<td class="td_mng sv_use" rowspan="2">
<div class="sel_wrap">
<button type="button" class="sel_btn">관리하기</button>
<ul class="sel_ul">
<?php echo $s_mod ?>
<?php echo $s_grp ?>
</ul>
</div>
</td>
</tr>
<tr <?php echo $tr_bg; ?>>
<td class="td_name sv_use"><div><?php echo $mb_nick ?></div></td>

View File

@ -103,7 +103,7 @@ $colspan = 6;
$row2 = sql_fetch($sql2);
$po_etc = ($row['po_etc']) ? "사용" : "미사용";
$s_mod = '<a href="./poll_form.php?'.$qstr.'&amp;w=u&amp;po_id='.$row['po_id'].'">수정</a>';
$s_mod = '<li class="sel_li"><a href="./poll_form.php?'.$qstr.'&amp;w=u&amp;po_id='.$row['po_id'].'" class="sel_a">수정</a></li>';
//$s_del = '<a href="javascript:post_delete(\'poll_form_update.php\', \''.$row['po_id'].'\');">삭제</a>';
?>
@ -116,7 +116,14 @@ $colspan = 6;
<td class="td_num"><?php echo $row['po_level'] ?></td>
<td class="td_num"><?php echo $row2['sum_po_cnt'] ?></td>
<td class="td_etc"><?php echo $po_etc ?></td>
<td class="td_mng"><?php echo $s_mod ?></td>
<td class="td_mng sv_use">
<div class="sel_wrap">
<button type="button" class="sel_btn">관리하기</button>
<ul class="sel_ul">
<?php echo $s_mod ?>
</ul>
</div>
</td>
</tr>
<?php

View File

@ -1,8 +1,6 @@
<?php
include_once('./_common.php');
header("Content-Type: text/html; charset=utf-8");
$subject = strtolower($_POST['subject']);
$content = strtolower(strip_tags($_POST['content']));

View File

@ -28,10 +28,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
<div style="float:left;<?php echo $lt_style ?>">
<?php
// 이 함수가 바로 최신글을 추출하는 역할을 합니다.
// 스킨은 입력하지 않을 경우 관리자 > 환경설정의 최신글 스킨경로를 기본 스킨으로 합니다.
// 사용방법
// latest(스킨, 게시판아이디, 출력라인, 글자수);
// 사용방법 : latest(스킨, 게시판아이디, 출력라인, 글자수);
echo latest('basic', $row['bo_table'], 5, 70);
?>
</div>

View File

@ -43,7 +43,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
?>
<div id="copymove" class="new_win">
<h1><?php echo $g4['title'] ?></h1>
<h1 id="new_win_title"><?php echo $g4['title'] ?></h1>
<form name="fboardmoveall" method="post" action="./move_update.php" onsubmit="return fboardmoveall_submit(this);">
<input type="hidden" name="sw" value="<?php echo $sw ?>">

View File

@ -22,8 +22,16 @@ if (!($w == '' || $w == 'u' || $w == 'r')) {
alert('w 값이 제대로 넘어오지 않았습니다.');
}
if (($w == 'u' || $w == 'r') && !$write['wr_id']) {
alert("글이 존재하지 않습니다.\\n삭제되었거나 이동된 경우입니다.", G4_URL);
if ($w == 'u' || $w == 'r') {
if ($write['wr_id']) {
// 가변 변수로 $wr_1 .. $wr_10 까지 만든다.
for ($i=1; $i<=10; $i++) {
$vvar = "wr_".$i;
$$vvar = $write['wr_'.$i];
}
} else {
alert("글이 존재하지 않습니다.\\n삭제되었거나 이동된 경우입니다.", G4_URL);
}
}
if ($w == '') {

View File

@ -73,7 +73,7 @@ h2 {font-size:1.2em}
#qnb {float:right;margin:0;padding:0;list-style:none}
#qnb li {margin-bottom:20px}
#qnb a {display:block;width:40px;font-size:0.9em;letter-spacing:-0.1em;text-align:center}
#qnb a {display:block;width:40px;font-size:0.9em;text-align:center;letter-spacing:-0.1em}
#qnb a:focus, #qnb a:hover, #qnb a:active {text-decoration:none}
#qnb img {margin-bottom:5px}
@ -233,7 +233,7 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
#point_mng {margin-top:50px}
/* 회원메일발송 목록 */
.td_test, .td_send {width:50px;text-align:center}
.td_mng {width:110px;text-align:center}
.td_mng {width:100px;text-align:center}
.td_smallmng {width:50px;text-align:center}
/* 투표관리 목록 */
.td_etc {width:80px;text-align:center}
@ -318,6 +318,15 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
.sv_on {display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto !important}
.sv_nojs .sv {display:block}
/* 셀렉트 스타일 UL */
.sel_wrap {position:relative;width:100px}
.sel_btn {width:100px;height:25px;border:1px solid #000;background:#333;color:#fff}
.sel_ul {display:none;position:absolute;top:10px;right:-20px;margin:0;padding:0;width:88px;border:1px solid #999;border-bottom:0;background:#fff;list-style:none}
.sel_on {display:block;z-index:2}
.sel_li {border-bottom:1px solid #999}
.sel_a {display:block;height:23px;text-align:center;line-height:2em !important;line-height:1.9em}
.sel_a:focus, .sel_a:hover {background:#f5f6fa;text-decoration:none}
/* pagination */
.pg_wrap {clear:both;margin:0 0 20px;padding-top:20px;text-align:center}
.pg {display:inline-block;border:1px solid #ddd;letter-spacing:-4px}

View File

@ -220,6 +220,15 @@ td.empty_table {padding:85px 0;text-align:center}
.sv_on {display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto !important}
.sv_nojs .sv {display:block}
/* 셀렉트 스타일 UL */
.sel_wrap {position:relative;width:100px}
.sel_btn {width:100px;height:25px;border:1px solid #000;background:#333;color:#fff}
.sel_ul {display:none;position:absolute;top:10px;right:-20px;margin:0;padding:0;width:88px;border:1px solid #999;border-bottom:0;background:#fff;list-style:none}
.sel_on {display:block;z-index:2}
.sel_li {border-bottom:1px solid #999}
.sel_a {display:block;height:23px;text-align:center;line-height:2em !important;line-height:1.9em}
.sel_a:focus, .sel_a:hover {background:#f5f6fa;text-decoration:none}
/* pagination */
.pg_wrap {clear:both;margin:0 0 20px;padding-top:20px;text-align:center}
.pg {display:inline-block;border:1px solid #cfded8;letter-spacing:-4px}

View File

@ -31,10 +31,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
<div style="float:left;<?php echo $lt_style ?>">
<?php
// 이 함수가 바로 최신글을 추출하는 역할을 합니다.
// 스킨은 입력하지 않을 경우 관리자 > 환경설정의 최신글 스킨경로를 기본 스킨으로 합니다.
// 사용방법
// latest(스킨, 게시판아이디, 출력라인, 글자수);
// 사용방법 : latest(스킨, 게시판아이디, 출력라인, 글자수);
echo latest("basic", $row['bo_table'], 5, 25);
?>
</div>

View File

@ -608,16 +608,46 @@ $(function(){
sv_hide = true;
});
// 셀렉트 ul
var sel_hide = false;
$('.sel_btn').click(function() {
$('.sel_ul').removeClass('sel_on');
$(this).siblings('.sel_ul').addClass('sel_on');
});
$(".sel_wrap").hover(
function() {
sel_hide = false;
},
function() {
sel_hide = true;
}
);
$('.sel_a').focusin(function() {
sel_hide = false;
});
$('.sel_a').focusout(function() {
sel_hide = true;
});
$(document).click(function() {
if(sv_hide) {
if(sv_hide) { // 사이드뷰 해제
$(".sv").removeClass("sv_on");
}
if (sel_hide) { // 셀렉트 ul 해제
$('.sel_ul').removeClass('sel_on');
}
});
$(document).focusin(function() {
if(sv_hide) {
if(sv_hide) { // 사이드뷰 해제
$(".sv").removeClass("sv_on");
}
if (sel_hide) { // 셀렉트 ul 해제
$('.sel_ul').removeClass('sel_on');
}
});
$("textarea#wr_content[maxlength]").live("keyup change", function() {

View File

@ -171,7 +171,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
var subject = "";
var content = "";
$.ajax({
url: g4_bbs_url+"/filter.ajax.php",
url: g4_bbs_url+"/ajax.filter.php",
type: "POST",
data: {
"subject": "",

View File

@ -202,7 +202,7 @@ function fwrite_submit(f)
var subject = "";
var content = "";
$.ajax({
url: g4_bbs_url+"/filter.ajax.php",
url: g4_bbs_url+"/ajax.filter.php",
type: "POST",
data: {
"subject": f.wr_subject.value,

View File

@ -174,7 +174,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
var subject = "";
var content = "";
$.ajax({
url: g4_bbs_url+"/filter.ajax.php",
url: g4_bbs_url+"/ajax.filter.php",
type: "POST",
data: {
"subject": "",

View File

@ -202,7 +202,7 @@ function fwrite_submit(f)
var subject = "";
var content = "";
$.ajax({
url: g4_bbs_url+"/filter.ajax.php",
url: g4_bbs_url+"/ajax.filter.php",
type: "POST",
data: {
"subject": f.wr_subject.value,

View File

@ -106,8 +106,8 @@ CKEDITOR.editorConfig = function( config ) {
'Arial;Comic Sans MS;Courier New;Lucida Sans Unicode;monospace;sans-serif;serif;Tahoma;Times New Roman;Verdana';
config.fontSize_defaultLabel = "10pt";
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.enterMode = CKEDITOR.ENTER_DIV;
config.shiftEnterMode = CKEDITOR.ENTER_DIV;
config.filebrowserUploadUrl = g4_ckeditor_url+"/upload.php?type=Images";
config.keystrokes=[
// Formatting

View File

@ -26,7 +26,7 @@ function chk_captcha()
$(function() {
$("#captcha").click(function(e) {
this.setAttribute("src", g4_url+"/plugin/captcha/run.php?t="+(new Date).getTime());
this.setAttribute("src", g4_url+"/plugin/gcaptcha/run.php?t="+(new Date).getTime());
var keycode = (e.keyCode ? e.keyCode : e.which);
// 첫 실행에서는 포커스를 주지 않음
if (typeof(keycode) != "undefined") {

View File

@ -115,7 +115,7 @@ if ($is_nogood) $colspan++;
?>
</td>
<td class="td_name"><?php echo $list[$i]['name'] ?></td>
<td class="td_name sv_use"><?php echo $list[$i]['name'] ?></td>
<td class="td_date"><?php echo $list[$i]['datetime2'] ?></td>
<td class="td_num"><?php echo $list[$i]['wr_hit'] ?></td>
<?php if ($is_good) { ?><td class="td_num"><?php echo $list[$i]['wr_good'] ?></td><?php } ?>

View File

@ -12,7 +12,8 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<section id="bo_vc">
<h2>댓글목록</h2>
<?php
for ($i=0; $i<count($list); $i++) {
$cmt_amt = count($list);
for ($i=0; $i<$cmt_amt; $i++) {
$comment_id = $list[$i]['wr_id'];
$cmt_depth = ""; // 댓글단계
$cmt_depth = strlen($list[$i]['wr_comment_reply']) * 20;
@ -23,10 +24,11 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
}
*/
$comment = preg_replace("/\[\<a\s.*href\=\"(http|https|ftp|mms)\:\/\/([^[:space:]]+)\.(mp3|wma|wmv|asf|asx|mpg|mpeg)\".*\<\/a\>\]/i", "<script>doc_write(obj_movie('$1://$2.$3'));</script>", $comment);
$cmt_sv = $cmt_amt - $i + 1; // 댓글 헤더 z-index 재설정 ie8 이하 사이드뷰 겹침 문제 해결
?>
<article id="c_<?php echo $comment_id ?>" <?php if ($cmt_depth) { ?>style="margin-left:<?php echo $cmt_depth ?>px;border-top-color:#e0e0e0"<?php } ?>>
<header>
<header style="z-index:<?php echo $cmt_sv; ?>">
<h1><?php echo $list[$i]['wr_name'] ?>님의 댓글</h1>
<?php echo $list[$i]['name'] ?>
<?php if ($cmt_depth) { ?><img src="<?php echo $board_skin_url ?>/img/icon_reply.gif" class="icon_reply" alt="댓글의 댓글"><?php } ?>
@ -122,6 +124,10 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<?php
include(G4_SNS_PATH."/view_comment_write.sns.skin.php");
?>
<?php
@include(G4_SKIN_PATH."/board/basic/view_comment.sns.skin.php");
?>
<tr>
<th scope="row">내용</th>
<td>
@ -175,7 +181,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
var subject = "";
var content = "";
$.ajax({
url: g4_bbs_url+"/filter.ajax.php",
url: g4_bbs_url+"/ajax.filter.php",
type: "POST",
data: {
"subject": "",

View File

@ -173,7 +173,7 @@ function fwrite_submit(f)
var subject = "";
var content = "";
$.ajax({
url: g4_bbs_url+"/filter.ajax.php",
url: g4_bbs_url+"/ajax.filter.php",
type: "POST",
data: {
"subject": f.wr_subject.value,

View File

@ -12,18 +12,23 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<section id="bo_vc">
<h2>댓글목록</h2>
<?php
for ($i=0; $i<count($list); $i++) {
$cmt_amt = count($list);
for ($i=0; $i<$cmt_amt; $i++) {
$comment_id = $list[$i]['wr_id'];
$cmt_depth = ""; // 댓글단계
$cmt_depth = strlen($list[$i]['wr_comment_reply']) * 20;
$str = $list[$i]['content'];
$comment = $list[$i]['content'];
/*
if (strstr($list[$i]['wr_option'], "secret")) {
$str = $str;
}
$str = preg_replace("/\[\<a\s.*href\=\"(http|https|ftp|mms)\:\/\/([^[:space:]]+)\.(mp3|wma|wmv|asf|asx|mpg|mpeg)\".*\<\/a\>\]/i", "<script>doc_write(obj_movie('$1://$2.$3'));</script>", $str);
*/
$comment = preg_replace("/\[\<a\s.*href\=\"(http|https|ftp|mms)\:\/\/([^[:space:]]+)\.(mp3|wma|wmv|asf|asx|mpg|mpeg)\".*\<\/a\>\]/i", "<script>doc_write(obj_movie('$1://$2.$3'));</script>", $comment);
$cmt_sv = $cmt_amt - $i + 1; // 댓글 헤더 z-index 재설정 ie8 이하 사이드뷰 겹침 문제 해결
?>
<article id="c_<?php echo $comment_id ?>" <?php if ($cmt_depth) { ?>style="margin-left:<?php echo $cmt_depth ?>px;border-top-color:#e0e0e0"<?php } ?>>
<header>
<header style="z-index:<?php echo $cmt_sv; ?>">
<h1><?php echo $list[$i]['wr_name'] ?>님의 댓글</h1>
<?php echo $list[$i]['name'] ?>
<?php if ($cmt_depth) { ?><img src="<?php echo $board_skin_url ?>/img/icon_reply.gif" class="icon_reply" alt="댓글의 댓글"><?php } ?>
@ -34,14 +39,14 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
작성일
<span class="bo_vc_hdinfo"><time datetime="<?php echo date('Y-m-d\TH:i:s+09:00', strtotime($list[$i]['datetime'])) ?>"><?php echo $list[$i]['datetime'] ?></time></span>
<?php
include(G4_SNS_PATH."/view_comment_list.sns.skin.php");
include(G4_SNS_PATH.'/view_comment_list.sns.skin.php');
?>
</header>
<!-- 댓글 출력 -->
<p>
<?php if (strstr($list[$i]['wr_option'], "secret")) echo "<img src=\"".$board_skin_url."/img/icon_secret.gif\" alt=\"비밀글\">"; ?>
<?php echo $str ?>
<?php if (strstr($list[$i]['wr_option'], "secret")) { ?><img src="<?php echo $board_skin_url; ?>/img/icon_secret.gif" alt="비밀글"><?php } ?>
<?php echo $comment ?>
</p>
<span id="edit_<?php echo $comment_id ?>"></span><!-- 수정 -->
@ -127,7 +132,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<th scope="row">내용</th>
<td>
<?php if ($comment_min || $comment_max) { ?><strong id="char_cnt"><span id="char_count"></span>글자</strong><?php } ?>
<textarea id="wr_content" name="wr_content" maxlength="10000" required class="required"
<textarea id="wr_content" name="wr_content" maxlength="10000" required class="required" title="내용"
<?php if ($comment_min || $comment_max) { ?>onkeyup="check_byte('wr_content', 'char_count');"<?php } ?>><?php echo $c_wr_content; ?></textarea>
<?php if ($comment_min || $comment_max) { ?><script> check_byte('wr_content', 'char_count'); </script><?php } ?>
<script>
@ -176,7 +181,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
var subject = "";
var content = "";
$.ajax({
url: g4_bbs_url+"/filter.ajax.php",
url: g4_bbs_url+"/ajax.filter.php",
type: "POST",
data: {
"subject": "",

View File

@ -202,7 +202,7 @@ function fwrite_submit(f)
var subject = "";
var content = "";
$.ajax({
url: g4_bbs_url+"/filter.ajax.php",
url: g4_bbs_url+"/ajax.filter.php",
type: "POST",
data: {
"subject": f.wr_subject.value,

View File

@ -342,7 +342,7 @@ function fregisterform_submit(f)
}
}
if (typeof(f.mb_recommend) != "undefined") {
if (typeof(f.mb_recommend) != "undefined" && f.mb_recommend.value) {
if (f.mb_id.value == f.mb_recommend.value) {
alert("본인을 추천할 수 없습니다.");
f.mb_recommend.focus();
@ -357,6 +357,7 @@ function fregisterform_submit(f)
}
}
/*
if (typeof(f.mb_hp) != "undefined" && f.mb_hp.value) {
var error = "";
$.ajax({
@ -381,6 +382,7 @@ function fregisterform_submit(f)
return false;
}
}
*/
<?php echo chk_captcha_js(); ?>

View File

@ -22,11 +22,6 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<!-- 검색결과 여기서부터 -->
<script>
document.fzip.addr1.focus();
</script>
<?php if ($search_count > 0) { ?>
<dl>
<dt>총 <?php echo $search_count ?>건 가나다순 정렬</dt>