Fixed makeThumb bugs.

diff --git a/album.xmi b/album.xmi
new file mode 100644 (file)
index 0000000..9c00653
--- /dev/null
+++ b/album.xmi
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<XMI xmlns:UML="org.omg/standards/UML" verified="false" timestamp="" xmi.version="1.2" >
+ <XMI.header>
+  <XMI.documentation>
+   <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
+   <XMI.exporterVersion>1.1</XMI.exporterVersion>
+  </XMI.documentation>
+  <XMI.model xmi.name="album" href="/home/luca/website/www/test/bife/album/album.xmi" />
+  <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
+ </XMI.header>
+ <XMI.content>
+  <docsettings viewid="114" documentation="Parse XML data getting widgets." uniqueid="155" />
+  <umlobjects>
+   <UML:Class stereotype="" package="BIFE" xmi.id="3" abstract="1" documentation="Base widget class.
+x2c:extern" name="Widget" static="0" scope="200" />
+   <UML:Class stereotype="" package="BIFE/Album" xmi.id="20" abstract="0" documentation="Photo album widget. [TODO: Make a better explanation]" name="Thumbs" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="22" type="void" abstract="0" documentation="Constructor." name="BIFE_Album_Thumbs" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="array" abstract="0" documentation="Attributes." name="attrs" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="57" type="void" abstract="0" documentation="Constructor." name="__construct" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="array" abstract="0" documentation="Attributes." name="attrs" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="23" type="string" abstract="0" documentation="Renders the widget." name="render" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="&amp;HTML_Template_HIT" abstract="0" documentation="Template to use to render the widget." name="template" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="95" type="array" abstract="0" documentation="Gets a list of photos with their descriptions and thumbnails.
+
+Returns an array of associative arrays with this keys:
+&lt;ul>
+&lt;li>&lt;b>file:&lt;/b> Photo filename.&lt;/li>
+&lt;li>&lt;b>desc:&lt;/b> Photo Description.&lt;/li>
+&lt;li>&lt;b>thumb:&lt;/b> Photo thumbnail filename.&lt;/li>
+&lt;/ul>
+" name="getList" static="0" scope="202" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Directory where images are." name="root" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="" type="array" abstract="0" documentation="Images extensions to accept." name="exts" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="3" value="" type="string" abstract="0" documentation="Format to use to save the thumbs." name="format" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="4" value="" type="string" abstract="0" documentation="Directory where the thumbs are." name="thumbsdir" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="97" type="string" abstract="0" documentation="Creates an image thumbnail, returning his filename." name="makeThumb" static="1" scope="202" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Filename of the image to create the thumb." name="filename" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="3" value="" type="string" abstract="0" documentation="Thumbs format." name="format" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="4" value="" type="string" abstract="0" documentation="Directory where to put the thumbs." name="thumbsdir" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="5" value="" type="string" abstract="0" documentation="Root directory." name="root" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="6" value="100" type="int" abstract="0" documentation="Maximum thumbnail size." name="size" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="98" type="string" abstract="0" documentation="Returns the filename of an image thumb." name="getThumbFilename" static="0" scope="202" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Filename of the image to get the thumb name." name="filename" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="" type="string" abstract="0" documentation="Thumbs format." name="format" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="3" value="" type="string" abstract="0" documentation="Directory where the thumbs are." name="thumbsdir" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="4" value="" type="string" abstract="0" documentation="Root directory." name="root" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="102" type="string" abstract="0" documentation="Returns the description of the album." name="getDescription" static="0" scope="202" />
+    <UML:Operation stereotype="" package="" xmi.id="100" type="array" abstract="0" documentation="Splits a filename returning an array with the path, name and extension." name="splitFilename" static="1" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Filename to split." name="filename" static="0" scope="200" />
+    </UML:Operation>
+   </UML:Class>
+   <UML:Class stereotype="" package="BIFE/Album" xmi.id="103" abstract="0" documentation="Photo widget." name="Photo" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="108" type="string" abstract="0" documentation="Renders the widget using a template returning a string with the results." name="render" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="&amp;HTML_Template_HIT" abstract="0" documentation="Template to use to render the widget." name="template" static="0" scope="200" />
+    </UML:Operation>
+   </UML:Class>
+   <UML:Class stereotype="" package="BIFE/Album" xmi.id="151" abstract="0" documentation="Album pager to an easier navigation when viewing photos." name="Pager" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="153" type="void" abstract="0" documentation="Constructor." name="BIFE_Album_Pager" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="array" abstract="0" documentation="Attributes." name="attrs" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="154" type="void" abstract="0" documentation="Constructor." name="__construct" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="array" abstract="0" documentation="Attributes." name="attrs" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="155" type="string" abstract="0" documentation="Renders the widget using a template returning a string with the results." name="render" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="&amp;HTML_Template_HIT" abstract="0" documentation="Template to use to render the widget." name="template" static="0" scope="200" />
+    </UML:Operation>
+   </UML:Class>
+  </umlobjects>
+  <diagrams>
+   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" showgrid="1" showopsig="0" usefillcolor="1" snapx="10" snapy="10" showatts="1" xmi.id="114" documentation="" type="402" showops="1" showpackage="1" name="Album Classes" localid="30000" showstereotype="0" showscope="1" font="Helvetica,9,-1,5,48,0,0,0,0,0" linecolor="#ff0000" >
+    <widgets>
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="90" showattsigs="600" usesdiagramusefillcolour="0" x="222" linecolour="#ff0000" y="23" showopsigs="600" usesdiagramlinecolour="0" fillcolour="#dcdcdc" height="25" usefillcolor="1" showattributes="0" xmi.id="3" showoperations="0" showpackage="1" showscope="1" showstereotype="0" font="Helvetica,9,-1,5,48,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="161" showattsigs="601" usesdiagramusefillcolour="0" x="22" linecolour="#ff0000" y="175" showopsigs="600" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="142" usefillcolor="1" showattributes="1" xmi.id="20" showoperations="1" showpackage="1" showscope="1" showstereotype="0" font="Helvetica,9,-1,5,48,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="126" showattsigs="601" usesdiagramusefillcolour="0" x="204" linecolour="#ff0000" y="175" showopsigs="600" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="37" usefillcolor="1" showattributes="1" xmi.id="103" showoperations="1" showpackage="1" showscope="1" showstereotype="0" font="Helvetica,9,-1,5,48,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="148" showattsigs="601" usesdiagramusefillcolour="0" x="352" linecolour="#ff0000" y="175" showopsigs="600" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="67" usefillcolor="1" showattributes="1" xmi.id="151" showoperations="1" showpackage="1" showscope="1" showstereotype="0" font="Helvetica,9,-1,5,48,0,0,0,0,0" />
+    </widgets>
+    <messages/>
+    <associations>
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="4" indexb="1" widgetbid="3" widgetaid="20" documentation="" type="500" >
+      <linepath>
+       <startpoint startx="102" starty="175" />
+       <endpoint endx="244" endy="48" />
+      </linepath>
+     </UML:AssocWidget>
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="4" indexb="2" widgetbid="3" widgetaid="103" documentation="" type="500" >
+      <linepath>
+       <startpoint startx="267" starty="175" />
+       <endpoint endx="267" endy="48" />
+      </linepath>
+     </UML:AssocWidget>
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="4" indexb="3" widgetbid="3" widgetaid="151" documentation="" type="500" >
+      <linepath>
+       <startpoint startx="426" starty="175" />
+       <endpoint endx="289" endy="48" />
+      </linepath>
+     </UML:AssocWidget>
+    </associations>
+   </diagram>
+  </diagrams>
+  <listview>
+   <listitem open="1" type="800" id="-1" label="Views" >
+    <listitem open="1" type="801" id="-1" label="Logical View" >
+     <listitem open="1" type="803" id="-1" label="Album" >
+      <listitem open="1" type="807" id="114" label="Album Classes" />
+      <listitem open="0" type="813" id="151" label="Pager" >
+       <listitem open="0" type="815" id="153" label="BIFE_Album_Pager" />
+       <listitem open="0" type="815" id="154" label="__construct" />
+       <listitem open="0" type="815" id="155" label="render" />
+      </listitem>
+      <listitem open="0" type="813" id="103" label="Photo" >
+       <listitem open="0" type="815" id="108" label="render" />
+      </listitem>
+      <listitem open="0" type="813" id="20" label="Thumbs" >
+       <listitem open="0" type="815" id="22" label="BIFE_Album_Thumbs" />
+       <listitem open="0" type="815" id="57" label="__construct" />
+       <listitem open="0" type="815" id="102" label="getDescription" />
+       <listitem open="0" type="815" id="95" label="getList" />
+       <listitem open="0" type="815" id="98" label="getThumbFilename" />
+       <listitem open="0" type="815" id="97" label="makeThumb" />
+       <listitem open="0" type="815" id="23" label="render" />
+       <listitem open="0" type="815" id="100" label="splitFilename" />
+      </listitem>
+     </listitem>
+     <listitem open="1" type="803" id="-1" label="BIFE" >
+      <listitem open="0" type="813" id="3" label="Widget" />
+     </listitem>
+    </listitem>
+    <listitem open="1" type="802" id="-1" label="Use Case View" />
+   </listitem>
+  </listview>
+ </XMI.content>
+</XMI>

diff --git a/src/BIFE/Album/Thumbs.php b/src/BIFE/Album/Thumbs.php
index c968c061f410da2dc089a24547dc2b4e58f5dbc0..d991b4942c291851d01fcb543f03b77f6440082c 100644 (file)
--- a/src/BIFE/Album/Thumbs.php
+++ b/src/BIFE/Album/Thumbs.php
@@ -108,10 +108,10 @@ class BIFE_Album_Thumbs extends BIFE_Widget {
                 $cur = $row * $this->attrs['COLUMNS'] + $col;
                 if ($photo = @$list[$cur]) {
                     if (is_null($photo['THUMB'])) {
                 $cur = $row * $this->attrs['COLUMNS'] + $col;
                 if ($photo = @$list[$cur]) {
                     if (is_null($photo['THUMB'])) {

-                        $photo['THUMB'] = $this->makeThumb(
-                            BIFE_Link::getFsPath() . $photo['FILE'],
+                        $photo['THUMB'] = $this->makeThumb($photo['FILE'],

                             $this->attrs['THUMBSFORMAT'],
                             $this->attrs['THUMBSFORMAT'],

-                            $this->attrs['THUMBSDIR']);
+                            $this->attrs['THUMBSDIR'],
+                            BIFE_Link::getFsPath() . $this->attrs['DIR']);

                     }
                     $photo['THUMB'] = BIFE_Link::getWebPath()
                         . $this->attrs['DIR'] . '/' . $photo['THUMB'];
                     }
                     $photo['THUMB'] = BIFE_Link::getWebPath()
                         . $this->attrs['DIR'] . '/' . $photo['THUMB'];


@@ -148,11 +148,16 @@ Returns an array of associative arrays with this keys:
 <li><b>desc:</b> Photo Description.</li>
 <li><b>thumb:</b> Photo thumbnail filename.</li>
 </ul>
 <li><b>desc:</b> Photo Description.</li>
 <li><b>thumb:</b> Photo thumbnail filename.</li>
 </ul>

+     *
+     * @param  string $root Directory where images are.
+     * @param  array $exts Images extensions to accept.
+     * @param  string $format Format to use to save the thumbs.
+     * @param  string $thumbsdir Directory where the thumbs are.

      *
      * @return array
      * @access protected
      */
      *
      * @return array
      * @access protected
      */

-    function getList() // ~X2C
+    function getList($root, $exts, $format, $thumbsdir) // ~X2C

     {
         $return = array();
         $d = dir($root);
     {
         $return = array();
         $d = dir($root);


@@ -161,7 +166,7 @@ Returns an array of associative arrays with this keys:
                 list($path, $name, $ext) = $this->splitFilename("$root/$file");
                 if (is_readable("$root/$file") and in_array($ext, $exts)) {
                     $thumb = $this->getThumbFilename($file, $format,
                 list($path, $name, $ext) = $this->splitFilename("$root/$file");
                 if (is_readable("$root/$file") and in_array($ext, $exts)) {
                     $thumb = $this->getThumbFilename($file, $format,

-                        $thumbsdir);
+                        $thumbsdir, $root);

                     $return[] = array(
                         'FILE'  => $file,
                         'DESC'  => $name,
                     $return[] = array(
                         'FILE'  => $file,
                         'DESC'  => $name,


@@ -180,20 +185,23 @@ Returns an array of associative arrays with this keys:
      * Creates an image thumbnail, returning his filename.
      *
      * @param  string $filename Filename of the image to create the thumb.
      * Creates an image thumbnail, returning his filename.
      *
      * @param  string $filename Filename of the image to create the thumb.

+     * @param  string $format Thumbs format.
+     * @param  string $thumbsdir Directory where to put the thumbs.
+     * @param  string $root Root directory.

      * @param  int $size Maximum thumbnail size.
      *
      * @return string
      * @access protected
      * @param  int $size Maximum thumbnail size.
      *
      * @return string
      * @access protected

+     * @static

      */
      */

-    function makeThumb($filename, $size = 100) // ~X2C
+    function makeThumb($filename, $format, $thumbsdir, $root, $size = 100) // ~X2C

     {
     {

-        $thumb = $this->getThumbFilename($filename, $format, $thumbsdir);
-        list($path, $name, $ext) = $this->splitFilename($thumb);
+        list($path, $name, $ext) = $this->splitFilename($filename);

         $img =& Image_Transform::factory('GD');
         $img =& Image_Transform::factory('GD');

-        $img->load($filename);
+        $img->load("$root/$filename");

         // If image is larger than the maximum size, we resize it.
         if ($img->img_x > $size or $img->img_y > $size ) {
         // If image is larger than the maximum size, we resize it.
         if ($img->img_x > $size or $img->img_y > $size ) {

-            if (!@is_dir($path) and !@mkdir($path)) {
+            if (!@is_dir("$root/$thumbsdir") and !@mkdir("$root/$thumbsdir")) {

                 return null;
             }
             if (PEAR::isError($img)) {
                 return null;
             }
             if (PEAR::isError($img)) {


@@ -203,10 +211,9 @@ Returns an array of associative arrays with this keys:
                 return null;
             }
         }
                 return null;
             }
         }

-        $img->save("$path/$name.$format", $format);
+        $img->save("$root/$thumbsdir/$name.$format", $format);

         $img->free();
         $img->free();

-
-        return $thumb;
+        return "$thumbsdir/$name.$format";

     }
     // -X2C
 
     }
     // -X2C
 


@@ -215,14 +222,21 @@ Returns an array of associative arrays with this keys:
      * Returns the filename of an image thumb.
      *
      * @param  string $filename Filename of the image to get the thumb name.
      * Returns the filename of an image thumb.
      *
      * @param  string $filename Filename of the image to get the thumb name.

+     * @param  string $format Thumbs format.
+     * @param  string $thumbsdir Directory where the thumbs are.
+     * @param  string $root Root directory.

      *
      * @return string
      * @access protected
      */
      *
      * @return string
      * @access protected
      */

-    function getThumbFilename($filename) // ~X2C
+    function getThumbFilename($filename, $format, $thumbsdir, $root) // ~X2C

     {
         list($path, $name, $ext) = $this->splitFilename($filename);
     {
         list($path, $name, $ext) = $this->splitFilename($filename);

-        return "$thumbsdir/$name.$format";
+        if (is_readable("$root/$thumbsdir/$name.$format")) {
+            return "$thumbsdir/$name.$format";
+        } else {
+            return null;
+        }

     }
     // -X2C
 
     }
     // -X2C
 


@@ -267,4 +281,4 @@ Returns an array of associative arrays with this keys:
 
 } // -X2C Class :Thumbs
 
 
 } // -X2C Class :Thumbs
 

-?>
\ No newline at end of file
+?>