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

adm/board_copy_update.php

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

adm/board_delete.inc.php

@@ -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);
 ?>

adm/board_form_update.php

@@ -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}&{$qstr}");
 ?>

bbs/delete.php

@@ -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.'&page='.$page.$qstr);
 ?>

bbs/delete_comment.php

@@ -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.'&wr_id='.$write[wr_parent].'&page='.$page. $qstr);
 ?>

bbs/move_update.php

@@ -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++)

bbs/scrap_popin_update.php

@@ -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지금 스크랩을 확인하시겠습니까?'))

bbs/write.php

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

lib/common.lib.php

@@ -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'])

lib/thumbnail.lib.php

@@ -98,7 +98,7 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h
         @chmod($target_path, 0707);
     }
 
-    $thumb_file = "$target_path/{$thumb_filename}_{$thumb_width}x{$thumb_height}.png";
+    $thumb_file = "$target_path/thumb-{$thumb_filename}_{$thumb_width}x{$thumb_height}.png";
     $thumb_time = @filemtime($thumb_file);
     $source_file = "$source_path/$filename";
     $source_time = @filemtime($source_file);
@@ -112,7 +112,7 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h
     // 이미지 파일이 없거나 아님
     if (!$size[0]) {
         if (!$thumb_height) $thumb_height = $thumb_width;
-        $thumb_file = "$target_path/noimg_{$thumb_width}x{$thumb_height}.png";
+        $thumb_file = "$target_path/thumb-noimg_{$thumb_width}x{$thumb_height}.png";
         if (!file_exists($thumb_file)) {
             $target = imagecreate($thumb_width, $thumb_height);
             imagecolorallocate($target, 250, 250, 250);

skin/board/basic/list.skin.php

@@ -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']) {
             ?>

skin/board/basic/write.skin.php

@@ -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 = "";