From 7f8b7adeb346c8d07e2da4b72e9f78e8ffcb82b9 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Thu, 3 Nov 2011 08:24:19 -0400
Subject: Refs #4027 updated all rss views except for groups

---
 mod/file/views/rss/file/enclosure.php | 16 ++++++++++++++++
 mod/file/views/rss/object/file.php    | 21 ---------------------
 2 files changed, 16 insertions(+), 21 deletions(-)
 create mode 100644 mod/file/views/rss/file/enclosure.php
 delete mode 100644 mod/file/views/rss/object/file.php

(limited to 'mod/file/views/rss')

diff --git a/mod/file/views/rss/file/enclosure.php b/mod/file/views/rss/file/enclosure.php
new file mode 100644
index 000000000..600d287ef
--- /dev/null
+++ b/mod/file/views/rss/file/enclosure.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Link to download the file
+ *
+ * @uses $vars['entity']
+ */
+
+if (elgg_instanceof($vars['entity'], 'object', 'file')) {
+	$download_url = elgg_get_site_url() . 'mod/file/download.php?file_guid=' . $vars['entity']->getGUID();
+	$size = $vars['entity']->size();
+	$mime_type = $vars['entity']->getMimeType();
+	echo <<<END
+
+	<enclosure url="$download_url" length="$size" type="$mime_type" />";
+END;
+}
diff --git a/mod/file/views/rss/object/file.php b/mod/file/views/rss/object/file.php
deleted file mode 100644
index a0660d6c8..000000000
--- a/mod/file/views/rss/object/file.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Elgg RSS file object view
- * 
- * @package ElggFile
- * @subpackage Core
- */
-$title = $vars['entity']->title;
-if (empty($title)) {
-	$title = elgg_get_excerpt($vars['entity']->description, 32);
-}
-?>
-
-<item>
-	<guid isPermaLink='true'><?php echo $vars['entity']->getURL(); ?></guid>
-	<pubDate><?php echo date("r", $vars['entity']->time_created) ?></pubDate>
-	<link><?php echo $vars['entity']->getURL(); ?></link>
-	<title><![CDATA[<?php echo $title; ?>]]></title>
-	<description><![CDATA[<?php echo (autop($vars['entity']->description)); ?>]]></description>
-	<enclosure url="<?php echo elgg_get_site_url(); ?>mod/file/download.php?file_guid=<?php echo $vars['entity']->getGUID(); ?>" length="<?php echo $vars['entity']->size(); ?>" type="<?php echo $vars['entity']->getMimeType(); ?>" />
-</item>
-- 
cgit v1.2.3


From 272ac7519214f1b75d4b71247438612af8c86643 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sat, 5 Nov 2011 15:43:50 -0400
Subject: Fixes #4048 using page handler for file downloads

---
 mod/file/download.php                 | 29 +-------------------------
 mod/file/pages/file/download.php      | 38 +++++++++++++++++++++++++++++++++++
 mod/file/pages/file/view.php          |  2 +-
 mod/file/start.php                    |  5 +++++
 mod/file/views/rss/file/enclosure.php |  2 +-
 5 files changed, 46 insertions(+), 30 deletions(-)
 create mode 100644 mod/file/pages/file/download.php

(limited to 'mod/file/views/rss')

diff --git a/mod/file/download.php b/mod/file/download.php
index 8e0287a1e..b2acdffec 100644
--- a/mod/file/download.php
+++ b/mod/file/download.php
@@ -9,31 +9,4 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 // Get the guid
 $file_guid = get_input("file_guid");
 
-// Get the file
-$file = get_entity($file_guid);
-if (!$file) {
-	register_error(elgg_echo("file:downloadfailed"));
-	forward();
-}
-
-$mime = $file->getMimeType();
-if (!$mime) {
-	$mime = "application/octet-stream";
-}
-
-$filename = $file->originalfilename;
-
-// fix for IE https issue
-header("Pragma: public");
-
-header("Content-type: $mime");
-if (strpos($mime, "image/") !== false) {
-	header("Content-Disposition: inline; filename=\"$filename\"");
-} else {
-	header("Content-Disposition: attachment; filename=\"$filename\"");
-}
-
-ob_clean();
-flush();
-readfile($file->getFilenameOnFilestore());
-exit;
+forward("file/download/$file_guid");
diff --git a/mod/file/pages/file/download.php b/mod/file/pages/file/download.php
new file mode 100644
index 000000000..00e6d500e
--- /dev/null
+++ b/mod/file/pages/file/download.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Elgg file download.
+ *
+ * @package ElggFile
+ */
+
+// Get the guid
+$file_guid = get_input("guid");
+
+// Get the file
+$file = get_entity($file_guid);
+if (!$file) {
+	register_error(elgg_echo("file:downloadfailed"));
+	forward();
+}
+
+$mime = $file->getMimeType();
+if (!$mime) {
+	$mime = "application/octet-stream";
+}
+
+$filename = $file->originalfilename;
+
+// fix for IE https issue
+header("Pragma: public");
+
+header("Content-type: $mime");
+if (strpos($mime, "image/") !== false) {
+	header("Content-Disposition: inline; filename=\"$filename\"");
+} else {
+	header("Content-Disposition: attachment; filename=\"$filename\"");
+}
+
+ob_clean();
+flush();
+readfile($file->getFilenameOnFilestore());
+exit;
diff --git a/mod/file/pages/file/view.php b/mod/file/pages/file/view.php
index 50c55a74f..a571c9d68 100644
--- a/mod/file/pages/file/view.php
+++ b/mod/file/pages/file/view.php
@@ -28,7 +28,7 @@ $content .= elgg_view_comments($file);
 elgg_register_menu_item('title', array(
 	'name' => 'download',
 	'text' => elgg_echo('file:download'),
-	'href' => "mod/file/download.php?file_guid=$file->guid",
+	'href' => "file/download/$file->guid",
 	'link_class' => 'elgg-button elgg-button-action',
 ));
 
diff --git a/mod/file/start.php b/mod/file/start.php
index f8b7fa423..7a0a05844 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -96,6 +96,7 @@ function file_init() {
  *  New file:        file/add/<guid>
  *  Edit file:       file/edit/<guid>
  *  Group files:     file/group/<guid>/all
+ *  Download:        file/download/<guid>
  *
  * Title is ignored
  *
@@ -138,6 +139,10 @@ function file_page_handler($page) {
 		case 'all':
 			include "$file_dir/world.php";
 			break;
+		case 'download':
+			set_input('guid', $page[1]);
+			include "$file_dir/download.php";
+			break;
 		default:
 			return false;
 	}
diff --git a/mod/file/views/rss/file/enclosure.php b/mod/file/views/rss/file/enclosure.php
index 600d287ef..fb4a899d9 100644
--- a/mod/file/views/rss/file/enclosure.php
+++ b/mod/file/views/rss/file/enclosure.php
@@ -6,7 +6,7 @@
  */
 
 if (elgg_instanceof($vars['entity'], 'object', 'file')) {
-	$download_url = elgg_get_site_url() . 'mod/file/download.php?file_guid=' . $vars['entity']->getGUID();
+	$download_url = elgg_get_site_url() . 'file/download/' . $vars['entity']->getGUID();
 	$size = $vars['entity']->size();
 	$mime_type = $vars['entity']->getMimeType();
 	echo <<<END
-- 
cgit v1.2.3