Merge branch 'master' of http://private.akbkhome.com/Pman.Core

diff --combined DataObjects/Images.php
index 1c790e0,37e0579..dfc22bb
--- 1/DataObjects/Images.php
--- 2/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@@ -15,18 -15,22 +15,22 @@@ class Pman_Core_DataObjects_Images exte
      public $ontable;                         // string(32)  not_null multiple_key
      public $onid;                            // int(11)  not_null
      public $mimetype;                        // string(64)  not_null
-     public $width;                           // int(11)  not_null
-     public $height;                          // int(11)  not_null
      public $filesize;                        // int(11)  not_null
-     public $displayorder;                    // int(11)  not_null
-     public $language;                        // string(6)  not_null
-     public $parent_image_id;                 // int(11)  not_null
      public $created;                         // datetime(19)  not_null binary
+     public $created_by;                         // int(11)  not_null
+ 
+     public $width;                           // int(11)  not_null
+     public $height;                          // int(11)  not_null
+     
+ 
      public $imgtype;                         // string(32)  not_null
+     public $parent_image_id;                 // int(11)  not_null
      public $linkurl;                         // string(254)  not_null
      public $descript;                        // blob(65535)  not_null blob
      public $title;                           // string(128)  not_null
- 
+     public $displayorder;                    // int(11)  not_null
+     public $language;                        // string(6)  not_null
+     
      
      /* the code above is auto generated do not remove the tag below */
      ###END_AUTOCODE
@@@ -36,34 -40,40 +40,40 @@@
       * ontable / onid.
       * 
       */
-     function createFrom($file)
+     function createFrom($file, $filename=false)
      {
          // copy the file into the storage area..
          if (!file_exists($file) || !filesize($file)) {
              return false;
          }
          
-         
-         $imgs = @getimagesize($file);
-         
-         if (empty($imgs) || empty($imgs[0]) || empty($imgs[1])) {
-             // it's a file!!!!
-         } else {
-             list($this->width , $this->height)  = $imgs;
-         }
-         
-         $this->filesize = filesize($file);
-         $this->created = date('Y-m-d H:i:s');
+         $filename = empty($filename) ? $file : $filename;
          
          if (empty($this->mimetype)) {
              require_once 'File/MimeType.php';
              $y = new File_MimeType();
-             $this->mimetype = $y->fromFilename($file);
+             $this->mimetype = $y->fromFilename($filename);
+         }
+         
+         $this->mimetype= strtolower($this->mimetype);
+         
+         if (array_shift(explode('/', $this->mimetype)) == 'image') { 
+         
+             $imgs = @getimagesize($file);
+             
+             if (empty($imgs) || empty($imgs[0]) || empty($imgs[1])) {
+                 // it's a file!!!!
+             } else {
+                 list($this->width , $this->height)  = $imgs;
+             }
          }
          
+         $this->filesize = filesize($file);
+         $this->created = date('Y-m-d H:i:s');
+          
          
          if (empty($this->filename)) {
-             $this->filename = basename($file);
+             $this->filename = basename($filename);
          }
          
          //DB_DataObject::debugLevel(1);
@@@ -103,7 -113,7 +113,7 @@@
       */
      function getStoreName() 
      {
-         $opts = PEAR::getStaticProperty('Pman', 'options');
+         $opts = HTML_FlexyFramework::get()->Pman;
          $fn = preg_replace('/[^a-z0-9\.]+/i', '_', $this->filename);
          return implode( '/', array(
              $opts['storedir'], '_images_', date('Y/m', strtotime($this->created)), $this->id . '-'. $fn
@@@ -137,7 -147,18 +147,18 @@@
          }
          
      }
-     
+     /**
+      * check mimetype against type
+      * - eg. img.is(#image#)
+      *
+      */
+     function is($type)
+     {
+         if (empty($this->mimetype)) {
+             return false;
+         }
+         return 0 === strcasecmp($type, array_shift(explode('/',$this->mimetype)));
+     }
    
      /**
       * onUpload (singlely attached image to a table)
@@@ -246,15 -267,36 +267,36 @@@
          if (empty($obj->id)) {
              return array();
          }
+         
          $c = clone($this);
          $c->ontable = $obj->tableName();
          $c->onid = $obj->id;
+         $c->autoJoin();
          if (!empty($mime_like)) {
 -            $c->whereAdd("mimetype LIKE '". $c->escape($mime_like) ."'");
 +            $c->whereAdd("Images.mimetype LIKE '". $c->escape($mime_like) ."'");
          }
  
          return $c->fetchAll();
      }
+      
+     
+     /**
+     * set or get the dataobject this image is associated with
+     * @param DB_DataObject $obj An object to associate this image with
+     *        (does not store it - you need to call update() to do that)
+     * @return DB_DataObject the dataobject this image is attached to.
+     */
+     function object($obj=false)
+     {
+         if ($obj === false) {
+             $ret = DB_DataObject::factory($this->ontable);
+             $ret->get($this->onid);
+             return $ret;
+         }
+         $this->ontable = $obj->tableName();
+         $this->onid = $obj->id; /// assumes our nice standard of using ids..
+         return $obj;
+     }
      
       
      function toRooArray($req = array()) {
@@@ -318,14 -360,14 +360,14 @@@
          $sz = explode('x', $size);
          $sx = $sz[0];
          //var_dump($sz);
-         if (!$this->id) {
+         if (!$this->id || empty($this->width)) {
              $this->height = $sx;
              $this->width = empty($sz[1]) ? $sx : $sz[1];
              $sy = $this->width ;
          }
          if (empty($sz[1])) {
-             $ratio =  $this->height/ ($this->width *1.0);
-             $sy = $ration * $sx;
+             $ratio =  empty($this->width) ? 1 : $this->height/ ($this->width *1.0);
+             $sy = $ratio * $sx;
          } else {
              $sy = $sz[1];
          }