lagdo / jaxon-dbadmin

templates/views/bootstrap3/menu/schemas.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
                 <div class="input-group">
-<?php if(isset($this->schemas) && ($this->schemas)): ?>
+<?php if (isset($this->schemas) && ($this->schemas)): ?>
                     <select class="form-control" id="adminer-schema-select">
-<?php foreach($this->schemas as $schema): ?>
+<?php foreach ($this->schemas as $schema): ?>
                         <option value="<?php echo $schema ?>"><?php echo $schema ?></option>
 <?php endforeach ?>
                     </select>

src/DbAdmin/CommandAdmin.php

Spacing +4 added lines, -8 removed lines

@@ -96,8 +96,7 @@ 
         if ($rowCount > 0) {
             $numRows = $statement->rowCount();
             $message = ($numRows ? ($limit && $numRows > $limit ?
-                $this->trans->lang('%d / ', $limit) :
-                "") . $this->trans->lang('%d row(s)', $numRows) : "");
+                $this->trans->lang('%d / ', $limit) : "") . $this->trans->lang('%d row(s)', $numRows) : "");
         }
 
         // Table header
@@ -179,9 +178,7 @@ 
         $timestamps = [];
         // TODO: Move this to driver implementations
         $parse = '[\'"' .
-            ($this->driver->jush() == "sql" ? '`#' :
-            ($this->driver->jush() == "sqlite" ? '`[' :
-            ($this->driver->jush() == "mssql" ? '[' : ''))) . ']|/\*|-- |$' .
+            ($this->driver->jush() == "sql" ? '`#' : ($this->driver->jush() == "sqlite" ? '`[' : ($this->driver->jush() == "mssql" ? '[' : ''))) . ']|/\*|-- |$' .
             ($this->driver->jush() == "pgsql" ? '|\$[^$]*\$' : '');
         // $total_start = \microtime(true);
         // \parse_str($_COOKIE["adminer_export"], $adminer_export);
@@ -207,8 +204,7 @@ 
 
             if ($found && \rtrim($found) != $delimiter) {
                 // find matching quote or comment end
-                while (\preg_match('(' . ($found == '/*' ? '\*/' : ($found == '[' ? ']' :
-                    (\preg_match('~^-- |^#~', $found) ? "\n" : \preg_quote($found) .
+                while (\preg_match('(' . ($found == '/*' ? '\*/' : ($found == '[' ? ']' : (\preg_match('~^-- |^#~', $found) ? "\n" : \preg_quote($found) .
                     "|\\\\."))) . '|$)s', $queries, $match, PREG_OFFSET_CAPTURE, $offset)) {
                     //! respect sql_mode NO_BACKSLASH_ESCAPES
                     $s = $match[0][0];
@@ -303,7 +299,7 @@ 
         if ($empty) {
             $messages[] = $this->trans->lang('No commands to execute.');
         } elseif ($onlyErrors) {
-            $messages[] =  $this->trans->lang('%d query(s) executed OK.', $commands - \count($errors));
+            $messages[] = $this->trans->lang('%d query(s) executed OK.', $commands - \count($errors));
             // $timestamps[] = $this->trans->formatTime($total_start);
         }
         // elseif($errors && $commands > 1)

src/Db/Util.php

Spacing +5 added lines, -8 removed lines

@@ -517,9 +517,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($this->editValue($val, $field)) . '</label>';
         }
 
@@ -583,8 +582,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))
         );
     }
 
@@ -755,7 +753,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 (" .
@@ -873,8 +871,7 @@ 
      */
     private function _selectValue(string $value, string $link, string $type, string $original)
     {
-        $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>";