From 96757d7ef1294344c2f196346b3d73a3515d7e54 Mon Sep 17 00:00:00 2001
From: moehm
Date: Thu, 20 Mar 2014 13:11:59 +0100
Subject: Finished func_download.

---
 www/functions/func_delete.php   |  4 ++++
 www/functions/func_download.php | 30 +++++++++++++++++++++---------
 2 files changed, 25 insertions(+), 9 deletions(-)

(limited to 'www/functions')

diff --git a/www/functions/func_delete.php b/www/functions/func_delete.php
index 821f1aa..aaf6e3e 100644
--- a/www/functions/func_delete.php
+++ b/www/functions/func_delete.php
@@ -1,5 +1,9 @@
 <?php
 
+/*
+	expected state: broken
+*/
+
 function delete_file($user, $path){
 
 	if(!$_SESSION["login"]){
diff --git a/www/functions/func_download.php b/www/functions/func_download.php
index 91c8085..9b3a489 100644
--- a/www/functions/func_download.php
+++ b/www/functions/func_download.php
@@ -1,5 +1,9 @@
 <?php
 
+/*
+	Expected state: broken.
+*/
+
 function start_file_download($user, $path){
 
 	$db = $GLOBALS["db"];
@@ -28,9 +32,11 @@ function start_file_download($user, $path){
 	}
 */
 
-	$var = download_file($db, $file_id);
-
-	return $var;
+	if(!download_file($db, $file_id)){
+		return false;
+	} else {
+		return true;
+	}
 }
 
 function check_file_hash($db, $file_id, $download_hash){
@@ -41,8 +47,11 @@ function check_file_hash($db, $file_id, $download_hash){
 		return false;
 	}
 
-	$var = download_file($db, $file_id);
-	return $var;
+	if(!download_file($db, $file_id)){
+		return false;
+	} else {
+		return true;
+	}
 
 }
 
@@ -56,11 +65,14 @@ function download_file($db, $file_id){
 
 	$uploaddir = "../files/";
 	$gzip_file = $uploaddir . $file_hash . ".gz";
-	$fp = gzopen($gzip_file, '') // TODO: DECOMPRESS CONSTANT
+	$fp = gzopen($gzip_file, 'r')
+	$uncompressed_file = gzread($fp, filesize($fp));
 
-	//TODO GZIP DECOMPRESSION
-
-	//TODO set HTTP HEADER
+	header("Content-Type: ".$file_mime);
+	header("Content-Disposition: attachment; filename=\"".$file_name."\"");
+	if(!readfile($uncompressed_file)){
+		return false;
+	}
 
 	return true;
 
-- 
cgit v1.2.3