@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | $pagingSize = $this->config->getAppValue('user_ldap', $configKey, $minPagingSize); |
113 | 113 | $minPagingSize = $minPagingSize === null ? $pagingSize : min($minPagingSize, $pagingSize); |
114 | 114 | } |
115 | - return (int)$minPagingSize; |
|
115 | + return (int) $minPagingSize; |
|
116 | 116 | } |
117 | 117 | |
118 | 118 | /** |
@@ -123,20 +123,20 @@ discard block |
||
123 | 123 | |
124 | 124 | $isBackgroundJobModeAjax = $this->config |
125 | 125 | ->getAppValue('core', 'backgroundjobs_mode', 'ajax') === 'ajax'; |
126 | - if($isBackgroundJobModeAjax) { |
|
126 | + if ($isBackgroundJobModeAjax) { |
|
127 | 127 | return; |
128 | 128 | } |
129 | 129 | |
130 | 130 | $cycleData = $this->getCycle(); |
131 | - if($cycleData === null) { |
|
131 | + if ($cycleData === null) { |
|
132 | 132 | $cycleData = $this->determineNextCycle(); |
133 | - if($cycleData === null) { |
|
133 | + if ($cycleData === null) { |
|
134 | 134 | $this->updateInterval(); |
135 | 135 | return; |
136 | 136 | } |
137 | 137 | } |
138 | 138 | |
139 | - if(!$this->qualifiesToRun($cycleData)) { |
|
139 | + if (!$this->qualifiesToRun($cycleData)) { |
|
140 | 140 | $this->updateInterval(); |
141 | 141 | return; |
142 | 142 | } |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | |
166 | 166 | $filter = $access->combineFilterWithAnd(array( |
167 | 167 | $access->connection->ldapUserFilter, |
168 | - $access->connection->ldapUserDisplayName . '=*', |
|
168 | + $access->connection->ldapUserDisplayName.'=*', |
|
169 | 169 | $access->getFilterPartForUserSearch('') |
170 | 170 | )); |
171 | 171 | $results = $access->fetchListOfUsers( |
@@ -176,10 +176,10 @@ discard block |
||
176 | 176 | true |
177 | 177 | ); |
178 | 178 | |
179 | - if((int)$connection->ldapPagingSize === 0) { |
|
179 | + if ((int) $connection->ldapPagingSize === 0) { |
|
180 | 180 | return false; |
181 | 181 | } |
182 | - return count($results) >= (int)$connection->ldapPagingSize; |
|
182 | + return count($results) >= (int) $connection->ldapPagingSize; |
|
183 | 183 | } |
184 | 184 | |
185 | 185 | /** |
@@ -190,16 +190,16 @@ discard block |
||
190 | 190 | */ |
191 | 191 | public function getCycle() { |
192 | 192 | $prefixes = $this->ldapHelper->getServerConfigurationPrefixes(true); |
193 | - if(count($prefixes) === 0) { |
|
193 | + if (count($prefixes) === 0) { |
|
194 | 194 | return null; |
195 | 195 | } |
196 | 196 | |
197 | 197 | $cycleData = [ |
198 | 198 | 'prefix' => $this->config->getAppValue('user_ldap', 'background_sync_prefix', null), |
199 | - 'offset' => (int)$this->config->getAppValue('user_ldap', 'background_sync_offset', 0), |
|
199 | + 'offset' => (int) $this->config->getAppValue('user_ldap', 'background_sync_offset', 0), |
|
200 | 200 | ]; |
201 | 201 | |
202 | - if( |
|
202 | + if ( |
|
203 | 203 | $cycleData['prefix'] !== null |
204 | 204 | && in_array($cycleData['prefix'], $prefixes) |
205 | 205 | ) { |
@@ -228,14 +228,14 @@ discard block |
||
228 | 228 | */ |
229 | 229 | public function determineNextCycle(array $cycleData = null) { |
230 | 230 | $prefixes = $this->ldapHelper->getServerConfigurationPrefixes(true); |
231 | - if(count($prefixes) === 0) { |
|
231 | + if (count($prefixes) === 0) { |
|
232 | 232 | return null; |
233 | 233 | } |
234 | 234 | |
235 | 235 | // get the next prefix in line and remember it |
236 | 236 | $oldPrefix = $cycleData === null ? null : $cycleData['prefix']; |
237 | 237 | $prefix = $this->getNextPrefix($oldPrefix); |
238 | - if($prefix === null) { |
|
238 | + if ($prefix === null) { |
|
239 | 239 | return null; |
240 | 240 | } |
241 | 241 | $cycleData['prefix'] = $prefix; |
@@ -253,8 +253,8 @@ discard block |
||
253 | 253 | * @return bool |
254 | 254 | */ |
255 | 255 | public function qualifiesToRun($cycleData) { |
256 | - $lastChange = $this->config->getAppValue('user_ldap', $cycleData['prefix'] . '_lastChange', 0); |
|
257 | - if((time() - $lastChange) > 60 * 30) { |
|
256 | + $lastChange = $this->config->getAppValue('user_ldap', $cycleData['prefix'].'_lastChange', 0); |
|
257 | + if ((time() - $lastChange) > 60 * 30) { |
|
258 | 258 | return true; |
259 | 259 | } |
260 | 260 | return false; |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | */ |
268 | 268 | protected function increaseOffset($cycleData) { |
269 | 269 | $ldapConfig = new Configuration($cycleData['prefix']); |
270 | - $cycleData['offset'] += (int)$ldapConfig->ldapPagingSize; |
|
270 | + $cycleData['offset'] += (int) $ldapConfig->ldapPagingSize; |
|
271 | 271 | $this->setCycle($cycleData); |
272 | 272 | } |
273 | 273 | |
@@ -280,17 +280,17 @@ discard block |
||
280 | 280 | protected function getNextPrefix($lastPrefix) { |
281 | 281 | $prefixes = $this->ldapHelper->getServerConfigurationPrefixes(true); |
282 | 282 | $noOfPrefixes = count($prefixes); |
283 | - if($noOfPrefixes === 0) { |
|
283 | + if ($noOfPrefixes === 0) { |
|
284 | 284 | return null; |
285 | 285 | } |
286 | 286 | $i = $lastPrefix === null ? false : array_search($lastPrefix, $prefixes, true); |
287 | - if($i === false) { |
|
287 | + if ($i === false) { |
|
288 | 288 | $i = -1; |
289 | 289 | } else { |
290 | 290 | $i++; |
291 | 291 | } |
292 | 292 | |
293 | - if(!isset($prefixes[$i])) { |
|
293 | + if (!isset($prefixes[$i])) { |
|
294 | 294 | $i = 0; |
295 | 295 | } |
296 | 296 | return $prefixes[$i]; |
@@ -302,49 +302,49 @@ discard block |
||
302 | 302 | * @param array $argument |
303 | 303 | */ |
304 | 304 | public function setArgument($argument) { |
305 | - if(isset($argument['config'])) { |
|
305 | + if (isset($argument['config'])) { |
|
306 | 306 | $this->config = $argument['config']; |
307 | 307 | } else { |
308 | 308 | $this->config = \OC::$server->getConfig(); |
309 | 309 | } |
310 | 310 | |
311 | - if(isset($argument['helper'])) { |
|
311 | + if (isset($argument['helper'])) { |
|
312 | 312 | $this->ldapHelper = $argument['helper']; |
313 | 313 | } else { |
314 | 314 | $this->ldapHelper = new Helper($this->config); |
315 | 315 | } |
316 | 316 | |
317 | - if(isset($argument['ldapWrapper'])) { |
|
317 | + if (isset($argument['ldapWrapper'])) { |
|
318 | 318 | $this->ldap = $argument['ldapWrapper']; |
319 | 319 | } else { |
320 | 320 | $this->ldap = new LDAP(); |
321 | 321 | } |
322 | 322 | |
323 | - if(isset($argument['avatarManager'])) { |
|
323 | + if (isset($argument['avatarManager'])) { |
|
324 | 324 | $this->avatarManager = $argument['avatarManager']; |
325 | 325 | } else { |
326 | 326 | $this->avatarManager = \OC::$server->getAvatarManager(); |
327 | 327 | } |
328 | 328 | |
329 | - if(isset($argument['dbc'])) { |
|
329 | + if (isset($argument['dbc'])) { |
|
330 | 330 | $this->dbc = $argument['dbc']; |
331 | 331 | } else { |
332 | 332 | $this->dbc = \OC::$server->getDatabaseConnection(); |
333 | 333 | } |
334 | 334 | |
335 | - if(isset($argument['ncUserManager'])) { |
|
335 | + if (isset($argument['ncUserManager'])) { |
|
336 | 336 | $this->ncUserManager = $argument['ncUserManager']; |
337 | 337 | } else { |
338 | 338 | $this->ncUserManager = \OC::$server->getUserManager(); |
339 | 339 | } |
340 | 340 | |
341 | - if(isset($argument['notificationManager'])) { |
|
341 | + if (isset($argument['notificationManager'])) { |
|
342 | 342 | $this->notificationManager = $argument['notificationManager']; |
343 | 343 | } else { |
344 | 344 | $this->notificationManager = \OC::$server->getNotificationManager(); |
345 | 345 | } |
346 | 346 | |
347 | - if(isset($argument['userManager'])) { |
|
347 | + if (isset($argument['userManager'])) { |
|
348 | 348 | $this->userManager = $argument['userManager']; |
349 | 349 | } else { |
350 | 350 | $this->userManager = new Manager( |
@@ -359,19 +359,19 @@ discard block |
||
359 | 359 | ); |
360 | 360 | } |
361 | 361 | |
362 | - if(isset($argument['mapper'])) { |
|
362 | + if (isset($argument['mapper'])) { |
|
363 | 363 | $this->mapper = $argument['mapper']; |
364 | 364 | } else { |
365 | 365 | $this->mapper = new UserMapping($this->dbc); |
366 | 366 | } |
367 | 367 | |
368 | - if(isset($argument['connectionFactory'])) { |
|
368 | + if (isset($argument['connectionFactory'])) { |
|
369 | 369 | $this->connectionFactory = $argument['connectionFactory']; |
370 | 370 | } else { |
371 | 371 | $this->connectionFactory = new ConnectionFactory($this->ldap); |
372 | 372 | } |
373 | 373 | |
374 | - if(isset($argument['accessFactory'])) { |
|
374 | + if (isset($argument['accessFactory'])) { |
|
375 | 375 | $this->accessFactory = $argument['accessFactory']; |
376 | 376 | } else { |
377 | 377 | $this->accessFactory = new AccessFactory( |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | $folder = $this->appData->getFolder($appName); |
73 | 73 | $gzip = false; |
74 | 74 | $file = $this->getFile($folder, $fileName, $gzip); |
75 | - } catch(NotFoundException $e) { |
|
75 | + } catch (NotFoundException $e) { |
|
76 | 76 | return new NotFoundResponse(); |
77 | 77 | } |
78 | 78 | |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | if (strpos($encoding, 'gzip') !== false) { |
102 | 102 | try { |
103 | 103 | $gzip = true; |
104 | - return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz |
|
104 | + return $folder->getFile($fileName.'.gzip'); # Safari doesn't like .gz |
|
105 | 105 | } catch (NotFoundException $e) { |
106 | 106 | // continue |
107 | 107 | } |
@@ -35,13 +35,13 @@ discard block |
||
35 | 35 | throw new \RuntimeException("No app with given id <$appId> known."); |
36 | 36 | } |
37 | 37 | |
38 | - if (!file_exists($appPath . '/appinfo/database.xml')) { |
|
38 | + if (!file_exists($appPath.'/appinfo/database.xml')) { |
|
39 | 39 | return ['errors' => [], 'warnings' => []]; |
40 | 40 | } |
41 | 41 | |
42 | 42 | libxml_use_internal_errors(true); |
43 | 43 | $loadEntities = libxml_disable_entity_loader(false); |
44 | - $xml = simplexml_load_file($appPath . '/appinfo/database.xml'); |
|
44 | + $xml = simplexml_load_file($appPath.'/appinfo/database.xml'); |
|
45 | 45 | libxml_disable_entity_loader($loadEntities); |
46 | 46 | |
47 | 47 | |
@@ -49,37 +49,37 @@ discard block |
||
49 | 49 | |
50 | 50 | foreach ($xml->table as $table) { |
51 | 51 | // Table names |
52 | - if (strpos((string)$table->name, '*dbprefix*') !== 0) { |
|
53 | - $errors[] = 'Database schema error: name of table ' . (string)$table->name . ' does not start with *dbprefix*'; |
|
52 | + if (strpos((string) $table->name, '*dbprefix*') !== 0) { |
|
53 | + $errors[] = 'Database schema error: name of table '.(string) $table->name.' does not start with *dbprefix*'; |
|
54 | 54 | } |
55 | - $tableName = substr((string)$table->name, strlen('*dbprefix*')); |
|
55 | + $tableName = substr((string) $table->name, strlen('*dbprefix*')); |
|
56 | 56 | if (strpos($tableName, '*dbprefix*') !== false) { |
57 | - $warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table ' . (string)$table->name; |
|
57 | + $warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table '.(string) $table->name; |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | if (strlen($tableName) > 27) { |
61 | - $errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed'; |
|
61 | + $errors[] = 'Database schema error: Name of table '.(string) $table->name.' is too long ('.strlen($tableName).'), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed'; |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | $hasAutoIncrement = false; |
65 | 65 | |
66 | 66 | // Column names |
67 | 67 | foreach ($table->declaration->field as $column) { |
68 | - if (strpos((string)$column->name, '*dbprefix*') !== false) { |
|
69 | - $warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column ' . (string)$column->name . ' on table ' . (string)$table->name; |
|
68 | + if (strpos((string) $column->name, '*dbprefix*') !== false) { |
|
69 | + $warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column '.(string) $column->name.' on table '.(string) $table->name; |
|
70 | 70 | } |
71 | 71 | |
72 | - if (strlen((string)$column->name) > 30) { |
|
73 | - $errors[] = 'Database schema error: Name of column ' . (string)$column->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 30 characters allowed'; |
|
72 | + if (strlen((string) $column->name) > 30) { |
|
73 | + $errors[] = 'Database schema error: Name of column '.(string) $column->name.' on table '.(string) $table->name.' is too long ('.strlen($tableName).'), max. 30 characters allowed'; |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | if ($column->autoincrement) { |
77 | 77 | if ($hasAutoIncrement) { |
78 | - $errors[] = 'Database schema error: Table ' . (string)$table->name . ' has multiple autoincrement columns'; |
|
78 | + $errors[] = 'Database schema error: Table '.(string) $table->name.' has multiple autoincrement columns'; |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | if (strlen($tableName) > 21) { |
82 | - $errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed'; |
|
82 | + $errors[] = 'Database schema error: Name of table '.(string) $table->name.' is too long ('.strlen($tableName).'), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed'; |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | $hasAutoIncrement = true; |
@@ -88,14 +88,14 @@ discard block |
||
88 | 88 | |
89 | 89 | // Index names |
90 | 90 | foreach ($table->declaration->index as $index) { |
91 | - $hasPrefix = strpos((string)$index->name, '*dbprefix*'); |
|
91 | + $hasPrefix = strpos((string) $index->name, '*dbprefix*'); |
|
92 | 92 | if ($hasPrefix !== false && $hasPrefix !== 0) { |
93 | - $warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index ' . (string)$index->name . ' on table ' . (string)$table->name; |
|
93 | + $warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index '.(string) $index->name.' on table '.(string) $table->name; |
|
94 | 94 | } |
95 | 95 | |
96 | - $indexName = $hasPrefix === 0 ? substr((string)$index->name, strlen('*dbprefix*')) : (string)$index->name; |
|
96 | + $indexName = $hasPrefix === 0 ? substr((string) $index->name, strlen('*dbprefix*')) : (string) $index->name; |
|
97 | 97 | if (strlen($indexName) > 27) { |
98 | - $errors[] = 'Database schema error: Name of index ' . (string)$index->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters + *dbprefix* allowed'; |
|
98 | + $errors[] = 'Database schema error: Name of index '.(string) $index->name.' on table '.(string) $table->name.' is too long ('.strlen($tableName).'), max. 27 characters + *dbprefix* allowed'; |
|
99 | 99 | } |
100 | 100 | } |
101 | 101 | } |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | $folder = $this->appData->getFolder($appName); |
73 | 73 | $gzip = false; |
74 | 74 | $file = $this->getFile($folder, $fileName, $gzip); |
75 | - } catch(NotFoundException $e) { |
|
75 | + } catch (NotFoundException $e) { |
|
76 | 76 | return new NotFoundResponse(); |
77 | 77 | } |
78 | 78 | |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | if (strpos($encoding, 'gzip') !== false) { |
102 | 102 | try { |
103 | 103 | $gzip = true; |
104 | - return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz |
|
104 | + return $folder->getFile($fileName.'.gzip'); # Safari doesn't like .gz |
|
105 | 105 | } catch (NotFoundException $e) { |
106 | 106 | // continue |
107 | 107 | } |
@@ -24,7 +24,7 @@ |
||
24 | 24 | */ |
25 | 25 | $config = \OC::$server->getConfig(); |
26 | 26 | $state = $config->getSystemValue('ldapIgnoreNamingRules', 'doSet'); |
27 | -if($state === 'doSet') { |
|
27 | +if ($state === 'doSet') { |
|
28 | 28 | \OC::$server->getConfig()->setSystemValue('ldapIgnoreNamingRules', false); |
29 | 29 | } |
30 | 30 |
@@ -128,7 +128,7 @@ |
||
128 | 128 | * @since 8.0.0 |
129 | 129 | * @suppress PhanDeprecatedFunction |
130 | 130 | */ |
131 | - public static function html_select_options($options, $selected, $params=array()) { |
|
131 | + public static function html_select_options($options, $selected, $params = array()) { |
|
132 | 132 | return \html_select_options($options, $selected, $params); |
133 | 133 | } |
134 | 134 | } |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | // WARNING: this should be moved to proper AppFramework handling |
24 | 24 | // Check if we are a user |
25 | 25 | if (!\OC::$server->getUserSession()->isLoggedIn()) { |
26 | - header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute( |
|
26 | + header('Location: '.\OC::$server->getURLGenerator()->linkToRoute( |
|
27 | 27 | 'core.login.showLoginForm', |
28 | 28 | [ |
29 | 29 | 'redirect_url' => \OC::$server->getRequest()->getRequestUri(), |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | } |
35 | 35 | // Redirect to 2FA challenge selection if 2FA challenge was not solved yet |
36 | 36 | if (\OC::$server->getTwoFactorAuthManager()->needsSecondFactor(\OC::$server->getUserSession()->getUser())) { |
37 | - header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge')); |
|
37 | + header('Location: '.\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge')); |
|
38 | 38 | exit(); |
39 | 39 | } |
40 | 40 |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | * @return IMemcache |
134 | 134 | */ |
135 | 135 | public function createLocking(string $prefix = ''): IMemcache { |
136 | - return new $this->lockingCacheClass($this->globalPrefix . '/' . $prefix); |
|
136 | + return new $this->lockingCacheClass($this->globalPrefix.'/'.$prefix); |
|
137 | 137 | } |
138 | 138 | |
139 | 139 | /** |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | * @return ICache |
144 | 144 | */ |
145 | 145 | public function createDistributed(string $prefix = ''): ICache { |
146 | - return new $this->distributedCacheClass($this->globalPrefix . '/' . $prefix); |
|
146 | + return new $this->distributedCacheClass($this->globalPrefix.'/'.$prefix); |
|
147 | 147 | } |
148 | 148 | |
149 | 149 | /** |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | * @return ICache |
154 | 154 | */ |
155 | 155 | public function createLocal(string $prefix = ''): ICache { |
156 | - return new $this->localCacheClass($this->globalPrefix . '/' . $prefix); |
|
156 | + return new $this->localCacheClass($this->globalPrefix.'/'.$prefix); |
|
157 | 157 | } |
158 | 158 | |
159 | 159 | /** |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | if (!($node instanceof File)) { |
173 | 173 | return new JSONResponse(['data' => ['message' => $this->l->t('Please select a file.')]]); |
174 | 174 | } |
175 | - if ($node->getSize() > 20*1024*1024) { |
|
175 | + if ($node->getSize() > 20 * 1024 * 1024) { |
|
176 | 176 | return new JSONResponse( |
177 | 177 | ['data' => ['message' => $this->l->t('File is too big')]], |
178 | 178 | Http::STATUS_BAD_REQUEST |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | is_uploaded_file($files['tmp_name'][0]) && |
201 | 201 | !\OC\Files\Filesystem::isFileBlacklisted($files['tmp_name'][0]) |
202 | 202 | ) { |
203 | - if ($files['size'][0] > 20*1024*1024) { |
|
203 | + if ($files['size'][0] > 20 * 1024 * 1024) { |
|
204 | 204 | return new JSONResponse( |
205 | 205 | ['data' => ['message' => $this->l->t('File is too big')]], |
206 | 206 | Http::STATUS_BAD_REQUEST |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | Http::STATUS_OK, |
293 | 293 | ['Content-Type' => $image->mimeType()]); |
294 | 294 | |
295 | - $resp->setETag((string)crc32($image->data())); |
|
295 | + $resp->setETag((string) crc32($image->data())); |
|
296 | 296 | $resp->cacheFor(0); |
297 | 297 | $resp->setLastModified(new \DateTime('now', new \DateTimeZone('GMT'))); |
298 | 298 | return $resp; |
@@ -325,7 +325,7 @@ discard block |
||
325 | 325 | |
326 | 326 | $image = new \OC_Image(); |
327 | 327 | $image->loadFromData($tmpAvatar); |
328 | - $image->crop($crop['x'], $crop['y'], (int)round($crop['w']), (int)round($crop['h'])); |
|
328 | + $image->crop($crop['x'], $crop['y'], (int) round($crop['w']), (int) round($crop['h'])); |
|
329 | 329 | try { |
330 | 330 | $avatar = $this->avatarManager->getAvatar($this->userId); |
331 | 331 | $avatar->set($image); |