diff options
Diffstat (limited to 'application/controllers')
| -rw-r--r-- | application/controllers/file.php | 7 | ||||
| -rw-r--r--[-rwxr-xr-x] | application/controllers/index.html | 0 | ||||
| -rw-r--r-- | application/controllers/user.php | 2 |
3 files changed, 4 insertions, 5 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(); } diff --git a/application/controllers/index.html b/application/controllers/index.html index c942a79ce..c942a79ce 100755..100644 --- a/application/controllers/index.html +++ b/application/controllers/index.html diff --git a/application/controllers/user.php b/application/controllers/user.php index 823166ea5..356cc430b 100644 --- a/application/controllers/user.php +++ b/application/controllers/user.php @@ -18,8 +18,6 @@ class User extends MY_Controller { { parent::__construct(); - $this->load->model("muser"); - $this->var->view_dir = "user/"; } |