HuasoFoundries / phpPgAdmin6

src/controllers/UsersController.php

Spacing +6 added lines, -6 removed lines

@@ -82,7 +82,7 @@ 
         $lang = $this->lang;
         $data = $misc->getDatabaseAccessor();
 
-        $renderUseExpires = function ($val) use ($lang) {
+        $renderUseExpires = function($val) use ($lang) {
             return $val == 'infinity' ? $lang['strnever'] : htmlspecialchars($val);
         };
 
@@ -244,7 +244,7 @@ 
                 $_POST['confirm'] = '';
             }
 
-            echo '<form action="'.SUBFOLDER."/src/views/users.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/users.php\" method=\"post\">\n";
             echo "<table>\n";
             echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strpassword']}</th>\n";
             echo "\t\t<td><input type=\"password\" name=\"password\" size=\"32\" value=\"",
@@ -317,10 +317,10 @@ 
                 $_POST['formPassword'] = '';
             }
 
-            echo '<form action="'.SUBFOLDER."/src/views/users.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/users.php\" method=\"post\">\n";
             echo "<table>\n";
             echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strusername']}</th>\n";
-            echo "\t\t<td class=\"data1\">", ($canRename ? "<input name=\"newname\" size=\"15\" maxlength=\"{$data->_maxNameLen}\" value=\"".htmlspecialchars($_POST['newname']).'" />' : $misc->printVal($userdata->fields['usename'])), "</td>\n\t</tr>\n";
+            echo "\t\t<td class=\"data1\">", ($canRename ? "<input name=\"newname\" size=\"15\" maxlength=\"{$data->_maxNameLen}\" value=\"" . htmlspecialchars($_POST['newname']) . '" />' : $misc->printVal($userdata->fields['usename'])), "</td>\n\t</tr>\n";
             echo "\t<tr>\n\t\t<th class=\"data left\"><label for=\"formSuper\">{$lang['strsuper']}</label></th>\n";
             echo "\t\t<td class=\"data1\"><input type=\"checkbox\" id=\"formSuper\" name=\"formSuper\"",
             (isset($_POST['formSuper'])) ? ' checked="checked"' : '', " /></td>\n\t</tr>\n";
@@ -391,7 +391,7 @@ 
 
             echo '<p>', sprintf($lang['strconfdropuser'], $misc->printVal($_REQUEST['username'])), "</p>\n";
 
-            echo '<form action="'.SUBFOLDER."/src/views/users.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/users.php\" method=\"post\">\n";
             echo "<p><input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
             echo '<input type="hidden" name="username" value="', htmlspecialchars($_REQUEST['username']), "\" />\n";
             echo $misc->form;
@@ -438,7 +438,7 @@ 
         $this->printTitle($lang['strcreateuser'], 'pg.user.create');
         $this->printMsg($msg);
 
-        echo '<form action="'.SUBFOLDER."/src/views/users.php\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/users.php\" method=\"post\">\n";
         echo "<table>\n";
         echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strusername']}</th>\n";
         echo "\t\t<td class=\"data1\"><input size=\"15\" maxlength=\"{$data->_maxNameLen}\" name=\"formUsername\" value=\"", htmlspecialchars($_POST['formUsername']), "\" /></td>\n\t</tr>\n";

src/controllers/MaterializedviewsController.php

Spacing +12 added lines, -12 removed lines

@@ -28,7 +28,7 @@ 
 
         $data = $misc->getDatabaseAccessor();
 
-        $this->printHeader('M '.$lang['strviews']);
+        $this->printHeader('M ' . $lang['strviews']);
         $this->printBody();
 
         switch ($action) {
@@ -111,9 +111,9 @@ 
 
         $columns = [
             'matview' => [
-                'title' => 'M '.$lang['strview'],
+                'title' => 'M ' . $lang['strview'],
                 'field' => Decorator::field('relname'),
-                'url'   => SUBFOLDER."/redirect/matview?{$misc->href}&",
+                'url'   => SUBFOLDER . "/redirect/matview?{$misc->href}&",
                 'vars'  => ['matview' => 'relname'],
             ],
             'owner'   => [
@@ -301,7 +301,7 @@ 
 
             $attrs = $data->getTableAttributes($_REQUEST['matview']);
 
-            echo '<form action="'.SUBFOLDER.'/src/views/'.$this->script.'" method="post" id="selectform">';
+            echo '<form action="' . SUBFOLDER . '/src/views/' . $this->script . '" method="post" id="selectform">';
             echo "\n";
 
             if ($attrs->recordCount() > 0) {
@@ -434,7 +434,7 @@ 
             $this->printTrail('getTrail');
             $this->printTitle($lang['strdrop'], 'pg.matview.drop');
 
-            echo '<form action="'.SUBFOLDER."/src/views/materializedviews.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/materializedviews.php\" method=\"post\">\n";
 
             //If multi drop
             if (isset($_REQUEST['ma'])) {
@@ -554,7 +554,7 @@ 
             }
             asort($arrFields);
 
-            echo '<form action="'.SUBFOLDER."/src/views/materializedviews.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/materializedviews.php\" method=\"post\">\n";
             echo "<table>\n";
             echo "<tr><th class=\"data\">{$lang['strviewname']}</th></tr>";
             echo "<tr>\n<td class=\"data1\">\n";
@@ -633,7 +633,7 @@ 
             echo "<p><input type=\"hidden\" name=\"action\" value=\"save_create_wiz\" />\n";
 
             foreach ($arrSelTables as $curTable) {
-                echo '<input type="hidden" name="formTables[]" value="'.htmlspecialchars(serialize($curTable))."\" />\n";
+                echo '<input type="hidden" name="formTables[]" value="' . htmlspecialchars(serialize($curTable)) . "\" />\n";
             }
 
             echo $misc->form;
@@ -659,7 +659,7 @@ 
         $this->printTitle($lang['strcreateviewwiz'], 'pg.matview.create');
         $this->printMsg($msg);
 
-        echo '<form action="'.SUBFOLDER."/src/views/materializedviews.php\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/materializedviews.php\" method=\"post\">\n";
         echo "<table>\n";
         echo "<tr><th class=\"data\">{$lang['strtables']}</th></tr>";
         echo "<tr>\n<td class=\"data1\">\n";
@@ -669,7 +669,7 @@ 
             $arrTmp = [];
             $arrTmp['schemaname'] = $tables->fields['nspname'];
             $arrTmp['tablename'] = $tables->fields['relname'];
-            $arrTables[$tables->fields['nspname'].'.'.$tables->fields['relname']] = serialize($arrTmp);
+            $arrTables[$tables->fields['nspname'] . '.' . $tables->fields['relname']] = serialize($arrTmp);
             $tables->moveNext();
         }
         echo \PHPPgAdmin\XHtml\HTMLController::printCombo($arrTables, 'formTables[]', false, '', true);
@@ -712,7 +712,7 @@ 
         $this->printTitle($lang['strcreateview'], 'pg.matview.create');
         $this->printMsg($msg);
 
-        echo '<form action="'.SUBFOLDER."/src/views/materializedviews.php\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/materializedviews.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<td class=\"data1\"><input name=\"formView\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
@@ -836,7 +836,7 @@ 
 
                                 // Make sure for multi-column foreign keys that we use a table alias tables joined to more than once
                                 // This can (and should be) more optimized for multi-column foreign keys
-                                $adj_tbl2 = in_array($tbl2, $arrUsedTbls) ? "$tbl2 AS alias_ppa_".mktime() : $tbl2;
+                                $adj_tbl2 = in_array($tbl2, $arrUsedTbls) ? "$tbl2 AS alias_ppa_" . mktime() : $tbl2;
 
                                 $linkFields .= strlen($linkFields) ? "{$curLink['operator']} $adj_tbl2 ON (\"{$arrLeftLink['schemaname']}\".\"{$arrLeftLink['tablename']}\".\"{$arrLeftLink['fieldname']}\" = \"{$arrRightLink['schemaname']}\".\"{$arrRightLink['tablename']}\".\"{$arrRightLink['fieldname']}\") "
                                 : "$tbl1 {$curLink['operator']} $adj_tbl2 ON (\"{$arrLeftLink['schemaname']}\".\"{$arrLeftLink['tablename']}\".\"{$arrLeftLink['fieldname']}\" = \"{$arrRightLink['schemaname']}\".\"{$arrRightLink['tablename']}\".\"{$arrRightLink['fieldname']}\") ";
@@ -882,7 +882,7 @@ 
 
             //add where from additional conditions
             if (strlen($addConditions)) {
-                $viewQuery .= ' WHERE '.$addConditions;
+                $viewQuery .= ' WHERE ' . $addConditions;
             }
 
             $status = $data->createView($_POST['formView'], $viewQuery, false, $_POST['formComment']);

src/controllers/SqleditController.php

Spacing +29 added lines, -29 removed lines

@@ -68,7 +68,7 @@ 
 
         $default_html = $this->printTabs($misc->getNavTabs('popup'), 'sql', false);
 
-        $default_html .= '<form action="'.SUBFOLDER.'/src/views/sql.php" method="post" enctype="multipart/form-data" class="sqlform" id="sqlform" target="detail">';
+        $default_html .= '<form action="' . SUBFOLDER . '/src/views/sql.php" method="post" enctype="multipart/form-data" class="sqlform" id="sqlform" target="detail">';
         $default_html .= "\n";
         $default_html .= $this->_printConnection('sql');
 
@@ -78,13 +78,13 @@ 
         $default_html .= '<label>';
         $default_html .= $this->misc->printHelp($lang['strsearchpath'], 'pg.schema.search_path', false);
 
-        $default_html .= ': <input type="text" name="search_path" size="50" value="'.$search_path.'" />';
+        $default_html .= ': <input type="text" name="search_path" size="50" value="' . $search_path . '" />';
         $default_html .= "</label>\n";
         $default_html .= "</div>\n";
 
         $default_html .= '<div id="queryedition" style="padding:1%;width:98%;float:left;">';
         $default_html .= "\n";
-        $default_html .= '<textarea style="width:98%;" rows="10" cols="50" name="query" id="query" resizable="true">'.$sqlquery.'</textarea>';
+        $default_html .= '<textarea style="width:98%;" rows="10" cols="50" name="query" id="query" resizable="true">' . $sqlquery . '</textarea>';
         $default_html .= "\n";
         $default_html .= "</div>\n";
 
@@ -94,20 +94,20 @@ 
             $max_size = $misc->inisizeToBytes(ini_get('upload_max_filesize'));
             if (is_float($max_size) && $max_size > 0) {
                 $default_html .= '<p>';
-                $default_html .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.$max_size.'" />';
+                $default_html .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . $max_size . '" />';
                 $default_html .= "\n";
-                $default_html .= '<label for="script">'.$lang['struploadscript'].'</label>';
+                $default_html .= '<label for="script">' . $lang['struploadscript'] . '</label>';
                 $default_html .= ' <input id="script" name="script" type="file" /></p>';
                 $default_html .= "</p>\n";
             }
         }
         $checked = (isset($_REQUEST['paginate']) ? ' checked="checked"' : '');
         $default_html .= '<p>';
-        $default_html .= '<label for="paginate"><input type="checkbox" id="paginate" name="paginate"'.$checked.' />&nbsp;'.$lang['strpaginate'].'</label>';
+        $default_html .= '<label for="paginate"><input type="checkbox" id="paginate" name="paginate"' . $checked . ' />&nbsp;' . $lang['strpaginate'] . '</label>';
         $default_html .= "</p>\n";
-        $default_html .= '<p><input type="submit" name="execute" accesskey="r" value="'.$lang['strexecute'].'" />';
+        $default_html .= '<p><input type="submit" name="execute" accesskey="r" value="' . $lang['strexecute'] . '" />';
         $default_html .= "\n";
-        $default_html .= '<input type="reset" accesskey="q" value="'.$lang['strreset'].'" /></p>';
+        $default_html .= '<input type="reset" accesskey="q" value="' . $lang['strreset'] . '" /></p>';
         $default_html .= "\n";
         $default_html .= '</form>';
         $default_html .= "\n";
@@ -130,8 +130,8 @@ 
         // The javascript action on the select box reloads the
         // popup whenever the server or database is changed.
         // This ensures that the correct page encoding is used.
-        $onchange = "onchange=\"location.href='".SUBFOLDER.'/sqledit/'.
-        urlencode($action)."?server=' + encodeURI(server.options[server.selectedIndex].value) + '&amp;database=' + encodeURI(database.options[database.selectedIndex].value) + ";
+        $onchange = "onchange=\"location.href='" . SUBFOLDER . '/sqledit/' .
+        urlencode($action) . "?server=' + encodeURI(server.options[server.selectedIndex].value) + '&amp;database=' + encodeURI(database.options[database.selectedIndex].value) + ";
 
         // The exact URL to reload to is different between SQL and Find mode, however.
         if ($action == 'find') {
@@ -165,29 +165,29 @@ 
 
         $default_html .= "<form action=\"database.php\" method=\"post\" target=\"detail\">\n";
         $default_html .= $this->_printConnection('find');
-        $default_html .= '<p><input class="focusme" name="term" value="'.htmlspecialchars($_REQUEST['term'])."\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" />\n";
+        $default_html .= '<p><input class="focusme" name="term" value="' . htmlspecialchars($_REQUEST['term']) . "\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" />\n";
 
         // Output list of filters.  This is complex due to all the 'has' and 'conf' feature possibilities
         $default_html .= "<select name=\"filter\">\n";
-        $default_html .= "\t<option value=\"\"".($_REQUEST['filter'] == '' ? ' selected="selected" ' : '').">{$lang['strallobjects']}</option>\n";
-        $default_html .= "\t<option value=\"SCHEMA\"".($_REQUEST['filter'] == 'SCHEMA' ? ' selected="selected" ' : '').">{$lang['strschemas']}</option>\n";
-        $default_html .= "\t<option value=\"TABLE\"".($_REQUEST['filter'] == 'TABLE' ? ' selected="selected" ' : '').">{$lang['strtables']}</option>\n";
-        $default_html .= "\t<option value=\"VIEW\"".($_REQUEST['filter'] == 'VIEW' ? ' selected="selected" ' : '').">{$lang['strviews']}</option>\n";
-        $default_html .= "\t<option value=\"SEQUENCE\"".($_REQUEST['filter'] == 'SEQUENCE' ? ' selected="selected" ' : '').">{$lang['strsequences']}</option>\n";
-        $default_html .= "\t<option value=\"COLUMN\"".($_REQUEST['filter'] == 'COLUMN' ? ' selected="selected" ' : '').">{$lang['strcolumns']}</option>\n";
-        $default_html .= "\t<option value=\"RULE\"".($_REQUEST['filter'] == 'RULE' ? ' selected="selected" ' : '').">{$lang['strrules']}</option>\n";
-        $default_html .= "\t<option value=\"INDEX\"".($_REQUEST['filter'] == 'INDEX' ? ' selected="selected" ' : '').">{$lang['strindexes']}</option>\n";
-        $default_html .= "\t<option value=\"TRIGGER\"".($_REQUEST['filter'] == 'TRIGGER' ? ' selected="selected" ' : '').">{$lang['strtriggers']}</option>\n";
-        $default_html .= "\t<option value=\"CONSTRAINT\"".($_REQUEST['filter'] == 'CONSTRAINT' ? ' selected="selected" ' : '').">{$lang['strconstraints']}</option>\n";
-        $default_html .= "\t<option value=\"FUNCTION\"".($_REQUEST['filter'] == 'FUNCTION' ? ' selected="selected" ' : '').">{$lang['strfunctions']}</option>\n";
-        $default_html .= "\t<option value=\"DOMAIN\"".($_REQUEST['filter'] == 'DOMAIN' ? ' selected="selected" ' : '').">{$lang['strdomains']}</option>\n";
+        $default_html .= "\t<option value=\"\"" . ($_REQUEST['filter'] == '' ? ' selected="selected" ' : '') . ">{$lang['strallobjects']}</option>\n";
+        $default_html .= "\t<option value=\"SCHEMA\"" . ($_REQUEST['filter'] == 'SCHEMA' ? ' selected="selected" ' : '') . ">{$lang['strschemas']}</option>\n";
+        $default_html .= "\t<option value=\"TABLE\"" . ($_REQUEST['filter'] == 'TABLE' ? ' selected="selected" ' : '') . ">{$lang['strtables']}</option>\n";
+        $default_html .= "\t<option value=\"VIEW\"" . ($_REQUEST['filter'] == 'VIEW' ? ' selected="selected" ' : '') . ">{$lang['strviews']}</option>\n";
+        $default_html .= "\t<option value=\"SEQUENCE\"" . ($_REQUEST['filter'] == 'SEQUENCE' ? ' selected="selected" ' : '') . ">{$lang['strsequences']}</option>\n";
+        $default_html .= "\t<option value=\"COLUMN\"" . ($_REQUEST['filter'] == 'COLUMN' ? ' selected="selected" ' : '') . ">{$lang['strcolumns']}</option>\n";
+        $default_html .= "\t<option value=\"RULE\"" . ($_REQUEST['filter'] == 'RULE' ? ' selected="selected" ' : '') . ">{$lang['strrules']}</option>\n";
+        $default_html .= "\t<option value=\"INDEX\"" . ($_REQUEST['filter'] == 'INDEX' ? ' selected="selected" ' : '') . ">{$lang['strindexes']}</option>\n";
+        $default_html .= "\t<option value=\"TRIGGER\"" . ($_REQUEST['filter'] == 'TRIGGER' ? ' selected="selected" ' : '') . ">{$lang['strtriggers']}</option>\n";
+        $default_html .= "\t<option value=\"CONSTRAINT\"" . ($_REQUEST['filter'] == 'CONSTRAINT' ? ' selected="selected" ' : '') . ">{$lang['strconstraints']}</option>\n";
+        $default_html .= "\t<option value=\"FUNCTION\"" . ($_REQUEST['filter'] == 'FUNCTION' ? ' selected="selected" ' : '') . ">{$lang['strfunctions']}</option>\n";
+        $default_html .= "\t<option value=\"DOMAIN\"" . ($_REQUEST['filter'] == 'DOMAIN' ? ' selected="selected" ' : '') . ">{$lang['strdomains']}</option>\n";
         if ($conf['show_advanced']) {
-            $default_html .= "\t<option value=\"AGGREGATE\"".($_REQUEST['filter'] == 'AGGREGATE' ? ' selected="selected" ' : '').">{$lang['straggregates']}</option>\n";
-            $default_html .= "\t<option value=\"TYPE\"".($_REQUEST['filter'] == 'TYPE' ? ' selected="selected" ' : '').">{$lang['strtypes']}</option>\n";
-            $default_html .= "\t<option value=\"OPERATOR\"".($_REQUEST['filter'] == 'OPERATOR' ? ' selected="selected" ' : '').">{$lang['stroperators']}</option>\n";
-            $default_html .= "\t<option value=\"OPCLASS\"".($_REQUEST['filter'] == 'OPCLASS' ? ' selected="selected" ' : '').">{$lang['stropclasses']}</option>\n";
-            $default_html .= "\t<option value=\"CONVERSION\"".($_REQUEST['filter'] == 'CONVERSION' ? ' selected="selected" ' : '').">{$lang['strconversions']}</option>\n";
-            $default_html .= "\t<option value=\"LANGUAGE\"".($_REQUEST['filter'] == 'LANGUAGE' ? ' selected="selected" ' : '').">{$lang['strlanguages']}</option>\n";
+            $default_html .= "\t<option value=\"AGGREGATE\"" . ($_REQUEST['filter'] == 'AGGREGATE' ? ' selected="selected" ' : '') . ">{$lang['straggregates']}</option>\n";
+            $default_html .= "\t<option value=\"TYPE\"" . ($_REQUEST['filter'] == 'TYPE' ? ' selected="selected" ' : '') . ">{$lang['strtypes']}</option>\n";
+            $default_html .= "\t<option value=\"OPERATOR\"" . ($_REQUEST['filter'] == 'OPERATOR' ? ' selected="selected" ' : '') . ">{$lang['stroperators']}</option>\n";
+            $default_html .= "\t<option value=\"OPCLASS\"" . ($_REQUEST['filter'] == 'OPCLASS' ? ' selected="selected" ' : '') . ">{$lang['stropclasses']}</option>\n";
+            $default_html .= "\t<option value=\"CONVERSION\"" . ($_REQUEST['filter'] == 'CONVERSION' ? ' selected="selected" ' : '') . ">{$lang['strconversions']}</option>\n";
+            $default_html .= "\t<option value=\"LANGUAGE\"" . ($_REQUEST['filter'] == 'LANGUAGE' ? ' selected="selected" ' : '') . ">{$lang['strlanguages']}</option>\n";
         }
         $default_html .= "</select>\n";
 

src/controllers/FunctionsController.php

Spacing +34 added lines, -34 removed lines

@@ -92,7 +92,7 @@ 
             'function'     => [
                 'title' => $lang['strfunction'],
                 'field' => Decorator::field('proproto'),
-                'url'   => SUBFOLDER."/redirect/function?action=properties&{$misc->href}&",
+                'url'   => SUBFOLDER . "/redirect/function?action=properties&{$misc->href}&",
                 'vars'  => ['function' => 'proproto', 'function_oid' => 'prooid'],
             ],
             'returns'      => [
@@ -387,7 +387,7 @@ 
                     }
                     if (isset($names_arr[$i]) && $names_arr[$i] != '') {
                         $data->fieldClean($names_arr[$i]);
-                        $args .= '"'.$names_arr[$i].'" ';
+                        $args .= '"' . $names_arr[$i] . '" ';
                     }
                     $args .= $args_arr[$i];
                 }
@@ -395,8 +395,8 @@ 
                 $args = $fndata->fields['proarguments'];
             }
 
-            $func_full = $fndata->fields['proname'].'('.$fndata->fields['proarguments'].')';
-            echo '<form action="'.SUBFOLDER."/src/views/functions.php\" method=\"post\">\n";
+            $func_full = $fndata->fields['proname'] . '(' . $fndata->fields['proarguments'] . ')';
+            echo '<form action="' . SUBFOLDER . "/src/views/functions.php\" method=\"post\">\n";
             echo "<table style=\"width: 90%\">\n";
             echo "<tr>\n";
             echo "<th class=\"data required\">{$lang['strschema']}</th>\n";
@@ -477,8 +477,8 @@ 
             // Display function cost options
             if ($data->hasFunctionCosting()) {
                 echo "<tr><th class=\"data required\" colspan=\"5\">{$lang['strfunctioncosting']}</th></tr>\n";
-                echo "<td class=\"data1\" colspan=\"2\">{$lang['strexecutioncost']}: <input name=\"formCost\" size=\"16\" value=\"".
-                htmlspecialchars($_POST['formCost']).'" /></td>';
+                echo "<td class=\"data1\" colspan=\"2\">{$lang['strexecutioncost']}: <input name=\"formCost\" size=\"16\" value=\"" .
+                htmlspecialchars($_POST['formCost']) . '" /></td>';
                 echo "<td class=\"data1\" colspan=\"2\">{$lang['strresultrows']}: <input name=\"formRows\" size=\"16\" value=\"",
                 htmlspecialchars($_POST['formRows']), '"', (!$fndata->fields['proretset']) ? 'disabled' : '', '/></td>';
             }
@@ -583,7 +583,7 @@ 
                     }
                     if (isset($names_arr[$i]) && $names_arr[$i] != '') {
                         $data->fieldClean($names_arr[$i]);
-                        $args .= '"'.$names_arr[$i].'" ';
+                        $args .= '"' . $names_arr[$i] . '" ';
                     }
                     $args .= $args_arr[$i];
                 }
@@ -597,7 +597,7 @@ 
             }
 
             $funcdata->fields['proretset'] = $data->phpBool($funcdata->fields['proretset']);
-            $func_full = $funcdata->fields['proname'].'('.$funcdata->fields['proarguments'].')';
+            $func_full = $funcdata->fields['proname'] . '(' . $funcdata->fields['proarguments'] . ')';
             echo "<table style=\"width: 90%\">\n";
             echo "<tr><th class=\"data\">{$lang['strfunction']}</th>\n";
             echo "<th class=\"data\">{$lang['strarguments']}</th>\n";
@@ -733,7 +733,7 @@ 
             $this->printTrail('schema');
             $this->printTitle($lang['strdrop'], 'pg.function.drop');
 
-            echo '<form action="'.SUBFOLDER."/src/views/functions.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/functions.php\" method=\"post\">\n";
 
             //If multi drop
             if (isset($_REQUEST['ma'])) {
@@ -880,16 +880,16 @@ 
                 $szSelected = ' selected="selected"';
             }
             /* this variable is include in the JS code bellow, so we need to ENT_QUOTES */
-            $szTypes .= '<option value="'.htmlspecialchars($types->fields['typname'], ENT_QUOTES)."\"{$szSelected}>";
-            $szTypes .= htmlspecialchars($types->fields['typname'], ENT_QUOTES).'</option>';
+            $szTypes .= '<option value="' . htmlspecialchars($types->fields['typname'], ENT_QUOTES) . "\"{$szSelected}>";
+            $szTypes .= htmlspecialchars($types->fields['typname'], ENT_QUOTES) . '</option>';
             $types->moveNext();
         }
 
-        $szFunctionName = "<td class=\"data1\"><input name=\"formFunction\" size=\"16\" maxlength=\"{$data->_maxNameLen}\" value=\"".
-        htmlspecialchars($_POST['formFunction']).'" /></td>';
+        $szFunctionName = "<td class=\"data1\"><input name=\"formFunction\" size=\"16\" maxlength=\"{$data->_maxNameLen}\" value=\"" .
+        htmlspecialchars($_POST['formFunction']) . '" /></td>';
 
-        $szArguments = '<td class="data1"><input name="formArguments" style="width:100%;" size="16" value="'.
-        htmlspecialchars($_POST['formArguments']).'" /></td>';
+        $szArguments = '<td class="data1"><input name="formArguments" style="width:100%;" size="16" value="' .
+        htmlspecialchars($_POST['formArguments']) . '" /></td>';
 
         $szSetOfSelected = '';
         $szNotSetOfSelected = '';
@@ -904,7 +904,7 @@ 
         $szReturns .= "<option value=\"SETOF\"{$szSetOfSelected}>SETOF</option>";
         $szReturns .= '</select>';
 
-        $szReturns .= '<select name="formReturns">'.$szTypes.'</select>';
+        $szReturns .= '<select name="formReturns">' . $szTypes . '</select>';
 
         // Create string array type selector
 
@@ -924,7 +924,7 @@ 
         // Create string for language
         $szLanguage = '<td class="data1">';
         if ($fnlang == 'c' || $fnlang == 'internal') {
-            $szLanguage .= $_POST['formLanguage']."\n";
+            $szLanguage .= $_POST['formLanguage'] . "\n";
             $szLanguage .= "<input type=\"hidden\" name=\"formLanguage\" value=\"{$_POST['formLanguage']}\" />\n";
         } else {
             $szLanguage .= "<select name=\"formLanguage\">\n";
@@ -934,8 +934,8 @@ 
                     $szSelected = ' selected="selected"';
                 }
                 if (strtolower($langs->fields['lanname']) != 'c' && strtolower($langs->fields['lanname']) != 'internal') {
-                    $szLanguage .= '<option value="'.htmlspecialchars($langs->fields['lanname'])."\"{$szSelected}>\n".
-                    $misc->printVal($langs->fields['lanname']).'</option>';
+                    $szLanguage .= '<option value="' . htmlspecialchars($langs->fields['lanname']) . "\"{$szSelected}>\n" .
+                    $misc->printVal($langs->fields['lanname']) . '</option>';
                 }
 
                 $langs->moveNext();
@@ -967,7 +967,7 @@ 
         }
         $szJSAddTR = "<tr id=\"parent_add_tr\" onclick=\"addArg();\" onmouseover=\"this.style.cursor='pointer'\">\n<td style=\"text-align: right\" colspan=\"6\" class=\"data3\"><table><tr><td class=\"data3\"><img src=\"{$szImgPath}/AddArguments.png\" alt=\"Add Argument\" /></td><td class=\"data3\"><span style=\"font-size: 8pt\">{$lang['strargadd']}</span></td></tr></table></td>\n</tr>\n";
 
-        echo '<script src="'.SUBFOLDER."/js/functions.js\" type=\"text/javascript\"></script>
+        echo '<script src="' . SUBFOLDER . "/js/functions.js\" type=\"text/javascript\"></script>
 		<script type=\"text/javascript\">
 			//<![CDATA[
 			var g_types_select = '<select name=\"formArgType[]\">{$szTypes}</select>{$szArgReturns}';
@@ -984,7 +984,7 @@ 
 			//]]>
 		</script>
 		";
-        echo '<form action="'.SUBFOLDER."/src/views//views/functions.php\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views//views/functions.php\" method=\"post\">\n";
         echo "<table><tbody id=\"args_table\">\n";
         echo "<tr><th class=\"data required\">{$lang['strname']}</th>\n";
         echo "<th class=\"data required\" colspan=\"2\">{$lang['strreturns']}</th>\n";
@@ -1027,10 +1027,10 @@ 
         // Display function cost options
         if ($data->hasFunctionCosting()) {
             echo "<tr><th class=\"data required\" colspan=\"4\">{$lang['strfunctioncosting']}</th></tr>\n";
-            echo "<td class=\"data1\" colspan=\"2\">{$lang['strexecutioncost']}: <input name=\"formCost\" size=\"16\" value=\"".
-            htmlspecialchars($_POST['formCost']).'" /></td>';
-            echo "<td class=\"data1\" colspan=\"2\">{$lang['strresultrows']}: <input name=\"formRows\" size=\"16\" value=\"".
-            htmlspecialchars($_POST['formRows']).'" /></td>';
+            echo "<td class=\"data1\" colspan=\"2\">{$lang['strexecutioncost']}: <input name=\"formCost\" size=\"16\" value=\"" .
+            htmlspecialchars($_POST['formCost']) . '" /></td>';
+            echo "<td class=\"data1\" colspan=\"2\">{$lang['strresultrows']}: <input name=\"formRows\" size=\"16\" value=\"" .
+            htmlspecialchars($_POST['formRows']) . '" /></td>';
         }
 
         // Display function properties
@@ -1082,12 +1082,12 @@ 
 
         $szJS = '';
 
-        echo '<script src="'.SUBFOLDER.'/js/functions.js" type="text/javascript"></script>';
-        echo '<script type="text/javascript">'.$this->buildJSData().'</script>';
+        echo '<script src="' . SUBFOLDER . '/js/functions.js" type="text/javascript"></script>';
+        echo '<script type="text/javascript">' . $this->buildJSData() . '</script>';
         if (!empty($_POST['formArgName'])) {
             $szJS = $this->buildJSRows($this->buildFunctionArguments($_POST));
         } else {
-            $szJS = '<script type="text/javascript" src="'.SUBFOLDER.'/js/functions.js">noArgsRebuild(addArg());</script>';
+            $szJS = '<script type="text/javascript" src="' . SUBFOLDER . '/js/functions.js">noArgsRebuild(addArg());</script>';
         }
 
         $cost = (isset($_POST['formCost'])) ? $_POST['formCost'] : null;
@@ -1108,7 +1108,7 @@ 
         } else {
             // Append array symbol to type if chosen
             $status = $data->createFunction($_POST['formFunction'], empty($_POST['nojs']) ? $this->buildFunctionArguments($_POST) : $_POST['formArguments'],
-                $_POST['formReturns'].$_POST['formArray'], $def, $_POST['formLanguage'],
+                $_POST['formReturns'] . $_POST['formArray'], $def, $_POST['formLanguage'],
                 $_POST['formProperties'], $_POST['formSetOf'] == 'SETOF',
                 $cost, $rows, $_POST['formComment'], false);
             if ($status == 0) {
@@ -1127,7 +1127,7 @@ 
         if (isset($_POST['formArgName'])) {
             $arrayArgs = [];
             foreach ($arrayVars['formArgName'] as $pK => $pV) {
-                $arrayArgs[] = $arrayVars['formArgModes'][$pK].' '.trim($pV).' '.trim($arrayVars['formArgType'][$pK]).$arrayVars['formArgArray'][$pK];
+                $arrayArgs[] = $arrayVars['formArgModes'][$pK] . ' ' . trim($pV) . ' ' . trim($arrayVars['formArgType'][$pK]) . $arrayVars['formArgArray'][$pK];
             }
 
             return implode(',', $arrayArgs);
@@ -1182,7 +1182,7 @@ 
         $szTypes = '';
 
         while (!$arrayTypes->EOF) {
-            $arrayPTypes[] = "'".$arrayTypes->fields['typname']."'";
+            $arrayPTypes[] = "'" . $arrayTypes->fields['typname'] . "'";
             $arrayTypes->moveNext();
         }
 
@@ -1190,9 +1190,9 @@ 
             $arrayPModes[] = "'{$pV}'";
         }
 
-        $szTypes = 'g_main_types = new Array('.implode(',', $arrayPTypes).');';
-        $szModes = 'g_main_modes = new Array('.implode(',', $arrayPModes).');';
+        $szTypes = 'g_main_types = new Array(' . implode(',', $arrayPTypes) . ');';
+        $szModes = 'g_main_modes = new Array(' . implode(',', $arrayPModes) . ');';
 
-        return $szTypes.$szModes;
+        return $szTypes . $szModes;
     }
 }

src/controllers/DataexportController.php

Spacing +3 added lines, -3 removed lines

@@ -94,7 +94,7 @@ 
                         $ext = 'txt';
                     }
 
-                    header('Content-Disposition: attachment; filename=dump.'.$ext);
+                    header('Content-Disposition: attachment; filename=dump.' . $ext);
                 }
             } else {
                 header('Content-Type: text/plain');
@@ -265,7 +265,7 @@ 
                                 $values = (is_null($v) ? 'NULL' : "'{$v}'");
                                 $first = false;
                             } else {
-                                $values .= ', '.((is_null($v) ? 'NULL' : "'{$v}'"));
+                                $values .= ', ' . ((is_null($v) ? 'NULL' : "'{$v}'"));
                             }
                         }
                         echo ") VALUES ({$values});\n";
@@ -354,7 +354,7 @@ 
             $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><td><select name=\"d_format\">\n";
         // COPY and SQL require a table

src/controllers/ViewsController.php

Spacing +10 added lines, -10 removed lines

@@ -112,7 +112,7 @@ 
             'view'    => [
                 'title' => $lang['strview'],
                 'field' => Decorator::field('relname'),
-                'url'   => SUBFOLDER."/redirect/view?{$misc->href}&",
+                'url'   => SUBFOLDER . "/redirect/view?{$misc->href}&",
                 'vars'  => ['view' => 'relname'],
             ],
             'owner'   => [
@@ -300,7 +300,7 @@ 
 
             $attrs = $data->getTableAttributes($_REQUEST['view']);
 
-            echo '<form action="'.SUBFOLDER.'/src/views/'.$this->script.'" method="post" id="selectform">';
+            echo '<form action="' . SUBFOLDER . '/src/views/' . $this->script . '" method="post" id="selectform">';
             echo "\n";
 
             if ($attrs->recordCount() > 0) {
@@ -433,7 +433,7 @@ 
             $this->printTrail('view');
             $this->printTitle($lang['strdrop'], 'pg.view.drop');
 
-            echo '<form action="'.SUBFOLDER."/src/views/views.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/views.php\" method=\"post\">\n";
 
             //If multi drop
             if (isset($_REQUEST['ma'])) {
@@ -553,7 +553,7 @@ 
             }
             asort($arrFields);
 
-            echo '<form action="'.SUBFOLDER."/src/views/views.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/views.php\" method=\"post\">\n";
             echo "<table>\n";
             echo "<tr><th class=\"data\">{$lang['strviewname']}</th></tr>";
             echo "<tr>\n<td class=\"data1\">\n";
@@ -632,7 +632,7 @@ 
             echo "<p><input type=\"hidden\" name=\"action\" value=\"save_create_wiz\" />\n";
 
             foreach ($arrSelTables as $curTable) {
-                echo '<input type="hidden" name="formTables[]" value="'.htmlspecialchars(serialize($curTable))."\" />\n";
+                echo '<input type="hidden" name="formTables[]" value="' . htmlspecialchars(serialize($curTable)) . "\" />\n";
             }
 
             echo $misc->form;
@@ -658,7 +658,7 @@ 
         $this->printTitle($lang['strcreateviewwiz'], 'pg.view.create');
         $this->printMsg($msg);
 
-        echo '<form action="'.SUBFOLDER."/src/views/views.php\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/views.php\" method=\"post\">\n";
         echo "<table>\n";
         echo "<tr><th class=\"data\">{$lang['strtables']}</th></tr>";
         echo "<tr>\n<td class=\"data1\">\n";
@@ -668,7 +668,7 @@ 
             $arrTmp = [];
             $arrTmp['schemaname'] = $tables->fields['nspname'];
             $arrTmp['tablename'] = $tables->fields['relname'];
-            $arrTables[$tables->fields['nspname'].'.'.$tables->fields['relname']] = serialize($arrTmp);
+            $arrTables[$tables->fields['nspname'] . '.' . $tables->fields['relname']] = serialize($arrTmp);
             $tables->moveNext();
         }
         echo \PHPPgAdmin\XHtml\HTMLController::printCombo($arrTables, 'formTables[]', false, '', true);
@@ -711,7 +711,7 @@ 
         $this->printTitle($lang['strcreateview'], 'pg.view.create');
         $this->printMsg($msg);
 
-        echo '<form action="'.SUBFOLDER."/src/views/views.php\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/views.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<td class=\"data1\"><input name=\"formView\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
@@ -835,7 +835,7 @@ 
 
                                 // Make sure for multi-column foreign keys that we use a table alias tables joined to more than once
                                 // This can (and should be) more optimized for multi-column foreign keys
-                                $adj_tbl2 = in_array($tbl2, $arrUsedTbls) ? "$tbl2 AS alias_ppa_".mktime() : $tbl2;
+                                $adj_tbl2 = in_array($tbl2, $arrUsedTbls) ? "$tbl2 AS alias_ppa_" . mktime() : $tbl2;
 
                                 $linkFields .= strlen($linkFields) ? "{$curLink['operator']} $adj_tbl2 ON (\"{$arrLeftLink['schemaname']}\".\"{$arrLeftLink['tablename']}\".\"{$arrLeftLink['fieldname']}\" = \"{$arrRightLink['schemaname']}\".\"{$arrRightLink['tablename']}\".\"{$arrRightLink['fieldname']}\") "
                                 : "$tbl1 {$curLink['operator']} $adj_tbl2 ON (\"{$arrLeftLink['schemaname']}\".\"{$arrLeftLink['tablename']}\".\"{$arrLeftLink['fieldname']}\" = \"{$arrRightLink['schemaname']}\".\"{$arrRightLink['tablename']}\".\"{$arrRightLink['fieldname']}\") ";
@@ -881,7 +881,7 @@ 
 
             //add where from additional conditions
             if (strlen($addConditions)) {
-                $viewQuery .= ' WHERE '.$addConditions;
+                $viewQuery .= ' WHERE ' . $addConditions;
             }
 
             $status = $data->createView($_POST['formView'], $viewQuery, false, $_POST['formComment']);

src/controllers/DatabaseController.php

Spacing +26 added lines, -26 removed lines

@@ -41,20 +41,20 @@ 
         $scripts = '';
         /* normal flow */
         if ($action == 'locks' || $action == 'processes') {
-            $scripts .= '<script src="'.SUBFOLDER.'/js/database.js" type="text/javascript"></script>';
+            $scripts .= '<script src="' . SUBFOLDER . '/js/database.js" type="text/javascript"></script>';
 
             $refreshTime = $conf['ajax_refresh'] * 1000;
 
             $scripts .= "<script type=\"text/javascript\">\n";
             $scripts .= "var Database = {\n";
             $scripts .= "ajax_time_refresh: {$refreshTime},\n";
-            $scripts .= "str_start: {text:'{$lang['strstart']}',icon: '".$misc->icon('Execute')."'},\n";
-            $scripts .= "str_stop: {text:'{$lang['strstop']}',icon: '".$misc->icon('Stop')."'},\n";
-            $scripts .= "load_icon: '".$misc->icon('Loading')."',\n";
+            $scripts .= "str_start: {text:'{$lang['strstart']}',icon: '" . $misc->icon('Execute') . "'},\n";
+            $scripts .= "str_stop: {text:'{$lang['strstop']}',icon: '" . $misc->icon('Stop') . "'},\n";
+            $scripts .= "load_icon: '" . $misc->icon('Loading') . "',\n";
             $scripts .= "server:'{$_REQUEST['server']}',\n";
             $scripts .= "dbname:'{$_REQUEST['database']}',\n";
             $scripts .= "action:'refresh_{$action}',\n";
-            $scripts .= "errmsg: '".str_replace("'", "\'", $lang['strconnectionfail'])."'\n";
+            $scripts .= "errmsg: '" . str_replace("'", "\'", $lang['strconnectionfail']) . "'\n";
             $scripts .= "};\n";
             $scripts .= "</script>\n";
         }
@@ -175,7 +175,7 @@ 
         $this->printTabs('database', 'find');
         $this->printMsg($msg);
 
-        echo '<form action="'.SUBFOLDER."/src/views/database.php\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/database.php\" method=\"post\">\n";
         echo '<p><input name="term" value="', htmlspecialchars($_REQUEST['term']),
             "\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" />\n";
         // Output list of filters.  This is complex due to all the 'has' and 'conf' feature possibilities
@@ -296,18 +296,18 @@ 
 
                     switch ($curr) {
                         case 'SCHEMA':
-                            echo '<li><a href="'.SUBFOLDER."/redirect/schema?{$misc->href}&amp;schema=", $misc->printVal($rs->fields['name']), '">', $this->_highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
+                            echo '<li><a href="' . SUBFOLDER . "/redirect/schema?{$misc->href}&amp;schema=", $misc->printVal($rs->fields['name']), '">', $this->_highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
                             break;
                         case 'TABLE':
                             echo '<li>';
                             echo "<a href=\"tables.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['schemaname']), '</a>.';
-                            echo '<a href="'.SUBFOLDER."/redirect/table?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '&amp;table=',
+                            echo '<a href="' . SUBFOLDER . "/redirect/table?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '&amp;table=',
                             urlencode($rs->fields['name']), '">', $this->_highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
                             break;
                         case 'VIEW':
                             echo '<li>';
                             echo "<a href=\"views.php?subject=schema&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['schemaname']), '</a>.';
-                            echo '<a href="'.SUBFOLDER."/redirect/view?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '&amp;view=',
+                            echo '<a href="' . SUBFOLDER . "/redirect/view?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '&amp;view=',
                             urlencode($rs->fields['name']), '">', $this->_highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
                             break;
                         case 'SEQUENCE':
@@ -318,7 +318,7 @@ 
                             break;
                         case 'COLUMNTABLE':
                             echo '<li>';
-                            echo '<a href="'.SUBFOLDER."/redirect/schema?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['schemaname']), '</a>.';
+                            echo '<a href="' . SUBFOLDER . "/redirect/schema?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['schemaname']), '</a>.';
                             echo "<a href=\"tblproperties.php?subject=table&amp;{$misc->href}&amp;table=", urlencode($rs->fields['relname']), '&amp;schema=', urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['relname']), '</a>.';
                             echo "<a href=\"colproperties.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '&amp;table=',
                             urlencode($rs->fields['relname']), '&amp;column=', urlencode($rs->fields['name']), '">',
@@ -326,7 +326,7 @@ 
                             break;
                         case 'COLUMNVIEW':
                             echo '<li>';
-                            echo '<a href="'.SUBFOLDER."/redirect/schema?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['schemaname']), '</a>.';
+                            echo '<a href="' . SUBFOLDER . "/redirect/schema?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['schemaname']), '</a>.';
                             echo "<a href=\"viewproperties.php?subject=view&amp;{$misc->href}&amp;view=", urlencode($rs->fields['relname']), '&amp;schema=', urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['relname']), '</a>.';
                             echo "<a href=\"colproperties.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '&amp;view=',
                             urlencode($rs->fields['relname']), '&amp;column=', urlencode($rs->fields['name']), '">',
@@ -334,14 +334,14 @@ 
                             break;
                         case 'INDEX':
                             echo '<li>';
-                            echo '<a href="'.SUBFOLDER."/redirect/schema?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['schemaname']), '</a>.';
-                            echo '<a href="'.SUBFOLDER."/redirect/table?{$misc->href}&amp;table=", urlencode($rs->fields['relname']), '&amp;schema=', urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['relname']), '</a>.';
+                            echo '<a href="' . SUBFOLDER . "/redirect/schema?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['schemaname']), '</a>.';
+                            echo '<a href="' . SUBFOLDER . "/redirect/table?{$misc->href}&amp;table=", urlencode($rs->fields['relname']), '&amp;schema=', urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['relname']), '</a>.';
                             echo "<a href=\"indexes.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '&amp;table=', urlencode($rs->fields['relname']), '">', $this->_highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
                             break;
                         case 'CONSTRAINTTABLE':
                             echo '<li>';
-                            echo '<a href="'.SUBFOLDER."/redirect/schema?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['schemaname']), '</a>.';
-                            echo '<a href="'.SUBFOLDER."/redirect/table?{$misc->href}&amp;table=", urlencode($rs->fields['relname']), '&amp;schema=', urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['relname']), '</a>.';
+                            echo '<a href="' . SUBFOLDER . "/redirect/schema?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['schemaname']), '</a>.';
+                            echo '<a href="' . SUBFOLDER . "/redirect/table?{$misc->href}&amp;table=", urlencode($rs->fields['relname']), '&amp;schema=', urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['relname']), '</a>.';
                             echo "<a href=\"constraints.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '&amp;table=',
                             urlencode($rs->fields['relname']), '">', $this->_highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
                             break;
@@ -353,22 +353,22 @@ 
                             break;
                         case 'TRIGGER':
                             echo '<li>';
-                            echo '<a href="'.SUBFOLDER."/redirect/schema?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['schemaname']), '</a>.';
-                            echo '<a href="'.SUBFOLDER."/redirect/table?{$misc->href}&amp;table=", urlencode($rs->fields['relname']), '&amp;schema=', urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['relname']), '</a>.';
+                            echo '<a href="' . SUBFOLDER . "/redirect/schema?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['schemaname']), '</a>.';
+                            echo '<a href="' . SUBFOLDER . "/redirect/table?{$misc->href}&amp;table=", urlencode($rs->fields['relname']), '&amp;schema=', urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['relname']), '</a>.';
                             echo "<a href=\"triggers.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '&amp;table=', urlencode($rs->fields['relname']), '">',
                             $this->_highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
                             break;
                         case 'RULETABLE':
                             echo '<li>';
-                            echo '<a href="'.SUBFOLDER."/redirect/schema?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['schemaname']), '</a>.';
-                            echo '<a href="'.SUBFOLDER."/redirect/table?{$misc->href}&amp;table=", urlencode($rs->fields['relname']), '&amp;schema=', urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['relname']), '</a>.';
+                            echo '<a href="' . SUBFOLDER . "/redirect/schema?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['schemaname']), '</a>.';
+                            echo '<a href="' . SUBFOLDER . "/redirect/table?{$misc->href}&amp;table=", urlencode($rs->fields['relname']), '&amp;schema=', urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['relname']), '</a>.';
                             echo "<a href=\"rules.php?subject=table&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '&amp;reltype=table&amp;table=',
                             urlencode($rs->fields['relname']), '">', $this->_highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
                             break;
                         case 'RULEVIEW':
                             echo '<li>';
-                            echo '<a href="'.SUBFOLDER."/redirect/schema?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['schemaname']), '</a>.';
-                            echo '<a href="'.SUBFOLDER."/redirect/view?{$misc->href}&amp;view=", urlencode($rs->fields['relname']), '&amp;schema=', urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['relname']), '</a>.';
+                            echo '<a href="' . SUBFOLDER . "/redirect/schema?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['schemaname']), '</a>.';
+                            echo '<a href="' . SUBFOLDER . "/redirect/view?{$misc->href}&amp;view=", urlencode($rs->fields['relname']), '&amp;schema=', urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['relname']), '</a>.';
                             echo "<a href=\"rules.php?subject=view&amp;{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '&amp;reltype=view&amp;view=',
                             urlencode($rs->fields['relname']), '">', $this->_highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
                             break;
@@ -414,7 +414,7 @@ 
                             break;
                         case 'OPCLASS':
                             echo '<li>';
-                            echo '<a href="'.SUBFOLDER."/redirect/schema?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['schemaname']), '</a>.';
+                            echo '<a href="' . SUBFOLDER . "/redirect/schema?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '">', $misc->printVal($rs->fields['schemaname']), '</a>.';
                             echo "<a href=\"opclasses.php?{$misc->href}&amp;schema=", urlencode($rs->fields['schemaname']), '">',
                             $this->_highlight($misc->printVal($rs->fields['name']), $_REQUEST['term']), "</a></li>\n";
                             break;
@@ -444,7 +444,7 @@ 
         $this->printTabs('database', '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";
         // Data only
@@ -533,7 +533,7 @@ 
         $this->printMsg($msg);
 
         if (strlen($msg) === 0) {
-            echo '<br /><a id="control" href=""><img src="'.$misc->icon('Refresh')."\" alt=\"{$lang['strrefresh']}\" title=\"{$lang['strrefresh']}\"/>&nbsp;{$lang['strrefresh']}</a>";
+            echo '<br /><a id="control" href=""><img src="' . $misc->icon('Refresh') . "\" alt=\"{$lang['strrefresh']}\" title=\"{$lang['strrefresh']}\"/>&nbsp;{$lang['strrefresh']}</a>";
         }
 
         echo '<div id="data_block">';
@@ -734,7 +734,7 @@ 
         $this->printTrail('database');
         $this->printTabs('database', 'locks');
 
-        echo '<br /><a id="control" href=""><img src="'.$misc->icon('Refresh')."\" alt=\"{$lang['strrefresh']}\" title=\"{$lang['strrefresh']}\"/>&nbsp;{$lang['strrefresh']}</a>";
+        echo '<br /><a id="control" href=""><img src="' . $misc->icon('Refresh') . "\" alt=\"{$lang['strrefresh']}\" title=\"{$lang['strrefresh']}\"/>&nbsp;{$lang['strrefresh']}</a>";
 
         echo '<div id="data_block">';
         $this->currentLocks();
@@ -759,7 +759,7 @@ 
         $this->printTrail('database');
         $this->printTabs('database', 'sql');
         echo "<p>{$lang['strentersql']}</p>\n";
-        echo '<form action="'.SUBFOLDER.'/src/views/sql.php" method="post" enctype="multipart/form-data" id="sqlform">'."\n";
+        echo '<form action="' . SUBFOLDER . '/src/views/sql.php" method="post" enctype="multipart/form-data" id="sqlform">' . "\n";
         echo "<p>{$lang['strsql']}<br />\n";
         echo '<textarea style="width:95%;" rows="15" cols="50" name="query" id="query">',
         htmlspecialchars($_SESSION['sqlquery']), "</textarea></p>\n";

src/controllers/TypesController.php

Spacing +8 added lines, -8 removed lines

@@ -245,7 +245,7 @@ 
         $this->printTitle($lang['strproperties'], 'pg.type');
         $this->printMsg($msg);
 
-        $attPre = function (&$rowdata) use ($data) {
+        $attPre = function(&$rowdata) use ($data) {
             $rowdata->fields['+type'] = $data->formatType($rowdata->fields['type'], $rowdata->fields['atttypmod']);
         };
 
@@ -338,7 +338,7 @@ 
 
             echo '<p>', sprintf($lang['strconfdroptype'], $misc->printVal($_REQUEST['type'])), "</p>\n";
 
-            echo '<form action="'.SUBFOLDER."/src/views/types.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/types.php\" method=\"post\">\n";
             echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$lang['strcascade']}</label></p>\n";
             echo "<p><input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
             echo '<input type="hidden" name="type" value="', htmlspecialchars($_REQUEST['type']), "\" />\n";
@@ -388,7 +388,7 @@ 
                 $this->printTitle($lang['strcreatecomptype'], 'pg.type.create');
                 $this->printMsg($msg);
 
-                echo '<form action="'.SUBFOLDER."/src/views/types.php\" method=\"post\">\n";
+                echo '<form action="' . SUBFOLDER . "/src/views/types.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=\"data\"><input name=\"name\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
@@ -431,7 +431,7 @@ 
                 $this->printTitle($lang['strcreatecomptype'], 'pg.type.create');
                 $this->printMsg($msg);
 
-                echo '<form action="'.SUBFOLDER."/src/views/types.php\" method=\"post\">\n";
+                echo '<form action="' . SUBFOLDER . "/src/views/types.php\" method=\"post\">\n";
 
                 // Output table header
                 echo "<table>\n";
@@ -559,7 +559,7 @@ 
                 $this->printTitle($lang['strcreateenumtype'], 'pg.type.create');
                 $this->printMsg($msg);
 
-                echo '<form action="'.SUBFOLDER."/src/views/types.php\" method=\"post\">\n";
+                echo '<form action="' . SUBFOLDER . "/src/views/types.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=\"data\"><input name=\"name\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
@@ -600,7 +600,7 @@ 
                 $this->printTitle($lang['strcreateenumtype'], 'pg.type.create');
                 $this->printMsg($msg);
 
-                echo '<form action="'.SUBFOLDER."/src/views/types.php\" method=\"post\">\n";
+                echo '<form action="' . SUBFOLDER . "/src/views/types.php\" method=\"post\">\n";
 
                 // Output table header
                 echo "<table>\n";
@@ -718,7 +718,7 @@ 
         $this->printTitle($lang['strcreatetype'], 'pg.type.create');
         $this->printMsg($msg);
 
-        echo '<form action="'.SUBFOLDER."/src/views/types.php\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/types.php\" method=\"post\">\n";
         echo "<table>\n";
         echo "<tr><th class=\"data left required\">{$lang['strname']}</th>\n";
         echo "<td class=\"data1\"><input name=\"typname\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
@@ -742,7 +742,7 @@ 
             $funcs->moveNext();
         }
         echo "</select></td></tr>\n";
-        echo '<tr><th class="data left'.(version_compare($data->major_version, '7.4', '<') ? ' required' : '')."\">{$lang['strlength']}</th>\n";
+        echo '<tr><th class="data left' . (version_compare($data->major_version, '7.4', '<') ? ' required' : '') . "\">{$lang['strlength']}</th>\n";
         echo '<td class="data1"><input name="typlen" size="8" value="',
         htmlspecialchars($_POST['typlen']), '" /></td></tr>';
         echo "<tr><th class=\"data left\">{$lang['strdefault']}</th>\n";

src/controllers/IntroController.php

Spacing +10 added lines, -10 removed lines

@@ -35,47 +35,47 @@
 
         $intro_html .= $this->printTabs('root', 'intro', false);
 
-        $intro_html .= '<h1>'.$this->appName.' '.$this->appVersion.' (PHP '.PHP_VERSION.')</h1>';
+        $intro_html .= '<h1>' . $this->appName . ' ' . $this->appVersion . ' (PHP ' . PHP_VERSION . ')</h1>';
 
         $intro_html .= '<form method="get" action="intro.php">';
         $intro_html .= '<table>';
         $intro_html .= '<tr class="data1">';
-        $intro_html .= '<th class="data">'.$this->lang['strlanguage'].'</th>';
+        $intro_html .= '<th class="data">' . $this->lang['strlanguage'] . '</th>';
         $intro_html .= '<td>';
         $intro_html .= '<select name="language" onchange="this.form.submit()">';
 
         $this->language = isset($_SESSION['webdbLanguage']) ? $_SESSION['webdbLanguage'] : 'english';
         foreach ($this->appLangFiles as $k => $v) {
             $selected = ($k == $this->language) ? ' selected="selected"' : '';
-            $intro_html .= "\t<option value=\"{$k}\"".$selected.">{$v}</option>\n";
+            $intro_html .= "\t<option value=\"{$k}\"" . $selected . ">{$v}</option>\n";
         }
 
         $intro_html .= '</select>';
         $intro_html .= '</td>';
         $intro_html .= '</tr>';
         $intro_html .= '<tr class="data2">';
-        $intro_html .= '<th class="data">'.$this->lang['strtheme'].'</th>';
+        $intro_html .= '<th class="data">' . $this->lang['strtheme'] . '</th>';
         $intro_html .= '<td>';
         $intro_html .= '<select name="theme" onchange="this.form.submit()">';
 
         foreach ($this->appThemes as $k => $v) {
             $selected = ($k == $this->conf['theme']) ? ' selected="selected"' : '';
-            $intro_html .= "\t<option value=\"{$k}\"".$selected.">{$v}</option>\n";
+            $intro_html .= "\t<option value=\"{$k}\"" . $selected . ">{$v}</option>\n";
         }
 
         $intro_html .= '</select>';
         $intro_html .= '</td>';
         $intro_html .= '</tr>';
         $intro_html .= '</table>';
-        $intro_html .= '<noscript><p><input type="submit" value="'.$this->lang['stralter'].'" /></p></noscript>';
+        $intro_html .= '<noscript><p><input type="submit" value="' . $this->lang['stralter'] . '" /></p></noscript>';
         $intro_html .= '</form>';
 
-        $intro_html .= '<p>'.$this->lang['strintro'].'</p>';
+        $intro_html .= '<p>' . $this->lang['strintro'] . '</p>';
 
         $intro_html .= '<ul class="intro">';
-        $intro_html .= '	<li><a href="https://github.com/HuasoFoundries/phpPgAdmin6">'.$this->lang['strppahome'].'</a></li>';
-        $intro_html .= '<li><a href="'.$this->lang['strpgsqlhome_url'].'">'.$this->lang['strpgsqlhome'].'</a></li>';
-        $intro_html .= '<li><a href="https://github.com/HuasoFoundries/phpPgAdmin6/issues">'.$this->lang['strreportbug'].'</a></li>';
+        $intro_html .= '	<li><a href="https://github.com/HuasoFoundries/phpPgAdmin6">' . $this->lang['strppahome'] . '</a></li>';
+        $intro_html .= '<li><a href="' . $this->lang['strpgsqlhome_url'] . '">' . $this->lang['strpgsqlhome'] . '</a></li>';
+        $intro_html .= '<li><a href="https://github.com/HuasoFoundries/phpPgAdmin6/issues">' . $this->lang['strreportbug'] . '</a></li>';
         //$intro_html .= '<li><a href="' . $this->lang['strviewfaq_url'] . '">' . $this->lang['strviewfaq'] . '</a></li>';
         $intro_html .= '</ul>';