summaryrefslogtreecommitdiffstats
path: root/application/controllers/file.php
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2013-09-25 15:03:59 +0200
committerFlorian Pritz <bluewind@xinu.at>2013-09-25 15:03:59 +0200
commit6705e6c987b6e4a43bbb666c33d8fc8a0ef1a0a6 (patch)
treeb815871f7f031633c400a33cf5d6245282d59955 /application/controllers/file.php
parent50230001eb5387b6b0ff7ce906d074ef4a530d11 (diff)
parentab98249a9a087745b29e5cb258ea0b624f12f64b (diff)
Merge branch 'working'
Diffstat (limited to 'application/controllers/file.php')
-rw-r--r--application/controllers/file.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/application/controllers/file.php b/application/controllers/file.php
index 98ccae884..6ac0bc28c 100644
--- a/application/controllers/file.php
+++ b/application/controllers/file.php
@@ -20,7 +20,6 @@ class File extends MY_Controller {
parent::__construct();
$this->load->model('mfile');
- $this->load->model('muser');
if (is_cli_client()) {
$this->var->view_dir = "file_plaintext";
@@ -99,10 +98,12 @@ class File extends MY_Controller {
exit();
}
+ $this->load->driver("ddownload");
+
// user wants the plain file
if ($lexer == 'plain') {
handle_etag($etag);
- rangeDownload($file, $filedata["filename"], "text/plain");
+ $this->ddownload->serveFile($file, $filedata["filename"], "text/plain");
exit();
}
@@ -123,7 +124,7 @@ class File extends MY_Controller {
header("$header_name: allow 'none'; img-src *; media-src *; font-src *; style-src * 'unsafe-inline'; script-src 'none'; object-src *; frame-src 'none'; ");
}
handle_etag($etag);
- rangeDownload($file, $filedata["filename"], $filedata["mimetype"]);
+ $this->ddownload->serveFile($file, $filedata["filename"], $filedata["mimetype"]);
exit();
}