@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | * @return mixed the value or $default |
86 | 86 | */ |
87 | 87 | public function getValue($key, $default = null) { |
88 | - $envValue = getenv(self::ENV_PREFIX . $key); |
|
88 | + $envValue = getenv(self::ENV_PREFIX.$key); |
|
89 | 89 | if ($envValue !== false) { |
90 | 90 | return $envValue; |
91 | 91 | } |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | foreach ($configFiles as $file) { |
198 | 198 | $fileExistsAndIsReadable = file_exists($file) && is_readable($file); |
199 | 199 | $filePointer = $fileExistsAndIsReadable ? fopen($file, 'r') : false; |
200 | - if($file === $this->configFilePath && |
|
200 | + if ($file === $this->configFilePath && |
|
201 | 201 | $filePointer === false) { |
202 | 202 | // Opening the main config might not be possible, e.g. if the wrong |
203 | 203 | // permissions are set (likely on a new installation) |
@@ -205,13 +205,13 @@ discard block |
||
205 | 205 | } |
206 | 206 | |
207 | 207 | // Try to acquire a file lock |
208 | - if(!flock($filePointer, LOCK_SH)) { |
|
208 | + if (!flock($filePointer, LOCK_SH)) { |
|
209 | 209 | throw new \Exception(sprintf('Could not acquire a shared lock on the config file %s', $file)); |
210 | 210 | } |
211 | 211 | |
212 | 212 | unset($CONFIG); |
213 | 213 | include $file; |
214 | - if(isset($CONFIG) && is_array($CONFIG)) { |
|
214 | + if (isset($CONFIG) && is_array($CONFIG)) { |
|
215 | 215 | $this->cache = array_merge($this->cache, $CONFIG); |
216 | 216 | } |
217 | 217 | |
@@ -236,29 +236,29 @@ discard block |
||
236 | 236 | $content .= var_export($this->cache, true); |
237 | 237 | $content .= ";\n"; |
238 | 238 | |
239 | - touch ($this->configFilePath); |
|
239 | + touch($this->configFilePath); |
|
240 | 240 | $filePointer = fopen($this->configFilePath, 'r+'); |
241 | 241 | |
242 | 242 | // Prevent others not to read the config |
243 | 243 | chmod($this->configFilePath, 0640); |
244 | 244 | |
245 | 245 | // File does not exist, this can happen when doing a fresh install |
246 | - if(!is_resource ($filePointer)) { |
|
246 | + if (!is_resource($filePointer)) { |
|
247 | 247 | // TODO fix this via DI once it is very clear that this doesn't cause side effects due to initialization order |
248 | 248 | // currently this breaks app routes but also could have other side effects especially during setup and exception handling |
249 | 249 | $url = \OC::$server->getURLGenerator()->linkToDocs('admin-dir_permissions'); |
250 | 250 | throw new HintException( |
251 | 251 | "Can't write into config directory!", |
252 | - 'This can usually be fixed by giving the webserver write access to the config directory. See ' . $url); |
|
252 | + 'This can usually be fixed by giving the webserver write access to the config directory. See '.$url); |
|
253 | 253 | } |
254 | 254 | |
255 | 255 | // Try to acquire a file lock |
256 | - if(!flock($filePointer, LOCK_EX)) { |
|
256 | + if (!flock($filePointer, LOCK_EX)) { |
|
257 | 257 | throw new \Exception(sprintf('Could not acquire an exclusive lock on the config file %s', $this->configFilePath)); |
258 | 258 | } |
259 | 259 | |
260 | 260 | // Write the config and release the lock |
261 | - ftruncate ($filePointer, 0); |
|
261 | + ftruncate($filePointer, 0); |
|
262 | 262 | fwrite($filePointer, $content); |
263 | 263 | fflush($filePointer); |
264 | 264 | flock($filePointer, LOCK_UN); |
@@ -35,12 +35,12 @@ discard block |
||
35 | 35 | throw new \RuntimeException("No app with given id <$appId> known."); |
36 | 36 | } |
37 | 37 | |
38 | - if (!is_dir($appPath . '/l10n/')) { |
|
38 | + if (!is_dir($appPath.'/l10n/')) { |
|
39 | 39 | return []; |
40 | 40 | } |
41 | 41 | |
42 | 42 | $errors = []; |
43 | - $directory = new \DirectoryIterator($appPath . '/l10n/'); |
|
43 | + $directory = new \DirectoryIterator($appPath.'/l10n/'); |
|
44 | 44 | |
45 | 45 | foreach ($directory as $file) { |
46 | 46 | if ($file->getExtension() !== 'json') { |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | json_decode($content, true); |
52 | 52 | |
53 | 53 | if (json_last_error() !== JSON_ERROR_NONE) { |
54 | - $errors[] = 'Invalid language file found: l10n/' . $file->getFilename() . ': ' . json_last_error_msg(); |
|
54 | + $errors[] = 'Invalid language file found: l10n/'.$file->getFilename().': '.json_last_error_msg(); |
|
55 | 55 | } |
56 | 56 | } |
57 | 57 |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | $json = file_get_contents('php://stdin'); |
113 | 113 | } else { |
114 | 114 | if (!file_exists($path)) { |
115 | - $output->writeln('<error>File not found: ' . $path . '</error>'); |
|
115 | + $output->writeln('<error>File not found: '.$path.'</error>'); |
|
116 | 116 | return 1; |
117 | 117 | } |
118 | 118 | $json = file_get_contents($path); |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | $existingMount->getApplicableUsers() === $mount->getApplicableUsers() && |
165 | 165 | $existingMount->getBackendOptions() === $mount->getBackendOptions() |
166 | 166 | ) { |
167 | - $output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>"); |
|
167 | + $output->writeln("<error>Duplicate mount (".$mount->getMountPoint().")</error>"); |
|
168 | 168 | return 1; |
169 | 169 | } |
170 | 170 | } |
@@ -31,8 +31,8 @@ discard block |
||
31 | 31 | OCP\User::checkLoggedIn(); |
32 | 32 | \OC::$server->getSession()->close(); |
33 | 33 | |
34 | -$files = isset($_GET['files']) ? (string)$_GET['files'] : ''; |
|
35 | -$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : ''; |
|
34 | +$files = isset($_GET['files']) ? (string) $_GET['files'] : ''; |
|
35 | +$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : ''; |
|
36 | 36 | |
37 | 37 | $files_list = json_decode($files); |
38 | 38 | // in case we get only a single file |
@@ -45,13 +45,13 @@ discard block |
||
45 | 45 | * the content must not be longer than 32 characters and must only contain |
46 | 46 | * alphanumeric characters |
47 | 47 | */ |
48 | -if(isset($_GET['downloadStartSecret']) |
|
48 | +if (isset($_GET['downloadStartSecret']) |
|
49 | 49 | && !isset($_GET['downloadStartSecret'][32]) |
50 | 50 | && preg_match('!^[a-zA-Z0-9]+$!', $_GET['downloadStartSecret']) === 1) { |
51 | 51 | setcookie('ocDownloadStarted', $_GET['downloadStartSecret'], time() + 20, '/'); |
52 | 52 | } |
53 | 53 | |
54 | -$server_params = array( 'head' => \OC::$server->getRequest()->getMethod() === 'HEAD' ); |
|
54 | +$server_params = array('head' => \OC::$server->getRequest()->getMethod() === 'HEAD'); |
|
55 | 55 | |
56 | 56 | /** |
57 | 57 | * Http range requests support |
@@ -68,7 +68,7 @@ |
||
68 | 68 | |
69 | 69 | $query = $this->connection->getQueryBuilder(); |
70 | 70 | $query->update('share') |
71 | - ->set('share_type', $query->createNamedParameter(Share::SHARE_TYPE_GUEST)) |
|
71 | + ->set('share_type', $query->createNamedParameter(Share::SHARE_TYPE_GUEST)) |
|
72 | 72 | ->where($query->expr()->eq('share_type', $query->createNamedParameter(Share::SHARE_TYPE_EMAIL))); |
73 | 73 | $query->execute(); |
74 | 74 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | private function setupUserFs($userId) { |
56 | 56 | \OC_Util::setupFS($userId); |
57 | 57 | $this->session->close(); |
58 | - return $this->principalPrefix . $userId; |
|
58 | + return $this->principalPrefix.$userId; |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | /** |
@@ -64,10 +64,10 @@ discard block |
||
64 | 64 | public function validateBearerToken($bearerToken) { |
65 | 65 | \OC_Util::setupFS(); |
66 | 66 | |
67 | - if(!$this->userSession->isLoggedIn()) { |
|
67 | + if (!$this->userSession->isLoggedIn()) { |
|
68 | 68 | $this->userSession->tryTokenLogin($this->request); |
69 | 69 | } |
70 | - if($this->userSession->isLoggedIn()) { |
|
70 | + if ($this->userSession->isLoggedIn()) { |
|
71 | 71 | return $this->setupUserFs($this->userSession->getUser()->getUID()); |
72 | 72 | } |
73 | 73 |
@@ -71,26 +71,26 @@ |
||
71 | 71 | } |
72 | 72 | |
73 | 73 | $app = substr($script, 0, strpos($script, '/')); |
74 | - $script = substr($script, strpos($script, '/')+1); |
|
74 | + $script = substr($script, strpos($script, '/') + 1); |
|
75 | 75 | $app_path = \OC_App::getAppPath($app); |
76 | 76 | $app_url = \OC_App::getAppWebPath($app); |
77 | 77 | |
78 | 78 | // missing translations files fill be ignored |
79 | 79 | if (strpos($script, 'l10n/') === 0) { |
80 | - $this->appendIfExist($app_path, $script . '.js', $app_url); |
|
80 | + $this->appendIfExist($app_path, $script.'.js', $app_url); |
|
81 | 81 | return; |
82 | 82 | } |
83 | 83 | |
84 | 84 | if ($app_path === false && $app_url === false) { |
85 | 85 | $this->logger->error('Could not find resource {resource} to load', [ |
86 | - 'resource' => $app . '/' . $script . '.js', |
|
86 | + 'resource' => $app.'/'.$script.'.js', |
|
87 | 87 | 'app' => 'jsresourceloader', |
88 | 88 | ]); |
89 | 89 | return; |
90 | 90 | } |
91 | 91 | |
92 | 92 | if (!$this->cacheAndAppendCombineJsonIfExist($app_path, $script.'.json', $app)) { |
93 | - $this->append($app_path, $script . '.js', $app_url); |
|
93 | + $this->append($app_path, $script.'.js', $app_url); |
|
94 | 94 | } |
95 | 95 | } |
96 | 96 |
@@ -67,7 +67,7 @@ |
||
67 | 67 | |
68 | 68 | $isMasterKeyEnabled = $this->util->isMasterKeyEnabled(); |
69 | 69 | |
70 | - if(!$isMasterKeyEnabled) { |
|
70 | + if (!$isMasterKeyEnabled) { |
|
71 | 71 | $output->writeln('Master key already disabled'); |
72 | 72 | } else { |
73 | 73 | $question = new ConfirmationQuestion( |
@@ -78,7 +78,7 @@ |
||
78 | 78 | $olderVersions = $ms->getMigratedVersions(); |
79 | 79 | $olderVersions[] = '0'; |
80 | 80 | $olderVersions[] = 'prev'; |
81 | - if (in_array($version, $olderVersions, true)) { |
|
81 | + if (in_array($version, $olderVersions, true)) { |
|
82 | 82 | $output->writeln('<error>Can not go back to previous migration without debug enabled</error>'); |
83 | 83 | return 1; |
84 | 84 | } |