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

Fix some other log notices when trying to access non-existing file with a viewer

Browse Source
This commit is contained in:
Victor Dubiniuk 2014-11-04 20:55:52 +03:00
parent d24863e97e
commit 897015ec10
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
controller/documentcontroller.php
View File

File diff suppressed because one or more lines are too long

8
lib/downloadresponse.php
View File

@ -28,17 +28,17 @@ class DownloadResponse extends \OCP\AppFramework\Http\Response {
$this->request = $request; $this->request = $request;
$this->user = $user; $this->user = $user;
$this->path = $path; $this->path = $path;
$this->view = new View('/' . $user); $this->view = new View('/' . $user);
if (!$this->view->file_exists($path)){ if (!$this->view->file_exists($path)){
$this->setStatus(Http::STATUS_NOT_FOUND); parent::setStatus(Http::STATUS_NOT_FOUND);
} }
} }
public function render(){ public function render(){
if ($this->status === Http::STATUS_NOT_FOUND){ if (parent::getStatus() === Http::STATUS_NOT_FOUND){
return ''; return '';
} }
$info = $this->view->getFileInfo($this->path); $info = $this->view->getFileInfo($this->path);
$this->ETag = $info['etag']; $this->ETag = $info['etag'];
@ -47,7 +47,7 @@ class DownloadResponse extends \OCP\AppFramework\Http\Response {
$size = strlen($data['content']); $size = strlen($data['content']);
if (!is_null($this->request->server['HTTP_RANGE'])){ if (isset($this->request->server['HTTP_RANGE']) && !is_null($this->request->server['HTTP_RANGE'])){
$isValidRange = preg_match('/^bytes=\d*-\d*(,\d*-\d*)*$/', $this->request->server['HTTP_RANGE']); $isValidRange = preg_match('/^bytes=\d*-\d*(,\d*-\d*)*$/', $this->request->server['HTTP_RANGE']);
if (!$isValidRange){ if (!$isValidRange){
return $this->sendRangeNotSatisfiable($size); return $this->sendRangeNotSatisfiable($size);