@@ -1,16 +1,16 @@ |
||
1 | 1 | <form id="<?php echo $this->formId ?>"> |
2 | -<?php foreach($this->fields as $name => $field): ?> |
|
2 | +<?php foreach ($this->fields as $name => $field): ?> |
|
3 | 3 | <div class="form-group row"> |
4 | 4 | <div class="col-md-3"> |
5 | 5 | <label title="<?php echo $field['type'] ?>"><?php echo $field['name'] ?></label> |
6 | 6 | </div> |
7 | 7 | <div class="col-md-2"> |
8 | -<?php if($field['functions']['type'] === 'name'): ?> |
|
8 | +<?php if ($field['functions']['type'] === 'name'): ?> |
|
9 | 9 | <label class=""><?php echo $field['functions']['name'] ?></label> |
10 | -<?php elseif($field['functions']['type'] === 'select'): ?> |
|
10 | +<?php elseif ($field['functions']['type'] === 'select'): ?> |
|
11 | 11 | <select name="<?php echo $field['functions']['name'] ?>" class="form-control"> |
12 | -<?php foreach($field['functions']['options'] as $function): ?> |
|
13 | - <option <?php if($function === $field['functions']['selected']): ?>selected<?php |
|
12 | +<?php foreach ($field['functions']['options'] as $function): ?> |
|
13 | + <option <?php if ($function === $field['functions']['selected']): ?>selected<?php |
|
14 | 14 | endif ?>><?php echo $function ?></option> |
15 | 15 | <?php endforeach ?> |
16 | 16 | </select> |
@@ -1,16 +1,16 @@ |
||
1 | 1 | <form class="form-horizontal" role="form" id="<?php echo $this->formId ?>"> |
2 | -<?php foreach($this->fields as $name => $field): ?> |
|
2 | +<?php foreach ($this->fields as $name => $field): ?> |
|
3 | 3 | <div class="form-group"> |
4 | 4 | <div class="col-md-3"> |
5 | 5 | <label title="<?php echo $field['type'] ?>"><?php echo $field['name'] ?></label> |
6 | 6 | </div> |
7 | 7 | <div class="col-md-2"> |
8 | -<?php if($field['functions']['type'] === 'name'): ?> |
|
8 | +<?php if ($field['functions']['type'] === 'name'): ?> |
|
9 | 9 | <label class=""><?php echo $field['functions']['name'] ?></label> |
10 | -<?php elseif($field['functions']['type'] === 'select'): ?> |
|
10 | +<?php elseif ($field['functions']['type'] === 'select'): ?> |
|
11 | 11 | <select name="<?php echo $field['functions']['name'] ?>" class="form-control"> |
12 | -<?php foreach($field['functions']['options'] as $function): ?> |
|
13 | - <option <?php if($function === $field['functions']['selected']): ?>selected<?php |
|
12 | +<?php foreach ($field['functions']['options'] as $function): ?> |
|
13 | + <option <?php if ($function === $field['functions']['selected']): ?>selected<?php |
|
14 | 14 | endif ?>><?php echo $function ?></option> |
15 | 15 | <?php endforeach ?> |
16 | 16 | </select> |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | 'text' => '<i>' . $this->trans->lang('original') . '</i>']; |
70 | 70 | } |
71 | 71 | if ($field->null) { |
72 | - $values[] = ['value' => '', 'checked' => $value === null && !$select, 'text' => '<i>NULL</i>']; |
|
72 | + $values[] = ['value' => '', 'checked' => $value === null && !$select, 'text' => '<i>NULL</i>']; |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | // From functions.inc.php (function enum_input()) |
@@ -80,8 +80,7 @@ discard block |
||
80 | 80 | preg_match_all("~'((?:[^']|'')*)'~", $field->fullType, $matches); |
81 | 81 | foreach ($matches[1] as $i => $val) { |
82 | 82 | $val = stripcslashes(str_replace("''", "'", $val)); |
83 | - $checked = (is_int($value) ? $value == $i + 1 : |
|
84 | - (is_array($value) ? in_array($i+1, $value) : $value === $val)); |
|
83 | + $checked = (is_int($value) ? $value == $i + 1 : (is_array($value) ? in_array($i + 1, $value) : $value === $val)); |
|
85 | 84 | $values[] = ['value' => $i + 1, 'checked' => $checked, 'text' => $this->util->html($val)]; |
86 | 85 | } |
87 | 86 |
@@ -419,8 +419,7 @@ discard block |
||
419 | 419 | } |
420 | 420 | $enumLength = $this->driver->enumLength(); |
421 | 421 | return (\preg_match("~^\\s*\\(?\\s*$enumLength(?:\\s*,\\s*$enumLength)*+\\s*\\)?\\s*\$~", $length) && |
422 | - \preg_match_all("~$enumLength~", $length, $matches) ? '(' . \implode(',', $matches[0]) . ')' : |
|
423 | - \preg_replace('~^[0-9].*~', '(\0)', \preg_replace('~[^-0-9,+()[\]]~', '', $length)) |
|
422 | + \preg_match_all("~$enumLength~", $length, $matches) ? '(' . \implode(',', $matches[0]) . ')' : \preg_replace('~^[0-9].*~', '(\0)', \preg_replace('~[^-0-9,+()[\]]~', '', $length)) |
|
424 | 423 | ); |
425 | 424 | } |
426 | 425 | |
@@ -607,7 +606,7 @@ discard block |
||
607 | 606 | $expressions = []; |
608 | 607 | foreach ($indexes as $i => $index) { |
609 | 608 | if ($index->type == 'FULLTEXT' && $this->input->values['fulltext'][$i] != '') { |
610 | - $columns = \array_map(function ($column) { |
|
609 | + $columns = \array_map(function($column) { |
|
611 | 610 | return $this->driver->escapeId($column); |
612 | 611 | }, $index->columns); |
613 | 612 | $expressions[] = 'MATCH (' . \implode(', ', $columns) . ') AGAINST (' . |
@@ -722,8 +721,7 @@ discard block |
||
722 | 721 | */ |
723 | 722 | private function _selectValue($value, string $link, string $type, $original): string |
724 | 723 | { |
725 | - $clause = ($value === null ? '<i>NULL</i>' : |
|
726 | - (\preg_match('~char|binary|boolean~', $type) && !\preg_match('~var~', $type) ? |
|
724 | + $clause = ($value === null ? '<i>NULL</i>' : (\preg_match('~char|binary|boolean~', $type) && !\preg_match('~var~', $type) ? |
|
727 | 725 | "<code>$value</code>" : $value)); |
728 | 726 | if (\preg_match('~blob|bytea|raw|file~', $type) && !$this->isUtf8($value)) { |
729 | 727 | $clause = '<i>' . $this->trans->lang('%d byte(s)', \strlen($original)) . '</i>'; |