DataObjects/Core_domain.php

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 154067b..a745ee0 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -30,23 +30,20 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
     
-    function checkPerm($perm, $au)
+    function checkPerm($lvl, $au)
     {
         // default permissons are to
         // allow create / edit / if the user has
         
         if (!$au) {
-            
-          
-            
             return false;
         }
         
         $o = $this->object();
         //print_r($o);
-        if (method_exists($o, 'hasPerm')) {
+        if (method_exists($o, 'checkPerm')) {
             // edit permissions on related object needed...
-            return $o->hasPerm( $perm == 'S' ? 'S' : 'E' , $au);
+            return $o->checkPerm( $lvl == 'S' ? 'S' : 'E' , $au);
             
         }
         
@@ -268,7 +265,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     /// ctrl not used??
     function onUpload($roo)
     {
-//        echo $_FILES['imageUpload']['type'];exit;
+        //print_r($_FILES); echo $_FILES['imageUpload']['type'];exit;
         if (empty($_FILES['imageUpload']['tmp_name']) || 
             empty($_FILES['imageUpload']['name']) || 
             empty($_FILES['imageUpload']['type'])
@@ -393,8 +390,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     }
     
      
-    function toRooArray($req = array()) {
-      //  echo '<PRE>';print_r($req);exit;
+    function toRooArray($req) {
+        
         $ret= $this->toArray();
       
         static $ff = false;
@@ -406,7 +403,9 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
                     $ff->Pman_Images['public_baseURL'] : $ff->baseURL;
         
         if (!empty($req['query']['imagesize'])) {
-             $baseURL = isset($req['query']['imageBaseURL']) ? $req['query']['imageBaseURL'] : false;
+            // query/imageBaseURL ... depricated...? -- set it in config?
+            
+            $baseURL = isset($req['query']['imageBaseURL']) ? $req['query']['imageBaseURL'] : $ret['public_baseURL'];
             
             $ret['url'] = $this->URL(-1, '/Images/Download',$baseURL);
             
@@ -658,6 +657,43 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             return false;
         }
         
+        if (!empty($this->imgtype) && $this->imgtype[0] == '-' && !empty($this->onid)) {
+            // then its an upload 
+            $img  = DB_DataObject::factory('Images');
+            $img->onid = $this->onid;
+            $img->ontable = $this->ontable;
+            $img->imgtype = $this->imgtype;
+            
+            $img->find();
+            while ($img->fetch()) {
+                $img->beforeDelete();
+                $img->delete();
+            }
+            
+        }
+        
+        require_once 'File/MimeType.php';
+        $y = new File_MimeType();
+        
+        if (in_array($this->mimetype, array(
+                        'text/application',
+                        'application/octet-stream',
+                        'image/x-png',  // WTF does this?
+                        'image/pjpeg',  // WTF does this?
+                        'application/x-apple-msg-attachment', /// apple doing it's magic...
+                        'application/vnd.ms-excel',   /// sometimes windows reports csv as excel???
+                        'application/csv-tab-delimited-table', // windows again!!?
+                ))) { // weird tyeps..
+            $inf = pathinfo($this->filename);
+            $this->mimetype  = $y->fromExt($inf['extension']);
+        }
+        
+        $ext = $y->toExt(trim((string) $this->mimetype ));
+        
+        if(array_pop(explode('.', $this->filename)) != $ext){
+            $this->filename = $this->filename .'.'. $ext; 
+        }
+        
         if (!$this->createFromData($data)) {
             return false;
         }