From: Alan <alan@roojs.com>
Date: Wed, 8 Feb 2023 03:35:33 +0000 (+0800)
Subject: fix shorten name modifying filename - which it should not do.
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=56ea3dd9c2f6edeecd2264fcb36c25bde27fb17e

fix shorten name modifying filename - which it should not do.
---

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 51ba52d3..537a68f1 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -203,7 +203,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     function getStoreName() 
     {
         $opts = HTML_FlexyFramework::get()->Pman;
-        $fn = preg_replace('/[^a-z0-9\.]+/i', '_', $this->filename);
+        $fn = preg_replace('/[^a-z0-9_\.]+/i', '_', $this->filename);
         return implode( '/', array(
             $opts['storedir'], '_images_', date('Y/m', strtotime($this->created)), $this->id . '-'. $fn
         ));
@@ -215,6 +215,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
      */
     function exists()
     {
+        clearstatcache();
+        //var_dump($this->getStoreName());
         return file_exists($this->getStoreName());
     }
     
@@ -503,7 +505,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             
             
         }
-        $ret['shorten_name'] = $ret['filename'] = $this->shorten_name();
+        $ret['shorten_name']   = $this->shorten_name();
         
         return $ret;
     }
diff --git a/Images.php b/Images.php
index 92e40dbf..ee9b9687 100644
--- a/Images.php
+++ b/Images.php
@@ -184,6 +184,7 @@ class Pman_Core_Images extends Pman
         $img = DB_DataObjecT::factory('Images');
          
         if (!$id || !$img->get($id) || !$img->exists()) {
+           //print_r($img);           die("HERE");
             $this->imgErr("image has been removed or deleted.",$s);
         }