cleaned up icon code - don't need tidypics/icon view anymore - may reinstate it at...

diff --git a/actions/icon.php b/actions/icon.php
deleted file mode 100644 (file)
index bfc1819..0000000
--- a/actions/icon.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php\r
-       /**\r
-        * tidypics icon action\r
-        * \r
-        */\r
-\r
-       $file_guid = get_input("file_guid");\r
-       $file = get_entity($file_guid);\r
-               \r
-       if ($file) {    \r
-               $filename = $file->thumbnail;\r
-               $mime = $file->mimetype;\r
-               \r
-               header("Content-type: $mime");\r
-               if (strpos($mime, "image/")!==false)\r
-                       header("Content-Disposition: inline; filename=\"$filename\"");\r
-               else\r
-                       header("Content-Disposition: attachment; filename=\"$filename\"");\r
-\r
-                       \r
-               $readfile = new ElggFile();\r
-               $readfile->owner_guid = $file->owner_guid;\r
-               $readfile->setFilename($filename);\r
-                       \r
-               $contents = $readfile->grabFile();\r
-               \r
-               if (empty($contents))\r
-                       echo file_get_contents(dirname(dirname(__FILE__)) . "/graphics/icons/general.jpg" );\r
-               else\r
-                       echo $contents;\r
-               \r
-               exit;\r
-       } else {\r
-               register_error(elgg_echo("file:downloadfailed"));\r
-       }\r
-?>
\ No newline at end of file

diff --git a/start.php b/start.php
index dec7e36ede8aed09e523b86037b18fdaeb862e18..cfd20db62f677928f03fc304e67e9ea1580e0364 100644 (file)
--- a/start.php
+++ b/start.php
@@ -386,7 +386,6 @@
        register_action("tidypics/addalbum", false, $CONFIG->pluginspath. "tidypics/actions/addalbum.php");\r
        register_action("tidypics/edit", false, $CONFIG->pluginspath. "tidypics/actions/edit.php");\r
        register_action("tidypics/delete", false, $CONFIG->pluginspath. "tidypics/actions/delete.php");\r
-       register_action("tidypics/icon", true, $CONFIG->pluginspath. "tidypics/actions/icon.php");\r
        register_action("tidypics/edit_multi", false, $CONFIG->pluginspath. "tidypics/actions/edit_multi.php");\r
        register_action("tidypics/download", true, $CONFIG->pluginspath . "tidypics/actions/download.php");\r
        register_action("tidypics/addtag", true, $CONFIG->pluginspath . "tidypics/actions/addtag.php");\r

diff --git a/views/default/object/album.php b/views/default/object/album.php
index 3a5f5a97561bb6519762b678e34cfb95f2243459..ca28d1672e5f22024fad67ff1ad85765153e69c6 100644 (file)
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -64,7 +64,11 @@
                                $info .= ", <a href=\"{$album->getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")</a>";
                        $info .= "</p>";
                        
-                       $icon = "<a href=\"{$album->getURL()}\">" . elgg_view("tidypics/icon", array('album' => true, 'size' => 'small')) . "</a>";
+                       //get album cover if one was set 
+                       if ($album->cover)
+                               $icon = "<a href=\"{$album->getURL()}\">" . '<img src="' . $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" alt="thumbnail" /></a>';
+                       else
+                               $icon = "<a href=\"{$album->getURL()}\">" . '<img src="' . $vars['url'] . 'mod/tidypics/graphics/image_error_thumb.png" alt="new album"></a>';
                        
                        echo elgg_view_listing($icon, $info);
                }

diff --git a/views/default/object/image.php b/views/default/object/image.php
index 03ba12a02b47c6e574610f6e714c16bc916bbcf1..d09b721f188cfbd1d5deda00f750c56de7b18075 100644 (file)
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -78,7 +78,7 @@ if ($photo_tags) {
                        if ($numcomments)
                                $info .= ", <a href=\"{$file->getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")</a>";
                        $info .= "</p>";
-                       $icon = "<a href=\"{$file->getURL()}\">" . elgg_view("tidypics/icon", array("mimetype" => $mime, 'thumbnail' => $file->thumbnail, 'file_guid' => $file_guid, 'size' => 'small')) . "</a>";
+                       $icon = "<a href=\"{$file->getURL()}\">" . '<img src="' . $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=' . $file_guid . '&size=thumb" alt="' . $title . '" /></a>';
 
                        echo elgg_view_listing($icon, $info);
                }

diff --git a/views/default/tidypics/icon.php b/views/default/tidypics/icon.php
deleted file mode 100644 (file)
index c960bc0..0000000
--- a/views/default/tidypics/icon.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-       /**
-        * Elgg tidypic icon
-        * Optionally you can specify a size.
-        * 
-        */
-
-       global $CONFIG;
-               
-if($vars['album']){
-       echo "<img src=\"{$CONFIG->wwwroot}mod/tidypics/graphics/icons/album.gif\" border=\"0\" />";
-}
-else{
-       
-       $mime = $vars['mimetype'];
-       if (isset($vars['thumbnail'])) {
-               $thumbnail = $vars['thumbnail'];
-       } else {
-               $thumbnail = false;
-       }
-       
-       $size = $vars['size'];
-       if ($size != 'large') {
-               $size = 'small';
-       }
-
-       if ($thumbnail && strpos($mime, "image/")!==false)
-               echo "<img src=\"{$vars['url']}action/tidypics/icon?file_guid={$vars['file_guid']}\" border=\"0\" />";
-       else 
-       {
-               if ($size == 'large')
-                       echo "<img src=\"{$CONFIG->wwwroot}mod/tidypics/graphics/icons/general_lrg.gif\" border=\"0\" />";
-               else
-                       echo "<img src=\"{$CONFIG->wwwroot}mod/tidypics/graphics/icons/general.gif\" border=\"0\" />";
-       }
-}
-?>
\ No newline at end of file