diff --git a/.gitignore b/.gitignore index bcecf93c7..3f6145ed1 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ test.php cheditor5/ log g5_tree +ckeditor43/ diff --git a/adm/admin.js b/adm/admin.js index e5c2a3e04..a3f4c7d64 100644 --- a/adm/admin.js +++ b/adm/admin.js @@ -63,4 +63,12 @@ function delete_confirm() return true; else return false; +} + +function delete_confirm2(msg) +{ + if(confirm(msg)) + return true; + else + return false; } \ No newline at end of file diff --git a/adm/board_form.php b/adm/board_form.php index 86497f74d..6e9d2a54c 100644 --- a/adm/board_form.php +++ b/adm/board_form.php @@ -159,7 +159,9 @@ $frm_submit = '
목록'.PHP_EOL; if ($w == 'u') $frm_submit .= ' 게시판복사 - 게시판 바로가기'.PHP_EOL; + 게시판 바로가기 + 게시판 썸네일 삭제 + '.PHP_EOL; $frm_submit .= '
'; ?> diff --git a/adm/board_thumbnail_delete.php b/adm/board_thumbnail_delete.php new file mode 100644 index 000000000..720cad4f9 --- /dev/null +++ b/adm/board_thumbnail_delete.php @@ -0,0 +1,52 @@ + + +
+

+ 완료 메세지가 나오기 전에 프로그램의 실행을 중지하지 마십시오. +

+
+ +'; + $files = glob($dir.'/thumb-*'); + if (is_array($files)) { + foreach($files as $thumbnail) { + $cnt++; + @unlink($thumbnail); + + echo '
  • '.$thumbnail.'
  • '.PHP_EOL; + + flush(); + + if ($cnt%10==0) + echo PHP_EOL; + } + } + + echo '
  • 완료됨
  • '.PHP_EOL; + echo '

    썸네일 '.$cnt.'건의 삭제 완료됐습니다.

    '.PHP_EOL; +} else { + echo '

    첨부파일 디렉토리가 존재하지 않습니다.

    '; +} +?> + +
    게시판 수정으로 돌아가기
    + + \ No newline at end of file diff --git a/adm/img/logo.jpg b/adm/img/logo.jpg index a186c2c16..a3d9b91a4 100644 Binary files a/adm/img/logo.jpg and b/adm/img/logo.jpg differ diff --git a/bbs/list.php b/bbs/list.php index 90c946368..c0301b410 100644 --- a/bbs/list.php +++ b/bbs/list.php @@ -61,10 +61,47 @@ if(G5_IS_MOBILE) { $page_rows = $board['bo_page_rows']; } +if ($page < 1) { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지) + +// 년도 2자리 +$today2 = G5_TIME_YMD; + +$list = array(); +$i = 0; +$notice_count = 0; +$notice_array = array(); + +// 공지 처리 +if (!$sca && !$stx) { + $arr_notice = explode(',', trim($board['bo_notice'])); + for ($k=0; $k 1 && $notice_count) + $from_record -= $notice_count; + +if($page == 1 && $notice_count) + $page_rows -= $notice_count; + // 관리자라면 CheckBox 보임 $is_checkbox = false; if ($is_member && ($is_admin == 'super' || $group['gr_admin'] == $member['mb_id'] || $board['bo_admin'] == $member['mb_id'])) @@ -85,7 +122,7 @@ if (!$sst) { $sst = $board['bo_sort_field']; } else { $sst = "wr_num, wr_reply"; - $sod = ""; + $sod = ""; } } else { // 게시물 리스트의 정렬 대상 필드가 아니라면 공백으로 (nasca 님 09.06.16) @@ -101,39 +138,17 @@ if ($sst) { if ($sca || $stx) { $sql = " select distinct wr_parent from {$write_table} where {$sql_search} {$sql_order} limit {$from_record}, $page_rows "; } else { - $sql = " select * from {$write_table} where wr_is_comment = 0 {$sql_order} limit {$from_record}, $page_rows "; + $sql = " select * from {$write_table} where wr_is_comment = 0 "; + if($notice_count && !empty($notice_array)) + $sql .= " and wr_id not in (".implode(', ', $notice_array).") "; + $sql .= " {$sql_order} limit {$from_record}, $page_rows "; } $result = sql_query($sql); -// 년도 2자리 -$today2 = G5_TIME_YMD; - -$list = array(); -$i = 0; - -if (!$sca && !$stx) { - $arr_notice = explode(',', trim($board['bo_notice'])); - for ($k=0; $k