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

This commit is contained in:
whitedot
2013-02-21 11:48:35 +09:00
2 changed files with 20 additions and 16 deletions

View File

@ -82,15 +82,17 @@ while ($row = sql_fetch_array($result))
while ($row2 = sql_fetch_array($result2)) {
@unlink(G4_DATA_PATH.'/file/'.$bo_table.'/'.$row2['bf_file']);
// 썸네일삭제
$dir = G4_DATA_PATH.'/file/'.$bo_table;
if($dh = opendir($dir)) {
while(($file = readdir($dh)) !== false) {
if($file == "." || $file == "..")
continue;
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);
$filename = preg_replace("/\.[^\.]+$/i", "", $row2['bf_file']);
if(strstr($file, $filename) && strpos($file, $filename) != 0) {
@unlink($dir.'/'.$file);
}
}
}
}

View File

@ -95,15 +95,17 @@ for ($i=count($tmp_array)-1; $i>=0; $i--)
@unlink(G4_DATA_PATH.'/file/'.$bo_table.'/'.$row2['bf_file']);
// 썸네일삭제
$dir = G4_DATA_PATH.'/file/'.$bo_table;
if($dh = opendir($dir)) {
while(($file = readdir($dh)) !== false) {
if($file == "." || $file == "..")
continue;
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);
$filename = preg_replace("/\.[^\.]+$/i", "", $row2['bf_file']);
if(strstr($file, $filename) && strpos($file, $filename) != 0) {
@unlink($dir.'/'.$file);
}
}
}
}