From 6edaca04cd83795008e82b3ec532ca7b8f6ef04e Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Mon, 4 Aug 2014 21:06:24 +0300 Subject: [PATCH] Download_Range -> Download\Range --- appinfo/app.php | 1 - lib/download.php | 2 +- lib/download/range.php | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/appinfo/app.php b/appinfo/app.php index 0e29d831..93a977a7 100755 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -39,7 +39,6 @@ OC::$CLASSPATH['OCA\Documents\DocumentController'] = 'documents/ajax/documentCon OC::$CLASSPATH['OCA\Documents\SessionController'] = 'documents/ajax/sessionController.php'; OC::$CLASSPATH['OCA\Documents\UserController'] = 'documents/ajax/userController.php'; OC::$CLASSPATH['OCA\Documents\Download_Simple'] = 'documents/lib/download/simple.php'; -OC::$CLASSPATH['OCA\Documents\Download_Range'] = 'documents/lib/download/range.php'; OC::$CLASSPATH['OCA\Documents\Filter_Office'] = 'documents/lib/filter/office.php'; //Script for registering file actions diff --git a/lib/download.php b/lib/download.php index 6d4ff3d2..5f9237af 100644 --- a/lib/download.php +++ b/lib/download.php @@ -43,7 +43,7 @@ class Download { $this->filepath = $filepath; if (isset($_SERVER['HTTP_RANGE'])) { - $this->instance = new Download_Range($owner, $filepath); + $this->instance = new Download\Range($owner, $filepath); } else { $this->instance = new Download_Simple($owner, $filepath); } diff --git a/lib/download/range.php b/lib/download/range.php index 00952cae..8344a531 100644 --- a/lib/download/range.php +++ b/lib/download/range.php @@ -9,12 +9,12 @@ * later. */ -namespace OCA\Documents; +namespace OCA\Documents\Download; /** * Class processing range HTTP request (partial download) */ -class Download_Range extends \OCA\Documents\Download { +class Range extends \OCA\Documents\Download { // Start of the range protected $start; @@ -41,7 +41,7 @@ class Download_Range extends \OCA\Documents\Download { $mimetype = $this->getMimeType(); $content = $this->view->file_get_contents($this->filepath); - $data = Filter::read($content, $mimetype); + $data = \OCA\Documents\Filter::read($content, $mimetype); $size = strlen($data['content']); $ranges = explode(',', substr($_SERVER['HTTP_RANGE'], 6));