firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'g4s'

Browse Source
This commit is contained in:
chicpro
2013-06-11 11:33:12 +09:00
parent 2c8fe9ad6c dad245e82d
commit bee7a35e03
13 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bbs/filter.ajax.php → bbs/ajax.filter.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']));

5
bbs/group.php
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>

2
bbs/move.php
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 ?>">

5
index.php
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>

2
mobile/skin/board/basic/view_comment.skin.php
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": "",

2
mobile/skin/board/basic/write.skin.php
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,

2
mobile/skin/board/gallery/view_comment.skin.php
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": "",

2
mobile/skin/board/gallery/write.skin.php
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,

2
skin/board/basic/list.skin.php
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 } ?>

12
skin/board/basic/view_comment.skin.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": "",

2
skin/board/basic/write.skin.php
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,

23
skin/board/gallery/view_comment.skin.php
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": "",

2
skin/board/gallery/write.skin.php
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,