HuasoFoundries / phpPgAdmin6

src/controllers/TblpropertiesController.php

Spacing +24 added lines, -24 removed lines

@@ -80,7 +80,7 @@ 
 
         $output = ob_get_clean();
 
-        $this->printHeader($lang['strtables'].' - '.$_REQUEST['table'], null, true, $header_template);
+        $this->printHeader($lang['strtables'] . ' - ' . $_REQUEST['table'], null, true, $header_template);
         $this->printBody();
 
         echo $output;
@@ -98,7 +98,7 @@ 
         $lang = $this->lang;
         $data = $misc->getDatabaseAccessor();
 
-        $attPre = function (&$rowdata, $actions) use ($data) {
+        $attPre = function(&$rowdata, $actions) use ($data) {
             $rowdata->fields['+type'] = $data->formatType($rowdata->fields['type'], $rowdata->fields['atttypmod']);
             $attname = $rowdata->fields['attname'];
             $table = $_REQUEST['table'];
@@ -111,31 +111,31 @@ 
             return $actions;
         };
 
-        $cstrRender = function ($s, $p) use ($misc, $data) {
+        $cstrRender = function($s, $p) use ($misc, $data) {
             $str = '';
             foreach ($p['keys'] as $k => $c) {
                 if (is_null($p['keys'][$k]['consrc'])) {
                     $atts = $data->getAttributeNames($_REQUEST['table'], explode(' ', $p['keys'][$k]['indkey']));
-                    $c['consrc'] = ($c['contype'] == 'u' ? 'UNIQUE (' : 'PRIMARY KEY (').implode(',', $atts).')';
+                    $c['consrc'] = ($c['contype'] == 'u' ? 'UNIQUE (' : 'PRIMARY KEY (') . implode(',', $atts) . ')';
                 }
 
                 if ($c['p_field'] == $s) {
                     switch ($c['contype']) {
                         case 'p':
-                            $str .= '<a href="constraints.php?'.$misc->href.'&amp;table='.urlencode($c['p_table']).'&amp;schema='.urlencode($c['p_schema']).'"><img src="'.
-                            $misc->icon('PrimaryKey').'" alt="[pk]" title="'.htmlentities($c['consrc'], ENT_QUOTES, 'UTF-8').'" /></a>';
+                            $str .= '<a href="constraints.php?' . $misc->href . '&amp;table=' . urlencode($c['p_table']) . '&amp;schema=' . urlencode($c['p_schema']) . '"><img src="' .
+                            $misc->icon('PrimaryKey') . '" alt="[pk]" title="' . htmlentities($c['consrc'], ENT_QUOTES, 'UTF-8') . '" /></a>';
                             break;
                         case 'f':
-                            $str .= '<a href="tblproperties.php?'.$misc->href.'&amp;table='.urlencode($c['f_table']).'&amp;schema='.urlencode($c['f_schema']).'"><img src="'.
-                            $misc->icon('ForeignKey').'" alt="[fk]" title="'.htmlentities($c['consrc'], ENT_QUOTES, 'UTF-8').'" /></a>';
+                            $str .= '<a href="tblproperties.php?' . $misc->href . '&amp;table=' . urlencode($c['f_table']) . '&amp;schema=' . urlencode($c['f_schema']) . '"><img src="' .
+                            $misc->icon('ForeignKey') . '" alt="[fk]" title="' . htmlentities($c['consrc'], ENT_QUOTES, 'UTF-8') . '" /></a>';
                             break;
                         case 'u':
-                            $str .= '<a href="constraints.php?'.$misc->href.'&amp;table='.urlencode($c['p_table']).'&amp;schema='.urlencode($c['p_schema']).'"><img src="'.
-                            $misc->icon('UniqueConstraint').'" alt="[uniq]" title="'.htmlentities($c['consrc'], ENT_QUOTES, 'UTF-8').'" /></a>';
+                            $str .= '<a href="constraints.php?' . $misc->href . '&amp;table=' . urlencode($c['p_table']) . '&amp;schema=' . urlencode($c['p_schema']) . '"><img src="' .
+                            $misc->icon('UniqueConstraint') . '" alt="[uniq]" title="' . htmlentities($c['consrc'], ENT_QUOTES, 'UTF-8') . '" /></a>';
                             break;
                         case 'c':
-                            $str .= '<a href="constraints.php?'.$misc->href.'&amp;table='.urlencode($c['p_table']).'&amp;schema='.urlencode($c['p_schema']).'"><img src="'.
-                            $misc->icon('CheckConstraint').'" alt="[check]" title="'.htmlentities($c['consrc'], ENT_QUOTES, 'UTF-8').'" /></a>';
+                            $str .= '<a href="constraints.php?' . $misc->href . '&amp;table=' . urlencode($c['p_table']) . '&amp;schema=' . urlencode($c['p_schema']) . '"><img src="' .
+                            $misc->icon('CheckConstraint') . '" alt="[check]" title="' . htmlentities($c['consrc'], ENT_QUOTES, 'UTF-8') . '" /></a>';
                     }
                 }
             }
@@ -163,7 +163,7 @@ 
             'column'  => [
                 'title' => $lang['strcolumn'],
                 'field' => Decorator::field('attname'),
-                'url'   => "colproperties.php?subject=column&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table']).'&amp;',
+                'url'   => "colproperties.php?subject=column&amp;{$misc->href}&amp;table=" . urlencode($_REQUEST['table']) . '&amp;',
                 'vars'  => ['column' => 'attname'],
             ],
             'type'    => [
@@ -202,22 +202,22 @@ 
         $actions = [
             'browse'     => [
                 'title' => $lang['strbrowse'],
-                'url'   => "display.php?{$misc->href}&amp;subject=column&amp;return=table&amp;table=".urlencode($_REQUEST['table']).'&amp;',
+                'url'   => "display.php?{$misc->href}&amp;subject=column&amp;return=table&amp;table=" . urlencode($_REQUEST['table']) . '&amp;',
                 'vars'  => ['column' => 'attname'],
             ],
             'alter'      => [
                 'title' => $lang['stralter'],
-                'url'   => "colproperties.php?action=properties&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table']).'&amp;',
+                'url'   => "colproperties.php?action=properties&amp;{$misc->href}&amp;table=" . urlencode($_REQUEST['table']) . '&amp;',
                 'vars'  => ['column' => 'attname'],
             ],
             'privileges' => [
                 'title' => $lang['strprivileges'],
-                'url'   => "privileges.php?subject=column&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table']).'&amp;',
+                'url'   => "privileges.php?subject=column&amp;{$misc->href}&amp;table=" . urlencode($_REQUEST['table']) . '&amp;',
                 'vars'  => ['column' => 'attname'],
             ],
             'drop'       => [
                 'title' => $lang['strdrop'],
-                'url'   => "tblproperties.php?action=confirm_drop&amp;{$misc->href}&amp;table=".urlencode($_REQUEST['table']).'&amp;',
+                'url'   => "tblproperties.php?action=confirm_drop&amp;{$misc->href}&amp;table=" . urlencode($_REQUEST['table']) . '&amp;',
                 'vars'  => ['column' => 'attname'],
             ],
         ];
@@ -520,7 +520,7 @@ 
                 $_POST['tablespace'] = $table->fields['tablespace'];
             }
 
-            echo '<form action="'.SUBFOLDER."/src/views/tblproperties.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/tblproperties.php\" method=\"post\">\n";
             echo "<table>\n";
             echo "<tr><th class=\"data left required\">{$lang['strname']}</th>\n";
             echo '<td class="data1">';
@@ -599,7 +599,7 @@ 
         $this->printTabs('table', 'export');
         $this->printMsg($msg);
 
-        echo '<form action="'.SUBFOLDER."/src/views/dataexport.php\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/dataexport.php\" method=\"post\">\n";
         echo "<table>\n";
         echo "<tr><th class=\"data\">{$lang['strformat']}</th><th class=\"data\" colspan=\"2\">{$lang['stroptions']}</th></tr>\n";
         // Data only
@@ -662,7 +662,7 @@ 
             // Don't show upload option if max size of uploads is zero
             $max_size = $misc->inisizeToBytes(ini_get('upload_max_filesize'));
             if (is_float($max_size) && $max_size > 0) {
-                echo '<form action="'.SUBFOLDER."/src/views/dataimport.php\" method=\"post\" enctype=\"multipart/form-data\">\n";
+                echo '<form action="' . SUBFOLDER . "/src/views/dataimport.php\" method=\"post\" enctype=\"multipart/form-data\">\n";
                 echo "<table>\n";
                 echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strformat']}</th>\n";
                 echo "\t\t<td><select name=\"format\">\n";
@@ -741,8 +741,8 @@ 
                 $this->printTitle($lang['straddcolumn'], 'pg.column.add');
                 $this->printMsg($msg);
 
-                echo '<script src="'.SUBFOLDER.'/js/tables.js" type="text/javascript"></script>';
-                echo '<form action="'.SUBFOLDER."/src/views/tblproperties.php\" method=\"post\">\n";
+                echo '<script src="' . SUBFOLDER . '/js/tables.js" type="text/javascript"></script>';
+                echo '<form action="' . SUBFOLDER . "/src/views/tblproperties.php\" method=\"post\">\n";
 
                 // Output table header
                 echo "<table>\n";
@@ -808,7 +808,7 @@ 
                 echo "<input type=\"submit\" value=\"{$lang['stradd']}\" />\n";
                 echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" /></p>\n";
                 echo "</form>\n";
-                echo '<script type="text/javascript">predefined_lengths = new Array('.implode(',', $escaped_predef_types).");checkLengths(document.getElementById('type').value,'');</script>\n";
+                echo '<script type="text/javascript">predefined_lengths = new Array(' . implode(',', $escaped_predef_types) . ");checkLengths(document.getElementById('type').value,'');</script>\n";
                 break;
             case 2:
                 // Check inputs
@@ -857,7 +857,7 @@ 
             echo '<p>', sprintf($lang['strconfdropcolumn'], $misc->printVal($_REQUEST['column']),
                 $misc->printVal($_REQUEST['table'])), "</p>\n";
 
-            echo '<form action="'.SUBFOLDER."/src/views/tblproperties.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/tblproperties.php\" method=\"post\">\n";
             echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
             echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), "\" />\n";
             echo '<input type="hidden" name="column" value="', htmlspecialchars($_REQUEST['column']), "\" />\n";

src/controllers/TablesController.php

Spacing +14 added lines, -14 removed lines

@@ -146,7 +146,7 @@ 
             'table'      => [
                 'title' => $lang['strtable'],
                 'field' => Decorator::field('relname'),
-                'url'   => SUBFOLDER."/redirect/table?{$misc->href}&",
+                'url'   => SUBFOLDER . "/redirect/table?{$misc->href}&",
                 'vars'  => ['table' => 'relname'],
             ],
             'owner'      => [
@@ -444,7 +444,7 @@ 
                 $this->printTitle($lang['strcreatetable'], 'pg.table.create');
                 $this->printMsg($msg);
 
-                echo '<form action="'.SUBFOLDER.'/src/views/'.$this->script.'" method="post">';
+                echo '<form action="' . SUBFOLDER . '/src/views/' . $this->script . '" method="post">';
                 echo "\n";
                 echo "<table>\n";
                 echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strname']}</th>\n";
@@ -508,8 +508,8 @@ 
                 $this->printTitle($lang['strcreatetable'], 'pg.table.create');
                 $this->printMsg($msg);
 
-                echo '<script src="'.SUBFOLDER.'/js/tables.js" type="text/javascript"></script>';
-                echo '<form action="'.SUBFOLDER."/src/views/tables.php\" method=\"post\">\n";
+                echo '<script src="' . SUBFOLDER . '/js/tables.js" type="text/javascript"></script>';
+                echo '<form action="' . SUBFOLDER . "/src/views/tables.php\" method=\"post\">\n";
 
                 // Output table header
                 echo "<table>\n";
@@ -563,7 +563,7 @@ 
                         foreach ($predefined_size_types as $value) {
                             $escaped_predef_types[] = "'{$value}'";
                         }
-                        echo '<script type="text/javascript">predefined_lengths = new Array('.implode(',', $escaped_predef_types).");</script>\n\t</td>";
+                        echo '<script type="text/javascript">predefined_lengths = new Array(' . implode(',', $escaped_predef_types) . ");</script>\n\t</td>";
                     }
 
                     // Output array type selector
@@ -576,7 +576,7 @@ 
                     htmlspecialchars($_REQUEST['length'][$i]), "\" /></td>\n";
                     echo "\t\t<td><input type=\"checkbox\" name=\"notnull[{$i}]\"", (isset($_REQUEST['notnull'][$i])) ? ' checked="checked"' : '', " /></td>\n";
                     echo "\t\t<td style=\"text-align: center\"><input type=\"checkbox\" name=\"uniquekey[{$i}]\""
-                        .(isset($_REQUEST['uniquekey'][$i]) ? ' checked="checked"' : '')." /></td>\n";
+                        .(isset($_REQUEST['uniquekey'][$i]) ? ' checked="checked"' : '') . " /></td>\n";
                     echo "\t\t<td style=\"text-align: center\"><input type=\"checkbox\" name=\"primarykey[{$i}]\" "
                         .(isset($_REQUEST['primarykey'][$i]) ? ' checked="checked"' : '')
                         ." /></td>\n";
@@ -713,7 +713,7 @@ 
 
             unset($tbltmp);
 
-            echo '<form action="'.SUBFOLDER."/src/views/tables.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/tables.php\" method=\"post\">\n";
             echo "<table>\n\t<tr>\n\t\t<th class=\"data left required\">{$lang['strname']}</th>\n";
             echo "\t\t<td class=\"data\"><input name=\"name\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"", htmlspecialchars($_REQUEST['name']), "\" /></td>\n\t</tr>\n";
             echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strcreatetablelikeparent']}</th>\n";
@@ -805,7 +805,7 @@ 
 
             $attrs = $data->getTableAttributes($_REQUEST['table']);
 
-            echo '<form action="'.SUBFOLDER."/src/views/tables.php\" method=\"post\" id=\"selectform\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/tables.php\" method=\"post\" id=\"selectform\">\n";
             if ($attrs->recordCount() > 0) {
                 // JavaScript for select all feature
                 echo "<script type=\"text/javascript\">\n";
@@ -942,7 +942,7 @@ 
                 $fksprops = false;
             }
 
-            echo '<form action="'.SUBFOLDER."/src/views/tables.php\" method=\"post\" id=\"ac_form\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/tables.php\" method=\"post\" id=\"ac_form\">\n";
             if ($attrs->recordCount() > 0) {
                 echo "<table>\n";
 
@@ -1012,7 +1012,7 @@ 
 
                 echo "<input type=\"hidden\" name=\"action\" value=\"insertrow\" />\n";
                 echo '<input type="hidden" name="fields" value="', htmlentities(serialize($fields), ENT_QUOTES, 'UTF-8'), "\" />\n";
-                echo '<input type="hidden" name="protection_counter" value="'.$_SESSION['counter']."\" />\n";
+                echo '<input type="hidden" name="protection_counter" value="' . $_SESSION['counter'] . "\" />\n";
                 echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), "\" />\n";
                 echo "<p><input type=\"submit\" name=\"insert\" value=\"{$lang['strinsert']}\" />\n";
                 echo "<input type=\"submit\" name=\"insertandrepeat\" accesskey=\"r\" value=\"{$lang['strinsertandrepeat']}\" />\n";
@@ -1082,7 +1082,7 @@ 
                 $this->printTrail('schema');
                 $this->printTitle($lang['strempty'], 'pg.table.empty');
 
-                echo '<form action="'.SUBFOLDER."/src/views/tables.php\" method=\"post\">\n";
+                echo '<form action="' . SUBFOLDER . "/src/views/tables.php\" method=\"post\">\n";
                 foreach ($_REQUEST['ma'] as $v) {
                     $a = unserialize(htmlspecialchars_decode($v, ENT_QUOTES));
                     echo '<p>', sprintf($lang['strconfemptytable'], $misc->printVal($a['table'])), "</p>\n";
@@ -1095,7 +1095,7 @@ 
 
                 echo '<p>', sprintf($lang['strconfemptytable'], $misc->printVal($_REQUEST['table'])), "</p>\n";
 
-                echo '<form action="'.SUBFOLDER."/src/views/tables.php\" method=\"post\">\n";
+                echo '<form action="' . SUBFOLDER . "/src/views/tables.php\" method=\"post\">\n";
                 echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), "\" />\n";
             } // END not mutli empty
 
@@ -1152,7 +1152,7 @@ 
                 $this->printTrail('schema');
                 $this->printTitle($lang['strdrop'], 'pg.table.drop');
 
-                echo '<form action="'.SUBFOLDER."/src/views/tables.php\" method=\"post\">\n";
+                echo '<form action="' . SUBFOLDER . "/src/views/tables.php\" method=\"post\">\n";
                 foreach ($_REQUEST['ma'] as $v) {
                     $a = unserialize(htmlspecialchars_decode($v, ENT_QUOTES));
                     echo '<p>', sprintf($lang['strconfdroptable'], $misc->printVal($a['table'])), "</p>\n";
@@ -1164,7 +1164,7 @@ 
 
                 echo '<p>', sprintf($lang['strconfdroptable'], $misc->printVal($_REQUEST['table'])), "</p>\n";
 
-                echo '<form action="'.SUBFOLDER."/src/views/tables.php\" method=\"post\">\n";
+                echo '<form action="' . SUBFOLDER . "/src/views/tables.php\" method=\"post\">\n";
                 echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), "\" />\n";
             } // END if multi drop
 

src/controllers/BaseController.php

Spacing +1 added lines, -1 removed lines

@@ -330,7 +330,7 @@
         $html = '';
         $msg = htmlspecialchars(\PHPPgAdmin\HelperTrait::br2ln($msg));
         if ($msg != '') {
-            $html .= '<p class="message">'.nl2br($msg).'</p>'."\n";
+            $html .= '<p class="message">' . nl2br($msg) . '</p>' . "\n";
         }
         if ($do_print) {
             echo $html;

src/controllers/SqlController.php

Spacing +2 added lines, -2 removed lines

@@ -120,7 +120,7 @@ 
          *
          * @param ADORecordSet $rs The recordset returned by the script execetor
          */
-        $sqlCallback = function ($query, $rs, $lineno) use ($data, $misc, $lang, $_connection) {
+        $sqlCallback = function($query, $rs, $lineno) use ($data, $misc, $lang, $_connection) {
 
             // Check if $rs is false, if so then there was a fatal error
             if ($rs === false) {
@@ -186,7 +186,7 @@ 
 
         $rs = $data->conn->Execute($this->query);
 
-        echo '<form method="post" id="sqlform" action="'.$_SERVER['REQUEST_URI'].'">';
+        echo '<form method="post" id="sqlform" action="' . $_SERVER['REQUEST_URI'] . '">';
         echo '<textarea width="90%" name="query"  id="query" rows="5" cols="100" resizable="true">';
 
         echo htmlspecialchars($this->query);

src/controllers/SchemasController.php

Spacing +5 added lines, -5 removed lines

@@ -97,7 +97,7 @@ 
             'schema'  => [
                 'title' => $lang['strschema'],
                 'field' => Decorator::field('nspname'),
-                'url'   => SUBFOLDER."/redirect/schema?{$misc->href}&",
+                'url'   => SUBFOLDER . "/redirect/schema?{$misc->href}&",
                 'vars'  => ['schema' => 'nspname'],
             ],
             'owner'   => [
@@ -283,7 +283,7 @@ 
         $this->printTitle($lang['strcreateschema'], 'pg.schema.create');
         $this->printMsg($msg);
 
-        echo '<form action="'.SUBFOLDER.'/src/views/schemas.php" method="post">'."\n";
+        echo '<form action="' . SUBFOLDER . '/src/views/schemas.php" method="post">' . "\n";
         echo "<table style=\"width: 100%\">\n";
         echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strname']}</th>\n";
         echo "\t\t<td class=\"data1\"><input name=\"formName\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
@@ -368,7 +368,7 @@ 
                 $_POST['owner'] = $schema->fields['ownername'];
             }
 
-            echo '<form action="'.SUBFOLDER.'/src/views/schemas.php" method="post">'."\n";
+            echo '<form action="' . SUBFOLDER . '/src/views/schemas.php" method="post">' . "\n";
             echo "<table>\n";
 
             echo "\t<tr>\n";
@@ -446,7 +446,7 @@ 
             $this->printTrail('schema');
             $this->printTitle($lang['strdrop'], 'pg.schema.drop');
 
-            echo '<form action="'.SUBFOLDER.'/src/views/schemas.php" method="post">'."\n";
+            echo '<form action="' . SUBFOLDER . '/src/views/schemas.php" method="post">' . "\n";
             //If multi drop
             if (isset($_REQUEST['ma'])) {
                 foreach ($_REQUEST['ma'] as $v) {
@@ -515,7 +515,7 @@ 
         $this->printTabs('schema', 'export');
         $this->printMsg($msg);
 
-        echo '<form action="'.SUBFOLDER.'/src/views/dbexport.php" method="post">'."\n";
+        echo '<form action="' . SUBFOLDER . '/src/views/dbexport.php" method="post">' . "\n";
 
         echo "<table>\n";
         echo "<tr><th class=\"data\">{$lang['strformat']}</th><th class=\"data\" colspan=\"2\">{$lang['stroptions']}</th></tr>\n";

src/controllers/AlldbController.php

Spacing +5 added lines, -5 removed lines

@@ -91,7 +91,7 @@ 
             'database'   => [
                 'title' => $lang['strdatabase'],
                 'field' => Decorator::field('datname'),
-                'url'   => SUBFOLDER."/redirect/database?{$misc->href}&",
+                'url'   => SUBFOLDER . "/redirect/database?{$misc->href}&",
                 'vars'  => ['database' => 'datname'],
             ],
             'owner'      => [
@@ -251,7 +251,7 @@ 
             $this->printTrail('database');
             $this->printTitle($lang['stralter'], 'pg.database.alter');
 
-            echo '<form action="'.SUBFOLDER."/src/views/alldb.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/alldb.php\" method=\"post\">\n";
             echo "<table>\n";
             echo "<tr><th class=\"data left required\">{$lang['strname']}</th>\n";
             echo '<td class="data1">';
@@ -328,7 +328,7 @@ 
             $this->printTrail('database');
             $this->printTitle($lang['strdrop'], 'pg.database.drop');
 
-            echo '<form action="'.SUBFOLDER."/src/views/alldb.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/alldb.php\" method=\"post\">\n";
             //If multi drop
             if (isset($_REQUEST['ma'])) {
                 foreach ($_REQUEST['ma'] as $v) {
@@ -419,7 +419,7 @@ 
             $tablespaces = $data->getTablespaces();
         }
 
-        echo '<form action="'.SUBFOLDER."/src/views/alldb.php\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/alldb.php\" method=\"post\">\n";
         echo "<table>\n";
         echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strname']}</th>\n";
         echo "\t\t<td class=\"data1\"><input name=\"formName\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
@@ -571,7 +571,7 @@ 
         $this->printTabs('server', 'export');
         $this->printMsg($msg);
 
-        echo '<form action="'.SUBFOLDER."/src/views/dbexport.php\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/dbexport.php\" method=\"post\">\n";
         echo "<table>\n";
         echo "<tr><th class=\"data\">{$lang['strformat']}</th><th class=\"data\">{$lang['stroptions']}</th></tr>\n";
         // Data only

src/controllers/PrivilegesController.php

Spacing +9 added lines, -9 removed lines

@@ -73,8 +73,8 @@ 
         $this->printMsg($msg);
 
         // Determine whether object should be ref'd by name or oid.
-        if (isset($_REQUEST[$_REQUEST['subject'].'_oid'])) {
-            $object = $_REQUEST[$_REQUEST['subject'].'_oid'];
+        if (isset($_REQUEST[$_REQUEST['subject'] . '_oid'])) {
+            $object = $_REQUEST[$_REQUEST['subject'] . '_oid'];
         } else {
             $object = $_REQUEST[$_REQUEST['subject']];
         }
@@ -176,7 +176,7 @@ 
         $object = $_REQUEST[$_REQUEST['subject']];
 
         if ($_REQUEST['subject'] == 'function') {
-            $objectoid = $_REQUEST[$_REQUEST['subject'].'_oid'];
+            $objectoid = $_REQUEST[$_REQUEST['subject'] . '_oid'];
             $urlvars = [
                 'action'         => 'alter',
                 'server'         => $_REQUEST['server'],
@@ -301,7 +301,7 @@ 
             }
             $this->printMsg($msg);
 
-            echo '<form action="'.SUBFOLDER."/src/views/privileges.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/privileges.php\" method=\"post\">\n";
             echo "<table>\n";
             echo "<tr><th class=\"data left\">{$lang['strusers']}</th>\n";
             echo '<td class="data1"><select name="username[]" multiple="multiple" size="', min(6, $users->recordCount()), "\">\n";
@@ -355,9 +355,9 @@ 
             echo "<p><input type=\"hidden\" name=\"action\" value=\"save\" />\n";
             echo '<input type="hidden" name="mode" value="', htmlspecialchars($mode), "\" />\n";
             echo '<input type="hidden" name="subject" value="', htmlspecialchars($_REQUEST['subject']), "\" />\n";
-            if (isset($_REQUEST[$_REQUEST['subject'].'_oid'])) {
-                echo '<input type="hidden" name="', htmlspecialchars($_REQUEST['subject'].'_oid'),
-                '" value="', htmlspecialchars($_REQUEST[$_REQUEST['subject'].'_oid']), "\" />\n";
+            if (isset($_REQUEST[$_REQUEST['subject'] . '_oid'])) {
+                echo '<input type="hidden" name="', htmlspecialchars($_REQUEST['subject'] . '_oid'),
+                '" value="', htmlspecialchars($_REQUEST[$_REQUEST['subject'] . '_oid']), "\" />\n";
             }
 
             echo '<input type="hidden" name="', htmlspecialchars($_REQUEST['subject']),
@@ -378,8 +378,8 @@ 
             echo "</form>\n";
         } else {
             // Determine whether object should be ref'd by name or oid.
-            if (isset($_REQUEST[$_REQUEST['subject'].'_oid'])) {
-                $object = $_REQUEST[$_REQUEST['subject'].'_oid'];
+            if (isset($_REQUEST[$_REQUEST['subject'] . '_oid'])) {
+                $object = $_REQUEST[$_REQUEST['subject'] . '_oid'];
             } else {
                 $object = $_REQUEST[$_REQUEST['subject']];
             }

src/controllers/HistoryController.php

Spacing +4 added lines, -4 removed lines

@@ -63,14 +63,14 @@ 
         $lang = $this->lang;
         $data = $misc->getDatabaseAccessor();
 
-        $onchange = "onchange=\"location.href='".SUBFOLDER."/src/views/history.php?server=' + encodeURI(server.options[server.selectedIndex].value) + '&database=' + encodeURI(database.options[database.selectedIndex].value) + '&'\"";
+        $onchange = "onchange=\"location.href='" . SUBFOLDER . "/src/views/history.php?server=' + encodeURI(server.options[server.selectedIndex].value) + '&database=' + encodeURI(database.options[database.selectedIndex].value) + '&'\"";
 
         $this->printHeader($lang['strhistory'], $this->scripts, true, 'header.twig');
 
         // Bring to the front always
         echo "<body onload=\"window.focus();\">\n";
 
-        echo '<form action="'.SUBFOLDER."/src/views/history.php\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/history.php\" method=\"post\">\n";
         $misc->printConnection($onchange);
         echo '</form><br />';
 
@@ -200,7 +200,7 @@ 
             echo "<p>{$lang['strconfdelhistory']}</p>\n";
 
             echo '<pre>', htmlentities($_SESSION['history'][$_REQUEST['server']][$_REQUEST['database']][$qid]['query'], ENT_QUOTES, 'UTF-8'), '</pre>';
-            echo '<form action="'.SUBFOLDER."/src/views/history.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/history.php\" method=\"post\">\n";
             echo "<input type=\"hidden\" name=\"action\" value=\"delhistory\" />\n";
             echo "<input type=\"hidden\" name=\"queryid\" value=\"$qid\" />\n";
             echo $misc->form;
@@ -228,7 +228,7 @@ 
             echo "<h3>{$lang['strclearhistory']}</h3>\n";
             echo "<p>{$lang['strconfclearhistory']}</p>\n";
 
-            echo '<form action="'.SUBFOLDER."/src/views/history.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/history.php\" method=\"post\">\n";
             echo "<input type=\"hidden\" name=\"action\" value=\"clearhistory\" />\n";
             echo $misc->form;
             echo "<input type=\"submit\" name=\"yes\" value=\"{$lang['stryes']}\" />\n";

src/controllers/AdminTrait.php

Spacing +20 added lines, -20 removed lines

@@ -29,7 +29,7 @@ 
                 $this->printTrail('schema');
                 $this->printTitle($lang['strclusterindex'], 'pg.index.cluster');
 
-                echo '<form action="'.SUBFOLDER."/src/views/{$script}\" method=\"post\">\n";
+                echo '<form action="' . SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n";
                 foreach ($_REQUEST['ma'] as $v) {
                     $a = unserialize(htmlspecialchars_decode($v, ENT_QUOTES));
                     echo '<p>', sprintf($lang['strconfclustertable'], $misc->printVal($a['table'])), "</p>\n";
@@ -40,7 +40,7 @@ 
                 $this->printTrail($type);
                 $this->printTitle($lang['strclusterindex'], 'pg.index.cluster');
 
-                echo '<form action="'.SUBFOLDER."/src/views/{$script}\" method=\"post\">\n";
+                echo '<form action="' . SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n";
 
                 if ($type == 'table') {
                     echo '<p>', sprintf($lang['strconfclustertable'], $misc->printVal($_REQUEST['object'])), "</p>\n";
@@ -118,7 +118,7 @@ 
                 $this->printTrail('schema');
                 $this->printTitle($lang['strreindex'], 'pg.reindex');
 
-                echo '<form action="'.SUBFOLDER."/src/views/{$script}\" method=\"post\">\n";
+                echo '<form action="' . SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n";
                 foreach ($_REQUEST['ma'] as $v) {
                     $a = unserialize(htmlspecialchars_decode($v, ENT_QUOTES));
                     echo '<p>', sprintf($lang['strconfreindextable'], $misc->printVal($a['table'])), "</p>\n";
@@ -129,7 +129,7 @@ 
                 $this->printTrail($type);
                 $this->printTitle($lang['strreindex'], 'pg.reindex');
 
-                echo '<form action="'.SUBFOLDER."/src/views/{$script}\" method=\"post\">\n";
+                echo '<form action="' . SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n";
 
                 if ($type == 'table') {
                     echo '<p>', sprintf($lang['strconfreindextable'], $misc->printVal($_REQUEST['object'])), "</p>\n";
@@ -203,7 +203,7 @@ 
                 $this->printTrail('schema');
                 $this->printTitle($lang['stranalyze'], 'pg.analyze');
 
-                echo '<form action="'.SUBFOLDER."/src/views/{$script}\" method=\"post\">\n";
+                echo '<form action="' . SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n";
                 foreach ($_REQUEST['ma'] as $v) {
                     $a = unserialize(htmlspecialchars_decode($v, ENT_QUOTES));
                     \Kint::dump($a);
@@ -215,7 +215,7 @@ 
                 $this->printTrail($type);
                 $this->printTitle($lang['stranalyze'], 'pg.analyze');
 
-                echo '<form action="'.SUBFOLDER."/src/views/{$script}\" method=\"post\">\n";
+                echo '<form action="' . SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n";
 
                 if ($type == 'table') {
                     echo '<p>', sprintf($lang['strconfanalyzetable'], $misc->printVal($_REQUEST['object'])), "</p>\n";
@@ -284,7 +284,7 @@ 
                 $this->printTrail('schema');
                 $this->printTitle($lang['strvacuum'], 'pg.vacuum');
 
-                echo '<form action="'.SUBFOLDER."/src/views/{$script}\" method=\"post\">\n";
+                echo '<form action="' . SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n";
                 foreach ($_REQUEST['ma'] as $v) {
                     $a = unserialize(htmlspecialchars_decode($v, ENT_QUOTES));
                     echo '<p>', sprintf($lang['strconfvacuumtable'], $misc->printVal($a['table'])), "</p>\n";
@@ -295,7 +295,7 @@ 
                 $this->printTrail($type);
                 $this->printTitle($lang['strvacuum'], 'pg.vacuum');
 
-                echo '<form action="'.SUBFOLDER."/src/views/{$script}\" method=\"post\">\n";
+                echo '<form action="' . SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n";
 
                 if ($type == 'table') {
                     echo '<p>', sprintf($lang['strconfvacuumtable'], $misc->printVal($_REQUEST['object'])), "</p>\n";
@@ -411,7 +411,7 @@ 
                 $old_val['autovacuum_vacuum_cost_limit'] = '';
             }
 
-            echo '<form action="'.SUBFOLDER."/src/views/{$script}\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n";
             echo $misc->form;
             echo "<input type=\"hidden\" name=\"action\" value=\"editautovac\" />\n";
             echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), "\" />\n";
@@ -497,7 +497,7 @@ 
             echo "<input type=\"submit\" name=\"yes\" value=\"{$lang['stryes']}\" />\n";
             echo "</form>\n";
 
-            echo '<form action="'.SUBFOLDER."/src/views/{$script}\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n";
             echo "<input type=\"hidden\" name=\"action\" value=\"admin\" />\n";
             echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), "\" />\n";
             echo $misc->form;
@@ -543,7 +543,7 @@ 
         echo "<table style=\"width: 50%\">\n";
         echo "<tr>\n";
         echo '<th class="data">';
-        $this->misc->printHelp($lang['strvacuum'], 'pg.admin.vacuum')."</th>\n";
+        $this->misc->printHelp($lang['strvacuum'], 'pg.admin.vacuum') . "</th>\n";
         echo '</th>';
         echo '<th class="data">';
         $this->misc->printHelp($lang['stranalyze'], 'pg.admin.analyze');
@@ -561,7 +561,7 @@ 
         // Vacuum
         echo "<tr class=\"row1\">\n";
         echo "<td style=\"text-align: center; vertical-align: bottom\">\n";
-        echo '<form action="'.SUBFOLDER."/src/views/{$script}\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n";
 
         echo "<p><input type=\"hidden\" name=\"action\" value=\"confirm_vacuum\" />\n";
         echo $misc->form;
@@ -575,7 +575,7 @@ 
 
         // Analyze
         echo "<td style=\"text-align: center; vertical-align: bottom\">\n";
-        echo '<form action="'.SUBFOLDER."/src/views/{$script}\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n";
         echo "<p><input type=\"hidden\" name=\"action\" value=\"confirm_analyze\" />\n";
         echo $misc->form;
         if ($type == 'table') {
@@ -590,7 +590,7 @@ 
         if ($data->hasRecluster()) {
             $disabled = '';
             echo "<td style=\"text-align: center; vertical-align: bottom\">\n";
-            echo '<form action="'.SUBFOLDER."/src/views/{$script}\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n";
             echo $misc->form;
             if ($type == 'table') {
                 echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['object']), "\" />\n";
@@ -608,7 +608,7 @@ 
 
         // Reindex
         echo "<td style=\"text-align: center; vertical-align: bottom\">\n";
-        echo '<form action="'.SUBFOLDER."/src/views/{$script}\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/{$script}\" method=\"post\">\n";
         echo "<p><input type=\"hidden\" name=\"action\" value=\"confirm_reindex\" />\n";
         echo $misc->form;
         if ($type == 'table') {
@@ -633,12 +633,12 @@ 
             }
 
             echo "<br /><br /><h2>{$lang['strvacuumpertable']}</h2>";
-            echo '<p>'.(($defaults['autovacuum'] == 'on') ? $lang['strturnedon'] : $lang['strturnedoff']).'</p>';
+            echo '<p>' . (($defaults['autovacuum'] == 'on') ? $lang['strturnedon'] : $lang['strturnedoff']) . '</p>';
             echo "<p class=\"message\">{$lang['strnotdefaultinred']}</p>";
 
-            $enlight = function ($f, $p) {
+            $enlight = function($f, $p) {
                 if (isset($f[$p[0]]) and ($f[$p[0]] != $p[1])) {
-                    return '<span style="color:#F33;font-weight:bold">'.htmlspecialchars($f[$p[0]]).'</span>';
+                    return '<span style="color:#F33;font-weight:bold">' . htmlspecialchars($f[$p[0]]) . '</span>';
                 }
 
                 return htmlspecialchars($p[1]);
@@ -648,13 +648,13 @@ 
                 'namespace'                       => [
                     'title' => $lang['strschema'],
                     'field' => Decorator::field('nspname'),
-                    'url'   => SUBFOLDER."/redirect/schema?{$misc->href}&amp;",
+                    'url'   => SUBFOLDER . "/redirect/schema?{$misc->href}&amp;",
                     'vars'  => ['schema' => 'nspname'],
                 ],
                 'relname'                         => [
                     'title' => $lang['strtable'],
                     'field' => Decorator::field('relname'),
-                    'url'   => SUBFOLDER."/redirect/table?{$misc->href}&amp;",
+                    'url'   => SUBFOLDER . "/redirect/table?{$misc->href}&amp;",
                     'vars'  => ['table' => 'relname', 'schema' => 'nspname'],
                 ],
                 'autovacuum_enabled'              => [