@@ -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) { |
@@ -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 | } |
@@ -168,7 +168,7 @@ |
||
| 168 | 168 | ->setValue('gid', $qb->createNamedParameter($gid)) |
| 169 | 169 | ->execute(); |
| 170 | 170 | return true; |
| 171 | - }else{ |
|
| 171 | + } else{ |
|
| 172 | 172 | return false; |
| 173 | 173 | } |
| 174 | 174 | } |
@@ -18,8 +18,11 @@ discard block |
||
| 18 | 18 | <?php if(is_array($err)):?> |
| 19 | 19 | <?php print_unescaped($err['error']); ?> |
| 20 | 20 | <span class='hint'><?php print_unescaped($err['hint']); ?></span> |
| 21 | - <?php else: ?> |
|
| 22 | - <?php print_unescaped($err); ?> |
|
| 21 | + <?php else { |
|
| 22 | + : ?> |
|
| 23 | + <?php print_unescaped($err); |
|
| 24 | +} |
|
| 25 | +?> |
|
| 23 | 26 | <?php endif; ?> |
| 24 | 27 | </p> |
| 25 | 28 | <?php endforeach; ?> |
@@ -75,8 +78,12 @@ discard block |
||
| 75 | 78 | |
| 76 | 79 | <?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?> |
| 77 | 80 | <fieldset id='databaseBackend'> |
| 78 | - <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) |
|
| 79 | - $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?> |
|
| 81 | + <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) { |
|
| 82 | + $hasOtherDB = true; |
|
| 83 | +} else { |
|
| 84 | + $hasOtherDB =false; |
|
| 85 | + } |
|
| 86 | + //other than SQLite ?> |
|
| 80 | 87 | <legend><?php p($l->t( 'Configure the database' )); ?></legend> |
| 81 | 88 | <div id="selectDbType"> |
| 82 | 89 | <?php foreach($_['databases'] as $type => $label): ?> |
@@ -88,11 +95,14 @@ discard block |
||
| 88 | 95 | <?php p($l->t( 'For more details check out the documentation.' )); ?> ↗</a> |
| 89 | 96 | </p> |
| 90 | 97 | <input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>"> |
| 91 | - <?php else: ?> |
|
| 98 | + <?php else { |
|
| 99 | + : ?> |
|
| 92 | 100 | <input type="radio" name="dbtype" value="<?php p($type) ?>" id="<?php p($type) ?>" |
| 93 | 101 | <?php print_unescaped($_['dbtype'] === $type ? 'checked="checked" ' : '') ?>/> |
| 94 | 102 | <label class="<?php p($type) ?>" for="<?php p($type) ?>"><?php p($label) ?></label> |
| 95 | - <?php endif; ?> |
|
| 103 | + <?php endif; |
|
| 104 | +} |
|
| 105 | +?> |
|
| 96 | 106 | <?php endforeach; ?> |
| 97 | 107 | </div> |
| 98 | 108 | </fieldset> |