@@ -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 | |
@@ -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 | } |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | if ($row === null) { |
| 122 | 122 | return !$update && $field->autoIncrement ? "" : (isset($queryOptions["select"]) ? false : $default); |
| 123 | 123 | } |
| 124 | - if ($row[$name] != "" && $this->driver->jush() == "sql" && preg_match("~enum|set~", $field->type) ) { |
|
| 124 | + if ($row[$name] != "" && $this->driver->jush() == "sql" && preg_match("~enum|set~", $field->type)) { |
|
| 125 | 125 | return is_array($row[$name]) ? array_sum($row[$name]) : +$row[$name]; |
| 126 | 126 | } |
| 127 | 127 | return is_bool($row[$name]) ? +$row[$name] : $row[$name]; |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | return "SQL"; |
| 142 | 142 | } |
| 143 | 143 | if ($queryOptions["save"]) { |
| 144 | - return (string)$queryOptions["function"][$name]; |
|
| 144 | + return (string) $queryOptions["function"][$name]; |
|
| 145 | 145 | } |
| 146 | 146 | if ($update && preg_match('~^CURRENT_TIMESTAMP~i', $field->onUpdate)) { |
| 147 | 147 | return 'now'; |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | */ |
| 159 | 159 | public function insertItem(string $table, array $queryOptions): array |
| 160 | 160 | { |
| 161 | - list($fields, ,) = $this->getFields($table, $queryOptions); |
|
| 161 | + list($fields,,) = $this->getFields($table, $queryOptions); |
|
| 162 | 162 | |
| 163 | 163 | // From edit.inc.php |
| 164 | 164 | $values = []; |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | */ |
| 189 | 189 | public function updateItem(string $table, array $queryOptions): array |
| 190 | 190 | { |
| 191 | - list($fields, $where, ) = $this->getFields($table, $queryOptions); |
|
| 191 | + list($fields, $where,) = $this->getFields($table, $queryOptions); |
|
| 192 | 192 | |
| 193 | 193 | // From edit.inc.php |
| 194 | 194 | $indexes = $this->driver->indexes($table); |
@@ -53,8 +53,7 @@ discard block |
||
| 53 | 53 | $row[$key] = '"' . str_replace('"', '""', $val) . '"'; |
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | - $separator = $this->options['format'] === 'csv' ? ',' : |
|
| 57 | - ($this->options['format'] === 'tsv' ? "\t" : ';'); |
|
| 56 | + $separator = $this->options['format'] === 'csv' ? ',' : ($this->options['format'] === 'tsv' ? "\t" : ';'); |
|
| 58 | 57 | $this->queries[] = implode($separator, $row); |
| 59 | 58 | } |
| 60 | 59 | |
@@ -203,7 +202,7 @@ discard block |
||
| 203 | 202 | } |
| 204 | 203 | if (!$this->insert) { |
| 205 | 204 | $this->insert = 'INSERT INTO ' . $this->driver->table($table) . ' (' . |
| 206 | - implode(', ', array_map(function ($key) { |
|
| 205 | + implode(', ', array_map(function($key) { |
|
| 207 | 206 | return $this->driver->escapeId($key); |
| 208 | 207 | }, $keys)) . ') VALUES'; |
| 209 | 208 | } |
@@ -168,8 +168,7 @@ |
||
| 168 | 168 | } |
| 169 | 169 | if ($this->isMail($value)) { |
| 170 | 170 | return '<a href="' . $this->html("mailto:$value") . '">' . $value . '</a>'; |
| 171 | - } |
|
| 172 | - elseif ($this->isUrl($value)) { |
|
| 171 | + } elseif ($this->isUrl($value)) { |
|
| 173 | 172 | // IE 11 and all modern browsers hide referrer |
| 174 | 173 | return '<a href="' . $this->html($value) . '"' . $this->blankTarget() . '>' . $value . '</a>'; |
| 175 | 174 | } |
@@ -281,7 +281,7 @@ discard block |
||
| 281 | 281 | $col = $value['col']; |
| 282 | 282 | $prefix = ''; |
| 283 | 283 | if ($op === 'FIND_IN_SET') { |
| 284 | - $prefix = $op .'(' . $this->driver->quote($value['val']) . ', '; |
|
| 284 | + $prefix = $op . '(' . $this->driver->quote($value['val']) . ', '; |
|
| 285 | 285 | } |
| 286 | 286 | $condition = $this->getWhereCondition($value, $fields); |
| 287 | 287 | if ($col !== '') { |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | */ |
| 311 | 311 | private function getMatchExpression(IndexEntity $index, int $i): string |
| 312 | 312 | { |
| 313 | - $columns = array_map(function ($column) { |
|
| 313 | + $columns = array_map(function($column) { |
|
| 314 | 314 | return $this->driver->escapeId($column); |
| 315 | 315 | }, $index->columns); |
| 316 | 316 | $match = $this->driver->quote($this->input->values['fulltext'][$i]); |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | } |
| 338 | 338 | } |
| 339 | 339 | foreach ((array) $this->input->values['where'] as $value) { |
| 340 | - if (($value['col'] !== '' || $value['val'] !== '') && |
|
| 340 | + if (($value['col'] !== '' || $value['val'] !== '') && |
|
| 341 | 341 | in_array($value['op'], $this->driver->operators())) { |
| 342 | 342 | $expressions[] = $this->getSelectExpression($value, $fields); |
| 343 | 343 | } |