diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-09-18 20:31:29 +0300 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2018-12-20 09:38:43 +0300 |
| commit | 5e589bacfe5074e46424c99596632f3cf4e2ad85 (patch) | |
| tree | 950aa099c85c98b6beb78c1ce5b35112a1af8040 /lib | |
| parent | c492302ce57b03e9049aad14b2e42c128ed11ef6 (diff) | |
Fix code style and practice
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Controller/TemplatesController.php | 3 | ||||
| -rw-r--r-- | lib/Settings/Admin.php | 1 | ||||
| -rw-r--r-- | lib/TemplateManager.php | 16 |
3 files changed, 7 insertions, 13 deletions
diff --git a/lib/Controller/TemplatesController.php b/lib/Controller/TemplatesController.php index d43ba65b..ef3f707e 100644 --- a/lib/Controller/TemplatesController.php +++ b/lib/Controller/TemplatesController.php @@ -30,6 +30,7 @@ use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\NotFoundResponse; use OCP\Files\Node; +use OCP\Files\NotFoundException; use OCP\IL10N; use OCP\IPreview; use OCP\IRequest; @@ -95,7 +96,7 @@ class TemplatesController extends Controller { bool $forceIcon = true, string $mode = 'fill') { - if ($template === '' || $x === 0 || $y === 0) { + if ($templateName === '' || $x === 0 || $y === 0) { return new DataResponse([], Http::STATUS_BAD_REQUEST); } diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php index fd684f09..8f8f70a7 100644 --- a/lib/Settings/Admin.php +++ b/lib/Settings/Admin.php @@ -39,7 +39,6 @@ class Admin implements ISettings { /** * Admin template settings * - * @param string $appName * @param IConfig $config * @param TemplateManager $manager */ diff --git a/lib/TemplateManager.php b/lib/TemplateManager.php index 1366b307..372296b5 100644 --- a/lib/TemplateManager.php +++ b/lib/TemplateManager.php @@ -23,6 +23,7 @@ namespace OCA\Richdocuments; +use OCP\Files\File; use OCP\Files\Folder; use OCP\Files\IAppData; use OCP\Files\IRootFolder; @@ -116,7 +117,7 @@ class TemplateManager { * Get template file/node * * @param string $templateName - * @return ISimpleFile/Node + * @return ISimpleFile|Node */ public function get(string $templateName) { try { @@ -169,21 +170,14 @@ class TemplateManager { * Delete a template to the global template folder * * @param string $templateName - * @param string $templateFile * @return void */ public function delete(string $templateName) { try { - $template = $this->folder->getFile($templateName); + $template = $this->get($templateName); $template->delete(); } catch (NotFoundException $e) { - $templateDir = $this->getUserTemplateDir(); - try { - $templateFile = $templateDir->get($templateName); - $templateFile->delete(); - } catch (NotFoundException $e) { - throw new NotFoundException($e); - } + throw new NotFoundException($e); } return true; } @@ -230,7 +224,7 @@ class TemplateManager { /** * Format template file for json return object * - * @param ISimpleFile/Node $template + * @param ISimpleFile|Node $template * @return array */ private function formatNodeReturn($template): array{ |