moved download action to download page

diff --git a/actions/download.php b/actions/download.php
deleted file mode 100644 (file)
index b382c56..0000000
--- a/actions/download.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php\r
-       /**\r
-        * Tidypics Download File Action\r
-        * \r
-        * do not call this directly - call through action handler\r
-        */\r
-        \r
-       global $CONFIG;\r
-\r
-       $file_guid = (int) get_input("file_guid");\r
-       $file = get_entity($file_guid);\r
-       \r
-       $view = get_input("view");\r
-       \r
-       if ($file) {\r
-               $filename = $file->originalfilename;\r
-               $mime = $file->mimetype;\r
-               \r
-               header("Content-Type: $mime");\r
-               if ($view == "inline")\r
-                       header("Content-Disposition: inline; filename=\"$filename\"");\r
-               else\r
-                       header("Content-Disposition: attachment; filename=\"$filename\"");\r
-\r
-               \r
-               $readfile = new ElggFile($file_guid);\r
-               $readfile->owner_guid = $file->owner_guid;\r
-               \r
-               $contents = $readfile->grabFile();\r
-               \r
-               if (empty($contents)) {\r
-                       echo file_get_contents(dirname(dirname(__FILE__)) . "/graphics/image_error_large.png" );\r
-               } else {\r
-                       \r
-                       // expires every 60 days\r
-                       $expires = 60 * 60*60*24;\r
-                       \r
-                       header("Content-Length: " . strlen($contents));\r
-                       header("Cache-Control: public", true);\r
-                       header("Pragma: public", true);\r
-                       header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true);\r
-                       \r
-                       \r
-                       echo $contents;\r
-               }\r
-               \r
-               exit;\r
-       }\r
-       else\r
-               register_error(elgg_echo("image:downloadfailed"));\r
-\r
-?>
\ No newline at end of file

diff --git a/start.php b/start.php
index 54322d8c9e9425333ec96f2afb9f9e8a2ff3bff0..6a1b957236c5098a253042e635140218e68125d0 100644 (file)
--- a/start.php
+++ b/start.php
@@ -72,10 +72,7 @@
                }\r
                \r
                // slideshow plugin hook\r
-               register_plugin_hook('tp_slideshow', 'album', 'tidypics_slideshow');\r
-               \r
-               // no checking security token for download\r
-               register_plugin_hook('action', 'tidypics/download', 'tidypics_download_override');\r
+               register_plugin_hook('tp_slideshow', 'album', 'tidypics_slideshow');            \r
        }\r
        \r
        /**\r
@@ -273,6 +270,12 @@
                                        include($CONFIG->pluginspath . "tidypics/pages/world.php");\r
                                break;\r
                                \r
+                               case "download": // download an image\r
+                                       if (isset($page[1])) set_input('file_guid', $page[1]);\r
+                                       if (isset($page[2])) set_input('type', $page[2]);\r
+                                       include($CONFIG->pluginspath . "tidypics/pages/download.php");\r
+                               break;\r
+                               \r
                                case "tagged": // all photos tagged with user \r
                                        if (isset($page[1])) set_input('guid',$page[1]);\r
                                        include($CONFIG->pluginspath . "tidypics/pages/tagged.php");\r
@@ -425,20 +428,6 @@
        function tp_mostrecentimages($max = 8, $pagination = true) {\r
                return list_entities("object", "image", 0, $max, false, false, $pagination);    \r
        }\r
-       /**\r
-        * Called before validating the security token on a download link\r
-        * We don't need security as this is not a true action (it doesn't change any data)\r
-        * \r
-        * @return false (shouldn't return though since the action exits\r
-        */\r
-       function tidypics_download_override($hook, $action)\r
-       {\r
-               global $CONFIG;\r
-               \r
-               include $CONFIG->actions[$action]['file'];\r
-               \r
-               return false;\r
-       }\r
        \r
 \r
        // Make sure tidypics_init is called on initialisation\r
@@ -453,7 +442,6 @@
        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/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
        register_action("tidypics/deletetag", true, $CONFIG->pluginspath . "tidypics/actions/deletetag.php");\r
        register_action("tidypics/flickrSetup", true, $CONFIG->pluginspath . "tidypics/actions/flickrSetup.php");\r

diff --git a/views/default/object/image.php b/views/default/object/image.php
index dd52f872ed25f48f1c1a8e73a12c0985d0273eb8..fb7a72ff85ab033077fe64b33759f959a49d2c27 100644 (file)
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -150,7 +150,7 @@
                                $image_link = false;
                                if (get_plugin_setting('download_link', 'tidypics') != "disabled") {
                                        // admin allows downloads so default to inline download link
-                                       $image_link = $vars['url'] . "action/tidypics/download?file_guid=" . $image_guid . "&view=inline";
+                                       $image_link = $vars['url'] . "pg/photos/download/{$image_guid}/inline/";
                                }
                                // does any plugin want to override the link
                                $image_link = trigger_plugin_hook('tp_image_link', 'image', $image, $image_link);                               

diff --git a/views/default/tidypics/image_menu.php b/views/default/tidypics/image_menu.php
index 5e6053a94521a0f386ebc82b231e43ad1cdb2f88..9e7a53969e6ba9c80f5def952b12844edf6ed518 100644 (file)
--- a/views/default/tidypics/image_menu.php
+++ b/views/default/tidypics/image_menu.php
@@ -43,7 +43,7 @@
        }\r
        \r
        if (get_plugin_setting('download_link', 'tidypics') != "disabled") {\r
-               $download_url = $vars['url'] . "action/tidypics/download?file_guid=" . $image_guid; \r
+               $download_url = $vars['url'] . "pg/photos/download/{$image_guid}/"; \r
 ?>\r
 <li id="download_image"><a href="<?php echo $download_url; ?>"><?php echo elgg_echo("image:download"); ?></a></li>\r
 <?php\r

diff --git a/views/rss/object/album.php b/views/rss/object/album.php
index c66c0f7e938f4b095f3acbdd50a78e07699748bf..c59f0e2d3a5cefd367cc05d9bf1e9822180fcee9 100644 (file)
--- a/views/rss/object/album.php
+++ b/views/rss/object/album.php
@@ -12,7 +12,7 @@
        $base_url = $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=';\r
 \r
        // use fullsize image\r
-       $base_url_fullsize = $vars['url'] . 'action/tidypics/download?file_guid=';\r
+       $base_url_fullsize = $vars['url'] . 'pg/photos/download/';\r
 \r
        // insert cover image if it exists image\r
        if ($album->cover) {\r
@@ -52,7 +52,7 @@
                <description><?php echo htmlentities($descr, ENT_QUOTES); ?></description>\r
                <pubDate><?php echo date("r", $image->time_created); ?></pubDate>\r
                <guid isPermaLink="true"><?php echo $image->getURL(); ?></guid>\r
-               <media:content url="<?php echo $base_url_fullsize . $image->guid . '&amp;view=inline'; ?>" medium="image" type="<?php echo $image->getMimeType(); ?>" />\r
+               <media:content url="<?php echo $base_url_fullsize . $image->guid . '/inline/'; ?>" medium="image" type="<?php echo $image->getMimeType(); ?>" />\r
                <media:title><?php echo $image->title; ?></media:title>\r
                <media:description><?php echo htmlentities($image->description); ?></media:description>\r
                <media:thumbnail url="<?php echo $base_url . $image->guid . '&amp;size=thumb'; ?>"></media:thumbnail>\r

diff --git a/views/rss/object/file.php b/views/rss/object/file.php
index ace3e28e643e81f1a3df5b8bb2bee959675a205a..e40da4f69cfbd71eea1732029f2ab475c31a6b34 100644 (file)
--- a/views/rss/object/file.php
+++ b/views/rss/object/file.php
@@ -19,5 +19,5 @@
          <link><?php echo $vars['entity']->getURL(); ?></link>\r
          <title><![CDATA[<?php echo $title; ?>]]></title>\r
          <description><![CDATA[<?php echo (autop($vars['entity']->description)); ?>]]></description>\r
-         <enclosure url="<?php echo $vars['url']; ?>action/file/download?file_guid=<?php echo $vars['entity']->getGUID(); ?>" length="<?php echo $vars['entity']->size(); ?>" type="<?php echo $vars['entity']->getMimeType(); ?>" />\r
+         <enclosure url="<?php echo $vars['url']; ?>pg/photos/download/<?php echo $vars['entity']->getGUID(); ?>/" length="<?php echo $vars['entity']->size(); ?>" type="<?php echo $vars['entity']->getMimeType(); ?>" />\r
        </item>\r