@@ -70,12 +70,12 @@ |
||
| 70 | 70 | list($alias, $columnName) = explode('.', $string, 2); |
| 71 | 71 | |
| 72 | 72 | if ($columnName === '*') { |
| 73 | - return '`' . $alias . '`.*'; |
|
| 73 | + return '`'.$alias.'`.*'; |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | - return '`' . $alias . '`.`' . $columnName . '`'; |
|
| 76 | + return '`'.$alias.'`.`'.$columnName.'`'; |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | - return '`' . $string . '`'; |
|
| 79 | + return '`'.$string.'`'; |
|
| 80 | 80 | } |
| 81 | 81 | } |
@@ -128,32 +128,32 @@ discard block |
||
| 128 | 128 | $authBackend = $this->backendService->getAuthMechanism($authIdentifier); |
| 129 | 129 | |
| 130 | 130 | if (!Filesystem::isValidPath($mountPoint)) { |
| 131 | - $output->writeln('<error>Invalid mountpoint "' . $mountPoint . '"</error>'); |
|
| 131 | + $output->writeln('<error>Invalid mountpoint "'.$mountPoint.'"</error>'); |
|
| 132 | 132 | return 1; |
| 133 | 133 | } |
| 134 | 134 | if (is_null($storageBackend)) { |
| 135 | - $output->writeln('<error>Storage backend with identifier "' . $storageIdentifier . '" not found (see `occ files_external:backends` for possible values)</error>'); |
|
| 135 | + $output->writeln('<error>Storage backend with identifier "'.$storageIdentifier.'" not found (see `occ files_external:backends` for possible values)</error>'); |
|
| 136 | 136 | return 404; |
| 137 | 137 | } |
| 138 | 138 | if (is_null($authBackend)) { |
| 139 | - $output->writeln('<error>Authentication backend with identifier "' . $authIdentifier . '" not found (see `occ files_external:backends` for possible values)</error>'); |
|
| 139 | + $output->writeln('<error>Authentication backend with identifier "'.$authIdentifier.'" not found (see `occ files_external:backends` for possible values)</error>'); |
|
| 140 | 140 | return 404; |
| 141 | 141 | } |
| 142 | 142 | $supportedSchemes = array_keys($storageBackend->getAuthSchemes()); |
| 143 | 143 | if (!in_array($authBackend->getScheme(), $supportedSchemes)) { |
| 144 | - $output->writeln('<error>Authentication backend "' . $authIdentifier . '" not valid for storage backend "' . $storageIdentifier . '" (see `occ files_external:backends storage ' . $storageIdentifier . '` for possible values)</error>'); |
|
| 144 | + $output->writeln('<error>Authentication backend "'.$authIdentifier.'" not valid for storage backend "'.$storageIdentifier.'" (see `occ files_external:backends storage '.$storageIdentifier.'` for possible values)</error>'); |
|
| 145 | 145 | return 1; |
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | $config = []; |
| 149 | 149 | foreach ($configInput as $configOption) { |
| 150 | 150 | if (!strpos($configOption, '=')) { |
| 151 | - $output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>'); |
|
| 151 | + $output->writeln('<error>Invalid mount configuration option "'.$configOption.'"</error>'); |
|
| 152 | 152 | return 1; |
| 153 | 153 | } |
| 154 | 154 | list($key, $value) = explode('=', $configOption, 2); |
| 155 | 155 | if (!$this->validateParam($key, $value, $storageBackend, $authBackend)) { |
| 156 | - $output->writeln('<error>Unknown configuration for backends "' . $key . '"</error>'); |
|
| 156 | + $output->writeln('<error>Unknown configuration for backends "'.$key.'"</error>'); |
|
| 157 | 157 | return 1; |
| 158 | 158 | } |
| 159 | 159 | $config[$key] = $value; |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | |
| 168 | 168 | if ($user) { |
| 169 | 169 | if (!$this->userManager->userExists($user)) { |
| 170 | - $output->writeln('<error>User "' . $user . '" not found</error>'); |
|
| 170 | + $output->writeln('<error>User "'.$user.'" not found</error>'); |
|
| 171 | 171 | return 1; |
| 172 | 172 | } |
| 173 | 173 | $mount->setApplicableUsers([$user]); |
@@ -178,9 +178,9 @@ discard block |
||
| 178 | 178 | } else { |
| 179 | 179 | $this->getStorageService($user)->addStorage($mount); |
| 180 | 180 | if ($input->getOption('output') === self::OUTPUT_FORMAT_PLAIN) { |
| 181 | - $output->writeln('<info>Storage created with id ' . $mount->getId() . '</info>'); |
|
| 181 | + $output->writeln('<info>Storage created with id '.$mount->getId().'</info>'); |
|
| 182 | 182 | } else { |
| 183 | - $output->writeln((string)$mount->getId()); |
|
| 183 | + $output->writeln((string) $mount->getId()); |
|
| 184 | 184 | } |
| 185 | 185 | } |
| 186 | 186 | return 0; |
@@ -304,9 +304,9 @@ |
||
| 304 | 304 | */ |
| 305 | 305 | public static function linkToRemote($service) { |
| 306 | 306 | $urlGenerator = \OC::$server->getURLGenerator(); |
| 307 | - $remoteBase = $urlGenerator->linkTo('', 'remote.php') . '/' . $service; |
|
| 307 | + $remoteBase = $urlGenerator->linkTo('', 'remote.php').'/'.$service; |
|
| 308 | 308 | return $urlGenerator->getAbsoluteURL( |
| 309 | - $remoteBase . (($service[strlen($service) - 1] != '/') ? '/' : '') |
|
| 309 | + $remoteBase.(($service[strlen($service) - 1] != '/') ? '/' : '') |
|
| 310 | 310 | ); |
| 311 | 311 | } |
| 312 | 312 | |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | |
| 79 | 79 | // default responders |
| 80 | 80 | $this->responders = [ |
| 81 | - 'json' => function ($data) { |
|
| 81 | + 'json' => function($data) { |
|
| 82 | 82 | if ($data instanceof DataResponse) { |
| 83 | 83 | $response = new JSONResponse( |
| 84 | 84 | $data->getData(), |
@@ -153,6 +153,6 @@ discard block |
||
| 153 | 153 | return $responder($response); |
| 154 | 154 | } |
| 155 | 155 | throw new \DomainException('No responder registered for format '. |
| 156 | - $format . '!'); |
|
| 156 | + $format.'!'); |
|
| 157 | 157 | } |
| 158 | 158 | } |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | $this->file = $file; |
| 52 | 52 | $this->setStatus($statusCode); |
| 53 | 53 | $this->setHeaders(array_merge($this->getHeaders(), $headers)); |
| 54 | - $this->addHeader('Content-Disposition', 'inline; filename="' . rawurldecode($file->getName()) . '"'); |
|
| 54 | + $this->addHeader('Content-Disposition', 'inline; filename="'.rawurldecode($file->getName()).'"'); |
|
| 55 | 55 | |
| 56 | 56 | $this->setETag($file->getEtag()); |
| 57 | 57 | $lastModified = new \DateTime(); |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | public function callback(IOutput $output) { |
| 67 | 67 | if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) { |
| 68 | - $output->setHeader('Content-Length: ' . $this->file->getSize()); |
|
| 68 | + $output->setHeader('Content-Length: '.$this->file->getSize()); |
|
| 69 | 69 | $output->setOutput($this->file->getContent()); |
| 70 | 70 | } |
| 71 | 71 | } |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | $this->filename = $filename; |
| 44 | 44 | $this->contentType = $contentType; |
| 45 | 45 | |
| 46 | - $this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"'); |
|
| 46 | + $this->addHeader('Content-Disposition', 'attachment; filename="'.$filename.'"'); |
|
| 47 | 47 | $this->addHeader('Content-Type', $contentType); |
| 48 | 48 | } |
| 49 | 49 | } |
@@ -68,7 +68,7 @@ |
||
| 68 | 68 | public function render() { |
| 69 | 69 | $response = json_encode($this->data, JSON_HEX_TAG); |
| 70 | 70 | if ($response === false) { |
| 71 | - throw new \Exception(sprintf('Could not json_encode due to invalid ' . |
|
| 71 | + throw new \Exception(sprintf('Could not json_encode due to invalid '. |
|
| 72 | 72 | 'non UTF-8 characters in the array: %s', var_export($this->data, true))); |
| 73 | 73 | } |
| 74 | 74 | |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | $result = $this->zip->addFromString($path, $source); |
| 73 | 73 | } |
| 74 | 74 | if ($result) { |
| 75 | - $this->zip->close();//close and reopen to save the zip |
|
| 75 | + $this->zip->close(); //close and reopen to save the zip |
|
| 76 | 76 | $this->zip->open($this->path); |
| 77 | 77 | } |
| 78 | 78 | return $result; |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | public function getFiles() { |
| 131 | 131 | $fileCount = $this->zip->numFiles; |
| 132 | 132 | $files = []; |
| 133 | - for ($i = 0;$i < $fileCount;$i++) { |
|
| 133 | + for ($i = 0; $i < $fileCount; $i++) { |
|
| 134 | 134 | $files[] = $this->zip->getNameIndex($i); |
| 135 | 135 | } |
| 136 | 136 | return $files; |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | $this->extractFile($path, $tmpFile); |
| 205 | 205 | } |
| 206 | 206 | $handle = fopen($tmpFile, $mode); |
| 207 | - return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) { |
|
| 207 | + return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) { |
|
| 208 | 208 | $this->writeBack($tmpFile, $path); |
| 209 | 209 | }); |
| 210 | 210 | } |
@@ -35,17 +35,17 @@ |
||
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | $excludedFolders = [ |
| 38 | - rtrim($root . '/data', '/'), |
|
| 39 | - rtrim($root . '/themes', '/'), |
|
| 40 | - rtrim($root . '/config', '/'), |
|
| 41 | - rtrim($root . '/apps', '/'), |
|
| 42 | - rtrim($root . '/assets', '/'), |
|
| 43 | - rtrim($root . '/lost+found', '/'), |
|
| 38 | + rtrim($root.'/data', '/'), |
|
| 39 | + rtrim($root.'/themes', '/'), |
|
| 40 | + rtrim($root.'/config', '/'), |
|
| 41 | + rtrim($root.'/apps', '/'), |
|
| 42 | + rtrim($root.'/assets', '/'), |
|
| 43 | + rtrim($root.'/lost+found', '/'), |
|
| 44 | 44 | // Ignore folders generated by updater since the updater is replaced |
| 45 | 45 | // after the integrity check is run. |
| 46 | 46 | // See https://github.com/owncloud/updater/issues/318#issuecomment-212497846 |
| 47 | - rtrim($root . '/updater', '/'), |
|
| 48 | - rtrim($root . '/_oc_upgrade', '/'), |
|
| 47 | + rtrim($root.'/updater', '/'), |
|
| 48 | + rtrim($root.'/_oc_upgrade', '/'), |
|
| 49 | 49 | ]; |
| 50 | 50 | $customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', ''); |
| 51 | 51 | if ($customDataDir !== '') { |