diff --git a/adm/admin.lib.php b/adm/admin.lib.php
index 44ea31f1f..061f7992d 100644
--- a/adm/admin.lib.php
+++ b/adm/admin.lib.php
@@ -57,26 +57,6 @@ function get_skin_dir($skin, $skin_path=G5_SKIN_PATH)
}
-// 회원 삭제
-function member_delete($mb_id)
-{
- global $config;
- global $g5;
-
- $sql = " select mb_name, mb_nick, mb_ip, mb_recommend, mb_memo, mb_level from {$g5['member_table']} where mb_id= '".$mb_id."' ";
- $mb = sql_fetch($sql);
- if ($mb['mb_recommend']) {
- $row = sql_fetch(" select count(*) as cnt from {$g5['member_table']} where mb_id = '".addslashes($mb['mb_recommend'])."' ");
- if ($row['cnt'])
- insert_point($mb['mb_recommend'], $config['cf_recommend_point'] * (-1), $mb_id.'님의 회원자료 삭제로 인한 추천인 포인트 반환', "@member", $mb['mb_recommend'], $mb_id.' 추천인 삭제');
- }
-
- // 회원자료는 정보만 없앤 후 아이디는 보관하여 다른 사람이 사용하지 못하도록 함 : 061025
- $sql = " update {$g5['member_table']} set mb_password = '', mb_level = 1, mb_email = '', mb_homepage = '', mb_tel = '', mb_hp = '', mb_zip1 = '', mb_zip2 = '', mb_addr1 = '', mb_addr2 = '', mb_birth = '', mb_sex = '', mb_signature = '', mb_memo = '".date('Ymd', G5_SERVER_TIME)." 삭제함\n{$mb['mb_memo']}', mb_leave_date = '".date('Ymd', G5_SERVER_TIME)."' where mb_id = '{$mb_id}' ";
- sql_query($sql);
-}
-
-
// 회원권한을 SELECT 형식으로 얻음
function get_member_level_select($name, $start_id=0, $end_id=10, $selected="", $event="")
{
diff --git a/adm/config_form.php b/adm/config_form.php
index 570022943..48a7179f1 100644
--- a/adm/config_form.php
+++ b/adm/config_form.php
@@ -162,6 +162,11 @@ if(!isset($config['cf_lg_mid'])) {
ADD `cf_lg_mert_key` varchar(255) NOT NULL DEFAULT '' AFTER `cf_lg_mid` ", true);
}
+if(!isset($config['cf_optimize_date'])) {
+ sql_query(" ALTER TABLE `{$g5['config_table']}`
+ ADD `cf_optimize_date` date NOT NULL default '0000-00-00' AFTER `cf_popular_del` ", true);
+}
+
if(!$config['cf_faq_skin']) $config['cf_faq_skin'] = "basic";
if(!$config['cf_mobile_faq_skin']) $config['cf_mobile_faq_skin'] = "basic";
diff --git a/bbs/db_table.optimize.php b/bbs/db_table.optimize.php
new file mode 100644
index 000000000..f676ce4ef
--- /dev/null
+++ b/bbs/db_table.optimize.php
@@ -0,0 +1,57 @@
+= G5_TIME_YMD)
+ return;
+
+// 설정일이 지난 접속자로그 삭제
+if($config['cf_visit_del'] > 0) {
+ $tmp_before_date = date("Y-m-d", G5_SERVER_TIME - ($config['cf_visit_del'] * 86400));
+ $sql = " delete from {$g5['visit_table']} where vi_date < '$tmp_before_date' ";
+ sql_query($sql);
+ sql_query(" OPTIMIZE TABLE `{$g5['visit_table']}`, `{$g5['visit_sum_table']}` ");
+}
+
+// 설정일이 지난 인기검색어 삭제
+if($config['cf_popular_del'] > 0) {
+ $tmp_before_date = date("Y-m-d", G5_SERVER_TIME - ($config['cf_popular_del'] * 86400));
+ $sql = " delete from {$g5['popular_table']} where pp_date < '$tmp_before_date' ";
+ sql_query($sql);
+ sql_query(" OPTIMIZE TABLE `{$g5['popular_table']}` ");
+}
+
+// 설정일이 지난 최근게시물 삭제
+if($config['cf_new_del'] > 0) {
+ $sql = " delete from {$g5['board_new_table']} where (TO_DAYS('".G5_TIME_YMDHIS."') - TO_DAYS(bn_datetime)) > '{$config['cf_new_del']}' ";
+ sql_query($sql);
+ sql_query(" OPTIMIZE TABLE `{$g5['board_new_table']}` ");
+}
+
+// 설정일이 지난 쪽지 삭제
+if($config['cf_memo_del'] > 0) {
+ $sql = " delete from {$g5['memo_table']} where (TO_DAYS('".G5_TIME_YMDHIS."') - TO_DAYS(me_send_datetime)) > '{$config['cf_memo_del']}' ";
+ sql_query($sql);
+ sql_query(" OPTIMIZE TABLE `{$g5['memo_table']}` ");
+}
+
+// 탈퇴회원 자동 삭제
+if($config['cf_leave_day'] > 0) {
+ $sql = " select mb_id from {$g5['member_table']} where (TO_DAYS('".G5_TIME_YMDHIS."') - TO_DAYS(mb_leave_date)) > '{$config['cf_leave_day']}' ";
+ $result = sql_query($sql);
+ while ($row=sql_fetch_array($result))
+ {
+ // 회원자료 삭제
+ member_delete($row['mb_id']);
+ }
+}
+
+// 실행일 기록
+if(isset($config['cf_optimize_date'])) {
+ sql_query(" update {$g5['config_table']} set cf_optimize_date = '".G5_TIME_YMD."' ");
+}
+?>
\ No newline at end of file
diff --git a/bbs/memo.php b/bbs/memo.php
index f5e4f032a..4d9c0129a 100644
--- a/bbs/memo.php
+++ b/bbs/memo.php
@@ -1,18 +1,12 @@
\ No newline at end of file
diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php
index f8db59dd8..a338770f9 100644
--- a/lib/thumbnail.lib.php
+++ b/lib/thumbnail.lib.php
@@ -161,6 +161,9 @@ function get_view_thumbnail($contents, $thumb_width=0)
else
$thumb_file = $filename;
+ if(!$thumb_file)
+ continue;
+
if ($width) {
$thumb_tag = '
';
} else {
@@ -169,7 +172,7 @@ function get_view_thumbnail($contents, $thumb_width=0)
// $img_tag에 editor 경로가 있으면 원본보기 링크 추가
$img_tag = $matches[0][$i];
- if(strpos($img_tag, 'data/editor') && preg_match("/\.({$config['cf_image_extension']})$/i", $filename)) {
+ if(strpos($img_tag, G5_DATA_DIR.'/'.G5_EDITOR_DIR) && preg_match("/\.({$config['cf_image_extension']})$/i", $filename)) {
$imgurl = str_replace(G5_URL, "", $src);
$thumb_tag = ''.$thumb_tag.'';
}
@@ -204,6 +207,10 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h
@chmod($target_path, G5_DIR_PERMISSION);
}
+ // 디렉토리가 존재하지 않거나 쓰기 권한이 없으면 썸네일 생성하지 않음
+ if(!(is_dir($target_path) && is_writable($target_path)))
+ return '';
+
// Animated GIF는 썸네일 생성하지 않음
if($size[2] == 1) {
if(is_animated_gif($source_file))