@@ -271,8 +271,9 @@ |
||
271 | 271 | } |
272 | 272 | foreach ($dirs as $dir) { |
273 | 273 | foreach ($exts as $ext) { |
274 | - if ($check_fn("$dir/$name" . $ext)) |
|
275 | - return true; |
|
274 | + if ($check_fn("$dir/$name" . $ext)) { |
|
275 | + return true; |
|
276 | + } |
|
276 | 277 | } |
277 | 278 | } |
278 | 279 | return false; |
@@ -80,7 +80,7 @@ |
||
80 | 80 | $fh = \OC\Files\Filesystem::fopen($file, 'r'); |
81 | 81 | $this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime); |
82 | 82 | fclose($fh); |
83 | - }elseif(\OC\Files\Filesystem::is_dir($file)) { |
|
83 | + } elseif(\OC\Files\Filesystem::is_dir($file)) { |
|
84 | 84 | $this->addDirRecursive($file, $internalDir); |
85 | 85 | } |
86 | 86 | } |
@@ -75,8 +75,7 @@ |
||
75 | 75 | $whence = SEEK_SET; |
76 | 76 | $offset = $this->stream_tell() + $offset; |
77 | 77 | $this->limit += $oldOffset - $offset; |
78 | - } |
|
79 | - else if ($whence === SEEK_SET) { |
|
78 | + } else if ($whence === SEEK_SET) { |
|
80 | 79 | $this->limit += $this->stream_tell() - $offset; |
81 | 80 | } else { |
82 | 81 | $this->limit -= $offset; |
@@ -90,8 +90,11 @@ |
||
90 | 90 | if (isset($params['host']) && isset($params['user']) && isset($params['password'])) { |
91 | 91 | $host = $params['host']; |
92 | 92 | //remove leading http[s], will be generated in createBaseUri() |
93 | - if (substr($host, 0, 8) == "https://") $host = substr($host, 8); |
|
94 | - else if (substr($host, 0, 7) == "http://") $host = substr($host, 7); |
|
93 | + if (substr($host, 0, 8) == "https://") { |
|
94 | + $host = substr($host, 8); |
|
95 | + } else if (substr($host, 0, 7) == "http://") { |
|
96 | + $host = substr($host, 7); |
|
97 | + } |
|
95 | 98 | $this->host = $host; |
96 | 99 | $this->user = $params['user']; |
97 | 100 | $this->password = $params['password']; |
@@ -317,8 +317,9 @@ |
||
317 | 317 | $files = array(); |
318 | 318 | $physicalDir = $this->getSourcePath($dir); |
319 | 319 | foreach (scandir($physicalDir) as $item) { |
320 | - if (\OC\Files\Filesystem::isIgnoredDir($item)) |
|
321 | - continue; |
|
320 | + if (\OC\Files\Filesystem::isIgnoredDir($item)) { |
|
321 | + continue; |
|
322 | + } |
|
322 | 323 | $physicalItem = $physicalDir . '/' . $item; |
323 | 324 | |
324 | 325 | if (strstr(strtolower($item), strtolower($query)) !== false) { |
@@ -289,7 +289,9 @@ |
||
289 | 289 | $dh = $this->opendir($dir); |
290 | 290 | if (is_resource($dh)) { |
291 | 291 | while (($item = readdir($dh)) !== false) { |
292 | - if (\OC\Files\Filesystem::isIgnoredDir($item)) continue; |
|
292 | + if (\OC\Files\Filesystem::isIgnoredDir($item)) { |
|
293 | + continue; |
|
294 | + } |
|
293 | 295 | if (strstr(strtolower($item), strtolower($query)) !== false) { |
294 | 296 | $files[] = $dir . '/' . $item; |
295 | 297 | } |
@@ -116,8 +116,7 @@ discard block |
||
116 | 116 | $length = '4'; |
117 | 117 | if ($column->getType() == 'SmallInt') { |
118 | 118 | $length = '2'; |
119 | - } |
|
120 | - elseif ($column->getType() == 'BigInt') { |
|
119 | + } elseif ($column->getType() == 'BigInt') { |
|
121 | 120 | $length = '8'; |
122 | 121 | } |
123 | 122 | $xml->addChild('length', $length); |
@@ -165,8 +164,7 @@ discard block |
||
165 | 164 | $xml->addChild('name', $index->getName()); |
166 | 165 | if ($index->isPrimary()) { |
167 | 166 | $xml->addChild('primary', 'true'); |
168 | - } |
|
169 | - elseif ($index->isUnique()) { |
|
167 | + } elseif ($index->isUnique()) { |
|
170 | 168 | $xml->addChild('unique', 'true'); |
171 | 169 | } |
172 | 170 | foreach($index->getColumns() as $column) { |
@@ -96,8 +96,7 @@ |
||
96 | 96 | $connection->executeUpdate($query); |
97 | 97 | $query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'"; |
98 | 98 | $connection->executeUpdate($query); |
99 | - } |
|
100 | - catch (\Exception $ex){ |
|
99 | + } catch (\Exception $ex){ |
|
101 | 100 | $this->logger->error('Database User creation failed: {error}', [ |
102 | 101 | 'app' => 'mysql.setup', |
103 | 102 | 'error' => $ex->getMessage() |
@@ -88,8 +88,7 @@ |
||
88 | 88 | // German umlauts, so using en_US instead |
89 | 89 | if (class_exists('Collator')) { |
90 | 90 | $this->collator = new \Collator('en_US'); |
91 | - } |
|
92 | - else { |
|
91 | + } else { |
|
93 | 92 | $this->collator = new \OC\NaturalSort_DefaultCollator(); |
94 | 93 | } |
95 | 94 | } |