lagdo /
jaxon-dbadmin
@@ -1,4 +1,4 @@ discard block |
||
| 1 | -<?php if(isset($this->class)): ?> |
|
| 1 | +<?php if (isset($this->class)): ?> |
|
| 2 | 2 | <div class="form-group row <?php echo $this->class ?>" data-index="<?php |
| 3 | 3 | echo $this->index ?>" id="<?php echo sprintf('%s-%02d', $this->class, $this->index) ?>"> |
| 4 | 4 | <?php endif ?> |
@@ -14,23 +14,23 @@ discard block |
||
| 14 | 14 | </div> |
| 15 | 15 | <label class="col-md-1 adminer-table-column-null" for="autoIncrementCol"> |
| 16 | 16 | <input type="radio" name="autoIncrementCol" value="<?php echo ($this->index + 1) ?>" <?php |
| 17 | - if($this->field->autoIncrement): ?>checked <?php endif ?>/> AI |
|
| 17 | + if ($this->field->autoIncrement): ?>checked <?php endif ?>/> AI |
|
| 18 | 18 | <input type="checkbox" name="<?php echo $this->prefixFields ?>[primary]" <?php |
| 19 | - if($this->field->primary): ?>checked <?php endif ?>/> |
|
| 19 | + if ($this->field->primary): ?>checked <?php endif ?>/> |
|
| 20 | 20 | </label> |
| 21 | 21 | <div class="col-md-2 adminer-table-column-middle"> |
| 22 | 22 | <select class="form-control" name="<?php |
| 23 | 23 | echo $this->prefixFields ?>[collation]" data-field="collation"<?php |
| 24 | - if($this->field->collationHidden): ?> readonly<?php endif ?>> |
|
| 24 | + if ($this->field->collationHidden): ?> readonly<?php endif ?>> |
|
| 25 | 25 | <option value="">(<?php echo $this->trans->lang('collation') ?>)</option> |
| 26 | -<?php foreach($this->collations as $group => $collations): ?> |
|
| 27 | -<?php if(is_string($collations)): ?> |
|
| 28 | - <option <?php if($this->field->collation === $collations): ?>selected<?php |
|
| 26 | +<?php foreach ($this->collations as $group => $collations): ?> |
|
| 27 | +<?php if (is_string($collations)): ?> |
|
| 28 | + <option <?php if ($this->field->collation === $collations): ?>selected<?php |
|
| 29 | 29 | endif ?>><?php echo $collations ?></option> |
| 30 | 30 | <?php else: ?> |
| 31 | 31 | <optgroup label="<?php echo $group ?>"> |
| 32 | -<?php foreach($collations as $collation): ?> |
|
| 33 | - <option <?php if($this->field->collation === $collation): ?>selected<?php |
|
| 32 | +<?php foreach ($collations as $collation): ?> |
|
| 33 | + <option <?php if ($this->field->collation === $collation): ?>selected<?php |
|
| 34 | 34 | endif ?>><?php echo $collation ?></option> |
| 35 | 35 | <?php endforeach ?> |
| 36 | 36 | </optgroup> |
@@ -39,13 +39,13 @@ discard block |
||
| 39 | 39 | </select> |
| 40 | 40 | </div> |
| 41 | 41 | <div class="col-md-2 adminer-table-column-middle"> |
| 42 | -<?php if(true/*isset($this->field->onUpdate)*/): ?> |
|
| 42 | +<?php if (true/*isset($this->field->onUpdate)*/): ?> |
|
| 43 | 43 | <select class="form-control" name="<?php |
| 44 | 44 | echo $this->prefixFields ?>[onUpdate]" data-field="onUpdate"<?php |
| 45 | - if($this->field->onUpdateHidden): ?> readonly<?php endif ?>> |
|
| 45 | + if ($this->field->onUpdateHidden): ?> readonly<?php endif ?>> |
|
| 46 | 46 | <option value="">(<?php echo $this->trans->lang('ON UPDATE') ?>)</option> |
| 47 | -<?php foreach($this->options['onUpdate'] as $group => $option): ?> |
|
| 48 | - <option <?php if($this->field->onUpdate === $option): ?>selected<?php |
|
| 47 | +<?php foreach ($this->options['onUpdate'] as $group => $option): ?> |
|
| 48 | + <option <?php if ($this->field->onUpdate === $option): ?>selected<?php |
|
| 49 | 49 | endif ?>><?php echo $option ?></option> |
| 50 | 50 | <?php endforeach ?> |
| 51 | 51 | </select> |
@@ -62,10 +62,10 @@ discard block |
||
| 62 | 62 | <div class="col-md-2 adminer-table-column-left second-line"> |
| 63 | 63 | <select class="form-control" name="<?php |
| 64 | 64 | echo $this->prefixFields ?>[type]" data-field="type"> |
| 65 | -<?php foreach($this->field->types as $group => $types): ?> |
|
| 65 | +<?php foreach ($this->field->types as $group => $types): ?> |
|
| 66 | 66 | <optgroup label="<?php echo $group ?>"> |
| 67 | -<?php foreach($types as $type): ?> |
|
| 68 | - <option <?php if($this->field->type === $type): ?>selected<?php |
|
| 67 | +<?php foreach ($types as $type): ?> |
|
| 68 | + <option <?php if ($this->field->type === $type): ?>selected<?php |
|
| 69 | 69 | endif ?>><?php echo $type ?></option> |
| 70 | 70 | <?php endforeach ?> |
| 71 | 71 | </optgroup> |
@@ -76,35 +76,35 @@ discard block |
||
| 76 | 76 | <input class="form-control" name="<?php |
| 77 | 77 | echo $this->prefixFields ?>[length]" placeholder="<?php |
| 78 | 78 | echo $this->trans->lang('Length') ?>" data-field="length"<?php |
| 79 | - if($this->field->lengthRequired): ?> required<?php endif ?> value="<?php |
|
| 79 | + if ($this->field->lengthRequired): ?> required<?php endif ?> value="<?php |
|
| 80 | 80 | echo $this->field->length ?>" size="3"> |
| 81 | 81 | </div> |
| 82 | 82 | <label class="col-md-1 adminer-table-column-null second-line"> |
| 83 | 83 | <input type="checkbox" value="1" name="<?php |
| 84 | 84 | echo $this->prefixFields ?>[null]" data-field="null" <?php |
| 85 | - if($this->field->null): ?>checked <?php endif ?>/> Null |
|
| 85 | + if ($this->field->null): ?>checked <?php endif ?>/> Null |
|
| 86 | 86 | </label> |
| 87 | 87 | <div class="col-md-2 adminer-table-column-middle second-line"> |
| 88 | 88 | <select class="form-control" name="<?php |
| 89 | 89 | echo $this->prefixFields ?>[unsigned]" data-field="unsigned"<?php |
| 90 | - if($this->field->unsignedHidden): ?> readonly<?php endif ?>> |
|
| 90 | + if ($this->field->unsignedHidden): ?> readonly<?php endif ?>> |
|
| 91 | 91 | <option value=""></option> |
| 92 | -<?php if($this->unsigned): ?> |
|
| 93 | -<?php foreach($this->unsigned as $option): ?> |
|
| 94 | - <option <?php if($this->field->unsigned === $option): ?>selected<?php |
|
| 92 | +<?php if ($this->unsigned): ?> |
|
| 93 | +<?php foreach ($this->unsigned as $option): ?> |
|
| 94 | + <option <?php if ($this->field->unsigned === $option): ?>selected<?php |
|
| 95 | 95 | endif ?>><?php echo $option ?></option> |
| 96 | 96 | <?php endforeach ?> |
| 97 | 97 | <?php endif ?> |
| 98 | 98 | </select> |
| 99 | 99 | </div> |
| 100 | 100 | <div class="col-md-2 adminer-table-column-middle second-line"> |
| 101 | -<?php if(true/*$this->foreignKeys*/): ?> |
|
| 101 | +<?php if (true/*$this->foreignKeys*/): ?> |
|
| 102 | 102 | <select class="form-control" name="<?php |
| 103 | 103 | echo $this->prefixFields ?>[onDelete]" data-field="onDelete"<?php |
| 104 | - if($this->field->onDeleteHidden): ?> readonly<?php endif ?>> |
|
| 104 | + if ($this->field->onDeleteHidden): ?> readonly<?php endif ?>> |
|
| 105 | 105 | <option value="">(<?php echo $this->trans->lang('ON DELETE') ?>)</option> |
| 106 | -<?php foreach($this->options['onDelete'] as $option): ?> |
|
| 107 | - <option <?php if($this->field->onDelete === $option): ?>selected<?php |
|
| 106 | +<?php foreach ($this->options['onDelete'] as $option): ?> |
|
| 107 | + <option <?php if ($this->field->onDelete === $option): ?>selected<?php |
|
| 108 | 108 | endif ?>><?php echo $option ?></option> |
| 109 | 109 | <?php endforeach ?> |
| 110 | 110 | </select> |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | <span class="input-group-addon"> |
| 116 | 116 | <input type="checkbox" value="1" name="<?php |
| 117 | 117 | echo $this->prefixFields ?>[hasDefault]" data-field="hasDefault" <?php |
| 118 | - if($this->field->hasDefault): ?>checked <?php endif ?>/> |
|
| 118 | + if ($this->field->hasDefault): ?>checked <?php endif ?>/> |
|
| 119 | 119 | </span> |
| 120 | 120 | <input class="form-control" name="<?php |
| 121 | 121 | echo $this->prefixFields ?>[default]" data-field="default" value="<?php |
@@ -130,12 +130,12 @@ discard block |
||
| 130 | 130 | <span class="caret"></span> |
| 131 | 131 | </button> |
| 132 | 132 | <ul class="dropdown-menu" data-index="<?php echo $this->index ?>"> |
| 133 | -<?php if($this->support['move_col']): ?> |
|
| 133 | +<?php if ($this->support['move_col']): ?> |
|
| 134 | 134 | <li><a href="#" class="adminer-table-column-add"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span></a></li> |
| 135 | 135 | <!-- <li><a href="#" class="adminer-table-column-up"><span class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span></a></li> |
| 136 | 136 | <li><a href="#" class="adminer-table-column-down"><span class="glyphicon glyphicon-arrow-down" aria-hidden="true"></span></a></li> --> |
| 137 | 137 | <?php endif ?> |
| 138 | -<?php if($this->support['drop_col']): ?> |
|
| 138 | +<?php if ($this->support['drop_col']): ?> |
|
| 139 | 139 | <li><a href="#" class="adminer-table-column-del"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></a></li> |
| 140 | 140 | <?php endif ?> |
| 141 | 141 | </ul> |
@@ -143,6 +143,6 @@ discard block |
||
| 143 | 143 | </div> |
| 144 | 144 | <!-- End second line --> |
| 145 | 145 | </div></div> |
| 146 | -<?php if(isset($this->class)): ?> |
|
| 146 | +<?php if (isset($this->class)): ?> |
|
| 147 | 147 | </div> |
| 148 | 148 | <?php endif ?> |
@@ -1,4 +1,4 @@ discard block |
||
| 1 | -<?php if(isset($this->class)): ?> |
|
| 1 | +<?php if (isset($this->class)): ?> |
|
| 2 | 2 | <div class="form-group row <?php echo $this->class ?>" data-index="<?php |
| 3 | 3 | echo $this->index ?>" id="<?php echo sprintf('%s-%02d', $this->class, $this->index) ?>"> |
| 4 | 4 | <?php endif ?> |
@@ -14,23 +14,23 @@ discard block |
||
| 14 | 14 | </div> |
| 15 | 15 | <label class="col-md-1 adminer-table-column-null" for="autoIncrementCol"> |
| 16 | 16 | <input type="radio" name="autoIncrementCol" value="<?php echo ($this->index + 1) ?>" <?php |
| 17 | - if($this->field->autoIncrement): ?>checked <?php endif ?>/> AI |
|
| 17 | + if ($this->field->autoIncrement): ?>checked <?php endif ?>/> AI |
|
| 18 | 18 | <input type="checkbox" name="<?php echo $this->prefixFields ?>[primary]" <?php |
| 19 | - if($this->field->primary): ?>checked <?php endif ?>/> |
|
| 19 | + if ($this->field->primary): ?>checked <?php endif ?>/> |
|
| 20 | 20 | </label> |
| 21 | 21 | <div class="col-md-2 adminer-table-column-middle"> |
| 22 | 22 | <select class="form-control" name="<?php |
| 23 | 23 | echo $this->prefixFields ?>[collation]" data-field="collation"<?php |
| 24 | - if($this->field->collationHidden): ?> readonly<?php endif ?>> |
|
| 24 | + if ($this->field->collationHidden): ?> readonly<?php endif ?>> |
|
| 25 | 25 | <option value="">(<?php echo $this->trans->lang('collation') ?>)</option> |
| 26 | -<?php foreach($this->collations as $group => $collations): ?> |
|
| 27 | -<?php if(is_string($collations)): ?> |
|
| 28 | - <option <?php if($this->field->collation === $collations): ?>selected<?php |
|
| 26 | +<?php foreach ($this->collations as $group => $collations): ?> |
|
| 27 | +<?php if (is_string($collations)): ?> |
|
| 28 | + <option <?php if ($this->field->collation === $collations): ?>selected<?php |
|
| 29 | 29 | endif ?>><?php echo $collations ?></option> |
| 30 | 30 | <?php else: ?> |
| 31 | 31 | <optgroup label="<?php echo $group ?>"> |
| 32 | -<?php foreach($collations as $collation): ?> |
|
| 33 | - <option <?php if($this->field->collation === $collation): ?>selected<?php |
|
| 32 | +<?php foreach ($collations as $collation): ?> |
|
| 33 | + <option <?php if ($this->field->collation === $collation): ?>selected<?php |
|
| 34 | 34 | endif ?>><?php echo $collation ?></option> |
| 35 | 35 | <?php endforeach ?> |
| 36 | 36 | </optgroup> |
@@ -39,13 +39,13 @@ discard block |
||
| 39 | 39 | </select> |
| 40 | 40 | </div> |
| 41 | 41 | <div class="col-md-2 adminer-table-column-middle"> |
| 42 | -<?php if(true/*isset($this->field->onUpdate)*/): ?> |
|
| 42 | +<?php if (true/*isset($this->field->onUpdate)*/): ?> |
|
| 43 | 43 | <select class="form-control" name="<?php |
| 44 | 44 | echo $this->prefixFields ?>[onUpdate]" data-field="onUpdate"<?php |
| 45 | - if($this->field->onUpdateHidden): ?> readonly<?php endif ?>> |
|
| 45 | + if ($this->field->onUpdateHidden): ?> readonly<?php endif ?>> |
|
| 46 | 46 | <option value="">(<?php echo $this->trans->lang('ON UPDATE') ?>)</option> |
| 47 | -<?php foreach($this->options['onUpdate'] as $group => $option): ?> |
|
| 48 | - <option <?php if($this->field->onUpdate === $option): ?>selected<?php |
|
| 47 | +<?php foreach ($this->options['onUpdate'] as $group => $option): ?> |
|
| 48 | + <option <?php if ($this->field->onUpdate === $option): ?>selected<?php |
|
| 49 | 49 | endif ?>><?php echo $option ?></option> |
| 50 | 50 | <?php endforeach ?> |
| 51 | 51 | </select> |
@@ -62,10 +62,10 @@ discard block |
||
| 62 | 62 | <div class="col-md-2 adminer-table-column-left second-line"> |
| 63 | 63 | <select class="form-control" name="<?php |
| 64 | 64 | echo $this->prefixFields ?>[type]" data-field="type"> |
| 65 | -<?php foreach($this->field->types as $group => $types): ?> |
|
| 65 | +<?php foreach ($this->field->types as $group => $types): ?> |
|
| 66 | 66 | <optgroup label="<?php echo $group ?>"> |
| 67 | -<?php foreach($types as $type): ?> |
|
| 68 | - <option <?php if($this->field->type === $type): ?>selected<?php |
|
| 67 | +<?php foreach ($types as $type): ?> |
|
| 68 | + <option <?php if ($this->field->type === $type): ?>selected<?php |
|
| 69 | 69 | endif ?>><?php echo $type ?></option> |
| 70 | 70 | <?php endforeach ?> |
| 71 | 71 | </optgroup> |
@@ -76,35 +76,35 @@ discard block |
||
| 76 | 76 | <input class="form-control" name="<?php |
| 77 | 77 | echo $this->prefixFields ?>[length]" placeholder="<?php |
| 78 | 78 | echo $this->trans->lang('Length') ?>" data-field="length"<?php |
| 79 | - if($this->field->lengthRequired): ?> required<?php endif ?> value="<?php |
|
| 79 | + if ($this->field->lengthRequired): ?> required<?php endif ?> value="<?php |
|
| 80 | 80 | echo $this->field->length ?>" size="3"> |
| 81 | 81 | </div> |
| 82 | 82 | <label class="col-md-1 adminer-table-column-null second-line"> |
| 83 | 83 | <input type="checkbox" value="1" name="<?php |
| 84 | 84 | echo $this->prefixFields ?>[null]" data-field="null" <?php |
| 85 | - if($this->field->null): ?>checked <?php endif ?>/> Null |
|
| 85 | + if ($this->field->null): ?>checked <?php endif ?>/> Null |
|
| 86 | 86 | </label> |
| 87 | 87 | <div class="col-md-2 adminer-table-column-middle second-line"> |
| 88 | 88 | <select class="form-control" name="<?php |
| 89 | 89 | echo $this->prefixFields ?>[unsigned]" data-field="unsigned"<?php |
| 90 | - if($this->field->unsignedHidden): ?> readonly<?php endif ?>> |
|
| 90 | + if ($this->field->unsignedHidden): ?> readonly<?php endif ?>> |
|
| 91 | 91 | <option value=""></option> |
| 92 | -<?php if($this->unsigned): ?> |
|
| 93 | -<?php foreach($this->unsigned as $option): ?> |
|
| 94 | - <option <?php if($this->field->unsigned === $option): ?>selected<?php |
|
| 92 | +<?php if ($this->unsigned): ?> |
|
| 93 | +<?php foreach ($this->unsigned as $option): ?> |
|
| 94 | + <option <?php if ($this->field->unsigned === $option): ?>selected<?php |
|
| 95 | 95 | endif ?>><?php echo $option ?></option> |
| 96 | 96 | <?php endforeach ?> |
| 97 | 97 | <?php endif ?> |
| 98 | 98 | </select> |
| 99 | 99 | </div> |
| 100 | 100 | <div class="col-md-2 adminer-table-column-middle second-line"> |
| 101 | -<?php if(true/*$this->foreignKeys*/): ?> |
|
| 101 | +<?php if (true/*$this->foreignKeys*/): ?> |
|
| 102 | 102 | <select class="form-control" name="<?php |
| 103 | 103 | echo $this->prefixFields ?>[onDelete]" data-field="onDelete"<?php |
| 104 | - if($this->field->onDeleteHidden): ?> readonly<?php endif ?>> |
|
| 104 | + if ($this->field->onDeleteHidden): ?> readonly<?php endif ?>> |
|
| 105 | 105 | <option value="">(<?php echo $this->trans->lang('ON DELETE') ?>)</option> |
| 106 | -<?php foreach($this->options['onDelete'] as $option): ?> |
|
| 107 | - <option <?php if($this->field->onDelete === $option): ?>selected<?php |
|
| 106 | +<?php foreach ($this->options['onDelete'] as $option): ?> |
|
| 107 | + <option <?php if ($this->field->onDelete === $option): ?>selected<?php |
|
| 108 | 108 | endif ?>><?php echo $option ?></option> |
| 109 | 109 | <?php endforeach ?> |
| 110 | 110 | </select> |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | <div class="input-group-text"> |
| 117 | 117 | <input type="checkbox" value="1" name="<?php |
| 118 | 118 | echo $this->prefixFields ?>[hasDefault]" data-field="hasDefault" <?php |
| 119 | - if($this->field->hasDefault): ?>checked <?php endif ?>/> |
|
| 119 | + if ($this->field->hasDefault): ?>checked <?php endif ?>/> |
|
| 120 | 120 | </div> |
| 121 | 121 | </div> |
| 122 | 122 | <input class="form-control" name="<?php |
@@ -131,12 +131,12 @@ discard block |
||
| 131 | 131 | echo $this->index ?>" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> |
| 132 | 132 | </button> |
| 133 | 133 | <div class="dropdown-menu" aria-labelledby="adminer-table-column-button-group-drop-<?php echo $this->index ?>"> |
| 134 | -<?php if($this->support['move_col']): ?> |
|
| 134 | +<?php if ($this->support['move_col']): ?> |
|
| 135 | 135 | <a class="dropdown-item adminer-table-column-add" href="#"><i class="bi bi-plus"></i></a> |
| 136 | 136 | <!-- <a class="dropdown-item adminer-table-column-up" href="#"><i class="bi bi-arrow-up"></i></a> |
| 137 | 137 | <a class="dropdown-item adminer-table-column-down" href="#"><i class="bi bi-arrow-down"></i></a> --> |
| 138 | 138 | <?php endif ?> |
| 139 | -<?php if($this->support['drop_col']): ?> |
|
| 139 | +<?php if ($this->support['drop_col']): ?> |
|
| 140 | 140 | <a class="dropdown-item adminer-table-column-del" href="#"><i class="bi bi-x"></i></a> |
| 141 | 141 | <?php endif ?> |
| 142 | 142 | </div> |
@@ -144,6 +144,6 @@ discard block |
||
| 144 | 144 | </div> |
| 145 | 145 | <!-- End second line --> |
| 146 | 146 | </div></div> |
| 147 | -<?php if(isset($this->class)): ?> |
|
| 147 | +<?php if (isset($this->class)): ?> |
|
| 148 | 148 | </div> |
| 149 | 149 | <?php endif ?> |
@@ -100,8 +100,7 @@ discard block |
||
| 100 | 100 | $maxlength = (!\preg_match('~int~', $field->type) && |
| 101 | 101 | \preg_match('~^(\d+)(,(\d+))?$~', $field->length, $match) ? |
| 102 | 102 | ((\preg_match("~binary~", $field->type) ? 2 : 1) * $match[1] + (($match[3] ?? null) ? 1 : 0) + |
| 103 | - (($match[2] ?? false) && !$unsigned ? 1 : 0)) : |
|
| 104 | - ($this->driver->typeExists($field->type) ? $this->driver->type($field->type) + ($unsigned ? 0 : 1) : 0)); |
|
| 103 | + (($match[2] ?? false) && !$unsigned ? 1 : 0)) : ($this->driver->typeExists($field->type) ? $this->driver->type($field->type) + ($unsigned ? 0 : 1) : 0)); |
|
| 105 | 104 | if ($this->driver->jush() == 'sql' && $this->driver->minVersion(5.6) && \preg_match('~time~', $field->type)) { |
| 106 | 105 | $maxlength += 7; // microtime |
| 107 | 106 | } |
@@ -242,15 +241,14 @@ discard block |
||
| 242 | 241 | $value = ( |
| 243 | 242 | $row !== null ? ( |
| 244 | 243 | $row[$name] != "" && $this->driver->jush() == "sql" && \preg_match("~enum|set~", $field->type) ? |
| 245 | - (\is_array($row[$name]) ? \array_sum($row[$name]) : +$row[$name]) : |
|
| 246 | - (\is_bool($row[$name]) ? +$row[$name] : $row[$name]) |
|
| 244 | + (\is_array($row[$name]) ? \array_sum($row[$name]) : +$row[$name]) : (\is_bool($row[$name]) ? +$row[$name] : $row[$name]) |
|
| 247 | 245 | ) : ( |
| 248 | 246 | !$update && $field->autoIncrement ? "" : (isset($queryOptions["select"]) ? false : $default) |
| 249 | 247 | ) |
| 250 | 248 | ); |
| 251 | 249 | $function = ( |
| 252 | 250 | $queryOptions["save"] |
| 253 | - ? (string)$queryOptions["function"][$name] |
|
| 251 | + ? (string) $queryOptions["function"][$name] |
|
| 254 | 252 | : ( |
| 255 | 253 | $update && \preg_match('~^CURRENT_TIMESTAMP~i', $field->onUpdate) |
| 256 | 254 | ? "now" |
