Changeset 1468:3132a0aca046 for inc/core/class.dc.media.php

Timestamp:

08/19/13 09:55:29 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

1466:e67efe636ce1 (diff), 1467:917fc08f3a59 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 2.5 commits into default branch (should be verified)

Files:

• inc/core/class.dc.media.php (modified) (6 diffs)
• inc/core/class.dc.media.php (modified) (2 diffs)

inc/core/class.dc.media.php

@@ -30 +30 @@
      
      public $thumb_tp = '%s/.%s_%s.jpg';     ///< <b>string</b> Thumbnail file pattern
+     public $thumb_tp_alpha = '%s/.%s_%s.png'; ///< <b>string</b> Thumbnail file pattern (with alpha layer)
      
      /**
@@ -298 +299 @@
                $f->media_thumb = array();
                $p = path::info($f->relname);
-               $thumb = sprintf($this->thumb_tp,$this->root.'/'.$p['dirname'],$p['base'],'%s');
-               $thumb_url = sprintf($this->thumb_tp,$this->root_url.$p['dirname'],$p['base'],'%s');
+               $alpha = ($p['extension'] == 'png') || ($p['extension'] == 'PNG');
+               $thumb = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp),$this->root.'/'.$p['dirname'],$p['base'],'%s');
+               $thumb_url = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp),$this->root_url.$p['dirname'],$p['base'],'%s');
                
                # Cleaner URLs
@@ -920 +922 @@
           
           $p = path::info($file);
-          $thumb = sprintf($this->thumb_tp,$p['dirname'],$p['base'],'%s');
+          $alpha = ($p['extension'] == 'png') || ($p['extension'] == 'PNG');
+          $thumb = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp),$p['dirname'],$p['base'],'%s');
           
           try
@@ -939 +942 @@
                          $rate = ($s[0] < 100 ? 95 : ($s[0] < 600 ? 90 : 85));
                          $img->resize($s[0],$s[0],$s[1]);
-                         $img->output('jpeg',$thumb_file,$rate);
+                         $img->output(($alpha ? 'png' : 'jpeg'),$thumb_file,$rate);
                          $img->loadImage($file);
                     }
@@ -958 +961 @@
           {
                $p = path::info($file->relname);
-               $thumb_old = sprintf($this->thumb_tp,$p['dirname'],$p['base'],'%s');
+               $alpha = ($p['extension'] == 'png') || ($p['extension'] == 'PNG');
+               $thumb_old = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp),$p['dirname'],$p['base'],'%s');
                
                $p = path::info($newFile->relname);
-               $thumb_new = sprintf($this->thumb_tp,$p['dirname'],$p['base'],'%s');
+               $alpha = ($p['extension'] == 'png') || ($p['extension'] == 'PNG');
+               $thumb_new = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp),$p['dirname'],$p['base'],'%s');
                
                foreach ($this->thumb_sizes as $suffix => $s) {
@@ -974 +979 @@
      {
           $p = path::info($f);
-          $thumb = sprintf($this->thumb_tp,'',$p['base'],'%s');
+          $alpha = ($p['extension'] == 'png') || ($p['extension'] == 'PNG');
+          $thumb = sprintf(($alpha ? $this->thumb_tp_alpha : $this->thumb_tp),'',$p['base'],'%s');
           
           foreach ($this->thumb_sizes as $suffix => $s) {

inc/core/class.dc.media.php

@@ -499 +499 @@
      @param    post_id   <b>integer</b>      Post ID
      @param    media_id  <b>integer</b>      Optionnal media ID
-     @param    return_rs <b>boolean</b>      Whether to return a resultset (true) or an array (false, default value).
-     @return   <b>array</b> Array or ResultSet of fileItems
-     */
-     public function getPostMedia($post_id,$media_id=null,$return_rs=false)
+     @return   <b>array</b> Array of fileItems
+     */
+     public function getPostMedia($post_id,$media_id=null)
      {
           $params = array(
@@ -518 +517 @@
                $f = $this->fileRecord($rs);
                if ($f !== null) {
-                    $res[] = $return_rs ? new ArrayObject($f) : $f;
-               }
-          }
-          
-          return $return_rs ? staticRecord::newFromArray($res) : $res;
+                    $res[] = $f;
+               }
+          }
+          
+          return $res;
      }