From f61a0e349540643c577ed88c1d908cfc4cda0bb5 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 22 Feb 2013 10:32:55 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EA=B8=80=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95,=20=EC=82=AD=EC=A0=9C=EC=8B=9C=20=EC=8D=B8=EB=84=A4?=
 =?UTF-8?q?=EC=9D=BC=20=EC=82=AD=EC=A0=9C=20=EC=BD=94=EB=93=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/delete.php       | 17 ++---------------
 bbs/delete_all.php   | 18 ++++--------------
 bbs/write_update.php | 19 +++++--------------
 3 files changed, 11 insertions(+), 43 deletions(-)

diff --git a/bbs/delete.php b/bbs/delete.php
index eea6cb217..5844dee2e 100644
--- a/bbs/delete.php
+++ b/bbs/delete.php
@@ -83,25 +83,12 @@ while ($row = sql_fetch_array($result))
             @unlink(G4_DATA_PATH.'/file/'.$bo_table.'/'.$row2['bf_file']);
             // 썸네일삭제
             if(preg_match("/\.({$config['cf_image_extension']})$/i", $row2['bf_file'])) {
-                $dir = G4_DATA_PATH.'/file/'.$bo_table;
-                if($dh = opendir($dir)) {
-                    while(($file = readdir($dh)) !== false) {
-                        if($file == "." || $file == "..")
-                            continue;
-
-                        $filename = preg_replace("/\.[^\.]+$/i", "", $row2['bf_file']);
-                        if(strstr($file, $filename) && strpos($file, $filename) != 0) {
-                            @unlink($dir.'/'.$file);
-                        }
-                    }
-
-                    closedir($dh);
-                }
+                delete_board_thumbnail($bo_table, $row2['bf_file']);
             }
         }
 
         // 에디터 썸네일 삭제
-        echo delete_editor_thumbnail($row['wr_content']);
+        delete_editor_thumbnail($row['wr_content']);
 
         // 파일테이블 행 삭제
         sql_query(" delete from {$g4['board_file_table']} where bo_table = '$bo_table' and wr_id = '{$row['wr_id']}' ");
diff --git a/bbs/delete_all.php b/bbs/delete_all.php
index ab19c590d..2885d73d5 100644
--- a/bbs/delete_all.php
+++ b/bbs/delete_all.php
@@ -96,23 +96,13 @@ for ($i=count($tmp_array)-1; $i>=0; $i--)
 
                 // 썸네일삭제
                 if(preg_match("/\.({$config['cf_image_extension']})$/i", $row2['bf_file'])) {
-                    $dir = G4_DATA_PATH.'/file/'.$bo_table;
-                    if($dh = opendir($dir)) {
-                        while(($file = readdir($dh)) !== false) {
-                            if($file == "." || $file == "..")
-                                continue;
-
-                            $filename = preg_replace("/\.[^\.]+$/i", "", $row2['bf_file']);
-                            if(strstr($file, $filename) && strpos($file, $filename) != 0) {
-                                @unlink($dir.'/'.$file);
-                            }
-                        }
-
-                        closedir($dh);
-                    }
+                    delete_board_thumbnail($bo_table, $row2['bf_file']);
                 }
             }
 
+            // 에디터 썸네일 삭제
+            delete_editor_thumbnail($row['wr_content']);
+
             // 파일테이블 행 삭제
             sql_query(" delete from {$g4['board_file_table']} where bo_table = '$bo_table' and wr_id = '{$row['wr_id']}' ");
 
diff --git a/bbs/write_update.php b/bbs/write_update.php
index e53169555..f15953699 100644
--- a/bbs/write_update.php
+++ b/bbs/write_update.php
@@ -188,6 +188,10 @@ for ($i=0; $i<count($_FILES['bf_file']['name']); $i++) {
 
         $row = sql_fetch(" select bf_file from {$g4['board_file_table']} where bo_table = '{$bo_table}' and wr_id = '{$wr_id}' and bf_no = '{$i}' ");
         @unlink(G4_DATA_PATH.'/file/'.$bo_table.'/'.$row['bf_file']);
+        // 썸네일삭제
+        if(preg_match("/\.({$config['cf_image_extension']})$/i", $row['bf_file'])) {
+            delete_board_thumbnail($bo_table, $row['bf_file']);
+        }
     }
     else
         $upload[$i]['del_check'] = false;
@@ -239,20 +243,7 @@ for ($i=0; $i<count($_FILES['bf_file']['name']); $i++) {
             @unlink(G4_DATA_PATH.'/file/'.$bo_table.'/'.$row['bf_file']);
             // 이미지파일이면 썸네일삭제
             if(preg_match("/\.({$config['cf_image_extension']})$/i", $row['bf_file'])) {
-                $dir = G4_DATA_PATH.'/file/'.$bo_table;
-                if($dh = opendir($dir)) {
-                    while(($entry = readdir($dh)) !== false) {
-                        if($entry == "." || $entry == "..")
-                            continue;
-
-                        $fname = preg_replace("/\.[^\.]+$/i", "", $row['bf_file']);
-                        if(strstr($entry, $fname) && strpos($entry, $fname) != 0) {
-                            @unlink($dir.'/'.$entry);
-                        }
-                    }
-
-                    closedir($dh);
-                }
+                delete_board_thumbnail($bo_table, $row['bf_file']);
             }
         }