projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Images.php
[Pman.Core]
/
DataObjects
/
Images.php
diff --git
a/DataObjects/Images.php
b/DataObjects/Images.php
index
10c92f1
..
cf49645
100644
(file)
--- a/
DataObjects/Images.php
+++ b/
DataObjects/Images.php
@@
-185,7
+185,6
@@
class Pman_Core_DataObjects_Images extends DB_DataObject
{
$opts = HTML_FlexyFramework::get()->Pman;
$fn = preg_replace('/[^a-z0-9\.]+/i', '_', $this->filename);
{
$opts = HTML_FlexyFramework::get()->Pman;
$fn = preg_replace('/[^a-z0-9\.]+/i', '_', $this->filename);
- print_r($opts);exit;
return implode( '/', array(
$opts['storedir'], '_images_', date('Y/m', strtotime($this->created)), $this->id . '-'. $fn
));
return implode( '/', array(
$opts['storedir'], '_images_', date('Y/m', strtotime($this->created)), $this->id . '-'. $fn
));
@@
-199,19
+198,41
@@
class Pman_Core_DataObjects_Images extends DB_DataObject
*/
function beforeDelete()
{
*/
function beforeDelete()
{
+
+ $opts = HTML_FlexyFramework::get()->Pman;
+ $deldir = $opts['storedir']. '/_deleted_images_';
+ if (!file_exists( $deldir )) {
+ mkdir($dir, 0755);
+ }
+
$fn = $this->getStoreName();
$fn = $this->getStoreName();
+ $b = basename($fn);
if (file_exists($fn)) {
if (file_exists($fn)) {
- unlink($fn);
+
+ if (file_exists($deldir . '/'. $b)) {
+ unlink($fn);
+ } else {
+ rename($fn, $deldir .'/',$b);
+ }
+
+
}
// delete thumbs..
}
// delete thumbs..
- $b = basename($fn);
+
$d = dirname($fn);
if (file_exists($d)) {
$dh = opendir($d);
while (false !== ($fn = readdir($dh))) {
if (substr($fn, 0, strlen($b)) == $b) {
$d = dirname($fn);
if (file_exists($d)) {
$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);
+
+
}
}
}
}
}
}