HuasoFoundries / phpPgAdmin6

src/xhtml/HTMLNavbarController.php

Spacing +20 added lines, -20 removed lines

@@ -30,7 +30,7 @@ 
 
         //$this->prtrace($trail);
 
-        $trail_html .= '<div class="trail" data-controller="'.$this->controller_name.'"><table><tr>';
+        $trail_html .= '<div class="trail" data-controller="' . $this->controller_name . '"><table><tr>';
 
         foreach ($trail as $crumb) {
             $trail_html .= '<td class="crumb">';
@@ -57,7 +57,7 @@ 
                 $crumblink .= "<span class=\"icon\"><img src=\"{$icon}\" alt=\"{$iconalt}\" /></span>";
             }
 
-            $crumblink .= '<span class="label">'.htmlspecialchars($crumb['text']).'</span></a>';
+            $crumblink .= '<span class="label">' . htmlspecialchars($crumb['text']) . '</span></a>';
 
             if (isset($crumb['help'])) {
                 $trail_html .= $this->misc->printHelp($crumblink, $crumb['help'], false);
@@ -157,7 +157,7 @@ 
         //$this->prtrace($tabs);
 
         if (count($tabs) > 0) {
-            $width = (int) (100 / count($tabs)).'%';
+            $width = (int) (100 / count($tabs)) . '%';
 
             $viewVars = [
                 'width'           => $width,
@@ -219,15 +219,15 @@ 
         $server_id = $misc->getServerId();
         $reqvars = $misc->getRequestVars('table');
 
-        $topbar_html = '<div class="topbar" data-controller="'.$this->controller_name.'"><table style="width: 100%"><tr><td>';
+        $topbar_html = '<div class="topbar" data-controller="' . $this->controller_name . '"><table style="width: 100%"><tr><td>';
 
         if ($server_info && isset($server_info['platform']) && isset($server_info['username'])) {
             /* top left informations when connected */
             $topbar_html .= sprintf($lang['strtopbar'],
-                '<span class="platform">'.htmlspecialchars($server_info['platform']).'</span>',
-                '<span class="host">'.htmlspecialchars((empty($server_info['host'])) ? 'localhost' : $server_info['host']).'</span>',
-                '<span class="port">'.htmlspecialchars($server_info['port']).'</span>',
-                '<span class="username">'.htmlspecialchars($server_info['username']).'</span>');
+                '<span class="platform">' . htmlspecialchars($server_info['platform']) . '</span>',
+                '<span class="host">' . htmlspecialchars((empty($server_info['host'])) ? 'localhost' : $server_info['host']) . '</span>',
+                '<span class="port">' . htmlspecialchars($server_info['port']) . '</span>',
+                '<span class="username">' . htmlspecialchars($server_info['username']) . '</span>');
 
             $topbar_html .= '</td>';
 
@@ -237,7 +237,7 @@ 
                 'sql'     => [
                     'attr'    => [
                         'href'   => [
-                            'url'     => SUBFOLDER.'/src/views/sqledit',
+                            'url'     => SUBFOLDER . '/src/views/sqledit',
                             'urlvars' => array_merge($reqvars, [
                                 'action' => 'sql',
                             ]),
@@ -250,7 +250,7 @@ 
                 'history' => [
                     'attr'    => [
                         'href' => [
-                            'url'     => SUBFOLDER.'/src/views/history',
+                            'url'     => SUBFOLDER . '/src/views/history',
                             'urlvars' => array_merge($reqvars, [
                                 'action' => 'pophistory',
                             ]),
@@ -262,7 +262,7 @@ 
                 'find'    => [
                     'attr'    => [
                         'href'   => [
-                            'url'     => SUBFOLDER.'/src/views/sqledit',
+                            'url'     => SUBFOLDER . '/src/views/sqledit',
                             'urlvars' => array_merge($reqvars, [
                                 'action' => 'find',
                             ]),
@@ -275,7 +275,7 @@ 
                 'logout'  => [
                     'attr'    => [
                         'href' => [
-                            'url'     => SUBFOLDER.'/src/views/servers',
+                            'url'     => SUBFOLDER . '/src/views/servers',
                             'urlvars' => [
                                 'action'       => 'logout',
                                 'logoutServer' => "{$server_info['host']}:{$server_info['port']}:{$server_info['sslmode']}",
@@ -300,8 +300,8 @@ 
 
             $topbar_html .= '</td>';
 
-            $sql_window_id = htmlentities('sqledit:'.$server_id);
-            $history_window_id = htmlentities('history:'.$server_id);
+            $sql_window_id = htmlentities('sqledit:' . $server_id);
+            $history_window_id = htmlentities('history:' . $server_id);
 
             $topbar_html .= "<script type=\"text/javascript\">
 						$('#toplink_sql').click(function() {
@@ -366,7 +366,7 @@ 
         $vars = $this->misc->getSubjectParams($subject);
         ksort($vars['params']);
 
-        return "{$vars['url']}?".http_build_query($vars['params'], '', '&amp;');
+        return "{$vars['url']}?" . http_build_query($vars['params'], '', '&amp;');
     }
 
     /**
@@ -389,7 +389,7 @@ 
 
         $trail['root'] = [
             'text' => $appName,
-            'url'  => SUBFOLDER.'/src/views/servers',
+            'url'  => SUBFOLDER . '/src/views/servers',
             'icon' => 'Introduction',
         ];
 
@@ -463,7 +463,7 @@ 
             ];
         } elseif (isset($_REQUEST['matview']) && !$done) {
             $trail['matview'] = [
-                'title' => 'M'.$lang['strview'],
+                'title' => 'M' . $lang['strview'],
                 'text'  => $_REQUEST['matview'],
                 'url'   => $this->getHREFSubject('matview'),
                 'help'  => 'pg.matview',
@@ -486,7 +486,7 @@ 
             switch ($subject) {
                 case 'function':
                     $trail[$subject] = [
-                        'title' => $lang['str'.$subject],
+                        'title' => $lang['str' . $subject],
                         'text'  => $_REQUEST[$subject],
                         'url'   => $this->getHREFSubject('function'),
                         'help'  => 'pg.function',
@@ -525,9 +525,9 @@ 
                                 break;
                         }
                         $trail[$subject] = [
-                            'title' => array_key_exists('str'.$subject, $lang) ? $lang['str'.$subject] : $subject,
+                            'title' => array_key_exists('str' . $subject, $lang) ? $lang['str' . $subject] : $subject,
                             'text'  => $_REQUEST[$subject],
-                            'help'  => 'pg.'.$subject,
+                            'help'  => 'pg.' . $subject,
                             'icon'  => $icon,
                         ];
                     }

src/xhtml/HTMLFooterController.php

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
             $footer_html .= $this->printReload(true, false);
         }
         if (!$this->_no_bottom_link) {
-            $footer_html .= '<a data-footertemplate="'.$template.'" href="#" class="bottom_link">'.$lang['strgotoppage'].'</a>';
+            $footer_html .= '<a data-footertemplate="' . $template . '" href="#" class="bottom_link">' . $lang['strgotoppage'] . '</a>';
         }
 
         $footer_html .= $this->view->fetch($template);
@@ -79,7 +79,7 @@ 
         $reload = "<script type=\"text/javascript\">\n";
         //$reload .= " alert('will reload');";
         if ($database) {
-            $reload .= "\tparent.frames && parent.frames.browser && parent.frames.browser.location.replace=\"".SUBFOLDER."/src/views/browser.php\";\n";
+            $reload .= "\tparent.frames && parent.frames.browser && parent.frames.browser.location.replace=\"" . SUBFOLDER . "/src/views/browser.php\";\n";
         } else {
             $reload .= "\tif(parent.frames && parent.frames.browser) { console.log('will reload frame browser'); parent.frames.browser.location.reload();} else { console.log('will do location replace'); location.replace(location.href);}\n";
             //$reload .= "\tparent.frames.detail.location.href=\"".SUBFOLDER . "/src/views/intro\";\n";
@@ -117,7 +117,7 @@ 
     {
         echo "<script type=\"text/javascript\">\n";
         echo "//<![CDATA[\n";
-        echo "   window.name = '{$name}", ($addServer ? ':'.htmlspecialchars($this->misc->getServerId()) : ''), "';\n";
+        echo "   window.name = '{$name}", ($addServer ? ':' . htmlspecialchars($this->misc->getServerId()) : ''), "';\n";
         echo "//]]>\n";
         echo "</script>\n";
     }

src/xhtml/TreeController.php

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
             }
         } else {
             $msg = isset($attrs['nodata']) ? $attrs['nodata'] : $lang['strnoobjects'];
-            $tree_xml .= "<tree text=\"{$msg}\" onaction=\"tree.getSelected().getParent().reload()\" icon=\"".$this->misc->icon('ObjectNotFound').'" />'."\n";
+            $tree_xml .= "<tree text=\"{$msg}\" onaction=\"tree.getSelected().getParent().reload()\" icon=\"" . $this->misc->icon('ObjectNotFound') . '" />' . "\n";
         }
 
         $tree_xml .= "</tree>\n";

src/controllers/FulltextController.php

Spacing +12 added lines, -12 removed lines

@@ -305,7 +305,7 @@ 
 
             echo '<p>', sprintf($lang['strconfdropftsconfig'], $misc->printVal($_REQUEST['ftscfg'])), "</p>\n";
 
-            echo '<form action="'.SUBFOLDER."/src/views/fulltext.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/fulltext.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=\"dropconfig\" />\n";
             echo '<input type="hidden" name="database" value="', htmlspecialchars($_REQUEST['database']), "\" />\n";
@@ -338,7 +338,7 @@ 
 
             echo '<p>', sprintf($lang['strconfdropftsdict'], $misc->printVal($_REQUEST['ftsdict'])), "</p>\n";
 
-            echo '<form action="'.SUBFOLDER."/src/views/fulltext.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/fulltext.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=\"dropdict\" />\n";
             echo '<input type="hidden" name="database" value="', htmlspecialchars($_REQUEST['database']), "\" />\n";
@@ -401,7 +401,7 @@ 
         $this->printTitle($lang['strftscreateconfig'], 'pg.ftscfg.create');
         $this->printMsg($msg);
 
-        echo '<form action="'.SUBFOLDER."/src/views/fulltext.php\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/fulltext.php\" method=\"post\">\n";
         echo "<table>\n";
         /* conf name */
         echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strname']}</th>\n";
@@ -417,7 +417,7 @@ 
         while (!$ftscfgs->EOF) {
             $data->fieldClean($ftscfgs->fields['schema']);
             $data->fieldClean($ftscfgs->fields['name']);
-            $tplname = $ftscfgs->fields['schema'].'.'.$ftscfgs->fields['name'];
+            $tplname = $ftscfgs->fields['schema'] . '.' . $ftscfgs->fields['name'];
             $tpls[$tplname] = serialize([
                 'name'   => $ftscfgs->fields['name'],
                 'schema' => $ftscfgs->fields['schema'],
@@ -438,7 +438,7 @@ 
         while (!$ftsparsers->EOF) {
             $data->fieldClean($ftsparsers->fields['schema']);
             $data->fieldClean($ftsparsers->fields['name']);
-            $parsername = $ftsparsers->fields['schema'].'.'.$ftsparsers->fields['name'];
+            $parsername = $ftsparsers->fields['schema'] . '.' . $ftsparsers->fields['name'];
 
             $ftsparsers_[$parsername] = serialize([
                 'parser' => $ftsparsers->fields['name'],
@@ -548,7 +548,7 @@ 
             // Fetch all FTS parsers from the database
             $ftsparsers = $data->getFtsParsers();
 
-            echo '<form action="'.SUBFOLDER."/src/views/fulltext.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/fulltext.php\" method=\"post\">\n";
             echo "<table>\n";
 
             echo "\t<tr>\n";
@@ -861,7 +861,7 @@ 
         $this->printTitle($lang['strftscreatedict'], 'pg.ftsdict.create');
         $this->printMsg($msg);
 
-        echo '<form action="'.SUBFOLDER."/src/views/fulltext.php\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/fulltext.php\" method=\"post\">\n";
         echo "<table>\n";
         echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strname']}</th>\n";
         echo "\t\t<td class=\"data1\"><input name=\"formName\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
@@ -877,7 +877,7 @@ 
         while (!$ftstpls->EOF) {
             $data->fieldClean($ftstpls->fields['schema']);
             $data->fieldClean($ftstpls->fields['name']);
-            $tplname = $ftstpls->fields['schema'].'.'.$ftstpls->fields['name'];
+            $tplname = $ftstpls->fields['schema'] . '.' . $ftstpls->fields['name'];
             $tpls[$tplname] = serialize([
                 'name'   => $ftstpls->fields['name'],
                 'schema' => $ftstpls->fields['schema'],
@@ -1015,7 +1015,7 @@ 
                 $_POST['formName'] = $_REQUEST['ftsdict'];
             }
 
-            echo '<form action="'.SUBFOLDER."/src/views/fulltext.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/fulltext.php\" method=\"post\">\n";
             echo "<table>\n";
 
             echo "\t<tr>\n";
@@ -1088,7 +1088,7 @@ 
             $this->printTrail('ftscfg'); // TODO: proper breadcrumbs
             $this->printTitle($lang['strdrop'], 'pg.ftscfg.alter');
 
-            echo '<form action="'.SUBFOLDER."/src/views/fulltext.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/fulltext.php\" method=\"post\">\n";
 
             // Case of multiaction drop
             if (isset($_REQUEST['ma'])) {
@@ -1154,7 +1154,7 @@ 
                 $_POST['ftscfg'] = $_REQUEST['ftscfg'];
             }
 
-            echo '<form action="'.SUBFOLDER."/src/views/fulltext.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/fulltext.php\" method=\"post\">\n";
 
             echo "<table>\n";
             echo "\t<tr>\n";
@@ -1259,7 +1259,7 @@ 
 
             $mappings = $data->getFtsMappings($_POST['ftscfg']);
 
-            echo '<form action="'.SUBFOLDER."/src/views/fulltext.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/fulltext.php\" method=\"post\">\n";
             echo "<table>\n";
             echo "\t<tr>\n";
             echo "\t\t<th class=\"data left required\">{$lang['strftsmapping']}</th>\n";

src/controllers/TblpropertiesController.php

Spacing +24 added lines, -24 removed lines

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

src/controllers/TablesController.php

Spacing +14 added lines, -14 removed lines

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

src/controllers/BaseController.php

Spacing +1 added lines, -1 removed lines

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

src/controllers/SqlController.php

Spacing +2 added lines, -2 removed lines

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

src/controllers/SchemasController.php

Spacing +5 added lines, -5 removed lines

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