@@ -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 | } |
@@ -1,26 +1,26 @@ |
||
1 | -<?php if(is_array($this->headers)): ?> |
|
1 | +<?php if (is_array($this->headers)): ?> |
|
2 | 2 | <thead> |
3 | 3 | <tr> |
4 | -<?php if(isset($this->checkbox)): ?> |
|
4 | +<?php if (isset($this->checkbox)): ?> |
|
5 | 5 | <th class="dbadmin-table-checkbox"><input id="dbadmin-table-<?php |
6 | 6 | echo $this->checkbox ?>-all" type="checkbox" /></th> |
7 | 7 | <?php endif ?> |
8 | -<?php foreach($this->headers as $header): ?> |
|
8 | +<?php foreach ($this->headers as $header): ?> |
|
9 | 9 | <th><?php echo $header ?></th> |
10 | 10 | <?php endforeach ?> |
11 | 11 | </tr> |
12 | 12 | </thead> |
13 | 13 | <?php endif ?> |
14 | 14 | <tbody> |
15 | -<?php foreach($this->details as $details): ?> |
|
15 | +<?php foreach ($this->details as $details): ?> |
|
16 | 16 | <tr> |
17 | -<?php if(isset($this->checkbox)): ?> |
|
17 | +<?php if (isset($this->checkbox)): ?> |
|
18 | 18 | <td><input type="checkbox" class="dbadmin-table-<?php echo |
19 | 19 | $this->checkbox ?>" name="<?php echo $this->checkbox ?>[]" /></td> |
20 | 20 | <?php endif ?> |
21 | -<?php foreach($details as $detail): ?> |
|
22 | -<?php if(is_array($detail)): ?> |
|
23 | - <td<?php foreach($detail['props'] as $name => $value): ?> <?php |
|
21 | +<?php foreach ($details as $detail): ?> |
|
22 | +<?php if (is_array($detail)): ?> |
|
23 | + <td<?php foreach ($detail['props'] as $name => $value): ?> <?php |
|
24 | 24 | echo $name ?>="<?php echo $value ?>"<?php |
25 | 25 | endforeach ?>><?php echo $detail['label'] ?></td> |
26 | 26 | <?php else: ?> |
@@ -1,18 +1,18 @@ |
||
1 | -<?php if(is_array($this->headers)): ?> |
|
1 | +<?php if (is_array($this->headers)): ?> |
|
2 | 2 | -- Jaxon DbAdmin <?php echo $this->headers['version'], ' ', |
3 | 3 | $this->headers['driver'], ' ', |
4 | 4 | $this->headers['server'] ?> dump |
5 | 5 | |
6 | -<?php if(($this->headers['sql'])): ?> |
|
6 | +<?php if (($this->headers['sql'])): ?> |
|
7 | 7 | SET NAMES utf8; |
8 | 8 | SET time_zone = '+00:00'; |
9 | 9 | SET foreign_key_checks = 0; |
10 | -<?php if(($this->headers['data_style'])): ?> |
|
10 | +<?php if (($this->headers['data_style'])): ?> |
|
11 | 11 | SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO'; |
12 | 12 | <?php endif ?> |
13 | 13 | <?php endif ?> |
14 | 14 | |
15 | 15 | <?php endif ?> |
16 | -<?php foreach($this->queries as $query): ?> |
|
16 | +<?php foreach ($this->queries as $query): ?> |
|
17 | 17 | <?php echo $query, "\n" ?> |
18 | 18 | <?php endforeach ?> |
@@ -1,13 +1,13 @@ |
||
1 | 1 | <nav><ul class="pagination"><?php |
2 | - if(($this->prev)) |
|
2 | + if (($this->prev)) |
|
3 | 3 | { |
4 | 4 | echo $this->prev; |
5 | 5 | } |
6 | - foreach($this->links as $link) |
|
6 | + foreach ($this->links as $link) |
|
7 | 7 | { |
8 | 8 | echo $link; |
9 | 9 | } |
10 | - if(($this->next)) |
|
10 | + if (($this->next)) |
|
11 | 11 | { |
12 | 12 | echo $this->next; |
13 | 13 | } |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | /** |
36 | 36 | * @var SelectEntity|null |
37 | 37 | */ |
38 | - private SelectEntity|null $selectEntity = null; |
|
38 | + private SelectEntity | null $selectEntity = null; |
|
39 | 39 | |
40 | 40 | /** |
41 | 41 | * @param AbstractFacade $dbFacade |
@@ -116,11 +116,9 @@ discard block |
||
116 | 116 | $value = $this->selectEntity->queryOptions["columns"][$valueKey] ?? []; |
117 | 117 | |
118 | 118 | $fun = $value["fun"] ?? ''; |
119 | - $fieldKey = !$this->selectEntity->select ? $key : |
|
120 | - ($value["col"] ?? current($this->selectEntity->select)); |
|
119 | + $fieldKey = !$this->selectEntity->select ? $key : ($value["col"] ?? current($this->selectEntity->select)); |
|
121 | 120 | $field = $this->selectEntity->fields[$fieldKey]; |
122 | - $name = !$field ? ($fun ? "*" : $key) : |
|
123 | - $this->admin->fieldName($field, $rank); |
|
121 | + $name = !$field ? ($fun ? "*" : $key) : $this->admin->fieldName($field, $rank); |
|
124 | 122 | |
125 | 123 | return [$fun, $name, $field]; |
126 | 124 | } |
@@ -246,8 +244,7 @@ discard block |
||
246 | 244 | private function getRowIdMd5Key(string $key, string $collation): string |
247 | 245 | { |
248 | 246 | return $this->driver->jush() != 'sql' || |
249 | - preg_match("~^utf8~", $collation) ? $key : |
|
250 | - "CONVERT($key USING " . $this->driver->charset() . ")"; |
|
247 | + preg_match("~^utf8~", $collation) ? $key : "CONVERT($key USING " . $this->driver->charset() . ")"; |
|
251 | 248 | } |
252 | 249 | |
253 | 250 | /** |
@@ -366,8 +363,8 @@ discard block |
||
366 | 363 | $query = $this->driver->getRowCountQuery($table, |
367 | 364 | $this->selectEntity->where, $this->hasGroupsInFields(), |
368 | 365 | $this->selectEntity->group); |
369 | - return (int)$this->driver->result($query); |
|
370 | - } catch(Exception $_) { |
|
366 | + return (int) $this->driver->result($query); |
|
367 | + } catch (Exception $_) { |
|
371 | 368 | return -1; |
372 | 369 | } |
373 | 370 | } |
@@ -105,7 +105,7 @@ |
||
105 | 105 | /** |
106 | 106 | * @var string|null |
107 | 107 | */ |
108 | - public string|null $error = null; |
|
108 | + public string | null $error = null; |
|
109 | 109 | |
110 | 110 | /** |
111 | 111 | * @var TableSelectEntity |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | { |
26 | 26 | return [ |
27 | 27 | 'select' => $select, |
28 | - 'values' => (array)$options["columns"], |
|
28 | + 'values' => (array) $options["columns"], |
|
29 | 29 | 'columns' => $columns, |
30 | 30 | 'functions' => $this->driver->functions(), |
31 | 31 | 'grouping' => $this->driver->grouping(), |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | } |
50 | 50 | return [ |
51 | 51 | // 'where' => $where, |
52 | - 'values' => (array)$options["where"], |
|
52 | + 'values' => (array) $options["where"], |
|
53 | 53 | 'columns' => $columns, |
54 | 54 | 'indexes' => $indexes, |
55 | 55 | 'operators' => $this->driver->operators(), |
@@ -68,8 +68,8 @@ discard block |
||
68 | 68 | private function getSortingOptions(array $columns, array $options): array |
69 | 69 | { |
70 | 70 | $values = []; |
71 | - $descs = (array)$options["desc"]; |
|
72 | - foreach ((array)$options["order"] as $key => $value) { |
|
71 | + $descs = (array) $options["desc"]; |
|
72 | + foreach ((array) $options["order"] as $key => $value) { |
|
73 | 73 | $values[] = [ |
74 | 74 | 'col' => $value, |
75 | 75 | 'desc' => $descs[$key] ?? 0, |
@@ -145,8 +145,7 @@ |
||
145 | 145 | } |
146 | 146 | if ($this->isMail($value)) { |
147 | 147 | return '<a href="' . $this->utils->html("mailto:$value") . '">' . $value . '</a>'; |
148 | - } |
|
149 | - elseif ($this->isUrl($value)) { |
|
148 | + } elseif ($this->isUrl($value)) { |
|
150 | 149 | // IE 11 and all modern browsers hide referrer |
151 | 150 | return '<a href="' . $this->utils->html($value) . '"' . $this->blankTarget() . '>' . $value . '</a>'; |
152 | 151 | } |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | { |
72 | 72 | // Check in server options |
73 | 73 | $serverAccess = $this->getOption("servers.$server.access.server", null); |
74 | - if($serverAccess === true || $serverAccess === false) |
|
74 | + if ($serverAccess === true || $serverAccess === false) |
|
75 | 75 | { |
76 | 76 | return $serverAccess; |
77 | 77 | } |
@@ -127,8 +127,7 @@ discard block |
||
127 | 127 | { |
128 | 128 | $defaultServer = $this->getOption('default'); |
129 | 129 | return !$defaultServer || |
130 | - !$this->getOption("servers.$defaultServer") ? '' : |
|
131 | - rq(Admin::class)->server($defaultServer); |
|
130 | + !$this->getOption("servers.$defaultServer") ? '' : rq(Admin::class)->server($defaultServer); |
|
132 | 131 | } |
133 | 132 | |
134 | 133 | /** |