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

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

Browse Source
This commit is contained in:
chicpro
2013-02-20 17:57:04 +09:00
parent a59d2120c0 a552fe0c2b
commit 0eab17d05d
15 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
adm/board_copy_update.php
View File

@ -181,6 +181,9 @@ if (count($file_copy)) {
}
}
delete_cache_latest($bo_table);
delete_cache_latest($target_table);
echo "<script>opener.document.location.reload();</script>";
alert("복사에 성공 했습니다.", './board_copy.php?bo_table='.$bo_table.'&amp;'.$qstr);

2
adm/board_delete.inc.php
View File

@ -26,6 +26,8 @@ sql_query(" delete from {$g4['board_file_table']} where bo_table = '{$tmp_bo_tab
// 게시판 테이블 DROP
sql_query(" drop table {$g4['write_prefix']}{$tmp_bo_table} ", FALSE);
delete_cache_latest($tmp_bo_table);
// 게시판 폴더 전체 삭제
rm_rf(G4_DATA_PATH.'/file/'.$tmp_bo_table);
?>

1
adm/board_form.php
View File

@ -567,6 +567,7 @@ $pg_anchor = "<ul class=\"anchor\">
<th scope="row"><label for="bo_skin">스킨 디렉토리<strong class="sound_only">필수</strong></label></th>
<td>
<?=get_skin_select("board", "bo_skin", "bo_skin", $board['bo_skin'], 'required');?>
<a href="" class="goto_sirskin" target="_blank">스킨자료실</a>
</td>
<td class="group_setting">
<input type="checkbox" id="chk_skin" name="chk_skin" value="1">

2
adm/board_form_update.php
View File

@ -278,5 +278,7 @@ if ($fields) {
sql_query($sql);
}
delete_cache_latest($bo_table);
goto_url("./board_form.php?w=u&bo_table={$bo_table}&amp;{$qstr}");
?>

4
adm/config_form.php
View File

@ -127,6 +127,7 @@ $pg_anchor = "
}
?>
</select>
<a href="" class="goto_sirskin" target="_blank">스킨자료실</a>
</td>
<th scope="row"><label for="cf_new_rows">최근게시물 라인수</label></th>
<td>
@ -145,6 +146,7 @@ $pg_anchor = "
}
?>
</select>
<a href="" class="goto_sirskin" target="_blank">스킨자료실</a>
</td>
</tr>
<tr>
@ -158,6 +160,7 @@ $pg_anchor = "
}
?>
</select>
<a href="" class="goto_sirskin" target="_blank">스킨자료실</a>
</td>
</tr>
<tr>
@ -284,6 +287,7 @@ $pg_anchor = "
}
?>
</select>
<a href="" class="goto_sirskin" target="_blank">스킨자료실</a>
</td>
</tr>
<tr>

2
bbs/delete.php
View File

@ -121,5 +121,7 @@ if ($count_write > 0 || $count_comment > 0)
@include_once($board_skin_path.'/delete.tail.skin.php');
delete_cache_latest($bo_table);
goto_url('./board.php?bo_table='.$bo_table.'&amp;page='.$page.$qstr);
?>

3
bbs/delete_comment.php
View File

@ -80,8 +80,9 @@ sql_query(" delete from {$g4[board_new_table]} where bo_table = '{$bo_table}' an
// 사용자 코드 실행
@include_once($board_skin_path.'/delete_comment.skin.php');
// 4.1
@include_once($board_skin_path.'/delete_comment.tail.skin.php');
delete_cache_latest($bo_table);
goto_url('./board.php?bo_table='.$bo_table.'&amp;wr_id='.$write[wr_parent].'&amp;page='.$page. $qstr);
?>

10
bbs/move_update.php
View File

@ -19,8 +19,6 @@ $save_count_write = 0;
$save_count_comment = 0;
$cnt = 0;
// SQL Injection 으로 인한 코드 보완
//$sql = " select distinct wr_num from {$write_table} where wr_id in (" . stripslashes($wr_id_list) . ") order by wr_id ";
$sql = " select distinct wr_num from $write_table where wr_id in ({$wr_id_list}) order by wr_id ";
$result = sql_query($sql);
while ($row = sql_fetch_array($result))
@ -39,14 +37,13 @@ while ($row = sql_fetch_array($result))
$next_wr_num = get_next_num($move_write_table);
//$sql2 = " select * from {$write_table} where wr_num = '{$wr_num}' order by wr_parent, wr_comment desc, wr_id ";
$sql2 = " select * from $write_table where wr_num = '$wr_num' order by wr_parent, wr_is_comment, wr_comment desc, wr_id ";
$result2 = sql_query($sql2);
while ($row2 = sql_fetch_array($result2))
{
$nick = cut_str($member['mb_nick'], $config['cf_cut_name']);
if (!$row2['wr_is_comment'] && $config['cf_use_copy_log'])
$row2['wr_content'] .= "\n".'[이 게시물은 '.$nick.'님에 의해 '.G4_TIME_YMDHIS.' '.$board['bo_subject'].'에서 '.($sw == 'copy' ? '복사' : '이동').' 됨]';
$row2['wr_content'] .= PHP_EOL.'[이 게시물은 '.$nick.'님에 의해 '.G4_TIME_YMDHIS.' '.$board['bo_subject'].'에서 '.($sw == 'copy' ? '복사' : '이동').' 됨]';
$sql = " insert into $move_write_table
set wr_num = '$next_wr_num',
@ -152,15 +149,18 @@ while ($row = sql_fetch_array($result))
$cnt++;
}
sql_query(" update {$g4['board_table']} set bo_count_write = bo_count_write + '$count_write' where bo_table = '$move_bo_table' ");
sql_query(" update {$g4['board_table']} set bo_count_comment = bo_count_comment + '$count_comment' where bo_table = '$move_bo_table' ");
delete_cache_latest($move_bo_table);
}
$save_count_write += $count_write;
$save_count_comment += $count_comment;
}
delete_cache_latest($bo_table);
if ($sw == "move")
{
for ($i=0; $i<count($save); $i++)

2
bbs/scrap_popin_update.php
View File

@ -87,6 +87,8 @@ if ($wr_content && ($member['mb_level'] >= $board['bo_comment_level']))
$sql = " insert into {$g4['scrap_table']} ( mb_id, bo_table, wr_id, ms_datetime ) values ( '{$member['mb_id']}', '$bo_table', '$wr_id', '".G4_TIME_YMDHIS."' ) ";
sql_query($sql);
delete_cache_latest($bo_table);
echo <<<HEREDOC
<script>
if (confirm('이 글을 스크랩 하였습니다.\\n\\n지금 스크랩을 확인하시겠습니까?'))

2
bbs/write.php
View File

@ -156,6 +156,8 @@ if ($w == '') {
$reply = $reply_array['wr_reply'] . $reply_char;
$title_msg = '글답변';
$write['wr_subject'] = 'Re: '.$write['wr_subject'];
}
// 그룹접근 가능

3
css/adm.css
View File

@ -310,3 +310,6 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
.pg_end,
.pg_next {border-left:1px solid #ddd}
.pg_current {background:#444;color:#fff;font-weight:bold}
/* 스킨자료실 바로가기 */
.goto_sirskin {color:#ff5300}

4
css/default.css
View File

@ -112,7 +112,7 @@ a:active {color:#000;text-decoration:underline}
/* 기본테이블 */
.basic_tbl {margin-bottom:10px;width:100%;border-collapse:collapse;border-spacing:0}
.basic_tbl caption {padding:0 0 10px;color:#777;text-align:left}
.basic_tbl thead th {padding:12px 0 8px;background:#4193a7;color:#fff}
.basic_tbl thead th {padding:12px 0 8px;background:#079dd2;color:#fff}
.basic_tbl thead a {color:#fff}
.basic_tbl thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
.basic_tbl tfoot th {border-top:1px solid #666;border-bottom:1px solid #666;background:#484848;color:#fff}
@ -429,7 +429,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#334356;color:#f
#bo_cate a:focus,
#bo_cate a:hover,
#bo_cate a:active {text-decoration:none}
#bo_cate #bo_cate_on {z-index:2;border:1px solid #555;background:#fff;color:#555;font-weight:bold}
#bo_cate #bo_cate_on {z-index:2;border:1px solid #079dd2;background:#fff;color:#079dd2;font-weight:bold}
.bo_fx {margin-bottom:5px;zoom:1}
.bo_fx:after {display:block;visibility:hidden;clear:both;content:""}

9
lib/common.lib.php
View File

@ -380,16 +380,11 @@ function get_list($write_row, $board, $skin_url, $subject_len=40)
$reply = $list['wr_reply'];
$list['reply'] = '';
if (strlen($reply) > 0)
{
for ($k=0; $k<strlen($reply); $k++)
$list['reply'] .= ' ';
}
$list['reply'] = strlen($reply)*10;
$list['icon_reply'] = '';
if ($list['reply'])
$list['icon_reply'] = '<img src="'.$skin_url.'/img/icon_reply.gif" alt="답변글">';
$list['icon_reply'] = '<img src="'.$skin_url.'/img/icon_reply.gif" style="margin-left:'.$list['reply'].'px;" alt="답변글">';
$list['icon_link'] = '';
if ($list['wr_link1'] || $list['wr_link2'])

1
skin/board/basic/list.skin.php
View File

@ -78,7 +78,6 @@ if ($is_nogood) $colspan++;
<? if ($is_checkbox) { ?><td class="td_chk"><input type="checkbox" name="chk_wr_id[]" value="<?=$list[$i]['wr_id']?>" title="이 게시물 선택"></td><? } ?>
<td class="td_subject">
<?
echo $list[$i]['reply'];
echo $list[$i]['icon_reply'];
if ($is_category && $list[$i]['ca_name']) {
?>

4
skin/board/basic/write.skin.php
View File

@ -191,8 +191,8 @@ function html_auto_br(obj)
function fwrite_submit(f)
{
<? echo get_editor_js('wr_content'); ?>
<? echo chk_editor_js('wr_content'); ?>
<? echo get_editor_js('wr_content', $is_dhtml_editor); ?>
<? echo chk_editor_js('wr_content', $is_dhtml_editor); ?>
var subject = "";
var content = "";