lagdo / jaxon-dbadmin

templates/views/bootstrap3/sql/export.php

Spacing +23 added lines, -23 removed lines

@@ -6,10 +6,10 @@ 
                     <label for="output" class="col-md-3 control-label"><?php
                         echo $this->options['output']['label'] ?></label>
                     <div class="col-md-8">
-<?php foreach($this->options['output']['options'] as $value => $label): ?>
+<?php foreach ($this->options['output']['options'] as $value => $label): ?>
                         <label class="radio-inline">
                             <input type="radio" name="output" value="<?php echo $value ?>" <?php
-                                if($this->options['output']['value'] === $value): ?>checked <?php
+                                if ($this->options['output']['value'] === $value): ?>checked <?php
                                 endif ?>/> <?php echo $label ?>
                         </label>
 <?php endforeach ?>
@@ -19,48 +19,48 @@ 
                     <label for="format" class="col-md-3 control-label"><?php
                         echo $this->options['format']['label'] ?></label>
                     <div class="col-md-8">
-<?php foreach($this->options['format']['options'] as $value => $label): ?>
+<?php foreach ($this->options['format']['options'] as $value => $label): ?>
                         <label class="radio-inline">
                             <input type="radio" name="format" value="<?php echo $value ?>" <?php
-                                if($this->options['format']['value'] === $value): ?>checked <?php
+                                if ($this->options['format']['value'] === $value): ?>checked <?php
                                 endif ?>/> <?php echo $label ?>
                         </label>
 <?php endforeach ?>
                     </div>
                 </div>
-<?php if(array_key_exists('db_style', $this->options)): ?>
+<?php if (array_key_exists('db_style', $this->options)): ?>
                 <div class="form-group">
                     <label for="db_style" class="col-md-3 control-label"><?php
                         echo $this->options['db_style']['label'] ?></label>
                     <div class="col-md-8">
                         <select name="db_style" class="form-control">
-<?php foreach($this->options['db_style']['options'] as $label): ?>
+<?php foreach ($this->options['db_style']['options'] as $label): ?>
                             <option <?php
-                                if($this->options['db_style']['value'] == $label): ?>selected<?php
+                                if ($this->options['db_style']['value'] == $label): ?>selected<?php
                                 endif ?>> <?php echo $label ?></option>
 <?php endforeach ?>
                         </select>
                     </div>
                 </div>
-<?php if(array_key_exists('routines', $this->options) || array_key_exists('events', $this->options)): ?>
+<?php if (array_key_exists('routines', $this->options) || array_key_exists('events', $this->options)): ?>
                 <div class="form-group">
                     <label class="col-md-3 control-label">&nbsp;</label>
-<?php if(array_key_exists('routines', $this->options)): ?>
+<?php if (array_key_exists('routines', $this->options)): ?>
                     <div class="col-md-4">
                         <div class="checkbox">
                             <label><input type="checkbox" name="routines" value="<?php
                                 echo $this->options['routines']['value'] ?>" <?php
-                                if($this->options['routines']['checked']): ?>checked <?php
+                                if ($this->options['routines']['checked']): ?>checked <?php
                                 endif ?>/> <?php echo $this->options['routines']['label'] ?></label>
                         </div>
                     </div>
 <?php endif ?>
-<?php if(array_key_exists('events', $this->options)): ?>
+<?php if (array_key_exists('events', $this->options)): ?>
                     <div class="col-md-4">
                         <div class="checkbox">
                             <label><input type="checkbox" name="events" value="<?php
                                 echo $this->options['events']['value'] ?>" <?php
-                                if($this->options['events']['checked']): ?>checked <?php
+                                if ($this->options['events']['checked']): ?>checked <?php
                                 endif ?>/> <?php echo $this->options['events']['label'] ?></label>
                         </div>
                     </div>
@@ -73,9 +73,9 @@ 
                         echo $this->options['table_style']['label'] ?></label>
                     <div class="col-md-8">
                         <select name="table_style" class="form-control">
-<?php foreach($this->options['table_style']['options'] as $label): ?>
+<?php foreach ($this->options['table_style']['options'] as $label): ?>
                             <option <?php
-                                if($this->options['table_style']['value'] == $label): ?>selected<?php
+                                if ($this->options['table_style']['value'] == $label): ?>selected<?php
                                 endif ?>> <?php echo $label ?></option>
 <?php endforeach ?>
                         </select>
@@ -87,16 +87,16 @@ 
                         <div class="checkbox">
                             <label><input type="checkbox" name="auto_increment" value="<?php
                                 echo $this->options['auto_increment']['value'] ?>" <?php
-                                if($this->options['auto_increment']['checked']): ?>checked <?php
+                                if ($this->options['auto_increment']['checked']): ?>checked <?php
                                 endif ?>/> <?php echo $this->options['auto_increment']['label'] ?></label>
                         </div>
                     </div>
-<?php if(array_key_exists('triggers', $this->options)): ?>
+<?php if (array_key_exists('triggers', $this->options)): ?>
                     <div class="col-md-4">
                         <div class="checkbox">
                             <label><input type="checkbox" name="triggers" value="<?php
                                 echo $this->options['triggers']['value'] ?>" <?php
-                                if($this->options['triggers']['checked']): ?>checked <?php
+                                if ($this->options['triggers']['checked']): ?>checked <?php
                                 endif ?>/> <?php echo $this->options['triggers']['label'] ?></label>
                         </div>
                     </div>
@@ -107,9 +107,9 @@ 
                         echo $this->options['data_style']['label'] ?></label>
                     <div class="col-md-8">
                         <select name="data_style" class="form-control">
-<?php foreach($this->options['data_style']['options'] as $label): ?>
+<?php foreach ($this->options['data_style']['options'] as $label): ?>
                             <option <?php
-                                if($this->options['data_style']['value'] == $label): ?>selected<?php
+                                if ($this->options['data_style']['value'] == $label): ?>selected<?php
                                 endif ?>> <?php echo $label ?></option>
 <?php endforeach ?>
                         </select>
@@ -125,7 +125,7 @@ 
             </div>
             <div class="col-md-4">
                 <div class="table-responsive">
-<?php if(isset($this->databases)): ?>
+<?php if (isset($this->databases)): ?>
                     <table class="table table-bordered">
                         <thead>
                             <tr>
@@ -142,7 +142,7 @@ 
                             </tr>
                         </thead>
                         <tbody>
-<?php foreach($this->databases['details'] as $database): ?>
+<?php foreach ($this->databases['details'] as $database): ?>
                             <tr>
                                 <td>
                                     <input type="checkbox" name="database_list[]" class="<?php
@@ -160,7 +160,7 @@ 
                         </tbody>
                     </table>
 <?php endif ?>
-<?php if(isset($this->tables)): ?>
+<?php if (isset($this->tables)): ?>
                     <table class="table table-bordered">
                         <thead>
                             <tr>
@@ -177,7 +177,7 @@ 
                             </tr>
                         </thead>
                         <tbody>
-<?php foreach($this->tables['details'] as $table): ?>
+<?php foreach ($this->tables['details'] as $table): ?>
                             <tr>
                                 <td>
                                     <input type="checkbox" name="table_list[]" class="<?php

templates/views/bootstrap3/sql/results.php

Spacing +9 added lines, -9 removed lines

@@ -1,44 +1,44 @@
-<?php foreach($this->results as $result): ?>
+<?php foreach ($this->results as $result): ?>
             <div class="row">
-<?php if(count($result['errors']) > 0): ?>
+<?php if (count($result['errors']) > 0): ?>
                 <div class="panel panel-danger">
                     <div class="panel-heading">
                         <?php echo $result['query'] ?>
                     </div>
                     <div class="panel-body" style="padding:5px 15px">
-<?php foreach($result['errors'] as $error): ?>
+<?php foreach ($result['errors'] as $error): ?>
                         <p style="margin:0"><?php echo $error ?></p>
 <?php endforeach ?>
                     </div>
                 </div>
 <?php endif ?>
-<?php if(count($result['messages']) > 0): ?>
+<?php if (count($result['messages']) > 0): ?>
                 <div class="panel panel-info">
                     <div class="panel-heading">
                         <?php echo $result['query'] ?>
                     </div>
                     <div class="panel-body" style="padding:5px 15px">
-<?php foreach($result['messages'] as $message): ?>
+<?php foreach ($result['messages'] as $message): ?>
                         <p style="margin:0"><?php echo $message ?></p>
 <?php endforeach ?>
                     </div>
                 </div>
 <?php endif ?>
 
-<?php if(($result['select'])): ?>
+<?php if (($result['select'])): ?>
                 <div class="table-responsive">
                     <table class="table table-bordered">
                         <thead>
                             <tr>
-<?php foreach($result['select']['headers'] as $header): ?>
+<?php foreach ($result['select']['headers'] as $header): ?>
                                 <th><?php echo $header ?></th>
 <?php endforeach ?>
                             </tr>
                         </thead>
                         <tbody>
-<?php foreach($result['select']['details'] as $details): ?>
+<?php foreach ($result['select']['details'] as $details): ?>
                             <tr>
-<?php foreach($details as $detail): ?>
+<?php foreach ($details as $detail): ?>
                                 <td><?php echo $detail ?></td>
 <?php endforeach ?>
                             </tr>

translations/gl.inc.php

Spacing +1 added lines, -1 removed lines

@@ -273,7 +273,7 @@
     'Modify' => 'Modificar',
     'Loading' => 'Cargando',
     'Load more data' => 'Cargar máis datos',
-    '%d / ' => array('%d / ','%d / '),
+    '%d / ' => array('%d / ', '%d / '),
     'Limit rows' => 'Limitar filas',
     'Default value' => 'Valor por defecto',
     'Full table scan' => 'Escaneo completo da táboa',

src/DbAdmin/TableSelectAdmin.php

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
     {
         return [
             'select' => $select,
-            'values' => (array)$options["columns"],
+            'values' => (array) $options["columns"],
             'columns' => $columns,
             'functions' => $this->driver->functions(),
             'grouping' => $this->driver->grouping(),
@@ -45,7 +45,7 @@ 
         }
         return [
             // 'where' => $where,
-            'values' => (array)$options["where"],
+            'values' => (array) $options["where"],
             'columns' => $columns,
             'indexes' => $indexes,
             'operators' => $this->driver->operators(),
@@ -64,8 +64,8 @@ 
     private function getSortingOptions(array $order, array $columns, array $indexes, array $options)
     {
         $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,
@@ -440,7 +440,7 @@ 
                     \preg_match('~char|text|enum|set~', $type) && strlen($value) > 64) {
                     $key = (\strpos($key, '(') ? $key : $this->driver->escapeId($key)); //! columns looking like functions
                     $key = "MD5(" . ($this->driver->jush() != 'sql' || \preg_match("~^utf8~", $collation) ?
-                        $key : "CONVERT($key USING " . $this->driver−>charset() . ")") . ")";
+                        $key : "CONVERT($key USING " . $this->driver− > charset() . ")") . ")";
                     $value = \md5($value);
                 }
                 if ($value !== null) {

src/DbAdmin/ExportAdmin.php

Spacing +2 added lines, -3 removed lines

@@ -239,8 +239,7 @@ 
                 $row[$key] = '"' . \str_replace('"', '""', $val) . '"';
             }
         }
-        $separator = $this->options["format"] == "csv" ? "," :
-            ($this->options["format"] == "tsv" ? "\t" : ";");
+        $separator = $this->options["format"] == "csv" ? "," : ($this->options["format"] == "tsv" ? "\t" : ";");
         $this->queries[] = \implode($separator, $row);
     }
 
@@ -354,7 +353,7 @@ 
                     } else {
                         if (!$insert) {
                             $insert = "INSERT INTO " . $this->driver->table($table) . " (" .
-                                \implode(", ", \array_map(function ($key) {
+                                \implode(", ", \array_map(function($key) {
                                     return $this->driver->escapeId($key);
                                 }, $keys)) . ") VALUES";
                         }

src/DbAdmin/TableAdmin.php

Spacing +4 added lines, -5 removed lines

@@ -273,14 +273,14 @@ 
                 $target .= '<b>' . $this->util->html($foreignKey->schema) . '</b>.';
             }
             $target = $this->util->html($foreignKey->table) .
-                '(' . \implode(', ', \array_map(function ($key) {
+                '(' . \implode(', ', \array_map(function($key) {
                     return $this->util->html($key);
                 }, $foreignKey->target)) . ')';
             $details[] = [
                 'name' => $this->util->html($name),
                 'source' => '<i>' . \implode(
                     '</i>, <i>',
-                    \array_map(function ($key) {
+                    \array_map(function($key) {
                         return $this->util->html($key);
                     }, $foreignKey->source)
                 ) . '</i>',
@@ -464,7 +464,7 @@ 
     private function createOrAlterTable(array $values, string $table = '', array $origFields = [])
     {
         // From create.inc.php
-        $values['fields'] = (array)$values['fields'];
+        $values['fields'] = (array) $values['fields'];
         if ($values['autoIncrementCol']) {
             $values['fields'][$values['autoIncrementCol']]['autoIncrement'] = true;
         }
@@ -483,8 +483,7 @@ 
             $field = TableFieldEntity::make($field);
             $foreignKey = $this->foreignKeys[$field->type] ?? null;
             //! can collide with user defined type
-            $typeField = ($foreignKey === null ? $field :
-                TableFieldEntity::make($this->referencableTables[$foreignKey]));
+            $typeField = ($foreignKey === null ? $field : TableFieldEntity::make($this->referencableTables[$foreignKey]));
             // Originally, deleted fields have the "field" field set to an empty string.
             // But in our implementation, the "name" field is not set.
             if ($field->name != '') {

src/DbAdmin/UserAdmin.php

Spacing +4 added lines, -6 removed lines

@@ -60,8 +60,7 @@ 
         foreach ($grants as $object => $grant) {
             //! separate db, table, columns, PROCEDURE|FUNCTION, routine
             $headers[] = $object === '*.*' ?
-                '<input type="hidden" name="objects[' . $i . ']" value="*.*" />*.*' :
-                '<input name="objects[' . $i . ']" value="' . $this->util->html($object) . '" autocapitalize="off" />';
+                '<input type="hidden" name="objects[' . $i . ']" value="*.*" />*.*' : '<input name="objects[' . $i . ']" value="' . $this->util->html($object) . '" autocapitalize="off" />';
             $i++;
         }
 
@@ -116,8 +115,7 @@ 
         foreach ($grants as $object => $grant) {
             //! separate db, table, columns, PROCEDURE|FUNCTION, routine
             $headers[] = $object === '*.*' ?
-                '<input type="hidden" name="objects[' . $i . ']" value="*.*" />*.*' :
-                '<input name="objects[' . $i . ']" value="' .
+                '<input type="hidden" name="objects[' . $i . ']" value="*.*" />*.*' : '<input name="objects[' . $i . ']" value="' .
                     $this->util->html($object) . '" autocapitalize="off" />';
             $i++;
         }
@@ -135,11 +133,11 @@ 
             ],
             'pass' => [
                 'label' => $this->trans->lang('Password'),
-                'value' => $password ,
+                'value' => $password,
             ],
             'hashed' => [
                 'label' => $this->trans->lang('Hashed'),
-                'value' => ($password  != ''),
+                'value' => ($password != ''),
             ],
         ];
 

src/DbAdmin/CommandAdmin.php

Indentation +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
      * @param int
      *
      * @return array
-    */
+     */
     protected function select($statement, $orgtables = [], $limit = 0)
     {
         $links = []; // colno => orgtable - create links from these columns

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/DbAdmin/TableQueryAdmin.php

Spacing +2 added lines, -3 removed lines

@@ -101,8 +101,7 @@ 
             $maxlength = (!\preg_match('~int~', $field->type) &&
                 \preg_match('~^(\d+)(,(\d+))?$~', $field->length, $match) ?
                 ((\preg_match("~binary~", $field->type) ? 2 : 1) * $match[1] + (($match[3] ?? null) ? 1 : 0) +
-                (($match[2] ?? false) && !$unsigned ? 1 : 0)) :
-                ($this->driver->typeExists($field->type) ? $this->driver->type($field->type) + ($unsigned ? 0 : 1) : 0));
+                (($match[2] ?? false) && !$unsigned ? 1 : 0)) : ($this->driver->typeExists($field->type) ? $this->driver->type($field->type) + ($unsigned ? 0 : 1) : 0));
             if ($this->driver->jush() == 'sql' && $this->driver->minVersion(5.6) && \preg_match('~time~', $field->type)) {
                 $maxlength += 7; // microtime
             }
@@ -261,7 +260,7 @@ 
                 }
                 $function = (
                     $queryOptions["save"]
-                    ? (string)$queryOptions["function"][$name]
+                    ? (string) $queryOptions["function"][$name]
                     : (
                         $update && \preg_match('~^CURRENT_TIMESTAMP~i', $field->onUpdate)
                         ? "now"