DataObjects/Images.php

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 9bb9898..4b75cca 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -131,6 +131,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             }
         }
         
+        $this->getNumberOfPages($file);
+        
         $this->filesize = filesize($file);
         $this->created = date('Y-m-d H:i:s');
          
@@ -635,7 +637,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             $roo->jerr("File upload failed : error = ". (!empty($this->err) ? $this->err : ''));
         }
         
-        $roo->addEvent("ADD", $this, $this->toEventString());
+        $this->addEvent($ar, $roo);
         
         $r = DB_DataObject::factory($this->tableName());
         $r->id = $this->id;
@@ -646,6 +648,11 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
          
     }
     
+    function addEvent($ar, $roo)
+    {
+        $roo->addEvent("ADD", $this, $this->toEventString());
+    }
+    
     function toEventString()
     {
         
@@ -778,11 +785,11 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             return false;
         }
         
-        $type = pathinfo($file, PATHINFO_EXTENSION);
+        $data = file_get_contents($file);
         
-        $data = file_get_contents($type);
+        $base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
         
-        $base64 = 'data:image/' . $type . ';base64,' . base64_encode($data);
+        return $base64;
     }
     
  }