projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4182942
)
DataObjects/Images.php
author
Alan Knowles
<alan@roojs.com>
Wed, 16 May 2018 04:29:01 +0000
(12:29 +0800)
committer
Alan Knowles
<alan@roojs.com>
Wed, 16 May 2018 04:29:01 +0000
(12:29 +0800)
DataObjects/Images.php
patch
|
blob
|
history
diff --git
a/DataObjects/Images.php
b/DataObjects/Images.php
index
d847abf
..
cf49645
100644
(file)
--- a/
DataObjects/Images.php
+++ b/
DataObjects/Images.php
@@
-200,8
+200,8
@@
class Pman_Core_DataObjects_Images extends DB_DataObject
{
$opts = HTML_FlexyFramework::get()->Pman;
{
$opts = HTML_FlexyFramework::get()->Pman;
- $dir = $opts['storedir']. '/_deleted_images_';
- if (!file_exists( $d
ir
)) {
+ $d
eld
ir = $opts['storedir']. '/_deleted_images_';
+ if (!file_exists( $d
eldir
)) {
mkdir($dir, 0755);
}
mkdir($dir, 0755);
}
@@
-209,10
+209,11
@@
class Pman_Core_DataObjects_Images extends DB_DataObject
$b = basename($fn);
if (file_exists($fn)) {
$b = basename($fn);
if (file_exists($fn)) {
- if (file_exists($d
ir
. '/'. $b)) {
+ if (file_exists($d
eldir
. '/'. $b)) {
unlink($fn);
unlink($fn);
+ } else {
+ rename($fn, $deldir .'/',$b);
}
}
- rename($fn, $dir.'/',$b);
}
}
@@
-224,7
+225,14
@@
class Pman_Core_DataObjects_Images extends DB_DataObject
$dh = opendir($d);
while (false !== ($fn = readdir($dh))) {
if (substr($fn, 0, strlen($b)) == $b) {
$dh = opendir($d);
while (false !== ($fn = readdir($dh))) {
if (substr($fn, 0, strlen($b)) == $b) {
- unlink($d. '/'. $fn);
+
+ if (file_exists($deldir . '/'. $fn)) {
+ unlink($d. '/'. $fn);
+ continue;
+ }
+ rename($d. '/'. $fn, $deldir .'/',$fn);
+
+
}
}
}
}
}
}