From 46f1a1c319a6fa5f23733bc567b49a99212933a7 Mon Sep 17 00:00:00 2001
From: mattpass <matt@helical-levity.com>
Date: Sun, 10 May 2020 15:47:26 +0100
Subject: [PATCH] classes expanded

---
 lib/download.php | 25 ++++++++-----------------
 lib/icecoder.php |  4 ++++
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/lib/download.php b/lib/download.php
index 4b15235..1085d96 100644
--- a/lib/download.php
+++ b/lib/download.php
@@ -1,26 +1,17 @@
 <?php
-include "headers.php";
-include "settings.php";
+require "icecoder.php";
+
+use ICEcoder\File;
 
 // Establish the real absolute path to the file
-$file = realpath($docRoot . $iceRoot . str_replace("|", "/", $_GET['file']));
+$filePath = realpath($docRoot . $iceRoot . str_replace("|", "/", $_GET['file']));
 // If it doesn't exist, or doesn't start with the $docRoot, stop here
-if (false === file_exists($file) || 0 !== strpos(str_replace("\\", "/", $file), $docRoot)) {
+if (false === file_exists($filePath) || 0 !== strpos(str_replace("\\", "/", $filePath), $docRoot)) {
 	die("<script>ICEcoder.message('Sorry, that file doesn\'t appear to exist');</script>");
 }
 
-if (true === file_exists($file)) {
-    header("Pragma: public");
-    header("Expires: 0");
-    header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
-    header("Cache-Control: public");
-    header('Content-Description: File Transfer');
-    header("Content-Type: application/octet-stream");
-    header('Content-Disposition: attachment; filename=' . basename($file));
-    // header("Content-Transfer-Encoding: binary");
-    header('Content-Length: ' . filesize($file));
-    ob_clean();
-    flush();
-    readfile($file);
+if (true === file_exists($filePath)) {
+    $file = new File();
+    $file->download($filePath);
     exit;
 }
diff --git a/lib/icecoder.php b/lib/icecoder.php
index 704ae51..1b4d144 100644
--- a/lib/icecoder.php
+++ b/lib/icecoder.php
@@ -1,7 +1,11 @@
 <?php
 // Classes
 require_once "../classes/_ExtraProcesses.php";
+require_once "../classes/Backup.php";
+require_once "../classes/File.php";
+require_once "../classes/FTP.php";
 require_once "../classes/System.php";
+require_once "../classes/URL.php";
 
 // Headers & Settings
 require_once "headers.php";