DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use parent namespace in subclasses

Browse Source
This commit is contained in:
Victor Dubiniuk 2013-09-07 20:05:35 +03:00
parent f4fadd3bcc
commit 0fd9b8cbcc
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
appinfo/app.php
View File

@ -38,8 +38,8 @@ OC::$CLASSPATH['OCA\Documents\Controller'] = 'documents/ajax/controller.php';
OC::$CLASSPATH['OCA\Documents\DocumentController'] = 'documents/ajax/documentController.php'; OC::$CLASSPATH['OCA\Documents\DocumentController'] = 'documents/ajax/documentController.php';
OC::$CLASSPATH['OCA\Documents\SessionController'] = 'documents/ajax/sessionController.php'; OC::$CLASSPATH['OCA\Documents\SessionController'] = 'documents/ajax/sessionController.php';
OC::$CLASSPATH['OCA\Documents\UserController'] = 'documents/ajax/userController.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_Simple'] = 'documents/lib/download/simple.php';
OC::$CLASSPATH['OCA\Documents\Download\Range'] = 'documents/lib/download/range.php'; OC::$CLASSPATH['OCA\Documents\Download_Range'] = 'documents/lib/download/range.php';
//TODO: stable5 only //TODO: stable5 only

5
lib/download.php
View File

@ -37,9 +37,9 @@ class Download {
$this->view = $view; $this->view = $view;
if (isset($_SERVER['HTTP_RANGE'])) { if (isset($_SERVER['HTTP_RANGE'])) {
$this->instance = new Download\Range($view, $filepath); $this->instance = new Download_Range($view, $filepath);
} else { } else {
$this->instance = new Download\Simple($view, $filepath); $this->instance = new Download_Simple($view, $filepath);
} }
} }
@ -98,5 +98,4 @@ class Download {
$tmpl->printPage(); $tmpl->printPage();
exit; exit;
} }
} }

7
lib/download/range.php
View File

@ -9,9 +9,9 @@
* later. * later.
*/ */
namespace OCA\Documents\Download; namespace OCA\Documents;
use OCA\Documents\View;
class Range extends \OCA\Documents\Download { class Download_Range extends \OCA\Documents\Download {
// Start of the range // Start of the range
protected $start; protected $start;
@ -73,5 +73,4 @@ class Range extends \OCA\Documents\Download {
header('Content-Range: bytes */' . $this->getFilesize()); // Required in 416. header('Content-Range: bytes */' . $this->getFilesize()); // Required in 416.
exit; exit;
} }
} }

6
lib/download/simple.php
View File

@ -9,11 +9,10 @@
* later. * later.
*/ */
namespace OCA\Documents\Download; namespace OCA\Documents;
class Simple extends \OCA\Documents\Download { class Download_Simple extends \OCA\Documents\Download {
public function __construct($view, $filepath){ public function __construct($view, $filepath){
$this->view = $view; $this->view = $view;
$this->filepath = $filepath; $this->filepath = $filepath;
@ -40,5 +39,4 @@ class Simple extends \OCA\Documents\Download {
\OC_Util::obEnd(); \OC_Util::obEnd();
$this->view->readfile($this->filepath); $this->view->readfile($this->filepath);
} }
} }