| @@ -2,12 +2,15 @@ | ||
| 2 | 2 | <thead> | 
| 3 | 3 | <tr> | 
| 4 | 4 | <?php foreach($this->headers as $header): ?> | 
| 5 | - <th><?php if(is_array($header)) echo $header['key'] ?></th> | |
| 5 | +            <th><?php if(is_array($header)) { | |
| 6 | + echo $header['key'] ?></th> | |
| 6 | 7 | <?php endforeach ?> | 
| 7 | 8 | </tr> | 
| 8 | 9 | </thead> | 
| 9 | 10 | <tbody> | 
| 10 | -<?php $rowId = 0; foreach($this->rows as $row): ?> | |
| 11 | +<?php $rowId = 0; | |
| 12 | +} | |
| 13 | +foreach($this->rows as $row): ?> | |
| 11 | 14 | <tr> | 
| 12 | 15 | <th> | 
| 13 | 16 | <div class="btn-group" role="group" data-row-id="<?php echo $rowId++ ?>"> | 
| @@ -26,7 +26,8 @@ discard block | ||
| 26 | 26 | <?php if(is_string($collations)): ?> | 
| 27 | 27 | <option <?php if($this->table->collation === $collations): ?>selected<?php | 
| 28 | 28 | endif ?>><?php echo $collations ?></option> | 
| 29 | -<?php else: ?> | |
| 29 | +<?php else { | |
| 30 | + : ?> | |
| 30 | 31 | <optgroup label="<?php echo $group ?>"> | 
| 31 | 32 | <?php foreach($collations as $collation): ?> | 
| 32 | 33 | <option <?php if($this->table->collation === $collation): ?>selected<?php | 
| @@ -61,7 +62,9 @@ discard block | ||
| 61 | 62 | <?php endif ?> | 
| 62 | 63 | </div> | 
| 63 | 64 | </div> | 
| 64 | -<?php $index = 0; foreach($this->fields as $field): ?> | |
| 65 | +<?php $index = 0; | |
| 66 | +} | |
| 67 | +foreach($this->fields as $field): ?> | |
| 65 | 68 |  <?php echo $this->render('adminer::views::table/column', [ | 
| 66 | 69 | 'trans' => $this->trans, | 
| 67 | 70 | 'class' => $this->formId . '-column', | 
| @@ -2,12 +2,15 @@ | ||
| 2 | 2 | <thead> | 
| 3 | 3 | <tr> | 
| 4 | 4 | <?php foreach($this->headers as $header): ?> | 
| 5 | - <th><?php if(is_array($header)) echo $header['key'] ?></th> | |
| 5 | +            <th><?php if(is_array($header)) { | |
| 6 | + echo $header['key'] ?></th> | |
| 6 | 7 | <?php endforeach ?> | 
| 7 | 8 | </tr> | 
| 8 | 9 | </thead> | 
| 9 | 10 | <tbody> | 
| 10 | -<?php $rowId = 0; foreach($this->rows as $row): ?> | |
| 11 | +<?php $rowId = 0; | |
| 12 | +} | |
| 13 | +foreach($this->rows as $row): ?> | |
| 11 | 14 | <tr> | 
| 12 | 15 | <th> | 
| 13 | 16 | <div class="btn-group" role="group" data-row-id="<?php echo $rowId++ ?>"> | 
| @@ -26,7 +26,8 @@ discard block | ||
| 26 | 26 | <?php if(is_string($collations)): ?> | 
| 27 | 27 | <option <?php if($this->table->collation === $collations): ?>selected<?php | 
| 28 | 28 | endif ?>><?php echo $collations ?></option> | 
| 29 | -<?php else: ?> | |
| 29 | +<?php else { | |
| 30 | + : ?> | |
| 30 | 31 | <optgroup label="<?php echo $group ?>"> | 
| 31 | 32 | <?php foreach($collations as $collation): ?> | 
| 32 | 33 | <option <?php if($this->table->collation === $collation): ?>selected<?php | 
| @@ -61,7 +62,9 @@ discard block | ||
| 61 | 62 | <?php endif ?> | 
| 62 | 63 | </div> | 
| 63 | 64 | </div> | 
| 64 | -<?php $index = 0; foreach($this->fields as $field): ?> | |
| 65 | +<?php $index = 0; | |
| 66 | +} | |
| 67 | +foreach($this->fields as $field): ?> | |
| 65 | 68 |  <?php echo $this->render('adminer::views::table/column', [ | 
| 66 | 69 | 'trans' => $this->trans, | 
| 67 | 70 | 'class' => $this->formId . '-column', | 
| @@ -325,8 +325,7 @@ | ||
| 325 | 325 |              try { | 
| 326 | 326 |                  \ini_set('memory_limit', \max($this->util->iniBytes('memory_limit'), | 
| 327 | 327 | 2 * \strlen($queries) + \memory_get_usage() + 8e6)); | 
| 328 | - } | |
| 329 | -            catch(\Exception $e) { | |
| 328 | +            } catch(\Exception $e) { | |
| 330 | 329 | // Do nothing if the option is not modified. | 
| 331 | 330 | } | 
| 332 | 331 | } | 
| @@ -46,7 +46,7 @@ discard block | ||
| 46 | 46 | * @param array $types | 
| 47 | 47 | * | 
| 48 | 48 | * @return string | 
| 49 | - */ | |
| 49 | + */ | |
| 50 | 50 | protected function values(array $row, array $blobs, array $types) | 
| 51 | 51 |      { | 
| 52 | 52 | $values = []; | 
| @@ -73,7 +73,7 @@ discard block | ||
| 73 | 73 | * @param int $limit | 
| 74 | 74 | * | 
| 75 | 75 | * @return string | 
| 76 | - */ | |
| 76 | + */ | |
| 77 | 77 | private function message($statement, int $limit) | 
| 78 | 78 |      { | 
| 79 | 79 | $numRows = $statement->rowCount(); | 
| @@ -95,7 +95,7 @@ discard block | ||
| 95 | 95 | * @param int $limit | 
| 96 | 96 | * | 
| 97 | 97 | * @return array | 
| 98 | - */ | |
| 98 | + */ | |
| 99 | 99 | protected function select($statement, $limit = 0) | 
| 100 | 100 |      { | 
| 101 | 101 | // No resultset | 
| @@ -858,8 +858,7 @@ | ||
| 858 | 858 |          if ($link === '') { | 
| 859 | 859 |              if ($this->isMail($value)) { | 
| 860 | 860 | $link = "mailto:$value"; | 
| 861 | - } | |
| 862 | -            elseif ($this->isUrl($value)) { | |
| 861 | +            } elseif ($this->isUrl($value)) { | |
| 863 | 862 | $link = $value; // IE 11 and all modern browsers hide referrer | 
| 864 | 863 | } | 
| 865 | 864 | } | 
| @@ -261,7 +261,7 @@ | ||
| 261 | 261 | * @return TableSelectEntity | 
| 262 | 262 | */ | 
| 263 | 263 | private function getSelectEntity(string $table, array $columns, array $fields, array $select, | 
| 264 | - array $group, array $where, array $order, array $unselected, int $limit, int $page): TableSelectEntity | |
| 264 | + array $group, array $where, array $order, array $unselected, int $limit, int $page): TableSelectEntity | |
| 265 | 265 |      { | 
| 266 | 266 | $select2 = $select; | 
| 267 | 267 | $group2 = $group; | 
| @@ -619,8 +619,7 @@ | ||
| 619 | 619 |          foreach (array_unique(array_merge($databases['list'], $databases['data'])) as $database) { | 
| 620 | 620 |              try { | 
| 621 | 621 | $this->dumpDatabase($database); | 
| 622 | - } | |
| 623 | -            catch (Exception $e) { | |
| 622 | +            } catch (Exception $e) { | |
| 624 | 623 | return $e->getMessage(); | 
| 625 | 624 | } | 
| 626 | 625 | } |