HuasoFoundries / phpPgAdmin6

src/controllers/ConstraintsController.php

Spacing +15 added lines, -15 removed lines

@@ -22,8 +22,8 @@ 
             return $this->doTree();
         }
 
-        $this->printHeader($lang['strtables'].' - '.$_REQUEST['table'].' - '.$lang['strconstraints'],
-            '<script src="'.SUBFOLDER.'/js/indexes.js" type="text/javascript"></script>', true, 'header_select2.twig');
+        $this->printHeader($lang['strtables'] . ' - ' . $_REQUEST['table'] . ' - ' . $lang['strconstraints'],
+            '<script src="' . SUBFOLDER . '/js/indexes.js" type="text/javascript"></script>', true, 'header_select2.twig');
 
         if ($action == 'add_unique_key' || $action == 'save_add_unique_key'
             || $action == 'add_primary_key' || $action == 'save_add_primary_key'
@@ -113,10 +113,10 @@ 
         $lang = $this->lang;
         $data = $misc->getDatabaseAccessor();
 
-        $cnPre = function (&$rowdata) use ($data) {
+        $cnPre = function(&$rowdata) use ($data) {
             if (is_null($rowdata->fields['consrc'])) {
                 $atts = $data->getAttributeNames($_REQUEST['table'], explode(' ', $rowdata->fields['indkey']));
-                $rowdata->fields['+definition'] = ($rowdata->fields['contype'] == 'u' ? 'UNIQUE (' : 'PRIMARY KEY (').implode(',', $atts).')';
+                $rowdata->fields['+definition'] = ($rowdata->fields['contype'] == 'u' ? 'UNIQUE (' : 'PRIMARY KEY (') . implode(',', $atts) . ')';
             } else {
                 $rowdata->fields['+definition'] = $rowdata->fields['consrc'];
             }
@@ -319,9 +319,9 @@ 
                     echo "<table>\n";
                     echo "<tr><th class=\"data\" colspan=\"3\">{$lang['strfktarget']}</th></tr>";
                     echo "<tr><th class=\"data\">{$lang['strtablecolumnlist']}</th><th class=\"data\">&nbsp;</th><th class=data>{$lang['strfkcolumnlist']}</th></tr>\n";
-                    echo '<tr><td class="data1">'.$selColumns->fetch()."</td>\n";
-                    echo '<td class="data1" style="text-align: center">'.$buttonRemove->fetch().$buttonAdd->fetch().'</td>';
-                    echo '<td class="data1">'.$selIndex->fetch()."</td></tr>\n";
+                    echo '<tr><td class="data1">' . $selColumns->fetch() . "</td>\n";
+                    echo '<td class="data1" style="text-align: center">' . $buttonRemove->fetch() . $buttonAdd->fetch() . '</td>';
+                    echo '<td class="data1">' . $selIndex->fetch() . "</td></tr>\n";
                     echo "<tr><th class=\"data\" colspan=\"3\">{$lang['stractions']}</th></tr>";
                     echo '<tr>';
                     echo "<td class=\"data1\" colspan=\"3\">\n";
@@ -438,9 +438,9 @@ 
                 echo "<tr><th class=\"data\" colspan=\"3\">{$lang['strname']}</th></tr>\n";
                 echo "<tr><td class=\"data1\" colspan=\"3\"><input type=\"text\" name=\"name\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" /></td></tr>\n";
                 echo "<tr><th class=\"data\">{$lang['strtablecolumnlist']}</th><th class=\"data\">&nbsp;</th><th class=\"data required\">{$lang['strfkcolumnlist']}</th></tr>\n";
-                echo '<tr><td class="data1">'.$selColumns->fetch()."</td>\n";
-                echo '<td class="data1" style="text-align: center">'.$buttonRemove->fetch().$buttonAdd->fetch()."</td>\n";
-                echo '<td class=data1>'.$selIndex->fetch()."</td></tr>\n";
+                echo '<tr><td class="data1">' . $selColumns->fetch() . "</td>\n";
+                echo '<td class="data1" style="text-align: center">' . $buttonRemove->fetch() . $buttonAdd->fetch() . "</td>\n";
+                echo '<td class=data1>' . $selIndex->fetch() . "</td></tr>\n";
                 echo "<tr><th class=\"data\" colspan=\"3\">{$lang['strfktarget']}</th></tr>";
                 echo '<tr>';
                 echo '<td class="data1" colspan="3"><select class="select2" name="target">';
@@ -546,9 +546,9 @@ 
             echo '<td class="data1" colspan="3"><input type="text" name="name" value="', htmlspecialchars($_POST['name']),
                 "\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" /></td></tr>";
             echo "<tr><th class=\"data\">{$lang['strtablecolumnlist']}</th><th class=\"data\">&nbsp;</th><th class=\"data required\">{$lang['strindexcolumnlist']}</th></tr>\n";
-            echo '<tr><td class="data1">'.$selColumns->fetch()."</td>\n";
-            echo '<td class="data1" style="text-align: center">'.$buttonRemove->fetch().$buttonAdd->fetch().'</td>';
-            echo '<td class=data1>'.$selIndex->fetch()."</td></tr>\n";
+            echo '<tr><td class="data1">' . $selColumns->fetch() . "</td>\n";
+            echo '<td class="data1" style="text-align: center">' . $buttonRemove->fetch() . $buttonAdd->fetch() . '</td>';
+            echo '<td class=data1>' . $selIndex->fetch() . "</td></tr>\n";
 
             // Tablespace (if there are any)
             if ($data->hasTablespaces() && $tablespaces->recordCount() > 0) {
@@ -637,7 +637,7 @@ 
             $this->printTitle($lang['straddcheck'], 'pg.constraint.check');
             $this->printMsg($msg);
 
-            echo '<form action="'.SUBFOLDER."/src/views/constraints.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/constraints.php\" method=\"post\">\n";
             echo "<table>\n";
             echo "<tr><th class=\"data\">{$lang['strname']}</th>\n";
             echo "<th class=\"data required\">{$lang['strdefinition']}</th></tr>\n";
@@ -687,7 +687,7 @@ 
             echo '<p>', sprintf($lang['strconfdropconstraint'], $misc->printVal($_REQUEST['constraint']),
                 $misc->printVal($_REQUEST['table'])), "</p>\n";
 
-            echo '<form action="'.SUBFOLDER."/src/views/constraints.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/constraints.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="constraint" value="', htmlspecialchars($_REQUEST['constraint']), "\" />\n";

src/controllers/ServersController.php

Spacing +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
             'server'   => [
                 'title' => $lang['strserver'],
                 'field' => Decorator::field('desc'),
-                'url'   => SUBFOLDER.'/redirect/server?',
+                'url'   => SUBFOLDER . '/redirect/server?',
                 'vars'  => ['server' => 'id'],
             ],
             'host'     => [
@@ -126,7 +126,7 @@ 
             ],
         ];
 
-        $svPre = function (&$rowdata) use ($actions) {
+        $svPre = function(&$rowdata) use ($actions) {
             $actions['logout']['disable'] = empty($rowdata->fields['username']);
 
             return $actions;

src/controllers/RolesController.php

Spacing +8 added lines, -8 removed lines

@@ -90,11 +90,11 @@ 
         $lang = $this->lang;
         $data = $misc->getDatabaseAccessor();
 
-        $renderRoleConnLimit = function ($val) use ($lang) {
+        $renderRoleConnLimit = function($val) use ($lang) {
             return $val == '-1' ? $lang['strnolimit'] : htmlspecialchars($val);
         };
 
-        $renderRoleExpires = function ($val) use ($lang) {
+        $renderRoleExpires = function($val) use ($lang) {
             return $val == 'infinity' ? $lang['strnever'] : htmlspecialchars($val);
         };
 
@@ -108,7 +108,7 @@ 
             'role'       => [
                 'title' => $lang['strrole'],
                 'field' => Decorator::field('rolname'),
-                'url'   => SUBFOLDER."/redirect/role?action=properties&{$misc->href}&",
+                'url'   => SUBFOLDER . "/redirect/role?action=properties&{$misc->href}&",
                 'vars'  => ['rolename' => 'rolname'],
             ],
             'superuser'  => [
@@ -245,7 +245,7 @@ 
         $this->printTitle($lang['strcreaterole'], 'pg.role.create');
         $this->printMsg($msg);
 
-        echo '<form action="'.SUBFOLDER."/src/views/roles.php\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/roles.php\" method=\"post\">\n";
         echo "<table>\n";
         echo "\t<tr>\n\t\t<th class=\"data left required\" style=\"width: 130px\">{$lang['strname']}</th>\n";
         echo "\t\t<td class=\"data1\"><input size=\"15\" maxlength=\"{$data->_maxNameLen}\" name=\"formRolename\" value=\"", htmlspecialchars($_POST['formRolename']), "\" /></td>\n\t</tr>\n";
@@ -417,10 +417,10 @@ 
                 $_POST['formPassword'] = '';
             }
 
-            echo '<form action="'.SUBFOLDER."/src/views/roles.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/roles.php\" method=\"post\">\n";
             echo "<table>\n";
             echo "\t<tr>\n\t\t<th class=\"data left\" style=\"width: 130px\">{$lang['strname']}</th>\n";
-            echo "\t\t<td class=\"data1\">", ($canRename ? "<input name=\"formNewRoleName\" size=\"15\" maxlength=\"{$data->_maxNameLen}\" value=\"".htmlspecialchars($_POST['formNewRoleName']).'" />' : $misc->printVal($roledata->fields['rolname'])), "</td>\n\t</tr>\n";
+            echo "\t\t<td class=\"data1\">", ($canRename ? "<input name=\"formNewRoleName\" size=\"15\" maxlength=\"{$data->_maxNameLen}\" value=\"" . htmlspecialchars($_POST['formNewRoleName']) . '" />' : $misc->printVal($roledata->fields['rolname'])), "</td>\n\t</tr>\n";
             echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strpassword']}</th>\n";
             echo "\t\t<td class=\"data1\"><input type=\"password\" size=\"15\" name=\"formPassword\" value=\"", htmlspecialchars($_POST['formPassword']), "\" /></td>\n\t</tr>\n";
             echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strconfirm']}</th>\n";
@@ -602,7 +602,7 @@ 
 
             echo '<p>', sprintf($lang['strconfdroprole'], $misc->printVal($_REQUEST['rolename'])), "</p>\n";
 
-            echo '<form action="'.SUBFOLDER."/src/views/roles.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/roles.php\" method=\"post\">\n";
             echo "<p><input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
             echo '<input type="hidden" name="rolename" value="', htmlspecialchars($_REQUEST['rolename']), "\" />\n";
             echo $misc->form;
@@ -830,7 +830,7 @@ 
                 $_POST['confirm'] = '';
             }
 
-            echo '<form action="'.SUBFOLDER."/src/views/roles.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/roles.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=\"",

src/controllers/DomainsController.php

Spacing +5 added lines, -5 removed lines

@@ -275,7 +275,7 @@ 
             }
 
             // Display domain info
-            echo '<form action="'.SUBFOLDER."/src/views/domains.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/domains.php\" method=\"post\">\n";
             echo "<table>\n";
             echo "<tr><th class=\"data left required\" style=\"width: 70px\">{$lang['strname']}</th>\n";
             echo '<td class="data1">', $misc->printVal($domaindata->fields['domname']), "</td></tr>\n";
@@ -330,7 +330,7 @@ 
             $this->printTitle($lang['straddcheck'], 'pg.constraint.check');
             $this->printMsg($msg);
 
-            echo '<form action="'.SUBFOLDER."/src/views/domains.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/domains.php\" method=\"post\">\n";
             echo "<table>\n";
             echo "<tr><th class=\"data\">{$lang['strname']}</th>\n";
             echo "<th class=\"data required\">{$lang['strdefinition']}</th></tr>\n";
@@ -380,7 +380,7 @@ 
 
             echo '<p>', sprintf($lang['strconfdropconstraint'], $misc->printVal($_REQUEST['constraint']),
                 $misc->printVal($_REQUEST['domain'])), "</p>\n";
-            echo '<form action="'.SUBFOLDER."/src/views/domains.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/domains.php\" method=\"post\">\n";
             echo "<input type=\"hidden\" name=\"action\" value=\"drop_con\" />\n";
             echo '<input type="hidden" name="domain" value="', htmlspecialchars($_REQUEST['domain']), "\" />\n";
             echo '<input type="hidden" name="constraint" value="', htmlspecialchars($_REQUEST['constraint']), "\" />\n";
@@ -546,7 +546,7 @@ 
             $this->printTitle($lang['strdrop'], 'pg.domain.drop');
 
             echo '<p>', sprintf($lang['strconfdropdomain'], $misc->printVal($_REQUEST['domain'])), "</p>\n";
-            echo '<form action="'.SUBFOLDER."/src/views/domains.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/domains.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="domain" value="', htmlspecialchars($_REQUEST['domain']), "\" />\n";
@@ -604,7 +604,7 @@ 
         $this->printTitle($lang['strcreatedomain'], 'pg.domain.create');
         $this->printMsg($msg);
 
-        echo '<form action="'.SUBFOLDER."/src/views/domains.php\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/domains.php\" method=\"post\">\n";
         echo "<table>\n";
         echo "<tr><th class=\"data left required\" style=\"width: 70px\">{$lang['strname']}</th>\n";
         echo "<td class=\"data1\"><input name=\"domname\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",

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