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

remove trailing whitespaces

Browse Source
This commit is contained in:
Andras Timar 2016-01-12 15:20:38 +01:00
parent 4eabeecc51
commit d290e21b40
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
controller/documentcontroller.php
View File

@ -29,21 +29,21 @@ use OCA\Richdocuments\Genesis;
use \OC\Files\View; use \OC\Files\View;
class DocumentController extends Controller{ class DocumentController extends Controller{
private $uid; private $uid;
private $l10n; private $l10n;
private $settings; private $settings;
const ODT_TEMPLATE_PATH = '/assets/odttemplate.odt'; const ODT_TEMPLATE_PATH = '/assets/odttemplate.odt';
const CLOUDSUITE_TMP_PATH = '/documents-tmp/'; const CLOUDSUITE_TMP_PATH = '/documents-tmp/';
public function __construct($appName, IRequest $request, IConfig $settings, IL10N $l10n, $uid){ public function __construct($appName, IRequest $request, IConfig $settings, IL10N $l10n, $uid){
parent::__construct($appName, $request); parent::__construct($appName, $request);
$this->uid = $uid; $this->uid = $uid;
$this->l10n = $l10n; $this->l10n = $l10n;
$this->settings = $settings; $this->settings = $settings;
} }
/** /**
* @NoAdminRequired * @NoAdminRequired
* @NoCSRFRequired * @NoCSRFRequired
@ -72,7 +72,7 @@ class DocumentController extends Controller{
return $response; return $response;
} }
/** /**
* @NoAdminRequired * @NoAdminRequired
*/ */
@ -100,17 +100,17 @@ class DocumentController extends Controller{
} }
$path = Helper::getNewFileName($view, $dir . '/' . $basename); $path = Helper::getNewFileName($view, $dir . '/' . $basename);
$content = ''; $content = '';
if (class_exists('\OC\Files\Type\TemplateManager')){ if (class_exists('\OC\Files\Type\TemplateManager')){
$manager = \OC_Helper::getFileTemplateManager(); $manager = \OC_Helper::getFileTemplateManager();
$content = $manager->getTemplate($mimetype); $content = $manager->getTemplate($mimetype);
} }
if (!$content){ if (!$content){
$content = file_get_contents(dirname(__DIR__) . self::ODT_TEMPLATE_PATH); $content = file_get_contents(dirname(__DIR__) . self::ODT_TEMPLATE_PATH);
} }
if ($content && $view->file_put_contents($path, $content)){ if ($content && $view->file_put_contents($path, $content)){
$info = $view->getFileInfo($path); $info = $view->getFileInfo($path);
$response = array( $response = array(
@ -222,11 +222,11 @@ class DocumentController extends Controller{
public function serve($esId){ public function serve($esId){
$session = new Db\Session(); $session = new Db\Session();
$session->load($esId); $session->load($esId);
$filename = $session->getGenesisUrl() ? $session->getGenesisUrl() : ''; $filename = $session->getGenesisUrl() ? $session->getGenesisUrl() : '';
return new DownloadResponse($this->request, $session->getOwner(), $filename); return new DownloadResponse($this->request, $session->getOwner(), $filename);
} }
/** /**
* @NoAdminRequired * @NoAdminRequired
*/ */
@ -236,7 +236,7 @@ class DocumentController extends Controller{
$response->setStatus(Http::STATUS_BAD_REQUEST); $response->setStatus(Http::STATUS_BAD_REQUEST);
return $response; return $response;
} }
$fullPath = '/files' . $path; $fullPath = '/files' . $path;
$fileInfo = \OC\Files\Filesystem::getFileInfo($path); $fileInfo = \OC\Files\Filesystem::getFileInfo($path);
if ($fileInfo){ if ($fileInfo){
@ -248,7 +248,7 @@ class DocumentController extends Controller{
} }
return new DownloadResponse($this->request, $this->uid, $fullPath); return new DownloadResponse($this->request, $this->uid, $fullPath);
} }
/** /**
* @NoAdminRequired * @NoAdminRequired
@ -295,13 +295,13 @@ class DocumentController extends Controller{
usort($documents, function($a, $b){ usort($documents, function($a, $b){
return @$b['mtime']-@$a['mtime']; return @$b['mtime']-@$a['mtime'];
}); });
$session = new Db\Session(); $session = new Db\Session();
$sessions = $session->getCollectionBy('file_id', $fileIds); $sessions = $session->getCollectionBy('file_id', $fileIds);
$members = array(); $members = array();
$member = new Db\Member(); $member = new Db\Member();
foreach ($sessions as $session) { foreach ($sessions as $session) {
$members[$session['es_id']] = $member->getActiveCollection($session['es_id']); $members[$session['es_id']] = $member->getActiveCollection($session['es_id']);
} }