Merge branch 'master' into saravea

Conflicts:
	.gitmodules
	mod/admins
	mod/assemblies
	mod/audio_html5
	mod/beechat
	mod/crud
	mod/elgg-activitystreams
	mod/elggman
	mod/elggpg
	mod/favorites
	mod/federated-objects
	mod/friendly_time
	mod/group_alias
	mod/group_operators
	mod/languages
	mod/lightpics
	mod/openid_client
	mod/spotlight
	mod/suicide
	mod/tasks
	mod/videolist

1 files changed, 41 insertions, 0 deletions

diff --git a/mod/lightpics/pages/photos/image/download.php b/mod/lightpics/pages/photos/image/download.php
new file mode 100644
index 000000000..ef47b7638
--- /dev/null
+++ b/mod/lightpics/pages/photos/image/download.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Download a photo
+ *
+ * @author Cash Costello
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2
+ */
+
+$guid = (int) get_input('guid');
+$image = get_entity($guid);
+
+$disposition = get_input('disposition', 'attachment');
+
+if ($image) {
+	$filename = $image->originalfilename;
+	$mime = $image->mimetype;
+
+	header("Content-Type: $mime");
+	header("Content-Disposition: $disposition; filename=\"$filename\"");
+
+	$contents = $image->grabFile();
+
+	if (empty($contents)) {
+		echo file_get_contents(dirname(dirname(__FILE__)) . "/graphics/image_error_large.png" );
+	} else {
+
+		// expires every 60 days
+		$expires = 60 * 60*60*24;
+
+		header("Content-Length: " . strlen($contents));
+		header("Cache-Control: public", true);
+		header("Pragma: public", true);
+		header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true);
+
+		echo $contents;
+	}
+
+	exit;
+} else {
+	register_error(elgg_echo("image:downloadfailed"));
+}