DataObjects/Core_notify.php

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index a949eda..b9fae2a 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -299,6 +299,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
                         '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!!?
@@ -439,12 +440,15 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         //$size = max(100, (int) $size);
         //$size = min(1024, (int) $size);
         // the size should 200x150 to convert
-        $size = explode('x', $size);
-        if(empty($size[1])){
-            $size[1] = 0;
+        $sizear = preg_split('/(x|c)/', $size);
+        if(empty($sizear[1])){
+            $sizear[1] = 0;
         }
-        $size = implode('x', $size);
+        $size = implode(strpos($size,'c') > -1 ? 'c' : 'x', $sizear);
+//        print_r($size);
         $fc = $this->toFileConvert();
+//        print_r($size);
+//        exit;
         $fc->convert($this->mimetype, $size);