@@ -52,7 +52,7 @@ discard block  | 
                                                    ||
| 52 | 52 | */  | 
                                                        
| 53 | 53 | $eventDispatcher = \OC::$server->getEventDispatcher();  | 
                                                        
| 54 | 54 |          $eventDispatcher->addListener('OCA\Files::loadAdditionalScripts',  | 
                                                        
| 55 | -                function () { | 
                                                        |
| 55 | +                function() { | 
                                                        |
| 56 | 56 | script(OcrConstants::APP_NAME, 'dist/ocrapp');  | 
                                                        
| 57 | 57 | style(OcrConstants::APP_NAME, 'ocrstyle');  | 
                                                        
| 58 | 58 | // if not loaded before - load select2 for multi select languages  | 
                                                        
@@ -63,7 +63,7 @@ discard block  | 
                                                    ||
| 63 | 63 | * Register core services  | 
                                                        
| 64 | 64 | */  | 
                                                        
| 65 | 65 |          $container->registerService('CurrentUID',  | 
                                                        
| 66 | -                function (IContainer $c) { | 
                                                        |
| 66 | +                function(IContainer $c) { | 
                                                        |
| 67 | 67 | /** @var \OC\Server $server */  | 
                                                        
| 68 | 68 |                      $server = $c->query('ServerContainer'); | 
                                                        
| 69 | 69 | $user = $server->getUserSession()  | 
                                                        
@@ -71,14 +71,14 @@ discard block  | 
                                                    ||
| 71 | 71 | return ($user) ? $user->getUID() : '';  | 
                                                        
| 72 | 72 | });  | 
                                                        
| 73 | 73 | // Allow automatic DI for the View, until they migrated to Nodes API  | 
                                                        
| 74 | -        $container->registerService(View::class, function () { | 
                                                        |
| 74 | +        $container->registerService(View::class, function() { | 
                                                        |
| 75 | 75 |              return new View(''); | 
                                                        
| 76 | 76 | }, false);  | 
                                                        
| 77 | 77 | /**  | 
                                                        
| 78 | 78 | * Register the PHPUtil  | 
                                                        
| 79 | 79 | */  | 
                                                        
| 80 | 80 |          $container->registerService('PHPUtil',  | 
                                                        
| 81 | -                function (IContainer $c) { | 
                                                        |
| 81 | +                function(IContainer $c) { | 
                                                        |
| 82 | 82 | /** @var \OC\Server $server */  | 
                                                        
| 83 | 83 |                      $server = $c->query('ServerContainer'); | 
                                                        
| 84 | 84 | return new PHPUtil($server->getL10N(OcrConstants::APP_NAME));  | 
                                                        
@@ -87,7 +87,7 @@ discard block  | 
                                                    ||
| 87 | 87 | * Register the RedisUtil  | 
                                                        
| 88 | 88 | */  | 
                                                        
| 89 | 89 |          $container->registerService('RedisUtil',  | 
                                                        
| 90 | -                function (IContainer $c) { | 
                                                        |
| 90 | +                function(IContainer $c) { | 
                                                        |
| 91 | 91 | /** @var \OC\Server $server */  | 
                                                        
| 92 | 92 |                      $server = $c->query('ServerContainer'); | 
                                                        
| 93 | 93 | return new RedisUtil($server->getL10N(OcrConstants::APP_NAME), $server->getLogger(), $server->getConfig());  | 
                                                        
@@ -96,14 +96,14 @@ discard block  | 
                                                    ||
| 96 | 96 | * Register the FileUtil  | 
                                                        
| 97 | 97 | */  | 
                                                        
| 98 | 98 |          $container->registerService('FileUtil',  | 
                                                        
| 99 | -                function (IContainer $c) { | 
                                                        |
| 99 | +                function(IContainer $c) { | 
                                                        |
| 100 | 100 | return new FileUtil();  | 
                                                        
| 101 | 101 | });  | 
                                                        
| 102 | 102 | /**  | 
                                                        
| 103 | 103 | * Register the Ocr Job mapper  | 
                                                        
| 104 | 104 | */  | 
                                                        
| 105 | 105 |          $container->registerService('OcrJobMapper',  | 
                                                        
| 106 | -                function (IContainer $c) { | 
                                                        |
| 106 | +                function(IContainer $c) { | 
                                                        |
| 107 | 107 | /** @var \OC\Server $server */  | 
                                                        
| 108 | 108 |                      $server = $c->query('ServerContainer'); | 
                                                        
| 109 | 109 | return new OcrJobMapper($server->getDatabaseConnection());  | 
                                                        
@@ -112,7 +112,7 @@ discard block  | 
                                                    ||
| 112 | 112 | * Register the File mapper  | 
                                                        
| 113 | 113 | */  | 
                                                        
| 114 | 114 |          $container->registerService('FileMapper',  | 
                                                        
| 115 | -                function (IContainer $c) { | 
                                                        |
| 115 | +                function(IContainer $c) { | 
                                                        |
| 116 | 116 | /** @var \OC\Server $server */  | 
                                                        
| 117 | 117 |                      $server = $c->query('ServerContainer'); | 
                                                        
| 118 | 118 | return new FileMapper($server->getDatabaseConnection());  | 
                                                        
@@ -121,7 +121,7 @@ discard block  | 
                                                    ||
| 121 | 121 | * Register the Share mapper  | 
                                                        
| 122 | 122 | */  | 
                                                        
| 123 | 123 |          $container->registerService('ShareMapper',  | 
                                                        
| 124 | -                function (IContainer $c) { | 
                                                        |
| 124 | +                function(IContainer $c) { | 
                                                        |
| 125 | 125 | /** @var \OC\Server $server */  | 
                                                        
| 126 | 126 |                      $server = $c->query('ServerContainer'); | 
                                                        
| 127 | 127 | return new ShareMapper($server->getDatabaseConnection());  | 
                                                        
@@ -130,7 +130,7 @@ discard block  | 
                                                    ||
| 130 | 130 | * Register the App Config Service  | 
                                                        
| 131 | 131 | */  | 
                                                        
| 132 | 132 |          $container->registerService('AppConfigService',  | 
                                                        
| 133 | -                function (IAppContainer $c) { | 
                                                        |
| 133 | +                function(IAppContainer $c) { | 
                                                        |
| 134 | 134 | /** @var \OC\Server $server */  | 
                                                        
| 135 | 135 |                      $server = $c->query('ServerContainer'); | 
                                                        
| 136 | 136 |                      return new AppConfigService($server->getConfig(), $server->getL10N(OcrConstants::APP_NAME), $c->query('RedisUtil'),  | 
                                                        
@@ -140,7 +140,7 @@ discard block  | 
                                                    ||
| 140 | 140 | * Register the Job Service  | 
                                                        
| 141 | 141 | */  | 
                                                        
| 142 | 142 |          $container->registerService('FileService',  | 
                                                        
| 143 | -                function (IAppContainer $c) { | 
                                                        |
| 143 | +                function(IAppContainer $c) { | 
                                                        |
| 144 | 144 | /** @var \OC\Server $server */  | 
                                                        
| 145 | 145 |                      $server = $c->query('ServerContainer'); | 
                                                        
| 146 | 146 |                      return new FileService($server->getL10N(OcrConstants::APP_NAME), $server->getLogger(), $c->query('CurrentUID'),  | 
                                                        
@@ -150,7 +150,7 @@ discard block  | 
                                                    ||
| 150 | 150 | * Register the Redis Service  | 
                                                        
| 151 | 151 | */  | 
                                                        
| 152 | 152 |          $container->registerService('RedisService',  | 
                                                        
| 153 | -                function (IAppContainer $c) { | 
                                                        |
| 153 | +                function(IAppContainer $c) { | 
                                                        |
| 154 | 154 | /** @var \OC\Server $server */  | 
                                                        
| 155 | 155 |                      $server = $c->query('ServerContainer'); | 
                                                        
| 156 | 156 |                      return new RedisService($c->query('OcrJobMapper'), $c->query('FileUtil'), $c->query('RedisUtil'),  | 
                                                        
@@ -160,7 +160,7 @@ discard block  | 
                                                    ||
| 160 | 160 | * Register the Job Service  | 
                                                        
| 161 | 161 | */  | 
                                                        
| 162 | 162 |          $container->registerService('JobService',  | 
                                                        
| 163 | -                function (IAppContainer $c) { | 
                                                        |
| 163 | +                function(IAppContainer $c) { | 
                                                        |
| 164 | 164 | /** @var \OC\Server $server */  | 
                                                        
| 165 | 165 |                      $server = $c->query('ServerContainer'); | 
                                                        
| 166 | 166 |                      return new JobService($server->getL10N(OcrConstants::APP_NAME), $server->getLogger(), $c->query('CurrentUID'),  | 
                                                        
@@ -172,7 +172,7 @@ discard block  | 
                                                    ||
| 172 | 172 | * Register the Status Service  | 
                                                        
| 173 | 173 | */  | 
                                                        
| 174 | 174 |          $container->registerService('StatusService',  | 
                                                        
| 175 | -                function (IAppContainer $c) { | 
                                                        |
| 175 | +                function(IAppContainer $c) { | 
                                                        |
| 176 | 176 | /** @var \OC\Server $server */  | 
                                                        
| 177 | 177 |                      $server = $c->query('ServerContainer'); | 
                                                        
| 178 | 178 |                      return new StatusService($server->getL10N(OcrConstants::APP_NAME), $server->getLogger(), $c->query('CurrentUID'),  | 
                                                        
@@ -182,7 +182,7 @@ discard block  | 
                                                    ||
| 182 | 182 | * Controller  | 
                                                        
| 183 | 183 | */  | 
                                                        
| 184 | 184 |          $container->registerService('StatusController',  | 
                                                        
| 185 | -                function (IAppContainer $c) { | 
                                                        |
| 185 | +                function(IAppContainer $c) { | 
                                                        |
| 186 | 186 | /** @var \OC\Server $server */  | 
                                                        
| 187 | 187 |                      $server = $c->query('ServerContainer'); | 
                                                        
| 188 | 188 |                      return new StatusController($c->getAppName(), $server->getRequest(), $c->query('StatusService')); | 
                                                        
@@ -191,7 +191,7 @@ discard block  | 
                                                    ||
| 191 | 191 | * Controller  | 
                                                        
| 192 | 192 | */  | 
                                                        
| 193 | 193 |          $container->registerService('JobController',  | 
                                                        
| 194 | -                function (IAppContainer $c) { | 
                                                        |
| 194 | +                function(IAppContainer $c) { | 
                                                        |
| 195 | 195 | /** @var \OC\Server $server */  | 
                                                        
| 196 | 196 |                      $server = $c->query('ServerContainer'); | 
                                                        
| 197 | 197 |                      return new JobController($c->getAppName(), $server->getRequest(), $c->query('JobService'),  | 
                                                        
@@ -201,7 +201,7 @@ discard block  | 
                                                    ||
| 201 | 201 | * Controller  | 
                                                        
| 202 | 202 | */  | 
                                                        
| 203 | 203 |          $container->registerService('UserHooks',  | 
                                                        
| 204 | -                function (IAppContainer $c) { | 
                                                        |
| 204 | +                function(IAppContainer $c) { | 
                                                        |
| 205 | 205 | /** @var \OC\Server $server */  | 
                                                        
| 206 | 206 |                      $server = $c->query('ServerContainer'); | 
                                                        
| 207 | 207 |                      return new UserHooks($c->query('ServerContainer') | 
                                                        
@@ -51,7 +51,7 @@  | 
                                                    ||
| 51 | 51 | * Registers the user hooks.  | 
                                                        
| 52 | 52 | */  | 
                                                        
| 53 | 53 |      public function register() { | 
                                                        
| 54 | -        $postDelete = function ($user) { | 
                                                        |
| 54 | +        $postDelete = function($user) { | 
                                                        |
| 55 | 55 |              $this->logger->debug('Deleting all jobs for user "{user}" after user deletion (Hook).', [ | 
                                                        
| 56 | 56 | 'user' => $user->getUID(),  | 
                                                        
| 57 | 57 | 'app' => OcrConstants::APP_NAME  | 
                                                        
@@ -157,7 +157,7 @@ discard block  | 
                                                    ||
| 157 | 157 |                  foreach ($fileInfo as $fInfo) { | 
                                                        
| 158 | 158 | // Check Shared  | 
                                                        
| 159 | 159 | $shared = $this->fileService->checkSharedWithInitiator($fInfo);  | 
                                                        
| 160 | -                    if($shared && $replace) { | 
                                                        |
| 160 | +                    if ($shared && $replace) { | 
                                                        |
| 161 | 161 |                          throw new NotFoundException($this->l10n->t('Cannot replace shared files.')); | 
                                                        
| 162 | 162 | }  | 
                                                        
| 163 | 163 | $target = $this->fileService->buildTarget($fInfo, $shared, $replace);  | 
                                                        
@@ -276,11 +276,11 @@ discard block  | 
                                                    ||
| 276 | 276 |              $this->logger->debug('Check if files were processed by ocr and if so, put them to the right dirs.', ['app' => OcrConstants::APP_NAME]); | 
                                                        
| 277 | 277 | $processed = $this->jobMapper->findAllProcessed($this->userId);  | 
                                                        
| 278 | 278 |              foreach ($processed as $job) { | 
                                                        
| 279 | -                if ($this->fileUtil->fileExists($this->tempM->getTempBaseDir().'/'.$job->getTempFile().'.pdf')) { | 
                                                        |
| 279 | +                if ($this->fileUtil->fileExists($this->tempM->getTempBaseDir() . '/' . $job->getTempFile() . '.pdf')) { | 
                                                        |
| 280 | 280 | // Save the tmp file with newname  | 
                                                        
| 281 | 281 | $this->pullResult($job);  | 
                                                        
| 282 | 282 | $this->jobMapper->delete($job);  | 
                                                        
| 283 | - $this->fileUtil->execRemove($this->tempM->getTempBaseDir().'/'.$job->getTempFile().'.pdf');  | 
                                                        |
| 283 | + $this->fileUtil->execRemove($this->tempM->getTempBaseDir() . '/' . $job->getTempFile() . '.pdf');  | 
                                                        |
| 284 | 284 |                  } else { | 
                                                        
| 285 | 285 | $job->setStatus(OcrConstants::STATUS_FAILED);  | 
                                                        
| 286 | 286 |                      $job->setErrorLog('Temp file does not exist.'); | 
                                                        
@@ -304,7 +304,7 @@ discard block  | 
                                                    ||
| 304 | 304 | $failed = $this->jobMapper->findAllFailed($this->userId);  | 
                                                        
| 305 | 305 |              foreach ($failed as $job) { | 
                                                        
| 306 | 306 | // clean the tempfile  | 
                                                        
| 307 | - $this->fileUtil->execRemove($this->tempM->getTempBaseDir().'/'.$job->getTempFile().'.pdf');  | 
                                                        |
| 307 | + $this->fileUtil->execRemove($this->tempM->getTempBaseDir() . '/' . $job->getTempFile() . '.pdf');  | 
                                                        |
| 308 | 308 | // set error displayed  | 
                                                        
| 309 | 309 | $job->setErrorDisplayed(true);  | 
                                                        
| 310 | 310 | $this->jobMapper->update($job);  | 
                                                        
@@ -329,7 +329,7 @@ discard block  | 
                                                    ||
| 329 | 329 |          if ($job->getReplace()) { | 
                                                        
| 330 | 330 | $this->view->unlink(str_replace($this->userId . '/files', '', $job->getSource()));  | 
                                                        
| 331 | 331 | }  | 
                                                        
| 332 | - $result = $this->view->file_put_contents($job->getTarget(), $this->fileUtil->getFileContents($this->tempM->getTempBaseDir().'/'.$job->getTempFile().'.pdf'));  | 
                                                        |
| 332 | + $result = $this->view->file_put_contents($job->getTarget(), $this->fileUtil->getFileContents($this->tempM->getTempBaseDir() . '/' . $job->getTempFile() . '.pdf'));  | 
                                                        |
| 333 | 333 |          if (!$result) { | 
                                                        
| 334 | 334 |              throw new NotFoundException($this->l10n->t('OCR could not put processed file to the right target folder. If you selected the replace option, you can restore the file by using the trash bin.')); | 
                                                        
| 335 | 335 | }  |