lagdo / jaxon-dbadmin

src/Db/Util.php

Spacing +5 added lines, -8 removed lines

@@ -449,9 +449,8 @@ 
         \preg_match_all("~'((?:[^']|'')*)'~", $field->length, $matches);
         foreach ($matches[1] as $i => $val) {
             $val = \stripcslashes(\str_replace("''", "'", $val));
-            $checked = (\is_int($value) ? $value == $i + 1 :
-                (\is_array($value) ? \in_array($i+1, $value) : $value === $val));
-            $inputs[] = "<label><input type='$type'$attrs value='" . ($i+1) . "'" .
+            $checked = (\is_int($value) ? $value == $i + 1 : (\is_array($value) ? \in_array($i + 1, $value) : $value === $val));
+            $inputs[] = "<label><input type='$type'$attrs value='" . ($i + 1) . "'" .
                 ($checked ? ' checked' : '') . '>' . $this->html($val) . '</label>';
         }
 
@@ -515,8 +514,7 @@ 
         }
         $enumLength = $this->driver->enumLength();
         return (\preg_match("~^\\s*\\(?\\s*$enumLength(?:\\s*,\\s*$enumLength)*+\\s*\\)?\\s*\$~", $length) &&
-            \preg_match_all("~$enumLength~", $length, $matches) ? '(' . \implode(',', $matches[0]) . ')' :
-            \preg_replace('~^[0-9].*~', '(\0)', \preg_replace('~[^-0-9,+()[\]]~', '', $length))
+            \preg_match_all("~$enumLength~", $length, $matches) ? '(' . \implode(',', $matches[0]) . ')' : \preg_replace('~^[0-9].*~', '(\0)', \preg_replace('~[^-0-9,+()[\]]~', '', $length))
         );
     }
 
@@ -703,7 +701,7 @@ 
         $expressions = [];
         foreach ($indexes as $i => $index) {
             if ($index->type == 'FULLTEXT' && $this->input->values['fulltext'][$i] != '') {
-                $columns = \array_map(function ($column) {
+                $columns = \array_map(function($column) {
                     return $this->driver->escapeId($column);
                 }, $index->columns);
                 $expressions[] = 'MATCH (' . \implode(', ', $columns) . ') AGAINST (' .
@@ -818,8 +816,7 @@ 
      */
     private function _selectValue($value, string $link, string $type, $original): string
     {
-        $clause = ($value === null ? '<i>NULL</i>' :
-            (\preg_match('~char|binary|boolean~', $type) && !\preg_match('~var~', $type) ?
+        $clause = ($value === null ? '<i>NULL</i>' : (\preg_match('~char|binary|boolean~', $type) && !\preg_match('~var~', $type) ?
             "<code>$value</code>" : $value));
         if (\preg_match('~blob|bytea|raw|file~', $type) && !$this->isUtf8($value)) {
             $clause = '<i>' . $this->trans->lang('%d byte(s)', \strlen($original)) . '</i>';

Braces +1 added lines, -2 removed lines

@@ -858,8 +858,7 @@
         if ($link === '') {
             if ($this->isMail($value)) {
                 $link = "mailto:$value";
-            }
-            elseif ($this->isUrl($value)) {
+            } elseif ($this->isUrl($value)) {
                 $link = $value; // IE 11 and all modern browsers hide referrer
             }
         }

src/DbAdmin/TableSelectAdmin.php

Spacing +6 added lines, -6 removed lines

@@ -30,7 +30,7 @@ 
     {
         return [
             'select' => $select,
-            'values' => (array)$options["columns"],
+            'values' => (array) $options["columns"],
             'columns' => $columns,
             'functions' => $this->driver->functions(),
             'grouping' => $this->driver->grouping(),
@@ -54,7 +54,7 @@ 
         }
         return [
             // 'where' => $where,
-            'values' => (array)$options["where"],
+            'values' => (array) $options["where"],
             'columns' => $columns,
             'indexes' => $indexes,
             'operators' => $this->driver->operators(),
@@ -73,8 +73,8 @@ 
     private function getSortingOptions(array $columns, array $options): array
     {
         $values = [];
-        $descs = (array)$options["desc"];
-        foreach ((array)$options["order"] as $key => $value) {
+        $descs = (array) $options["desc"];
+        foreach ((array) $options["order"] as $key => $value) {
             $values[] = [
                 'col' => $value,
                 'desc' => $descs[$key] ?? 0,
@@ -415,8 +415,8 @@ 
      */
     public function execSelect(string $table, array $queryOptions): array
     {
-        list(, $query, $select, $fields, , , $indexes, $where, $group, , $limit, $page,
-            $textLength, , $unselected) = $this->prepareSelect($table, $queryOptions);
+        list(, $query, $select, $fields,,, $indexes, $where, $group,, $limit, $page,
+            $textLength,, $unselected) = $this->prepareSelect($table, $queryOptions);
 
         $error = null;
         // From driver.inc.php