finished improving thumbnail code and replaced the old image error image

diff --git a/graphics/empty_album.png b/graphics/empty_album.png
new file mode 100644 (file)
index 0000000..0c041d0
Binary files /dev/null and b/graphics/empty_album.png differ

diff --git a/graphics/image_error_large.png b/graphics/image_error_large.png
new file mode 100644 (file)
index 0000000..4316f45
Binary files /dev/null and b/graphics/image_error_large.png differ

diff --git a/graphics/image_error_small.png b/graphics/image_error_small.png
new file mode 100644 (file)
index 0000000..2f814fd
Binary files /dev/null and b/graphics/image_error_small.png differ

diff --git a/graphics/image_error_thumb.png b/graphics/image_error_thumb.png
new file mode 100644 (file)
index 0000000..0eeb797
Binary files /dev/null and b/graphics/image_error_thumb.png differ

diff --git a/graphics/img_error.jpg b/graphics/img_error.jpg
deleted file mode 100644 (file)
index e3aad2a..0000000
Binary files a/graphics/img_error.jpg and /dev/null differ

diff --git a/thumbnail.php b/thumbnail.php
index 113262960742a82634862eaaa5cd680f70074105..688d400af779f2763da6a80430ead925ec592123 100644 (file)
--- a/thumbnail.php
+++ b/thumbnail.php
@@ -16,15 +16,27 @@
        if ($size != 'small' && $size != 'thumb') {\r
                $size = 'large';\r
        }\r
-       error_log('size is ' . $size);\r
+       \r
+       $error_image = '';\r
+       switch ($size) {\r
+               case 'thumb':\r
+                       $error_image = "image_error_thumb.png";\r
+                       break;\r
+               case 'small':\r
+                       $error_image = "image_error_small.png";\r
+                       break;\r
+               case 'large':\r
+                       $error_image = "image_error_large.png";\r
+                       break;\r
+       }\r
        \r
        // Get file entity\r
        $file = get_entity($file_guid);\r
        if (!$file)\r
-               forward('mod/tidypics/graphics/img_error.jpg');\r
+               forward('mod/tidypics/graphics/' . $error_image);\r
        \r
        if ($file->getSubtype() != "image")\r
-               forward('mod/tidypics/graphics/img_error.jpg');\r
+               forward('mod/tidypics/graphics/' . $error_image);\r
        \r
        // Get filename\r
        if ($size == "thumb") {\r
@@ -34,10 +46,9 @@
        } else {\r
                $thumbfile = $file->largethumb;\r
        }\r
-       error_log('filename is ' . $thumbfile);\r
        \r
        if (!$thumbfile)\r
-               forward('mod/tidypics/graphics/img_error.jpg');\r
+               forward('mod/tidypics/graphics/' . $error_image);\r
        \r
        // create Elgg File object\r
        $readfile = new ElggFile();\r
@@ -47,11 +58,12 @@
 \r
        // send error image if file could not be read\r
        if (!$contents) {\r
-               forward('mod/tidypics/graphics/img_error.jpg');\r
+               forward('mod/tidypics/graphics/' . $error_image);\r
        }\r
 \r
        // Return the thumbnail and exit\r
-       header("Content-type: image");\r
+       $mime = $file->mimetype;\r
+       header("Content-type: $mime");\r
        echo $contents;\r
        exit;\r
 ?>\r

diff --git a/views/default/object/album.php b/views/default/object/album.php
index 1e8ff9dc92ce55e911ce890f3f6f2cfb927c1e0b..eb26123e26912378d5ccd32ef53b9a8b97a7d3b2 100644 (file)
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -5,7 +5,7 @@
 
        global $CONFIG;
        
-       $file = $vars['entity'];        
+       $file = $vars['entity'];
        $file_guid = $file->getGUID();
        $tags = $file->tags;
        $title = $file->title;
@@ -14,7 +14,7 @@
        $friendlytime = friendly_time($vars['entity']->time_created);
        $mime = $file->mimetype;
 
-       if (get_context() == "search") {        
+       if (get_context() == "search") {
 
                if (get_input('search_viewtype') == "gallery") {
                        //default gallery view for album listing @ /photos/owned/
@@ -23,7 +23,7 @@
                        if($file->cover)
                                $album_cover = '<img src="'.$vars['url'].'mod/tidypics/thumbnail.php?file_guid='.$file->cover.'&size=small" border="0" class="tidypics_album_cover"  alt="thumbnail"/>';
                        else
-                               $album_cover = '<img src="'.$vars['url'].'mod/tidypics/graphics/img_error.jpg" class="tidypics_album_cover" alt="new album">';
+                               $album_cover = '<img src="'.$vars['url'].'mod/tidypics/graphics/empty_album.png" class="tidypics_album_cover" alt="new album">';
 
        ?>
                        <div class="tidypics_album_gallery_item">                       

diff --git a/views/default/tidypics/albums.php b/views/default/tidypics/albums.php
index ba75760c6b4b515ff16778ff45769f2ef6226842..9c75bf024daf507ec93e1ca9b0ee21b1a31369d5 100644 (file)
--- a/views/default/tidypics/albums.php
+++ b/views/default/tidypics/albums.php
@@ -14,9 +14,9 @@
                foreach($owner_albums as $album) {\r
 \r
                        if($album->cover)\r
-                               $album_cover = '<img src="'.$vars['url'].'mod/tidypics/thumbnail.php?file_guid='.$album->cover.'&size=small" border="0" class="tidypics_album_cover"  alt="' . $album->title . '"/>';\r
+                               $album_cover = '<img src="'.$vars['url'].'mod/tidypics/thumbnail.php?file_guid='.$album->cover.'&size=small"  class="tidypics_album_cover"  alt="' . $album->title . '"/>';\r
                        else\r
-                               $album_cover = '<img src="'.$vars['url'].'mod/tidypics/graphics/img_error.jpg" border="0" class="tidypics_album_cover" alt="' . $album->title . '">';\r
+                               $album_cover = '<img src="'.$vars['url'].'mod/tidypics/graphics/empty_album.png" class="tidypics_album_cover" alt="' . $album->title . '">';\r
 ?>\r
                <div class="tidypics_album_widget_single_item">\r
                        <div class="tidypics_album_widget_title"><a href="<?php echo $album->getURL();?>"><?php echo $album->title;?></a></div>\r