HuasoFoundries / phpPgAdmin6

src/controllers/DisplayController.php

Spacing +89 added lines, -89 removed lines

@@ -25,13 +25,13 @@ 
 
         set_time_limit(0);
 
-        $scripts = '<script src="'.SUBFOLDER.'/js/display.js" type="text/javascript"></script>';
+        $scripts = '<script src="' . SUBFOLDER . '/js/display.js" type="text/javascript"></script>';
 
-        $scripts .= '<script type="text/javascript">'."\n";
+        $scripts .= '<script type="text/javascript">' . "\n";
         $scripts .= "var Display = {\n";
-        $scripts .= "errmsg: '".str_replace("'", "\'", $lang['strconnectionfail'])."'\n";
+        $scripts .= "errmsg: '" . str_replace("'", "\'", $lang['strconnectionfail']) . "'\n";
         $scripts .= "};\n";
-        $scripts .= '</script>'."\n";
+        $scripts .= '</script>' . "\n";
 
         $footer_template = 'footer.twig';
         $header_template = 'header.twig';
@@ -75,13 +75,13 @@ 
         // Set the title based on the subject of the request
         if (isset($_REQUEST['subject']) && isset($_REQUEST[$_REQUEST['subject']])) {
             if ($_REQUEST['subject'] == 'table') {
-                $this->printHeader($lang['strtables'].': '.$_REQUEST[$_REQUEST['subject']], $scripts, true, $header_template);
+                $this->printHeader($lang['strtables'] . ': ' . $_REQUEST[$_REQUEST['subject']], $scripts, true, $header_template);
             } elseif ($_REQUEST['subject'] == 'view') {
-                $this->printHeader($lang['strviews'].': '.$_REQUEST[$_REQUEST['subject']], $scripts, true, $header_template);
+                $this->printHeader($lang['strviews'] . ': ' . $_REQUEST[$_REQUEST['subject']], $scripts, true, $header_template);
             } elseif ($_REQUEST['subject'] == 'matview') {
-                $this->printHeader('M'.$lang['strviews'].': '.$_REQUEST[$_REQUEST['subject']], $scripts, true, $header_template);
+                $this->printHeader('M' . $lang['strviews'] . ': ' . $_REQUEST[$_REQUEST['subject']], $scripts, true, $header_template);
             } elseif ($_REQUEST['subject'] == 'column') {
-                $this->printHeader($lang['strcolumn'].': '.$_REQUEST[$_REQUEST['subject']], $scripts, true, $header_template);
+                $this->printHeader($lang['strcolumn'] . ': ' . $_REQUEST[$_REQUEST['subject']], $scripts, true, $header_template);
             }
         } else {
             $this->printHeader($lang['strqueryresults'], $scripts, true, $header_template);
@@ -267,7 +267,7 @@ 
         $this->prtrace($query);
         //die(htmlspecialchars($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($query);
@@ -340,19 +340,19 @@ 
             // Display edit and delete actions if we have a key
             $colspan = count($buttons);
             if ($colspan > 0 and count($key) > 0) {
-                echo "<th colspan=\"{$colspan}\" class=\"data\">{$lang['stractions']}</th>"."\n";
+                echo "<th colspan=\"{$colspan}\" class=\"data\">{$lang['stractions']}</th>" . "\n";
             }
 
             /* we show OIDs only if we are in TABLE or SELECT type browsing */
             $this->printTableHeaderCells($rs, $_gets, isset($object));
 
-            echo '</tr>'."\n";
+            echo '</tr>' . "\n";
 
             $i = 0;
             reset($rs->fields);
             while (!$rs->EOF) {
                 $id = (($i % 2) == 0 ? '1' : '2');
-                echo "<tr class=\"data{$id}\">"."\n";
+                echo "<tr class=\"data{$id}\">" . "\n";
                 // Display edit and delete links if we have a key
                 if ($colspan > 0 and count($key) > 0) {
                     $keys_array = [];
@@ -365,7 +365,7 @@ 
                         $keys_array["key[{$v}]"] = $rs->fields[$v];
                     }
                     if ($has_nulls) {
-                        echo "<td colspan=\"{$colspan}\">&nbsp;</td>"."\n";
+                        echo "<td colspan=\"{$colspan}\">&nbsp;</td>" . "\n";
                     } else {
                         if (isset($actions['actionbuttons']['edit'])) {
                             $actions['actionbuttons']['edit'] = $edit_params;
@@ -386,24 +386,24 @@ 
                         foreach ($actions['actionbuttons'] as $action) {
                             echo "<td class=\"opbutton{$id}\">";
                             $this->printLink($action, true, __METHOD__);
-                            echo '</td>'."\n";
+                            echo '</td>' . "\n";
                         }
                     }
                 }
 
                 $this->printTableRowCells($rs, $fkey_information, isset($object));
 
-                echo '</tr>'."\n";
+                echo '</tr>' . "\n";
                 $rs->moveNext();
                 $i++;
             }
-            echo '</table>'."\n";
+            echo '</table>' . "\n";
 
-            echo '<p>', $rs->recordCount(), " {$lang['strrows']}</p>"."\n";
+            echo '<p>', $rs->recordCount(), " {$lang['strrows']}</p>" . "\n";
             // Show page navigation
             $misc->printPages($_REQUEST['page'], $max_pages, $_gets);
         } else {
-            echo "<p>{$lang['strnodata']}</p>"."\n";
+            echo "<p>{$lang['strnodata']}</p>" . "\n";
         }
 
         // Navigation links
@@ -585,7 +585,7 @@ 
                 $fksprops = false;
             }
 
-            echo '<form action="'.SUBFOLDER.'/src/views/display.php" method="post" id="ac_form">'."\n";
+            echo '<form action="' . SUBFOLDER . '/src/views/display.php" method="post" id="ac_form">' . "\n";
 
             /*echo '<p>';
             if (!$error) {
@@ -599,11 +599,11 @@ 
             $elements = 0;
             $error = true;
             if ($rs->recordCount() == 1 && $attrs->recordCount() > 0) {
-                echo '<table>'."\n";
+                echo '<table>' . "\n";
 
                 // Output table header
                 echo "<tr><th class=\"data\">{$lang['strcolumn']}</th><th class=\"data\">{$lang['strtype']}</th>";
-                echo "<th class=\"data\">{$lang['strformat']}</th>"."\n";
+                echo "<th class=\"data\">{$lang['strformat']}</th>" . "\n";
                 echo "<th class=\"data\">{$lang['strnull']}</th><th class=\"data\">{$lang['strvalue']}</th></tr>";
 
                 $i = 0;
@@ -616,19 +616,19 @@ 
                         $_REQUEST['format'][$attrs->fields['attname']] = 'VALUE';
                     }
 
-                    echo "<tr class=\"data{$id}\">"."\n";
+                    echo "<tr class=\"data{$id}\">" . "\n";
                     echo '<td style="white-space:nowrap;">', $misc->printVal($attrs->fields['attname']), '</td>';
-                    echo '<td style="white-space:nowrap;">'."\n";
+                    echo '<td style="white-space:nowrap;">' . "\n";
                     echo $misc->printVal($data->formatType($attrs->fields['type'], $attrs->fields['atttypmod']));
                     echo '<input type="hidden" name="types[', htmlspecialchars($attrs->fields['attname']), ']" value="',
                     htmlspecialchars($attrs->fields['type']), '" /></td>';
                     $elements++;
-                    echo '<td style="white-space:nowrap;">'."\n";
-                    echo '<select name="format['.htmlspecialchars($attrs->fields['attname']), ']">'."\n";
-                    echo '<option value="VALUE"', ($_REQUEST['format'][$attrs->fields['attname']] == 'VALUE') ? ' selected="selected"' : '', ">{$lang['strvalue']}</option>"."\n";
+                    echo '<td style="white-space:nowrap;">' . "\n";
+                    echo '<select name="format[' . htmlspecialchars($attrs->fields['attname']), ']">' . "\n";
+                    echo '<option value="VALUE"', ($_REQUEST['format'][$attrs->fields['attname']] == 'VALUE') ? ' selected="selected"' : '', ">{$lang['strvalue']}</option>" . "\n";
                     $selected = ($_REQUEST['format'][$attrs->fields['attname']] == 'EXPRESSION') ? ' selected="selected"' : '';
-                    echo '<option value="EXPRESSION"'.$selected.">{$lang['strexpression']}</option>"."\n";
-                    echo "</select>\n</td>"."\n";
+                    echo '<option value="EXPRESSION"' . $selected . ">{$lang['strexpression']}</option>" . "\n";
+                    echo "</select>\n</td>" . "\n";
                     $elements++;
                     echo '<td style="white-space:nowrap;">';
                     // Output null box if the column allows nulls (doesn't look at CHECKs or ASSERTIONS)
@@ -638,7 +638,7 @@ 
                             $_REQUEST['nulls'][$attrs->fields['attname']] = 'on';
                         }
                         echo "<label><span><input type=\"checkbox\" name=\"nulls[{$attrs->fields['attname']}]\"",
-                        isset($_REQUEST['nulls'][$attrs->fields['attname']]) ? ' checked="checked"' : '', ' /></span></label></td>'."\n";
+                        isset($_REQUEST['nulls'][$attrs->fields['attname']]) ? ' checked="checked"' : '', ' /></span></label></td>' . "\n";
                         $elements++;
                     } else {
                         echo '&nbsp;</td>';
@@ -653,7 +653,7 @@ 
                     // keep track of which element offset we're up to.  We can't refer to the null checkbox by name
                     // as it contains '[' and ']' characters.
                     if (!$attrs->fields['attnotnull']) {
-                        $extras['onChange'] = 'elements['.($elements - 1).'].checked = false;';
+                        $extras['onChange'] = 'elements[' . ($elements - 1) . '].checked = false;';
                     }
 
                     if (($fksprops !== false) && isset($fksprops['byfield'][$attrs->fields['attnum']])) {
@@ -665,63 +665,63 @@ 
 
                     echo '</td>';
                     $elements++;
-                    echo '</tr>'."\n";
+                    echo '</tr>' . "\n";
                     $i++;
                     $attrs->moveNext();
                 }
-                echo '</table>'."\n";
+                echo '</table>' . "\n";
 
                 $error = false;
             } elseif ($rs->recordCount() != 1) {
-                echo "<p>{$lang['strrownotunique']}</p>"."\n";
+                echo "<p>{$lang['strrownotunique']}</p>" . "\n";
             } else {
-                echo "<p>{$lang['strinvalidparam']}</p>"."\n";
+                echo "<p>{$lang['strinvalidparam']}</p>" . "\n";
             }
 
-            echo '<input type="hidden" name="action" value="editrow" />'."\n";
+            echo '<input type="hidden" name="action" value="editrow" />' . "\n";
             echo $misc->form;
             if (isset($_REQUEST['table'])) {
-                echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), '" />'."\n";
+                echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), '" />' . "\n";
             }
 
             if (isset($_REQUEST['subject'])) {
-                echo '<input type="hidden" name="subject" value="', htmlspecialchars($_REQUEST['subject']), '" />'."\n";
+                echo '<input type="hidden" name="subject" value="', htmlspecialchars($_REQUEST['subject']), '" />' . "\n";
             }
 
             if (isset($_REQUEST['query'])) {
-                echo '<input type="hidden" name="query" value="', htmlspecialchars($_REQUEST['query']), '" />'."\n";
+                echo '<input type="hidden" name="query" value="', htmlspecialchars($_REQUEST['query']), '" />' . "\n";
             }
 
             if (isset($_REQUEST['count'])) {
-                echo '<input type="hidden" name="count" value="', htmlspecialchars($_REQUEST['count']), '" />'."\n";
+                echo '<input type="hidden" name="count" value="', htmlspecialchars($_REQUEST['count']), '" />' . "\n";
             }
 
             if (isset($_REQUEST['return'])) {
-                echo '<input type="hidden" name="return" value="', htmlspecialchars($_REQUEST['return']), '" />'."\n";
+                echo '<input type="hidden" name="return" value="', htmlspecialchars($_REQUEST['return']), '" />' . "\n";
             }
 
-            echo '<input type="hidden" name="page" value="', htmlspecialchars($_REQUEST['page']), '" />'."\n";
-            echo '<input type="hidden" name="sortkey" value="', htmlspecialchars($_REQUEST['sortkey']), '" />'."\n";
-            echo '<input type="hidden" name="sortdir" value="', htmlspecialchars($_REQUEST['sortdir']), '" />'."\n";
-            echo '<input type="hidden" name="strings" value="', htmlspecialchars($_REQUEST['strings']), '" />'."\n";
-            echo '<input type="hidden" name="key" value="', htmlspecialchars(urlencode(serialize($key))), '" />'."\n";
+            echo '<input type="hidden" name="page" value="', htmlspecialchars($_REQUEST['page']), '" />' . "\n";
+            echo '<input type="hidden" name="sortkey" value="', htmlspecialchars($_REQUEST['sortkey']), '" />' . "\n";
+            echo '<input type="hidden" name="sortdir" value="', htmlspecialchars($_REQUEST['sortdir']), '" />' . "\n";
+            echo '<input type="hidden" name="strings" value="', htmlspecialchars($_REQUEST['strings']), '" />' . "\n";
+            echo '<input type="hidden" name="key" value="', htmlspecialchars(urlencode(serialize($key))), '" />' . "\n";
             echo '<p>';
             if (!$error) {
-                echo "<input type=\"submit\" name=\"save\" accesskey=\"r\" value=\"{$lang['strsave']}\" />"."\n";
+                echo "<input type=\"submit\" name=\"save\" accesskey=\"r\" value=\"{$lang['strsave']}\" />" . "\n";
             }
 
-            echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />"."\n";
+            echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />" . "\n";
 
             if ($fksprops !== false) {
                 if ($conf['autocomplete'] != 'default off') {
-                    echo "<input type=\"checkbox\" id=\"no_ac\" value=\"1\" checked=\"checked\" /><label for=\"no_ac\">{$lang['strac']}</label>"."\n";
+                    echo "<input type=\"checkbox\" id=\"no_ac\" value=\"1\" checked=\"checked\" /><label for=\"no_ac\">{$lang['strac']}</label>" . "\n";
                 } else {
-                    echo "<input type=\"checkbox\" id=\"no_ac\" value=\"0\" /><label for=\"no_ac\">{$lang['strac']}</label>"."\n";
+                    echo "<input type=\"checkbox\" id=\"no_ac\" value=\"0\" /><label for=\"no_ac\">{$lang['strac']}</label>" . "\n";
                 }
             }
 
-            echo '</p>'."\n";
-            echo '</form>'."\n";
+            echo '</p>' . "\n";
+            echo '</form>' . "\n";
         } else {
             if (!isset($_POST['values'])) {
                 $_POST['values'] = [];
@@ -759,58 +759,58 @@ 
 
             $rs = $data->browseRow($_REQUEST['table'], $_REQUEST['key']);
 
-            echo '<form action="'.SUBFOLDER.'/src/views/display.php" method="post">'."\n";
+            echo '<form action="' . SUBFOLDER . '/src/views/display.php" method="post">' . "\n";
             echo $misc->form;
 
             if ($rs->recordCount() == 1) {
-                echo "<p>{$lang['strconfdeleterow']}</p>"."\n";
+                echo "<p>{$lang['strconfdeleterow']}</p>" . "\n";
 
                 $fkinfo = [];
                 echo '<table><tr>';
                 $this->printTableHeaderCells($rs, false, true);
                 echo '</tr>';
-                echo '<tr class="data1">'."\n";
+                echo '<tr class="data1">' . "\n";
                 $this->printTableRowCells($rs, $fkinfo, true);
-                echo '</tr>'."\n";
-                echo '</table>'."\n";
-                echo '<br />'."\n";
+                echo '</tr>' . "\n";
+                echo '</table>' . "\n";
+                echo '<br />' . "\n";
 
-                echo '<input type="hidden" name="action" value="delrow" />'."\n";
-                echo "<input type=\"submit\" name=\"yes\" value=\"{$lang['stryes']}\" />"."\n";
-                echo "<input type=\"submit\" name=\"no\" value=\"{$lang['strno']}\" />"."\n";
+                echo '<input type="hidden" name="action" value="delrow" />' . "\n";
+                echo "<input type=\"submit\" name=\"yes\" value=\"{$lang['stryes']}\" />" . "\n";
+                echo "<input type=\"submit\" name=\"no\" value=\"{$lang['strno']}\" />" . "\n";
             } elseif ($rs->recordCount() != 1) {
-                echo "<p>{$lang['strrownotunique']}</p>"."\n";
-                echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />"."\n";
+                echo "<p>{$lang['strrownotunique']}</p>" . "\n";
+                echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />" . "\n";
             } else {
-                echo "<p>{$lang['strinvalidparam']}</p>"."\n";
-                echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />"."\n";
+                echo "<p>{$lang['strinvalidparam']}</p>" . "\n";
+                echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />" . "\n";
             }
             if (isset($_REQUEST['table'])) {
-                echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), '" />'."\n";
+                echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), '" />' . "\n";
             }
 
             if (isset($_REQUEST['subject'])) {
-                echo '<input type="hidden" name="subject" value="', htmlspecialchars($_REQUEST['subject']), '" />'."\n";
+                echo '<input type="hidden" name="subject" value="', htmlspecialchars($_REQUEST['subject']), '" />' . "\n";
             }
 
             if (isset($_REQUEST['query'])) {
-                echo '<input type="hidden" name="query" value="', htmlspecialchars($_REQUEST['query']), '" />'."\n";
+                echo '<input type="hidden" name="query" value="', htmlspecialchars($_REQUEST['query']), '" />' . "\n";
             }
 
             if (isset($_REQUEST['count'])) {
-                echo '<input type="hidden" name="count" value="', htmlspecialchars($_REQUEST['count']), '" />'."\n";
+                echo '<input type="hidden" name="count" value="', htmlspecialchars($_REQUEST['count']), '" />' . "\n";
             }
 
             if (isset($_REQUEST['return'])) {
-                echo '<input type="hidden" name="return" value="', htmlspecialchars($_REQUEST['return']), '" />'."\n";
+                echo '<input type="hidden" name="return" value="', htmlspecialchars($_REQUEST['return']), '" />' . "\n";
             }
 
-            echo '<input type="hidden" name="page" value="', htmlspecialchars($_REQUEST['page']), '" />'."\n";
-            echo '<input type="hidden" name="sortkey" value="', htmlspecialchars($_REQUEST['sortkey']), '" />'."\n";
-            echo '<input type="hidden" name="sortdir" value="', htmlspecialchars($_REQUEST['sortdir']), '" />'."\n";
-            echo '<input type="hidden" name="strings" value="', htmlspecialchars($_REQUEST['strings']), '" />'."\n";
-            echo '<input type="hidden" name="key" value="', htmlspecialchars(urlencode(serialize($_REQUEST['key']))), '" />'."\n";
-            echo '</form>'."\n";
+            echo '<input type="hidden" name="page" value="', htmlspecialchars($_REQUEST['page']), '" />' . "\n";
+            echo '<input type="hidden" name="sortkey" value="', htmlspecialchars($_REQUEST['sortkey']), '" />' . "\n";
+            echo '<input type="hidden" name="sortdir" value="', htmlspecialchars($_REQUEST['sortdir']), '" />' . "\n";
+            echo '<input type="hidden" name="strings" value="', htmlspecialchars($_REQUEST['strings']), '" />' . "\n";
+            echo '<input type="hidden" name="key" value="', htmlspecialchars(urlencode(serialize($_REQUEST['key']))), '" />' . "\n";
+            echo '</form>' . "\n";
         } else {
             $status = $data->deleteRow($_POST['table'], unserialize(urldecode($_POST['key'])));
             if ($status == 0) {
@@ -842,7 +842,7 @@ 
         if (isset($_REQUEST['table'])) {
             $constraints = $data->getConstraintsWithFields($_REQUEST['table']);
             if ($constraints->recordCount() > 0) {
-                $fkey_information['common_url'] = $misc->getHREF('schema').'&amp;subject=table';
+                $fkey_information['common_url'] = $misc->getHREF('schema') . '&amp;subject=table';
 
                 /* build the FK constraints data structure */
                 while (!$constraints->EOF) {
@@ -850,7 +850,7 @@ 
                     if ($constr['contype'] == 'f') {
                         if (!isset($fkey_information['byconstr'][$constr['conid']])) {
                             $fkey_information['byconstr'][$constr['conid']] = [
-                                'url_data' => 'table='.urlencode($constr['f_table']).'&amp;schema='.urlencode($constr['f_schema']),
+                                'url_data' => 'table=' . urlencode($constr['f_table']) . '&amp;schema=' . urlencode($constr['f_schema']),
                                 'fkeys'    => [],
                                 'consrc'   => $constr['consrc'],
                             ];
@@ -893,7 +893,7 @@ 
             $finfo = $rs->fetchField($j);
 
             if ($args === false) {
-                echo '<th class="data">', $misc->printVal($finfo->name), '</th>'."\n";
+                echo '<th class="data">', $misc->printVal($finfo->name), '</th>' . "\n";
             } else {
                 $args['page'] = $_REQUEST['page'];
                 $args['sortkey'] = $j + 1;
@@ -909,12 +909,12 @@ 
                 , $misc->printVal($finfo->name);
                 if ($_REQUEST['sortkey'] == ($j + 1)) {
                     if ($_REQUEST['sortdir'] == 'asc') {
-                        echo '<img src="'.$misc->icon('RaiseArgument').'" alt="asc">';
+                        echo '<img src="' . $misc->icon('RaiseArgument') . '" alt="asc">';
                     } else {
-                        echo '<img src="'.$misc->icon('LowerArgument').'" alt="desc">';
+                        echo '<img src="' . $misc->icon('LowerArgument') . '" alt="desc">';
                     }
                 }
-                echo '</a></th>'."\n";
+                echo '</a></th>' . "\n";
             }
             $j++;
         }
@@ -950,14 +950,14 @@ 
                         $query_params = $fkey_information['byconstr'][$conid]['url_data'];
 
                         foreach ($fkey_information['byconstr'][$conid]['fkeys'] as $p_field => $f_field) {
-                            $query_params .= '&amp;'.urlencode("fkey[{$f_field}]").'='.urlencode($rs->fields[$p_field]);
+                            $query_params .= '&amp;' . urlencode("fkey[{$f_field}]") . '=' . urlencode($rs->fields[$p_field]);
                         }
 
                         /* $fkey_information['common_url'] is already urlencoded */
-                        $query_params .= '&amp;'.$fkey_information['common_url'];
+                        $query_params .= '&amp;' . $fkey_information['common_url'];
                         echo '<div style="display:inline-block;">';
-                        echo '<a class="fk fk_'.htmlentities($conid, ENT_QUOTES, 'UTF-8')."\" href=\"display.php?{$query_params}\">";
-                        echo '<img src="'.$misc->icon('ForeignKey').'" style="vertical-align:middle;" alt="[fk]" title="'
+                        echo '<a class="fk fk_' . htmlentities($conid, ENT_QUOTES, 'UTF-8') . "\" href=\"display.php?{$query_params}\">";
+                        echo '<img src="' . $misc->icon('ForeignKey') . '" style="vertical-align:middle;" alt="[fk]" title="'
                         .htmlentities($fkey_information['byconstr'][$conid]['consrc'], ENT_QUOTES, 'UTF-8')
                             .'" />';
                         echo '</a>';
@@ -994,7 +994,7 @@ 
         $rs = $data->browseQuery('SELECT', $_REQUEST['table'], $_REQUEST['query'],
             null, null, 1, 1, $max_pages);
 
-        echo '<a href="javascript:void(0);" style="display:table-cell;" class="fk_delete"><img alt="[delete]" src="'.$misc->icon('Delete').'" /></a>'."\n";
+        echo '<a href="javascript:void(0);" style="display:table-cell;" class="fk_delete"><img alt="[delete]" src="' . $misc->icon('Delete') . '" /></a>' . "\n";
         echo '<div style="display:table-cell;">';
 
         if (is_object($rs) && $rs->recordCount() > 0) {
@@ -1006,10 +1006,10 @@ 
             echo '<table><tr>';
             $this->printTableHeaderCells($rs, false, true);
             echo '</tr>';
-            echo '<tr class="data1">'."\n";
+            echo '<tr class="data1">' . "\n";
             $this->printTableRowCells($rs, $fkinfo, true);
-            echo '</tr>'."\n";
-            echo '</table>'."\n";
+            echo '</tr>' . "\n";
+            echo '</table>' . "\n";
         } else {
             echo $lang['strnodata'];
         }

src/controllers/SequencesController.php

Spacing +4 added lines, -4 removed lines

@@ -397,7 +397,7 @@ 
             $this->printTitle($lang['strdrop'], 'pg.sequence.drop');
             $this->printMsg($msg);
 
-            echo '<form action="'.SUBFOLDER."/src/views/sequences.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/sequences.php\" method=\"post\">\n";
 
             //If multi drop
             if (isset($_REQUEST['ma'])) {
@@ -491,7 +491,7 @@ 
         $this->printTitle($lang['strcreatesequence'], 'pg.sequence.create');
         $this->printMsg($msg);
 
-        echo '<form action="'.SUBFOLDER."/src/views/sequences.php\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/sequences.php\" method=\"post\">\n";
         echo "<table>\n";
 
         echo "<tr><th class=\"data left required\">{$lang['strname']}</th>\n";
@@ -646,7 +646,7 @@ 
         $sequence = $data->getSequence($_REQUEST['sequence']);
 
         if (is_object($sequence) && $sequence->recordCount() > 0) {
-            echo '<form action="'.SUBFOLDER."/src/views/sequences.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/sequences.php\" method=\"post\">\n";
             echo '<table border="0">';
             echo "<tr><th class=\"data left required\">{$lang['strlastvalue']}</th>\n";
             echo '<td class="data1">';
@@ -772,7 +772,7 @@ 
                 $_POST['formCycledValue'] = 'on';
             }
 
-            echo '<form action="'.SUBFOLDER."/src/views/sequences.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/sequences.php\" method=\"post\">\n";
             echo "<table>\n";
 
             echo "<tr><th class=\"data left required\">{$lang['strname']}</th>\n";

src/controllers/GroupsController.php

Spacing +3 added lines, -3 removed lines

@@ -163,7 +163,7 @@ 
 
             echo '<p>', sprintf($lang['strconfdropmember'], $misc->printVal($_REQUEST['user']), $misc->printVal($_REQUEST['group'])), "</p>\n";
 
-            echo '<form action="'.SUBFOLDER."/src/views/groups.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/groups.php\" method=\"post\">\n";
             echo $misc->form;
             echo "<input type=\"hidden\" name=\"action\" value=\"drop_member\" />\n";
             echo '<input type="hidden" name="group" value="', htmlspecialchars($_REQUEST['group']), "\" />\n";
@@ -233,7 +233,7 @@ 
         }
 
         // Display form for adding a user to the group
-        echo '<form action="'.SUBFOLDER."/src/views/groups.php\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/groups.php\" method=\"post\">\n";
         echo '<select name="user">';
         while (!$users->EOF) {
             $uname = $misc->printVal($users->fields['usename']);
@@ -277,7 +277,7 @@ 
 
             echo '<p>', sprintf($lang['strconfdropgroup'], $misc->printVal($_REQUEST['group'])), "</p>\n";
 
-            echo '<form action="'.SUBFOLDER."/src/views/groups.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/groups.php\" method=\"post\">\n";
             echo $misc->form;
             echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
             echo '<input type="hidden" name="group" value="', htmlspecialchars($_REQUEST['group']), "\" />\n";

src/controllers/MaterializedviewpropertiesController.php

Spacing +7 added lines, -7 removed lines

@@ -22,7 +22,7 @@ 
             return $this->doTree();
         }
 
-        $this->printHeader($lang['strviews'].' - '.$_REQUEST['matview']);
+        $this->printHeader($lang['strviews'] . ' - ' . $_REQUEST['matview']);
         $this->printBody();
 
         switch ($action) {
@@ -91,7 +91,7 @@ 
         $lang = $this->lang;
         $data = $misc->getDatabaseAccessor();
 
-        $attPre = function (&$rowdata) use ($data) {
+        $attPre = function(&$rowdata) use ($data) {
             $rowdata->fields['+type'] = $data->formatType($rowdata->fields['type'], $rowdata->fields['atttypmod']);
         };
 
@@ -113,7 +113,7 @@ 
             'column'  => [
                 'title' => $lang['strcolumn'],
                 'field' => Decorator::field('attname'),
-                'url'   => "colproperties.php?subject=column&{$misc->href}&view=".urlencode($_REQUEST['matview']).'&',
+                'url'   => "colproperties.php?subject=column&{$misc->href}&view=" . urlencode($_REQUEST['matview']) . '&',
                 'vars'  => ['column' => 'attname'],
             ],
             'type'    => [
@@ -300,7 +300,7 @@ 
                 $_POST['formComment'] = $viewdata->fields['relcomment'];
             }
 
-            echo '<form action="'.SUBFOLDER."/src/views/materializedviewproperties.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/materializedviewproperties.php\" method=\"post\">\n";
             echo "<table style=\"width: 100%\">\n";
             echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strdefinition']}</th>\n";
             echo "\t\t<td class=\"data1\"><textarea style=\"width: 100%;\" rows=\"20\" cols=\"50\" name=\"formDefinition\">",
@@ -338,7 +338,7 @@ 
         $this->printTabs('view', '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
@@ -453,7 +453,7 @@ 
                 $this->printTitle($lang['stralter'], 'pg.column.alter');
                 $this->printMsg($msg);
 
-                echo '<form action="'.SUBFOLDER."/src/views/materializedviewproperties.php\" method=\"post\">\n";
+                echo '<form action="' . SUBFOLDER . "/src/views/materializedviewproperties.php\" method=\"post\">\n";
 
                 // Output view header
                 echo "<table>\n";
@@ -549,7 +549,7 @@ 
                     $_POST['comment'] = $view->fields['relcomment'];
                 }
 
-                echo '<form action="'.SUBFOLDER."/src/views/materializedviewproperties.php\" method=\"post\">\n";
+                echo '<form action="' . SUBFOLDER . "/src/views/materializedviewproperties.php\" method=\"post\">\n";
                 echo "<table>\n";
                 echo "<tr><th class=\"data left required\">{$lang['strname']}</th>\n";
                 echo '<td class="data1">';

src/controllers/ViewpropertiesController.php

Spacing +7 added lines, -7 removed lines

@@ -22,7 +22,7 @@ 
             return $this->doTree();
         }
 
-        $this->printHeader($lang['strviews'].' - '.$_REQUEST['view']);
+        $this->printHeader($lang['strviews'] . ' - ' . $_REQUEST['view']);
         $this->printBody();
 
         switch ($action) {
@@ -91,7 +91,7 @@ 
         $lang = $this->lang;
         $data = $misc->getDatabaseAccessor();
 
-        $attPre = function (&$rowdata) use ($data) {
+        $attPre = function(&$rowdata) use ($data) {
             $rowdata->fields['+type'] = $data->formatType($rowdata->fields['type'], $rowdata->fields['atttypmod']);
         };
 
@@ -113,7 +113,7 @@ 
             'column'  => [
                 'title' => $lang['strcolumn'],
                 'field' => Decorator::field('attname'),
-                'url'   => "colproperties.php?subject=column&{$misc->href}&view=".urlencode($_REQUEST['view']).'&',
+                'url'   => "colproperties.php?subject=column&{$misc->href}&view=" . urlencode($_REQUEST['view']) . '&',
                 'vars'  => ['column' => 'attname'],
             ],
             'type'    => [
@@ -300,7 +300,7 @@ 
                 $_POST['formComment'] = $viewdata->fields['relcomment'];
             }
 
-            echo '<form action="'.SUBFOLDER."/src/views/viewproperties.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/viewproperties.php\" method=\"post\">\n";
             echo "<table style=\"width: 100%\">\n";
             echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strdefinition']}</th>\n";
             echo "\t\t<td class=\"data1\"><textarea style=\"width: 100%;\" rows=\"20\" cols=\"50\" name=\"formDefinition\">",
@@ -338,7 +338,7 @@ 
         $this->printTabs('view', '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
@@ -453,7 +453,7 @@ 
                 $this->printTitle($lang['stralter'], 'pg.column.alter');
                 $this->printMsg($msg);
 
-                echo '<form action="'.SUBFOLDER."/src/views/viewproperties.php\" method=\"post\">\n";
+                echo '<form action="' . SUBFOLDER . "/src/views/viewproperties.php\" method=\"post\">\n";
 
                 // Output view header
                 echo "<table>\n";
@@ -549,7 +549,7 @@ 
                     $_POST['comment'] = $view->fields['relcomment'];
                 }
 
-                echo '<form action="'.SUBFOLDER."/src/views/viewproperties.php\" method=\"post\">\n";
+                echo '<form action="' . SUBFOLDER . "/src/views/viewproperties.php\" method=\"post\">\n";
                 echo "<table>\n";
                 echo "<tr><th class=\"data left required\">{$lang['strname']}</th>\n";
                 echo '<td class="data1">';

src/controllers/ColpropertiesController.php

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
         $action = $this->action;
         $data = $misc->getDatabaseAccessor();
 
-        $this->printHeader($lang['strtables'].' - '.$this->tableName, null, true, 'header_select2.twig');
+        $this->printHeader($lang['strtables'] . ' - ' . $this->tableName, null, true, 'header_select2.twig');
         $this->printBody();
 
         if (isset($_REQUEST['view'])) {
@@ -63,7 +63,7 @@ 
         $lang = $this->lang;
         $data = $misc->getDatabaseAccessor();
 
-        $attPre = function (&$rowdata) use ($data) {
+        $attPre = function(&$rowdata) use ($data) {
             $rowdata->fields['+type'] = $data->formatType($rowdata->fields['type'], $rowdata->fields['atttypmod']);
         };
 
@@ -232,8 +232,8 @@ 
                 $this->printTitle($lang['stralter'], 'pg.column.alter');
                 $this->printMsg($msg);
 
-                echo '<script src="'.SUBFOLDER.'/js/tables.js" type="text/javascript"></script>';
-                echo '<form action="'.SUBFOLDER."/src/views/colproperties.php\" method=\"post\">\n";
+                echo '<script src="' . SUBFOLDER . '/js/tables.js" type="text/javascript"></script>';
+                echo '<form action="' . SUBFOLDER . "/src/views/colproperties.php\" method=\"post\">\n";
 
                 // Output table header
                 echo "<table>\n";
@@ -290,7 +290,7 @@ 
                     $types = $data->getTypes(true, false, true);
                     $types_for_js = [];
 
-                    echo "<td><select name=\"type\" id=\"type\" class=\"select2\" onchange=\"checkLengths(document.getElementById('type').value,'');\">"."\n";
+                    echo "<td><select name=\"type\" id=\"type\" class=\"select2\" onchange=\"checkLengths(document.getElementById('type').value,'');\">" . "\n";
                     while (!$types->EOF) {
                         $typname = $types->fields['typname'];
                         $types_for_js[] = $typname;
@@ -344,7 +344,7 @@ 
                 echo "<input type=\"submit\" value=\"{$lang['stralter']}\" />\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
@@ -370,10 +370,10 @@ 
                         $_REQUEST['column'] = $_REQUEST['field'];
                         $misc->setReloadBrowser(true);
                     }
-                    $this->doDefault($sql."<br/>{$lang['strcolumnaltered']}");
+                    $this->doDefault($sql . "<br/>{$lang['strcolumnaltered']}");
                 } else {
                     $_REQUEST['stage'] = 1;
-                    $this->doAlter($sql."<br/>{$lang['strcolumnalteredbad']}");
+                    $this->doAlter($sql . "<br/>{$lang['strcolumnalteredbad']}");
 
                     return;
                 }

src/controllers/TriggersController.php

Spacing +7 added lines, -7 removed lines

@@ -22,7 +22,7 @@ 
             return $this->doTree();
         }
 
-        $this->printHeader($lang['strtables'].' - '.$_REQUEST['table'].' - '.$lang['strtriggers']);
+        $this->printHeader($lang['strtables'] . ' - ' . $_REQUEST['table'] . ' - ' . $lang['strtriggers']);
         $this->printBody();
 
         switch ($action) {
@@ -99,7 +99,7 @@ 
         $lang = $this->lang;
         $data = $misc->getDatabaseAccessor();
 
-        $tgPre = function (&$rowdata, $actions) use ($data) {
+        $tgPre = function(&$rowdata, $actions) use ($data) {
             // toggle enable/disable trigger per trigger
             if (!$data->phpBool($rowdata->fields['tgenabled'])) {
                 unset($actions['disable']);
@@ -274,7 +274,7 @@ 
                 $_POST['name'] = $triggerdata->fields['tgname'];
             }
 
-            echo '<form action="'.SUBFOLDER."/src/views/triggers.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/triggers.php\" method=\"post\">\n";
             echo "<table>\n";
             echo "<tr><th class=\"data\">{$lang['strname']}</th>\n";
             echo '<td class="data1">';
@@ -310,7 +310,7 @@ 
             echo '<p>', sprintf($lang['strconfdroptrigger'], $misc->printVal($_REQUEST['trigger']),
                 $misc->printVal($_REQUEST['table'])), "</p>\n";
 
-            echo '<form action="'.SUBFOLDER."/src/views/triggers.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/triggers.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="trigger" value="', htmlspecialchars($_REQUEST['trigger']), "\" />\n";
@@ -346,7 +346,7 @@ 
             echo '<p>', sprintf($lang['strconfenabletrigger'], $misc->printVal($_REQUEST['trigger']),
                 $misc->printVal($_REQUEST['table'])), "</p>\n";
 
-            echo '<form action="'.SUBFOLDER."/src/views/triggers.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/triggers.php\" method=\"post\">\n";
             echo "<input type=\"hidden\" name=\"action\" value=\"enable\" />\n";
             echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), "\" />\n";
             echo '<input type="hidden" name="trigger" value="', htmlspecialchars($_REQUEST['trigger']), "\" />\n";
@@ -381,7 +381,7 @@ 
             echo '<p>', sprintf($lang['strconfdisabletrigger'], $misc->printVal($_REQUEST['trigger']),
                 $misc->printVal($_REQUEST['table'])), "</p>\n";
 
-            echo '<form action="'.SUBFOLDER."/src/views/triggers.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/triggers.php\" method=\"post\">\n";
             echo "<input type=\"hidden\" name=\"action\" value=\"disable\" />\n";
             echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), "\" />\n";
             echo '<input type="hidden" name="trigger" value="', htmlspecialchars($_REQUEST['trigger']), "\" />\n";
@@ -440,7 +440,7 @@ 
         $sel3 = new \PHPPgAdmin\XHtml\XHtmlSelect('formFrequency');
         $sel3->set_data($data->triggerFrequency);
 
-        echo '<form action="'.SUBFOLDER."/src/views/triggers.php\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/triggers.php\" method=\"post\">\n";
         echo "<table>\n";
         echo "<tr>\n";
         echo "		<th class=\"data\">{$lang['strname']}</th>\n";

src/controllers/AcinsertController.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
                 echo '<th>';
 
                 if (in_array($h, $fkeynames)) {
-                    echo '<img src="'.$misc->icon('ForeignKey').'" alt="[referenced key]" />';
+                    echo '<img src="' . $misc->icon('ForeignKey') . '" alt="[referenced key]" />';
                 }
 
                 echo htmlentities($h, ENT_QUOTES, 'UTF-8'), '</th>';
@@ -98,7 +98,7 @@ 
                 $js .= "fkl_hasnext=false;\n";
             }
 
-            echo $js.'</script>';
+            echo $js . '</script>';
         } else {
             printf("<p>{$lang['strnofkref']}</p>", "\"{$_POST['f_schema']}\".\"{$_POST['f_table']}\".\"{$fkeynames[$_POST['fattpos']]}\"");
 

src/controllers/DbexportController.php

Spacing +11 added lines, -11 removed lines

@@ -39,7 +39,7 @@ 
 
             // Obtain the pg_dump version number and check if the path is good
             $version = [];
-            preg_match("/(\d+(?:\.\d+)?)(?:\.\d+)?.*$/", exec($exe.' --version'), $version);
+            preg_match("/(\d+(?:\.\d+)?)(?:\.\d+)?.*$/", exec($exe . ' --version'), $version);
 
             $this->prtrace('$exe', $exe, 'version', $version[1]);
 
@@ -77,20 +77,20 @@ 
             }
 
             // Set environmental variables that pg_dump uses
-            putenv('PGPASSWORD='.$server_info['password']);
-            putenv('PGUSER='.$server_info['username']);
+            putenv('PGPASSWORD=' . $server_info['password']);
+            putenv('PGUSER=' . $server_info['username']);
             $hostname = $server_info['host'];
             if ($hostname !== null && $hostname != '') {
-                putenv('PGHOST='.$hostname);
+                putenv('PGHOST=' . $hostname);
             }
             $port = $server_info['port'];
             if ($port !== null && $port != '') {
-                putenv('PGPORT='.$port);
+                putenv('PGPORT=' . $port);
             }
 
             // Build command for executing pg_dump.  '-i' means ignore version differences.
             if (((float) $version[1]) < 9.5) {
-                $cmd = $exe.' -i';
+                $cmd = $exe . ' -i';
             } else {
                 $cmd = $exe;
             }
@@ -105,7 +105,7 @@ 
             switch ($_REQUEST['subject']) {
                 case 'schema':
                     // This currently works for 8.2+ (due to the orthoganl -t -n issue introduced then)
-                    $cmd .= ' -n '.$misc->escapeShellArg("\"{$f_schema}\"");
+                    $cmd .= ' -n ' . $misc->escapeShellArg("\"{$f_schema}\"");
                     break;
                 case 'table':
                 case 'view':
@@ -116,13 +116,13 @@ 
                     // Starting in 8.2, -n and -t are orthagonal, so we now schema qualify
                     // the table name in the -t argument and quote both identifiers
                     if (((float) $version[1]) >= 8.2) {
-                        $cmd .= ' -t '.$misc->escapeShellArg("\"{$f_schema}\".\"{$f_object}\"");
+                        $cmd .= ' -t ' . $misc->escapeShellArg("\"{$f_schema}\".\"{$f_object}\"");
                     } else {
                         // If we are 7.4 or higher, assume they are using 7.4 pg_dump and
                         // set dump schema as well.  Also, mixed case dumping has been fixed
                         // then..
-                        $cmd .= ' -t '.$misc->escapeShellArg($f_object)
-                        .' -n '.$misc->escapeShellArg($f_schema);
+                        $cmd .= ' -t ' . $misc->escapeShellArg($f_object)
+                        .' -n ' . $misc->escapeShellArg($f_schema);
                     }
             }
 
@@ -163,7 +163,7 @@ 
             }
 
             if (!$dumpall) {
-                putenv('PGDATABASE='.$_REQUEST['database']);
+                putenv('PGDATABASE=' . $_REQUEST['database']);
             }
 
             $this->prtrace('ENV VARS', [