HuasoFoundries / phpPgAdmin6

src/controllers/LoginController.php

Spacing +11 added lines, -11 removed lines

@@ -79,7 +79,7 @@ 
             $login_html .= $this->printMsg($msg, false);
         }
 
-        $login_html .= '<form id="login_form"  method="post" name="login_form" action="'.SUBFOLDER.'/redirect/server?server='.htmlspecialchars($server_id).'">';
+        $login_html .= '<form id="login_form"  method="post" name="login_form" action="' . SUBFOLDER . '/redirect/server?server=' . htmlspecialchars($server_id) . '">';
 
         $md5_server = md5($server_id);
         // Pass request vars through form (is this a security risk???)
@@ -91,33 +91,33 @@ 
                 $key = explode('?', $key)[1];
             }
 
-            $login_html .= '<input type="hidden" name="'.htmlspecialchars($key).'" value="'.htmlspecialchars($val).'" />'."\n";
+            $login_html .= '<input type="hidden" name="' . htmlspecialchars($key) . '" value="' . htmlspecialchars($val) . '" />' . "\n";
         }
 
-        $login_html .= '<input type="hidden" name="loginServer" value="'.htmlspecialchars($server_id).'" />';
+        $login_html .= '<input type="hidden" name="loginServer" value="' . htmlspecialchars($server_id) . '" />';
         $login_html .= '<table class="navbar" border="0" cellpadding="5" cellspacing="3">';
         $login_html .= '<tr>';
-        $login_html .= '<td>'.$lang['strusername'].'</td>';
+        $login_html .= '<td>' . $lang['strusername'] . '</td>';
         $loginusername = isset($_POST['loginUsername']) ? htmlspecialchars($_POST['loginUsername']) : '';
 
-        $login_html .= '<td><input type="text" name="loginUsername" value="'.$loginusername.'" size="24" /></td>';
+        $login_html .= '<td><input type="text" name="loginUsername" value="' . $loginusername . '" size="24" /></td>';
         $login_html .= '</tr>';
         $login_html .= '<tr>';
-        $login_html .= '<td>'.$lang['strpassword'].'</td>';
-        $login_html .= '<td><input id="loginPassword" type="password" name="loginPassword_'.$md5_server.'" size="24" /></td>';
+        $login_html .= '<td>' . $lang['strpassword'] . '</td>';
+        $login_html .= '<td><input id="loginPassword" type="password" name="loginPassword_' . $md5_server . '" size="24" /></td>';
         $login_html .= '</tr>';
         $login_html .= '</table>';
         if (count($conf['servers']) > 1) {
             $checked = isset($_POST['loginShared']) ? 'checked="checked"' : '';
-            $login_html .= '<p><input type="checkbox" id="loginShared" name="loginShared" '.$checked.' />';
-            $login_html .= '<label for="loginShared">'.$lang['strtrycred'].'</label></p>';
+            $login_html .= '<p><input type="checkbox" id="loginShared" name="loginShared" ' . $checked . ' />';
+            $login_html .= '<label for="loginShared">' . $lang['strtrycred'] . '</label></p>';
         }
-        $login_html .= '<p><input type="submit" name="loginSubmit" value="'.$lang['strlogin'].'" /></p>';
+        $login_html .= '<p><input type="submit" name="loginSubmit" value="' . $lang['strlogin'] . '" /></p>';
         $login_html .= '</form>';
 
         $login_html .= '<script type="text/javascript">';
         $login_html .= '	var uname = document.login_form.loginUsername;';
-        $login_html .= '	var pword = document.login_form.loginPassword_'.$md5_server.';';
+        $login_html .= '	var pword = document.login_form.loginPassword_' . $md5_server . ';';
         $login_html .= '	if (uname.value == "") {';
         $login_html .= '		uname.focus();';
         $login_html .= '	} else {';

src/controllers/IndexesController.php

Spacing +49 added lines, -49 removed lines

@@ -22,7 +22,7 @@ 
             return $this->doTree();
         }
 
-        $this->printHeader($lang['strindexes'], '<script src="'.SUBFOLDER.'/js/indexes.js" type="text/javascript"></script>');
+        $this->printHeader($lang['strindexes'], '<script src="' . SUBFOLDER . '/js/indexes.js" type="text/javascript"></script>');
 
         if ($action == 'create_index' || $action == 'save_create_index') {
             echo '<body onload="init();">';
@@ -82,7 +82,7 @@ 
         $lang = $this->lang;
         $data = $misc->getDatabaseAccessor();
 
-        $indPre = function (&$rowdata, $actions) use ($data, $lang) {
+        $indPre = function(&$rowdata, $actions) use ($data, $lang) {
             if ($data->phpBool($rowdata->fields['indisprimary'])) {
                 $rowdata->fields['+constraints'] = $lang['strprimarykey'];
                 $actions['drop']['disable'] = true;
@@ -218,7 +218,7 @@ 
 
         $reqvars = $misc->getRequestVars($subject);
 
-        $getIcon = function ($f) {
+        $getIcon = function($f) {
             if ($f['indisprimary'] == 't') {
                 return 'PrimaryKey';
             }
@@ -255,25 +255,25 @@ 
             $this->printTrail('index');
             $this->printTitle($lang['strclusterindex'], 'pg.index.cluster');
 
-            echo '<p>', sprintf($lang['strconfcluster'], $misc->printVal($_REQUEST['index'])), '</p>'."\n";
+            echo '<p>', sprintf($lang['strconfcluster'], $misc->printVal($_REQUEST['index'])), '</p>' . "\n";
 
-            echo '<form action="'.SUBFOLDER.'/src/views/indexes.php" method="post">'."\n";
+            echo '<form action="' . SUBFOLDER . '/src/views/indexes.php" method="post">' . "\n";
             echo '<p><input type="checkbox" id="analyze" name="analyze"', (isset($_REQUEST['analyze']) ? ' checked="checked"' : ''), ' />';
-            echo "<label for=\"analyze\">{$lang['stranalyze']}</label></p>"."\n";
-            echo '<input type="hidden" name="action" value="cluster_index" />'."\n";
-            echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), '" />'."\n";
-            echo '<input type="hidden" name="index" value="', htmlspecialchars($_REQUEST['index']), '" />'."\n";
+            echo "<label for=\"analyze\">{$lang['stranalyze']}</label></p>" . "\n";
+            echo '<input type="hidden" name="action" value="cluster_index" />' . "\n";
+            echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), '" />' . "\n";
+            echo '<input type="hidden" name="index" value="', htmlspecialchars($_REQUEST['index']), '" />' . "\n";
             echo $misc->form;
-            echo "<input type=\"submit\" name=\"cluster\" value=\"{$lang['strclusterindex']}\" />"."\n";
-            echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />"."\n";
-            echo '</form>'."\n";
+            echo "<input type=\"submit\" name=\"cluster\" value=\"{$lang['strclusterindex']}\" />" . "\n";
+            echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />" . "\n";
+            echo '</form>' . "\n";
         } else {
             $status = $data->clusterIndex($_POST['table'], $_POST['index']);
             if ($status == 0) {
                 if (isset($_POST['analyze'])) {
                     $status = $data->analyzeDB($_POST['table']);
                     if ($status == 0) {
-                        $this->doDefault($lang['strclusteredgood'].' '.$lang['stranalyzegood']);
+                        $this->doDefault($lang['strclusteredgood'] . ' ' . $lang['stranalyzegood']);
                     } else {
                         $this->doDefault($lang['stranalyzebad']);
                     }
@@ -368,54 +368,54 @@ 
         $buttonRemove->set_attribute('onclick', 'buttonPressed(this);');
         $buttonRemove->set_attribute('type', 'button');
 
-        echo '<form onsubmit="doSelectAll();" name="formIndex" action="indexes.php" method="post">'."\n";
+        echo '<form onsubmit="doSelectAll();" name="formIndex" action="indexes.php" method="post">' . "\n";
 
-        echo '<table>'."\n";
-        echo '<tr><th class="data required" colspan="3">'.$lang['strindexname'].'</th></tr>';
+        echo '<table>' . "\n";
+        echo '<tr><th class="data required" colspan="3">' . $lang['strindexname'] . '</th></tr>';
         echo '<tr>';
         echo '<td class="data1" colspan="3">';
-        echo '<input type="text" name="formIndexName" size="32" maxlength="'.$data->_maxNameLen.'" value="'.htmlspecialchars($_POST['formIndexName']).'" />';
+        echo '<input type="text" name="formIndexName" size="32" maxlength="' . $data->_maxNameLen . '" value="' . htmlspecialchars($_POST['formIndexName']) . '" />';
         echo '</td></tr>';
-        echo '<tr><th class="data">'.$lang['strtablecolumnlist'].'</th><th class="data">&nbsp;</th>';
-        echo '<th class="data required">'.$lang['strindexcolumnlist'].'</th></tr>'."\n";
-        echo '<tr><td class="data1">'.$selColumns->fetch().'</td>'."\n";
-        echo '<td class="data1">'.$buttonRemove->fetch().$buttonAdd->fetch().'</td>';
-        echo '<td class="data1">'.$selIndex->fetch().'</td></tr>'."\n";
-        echo '</table>'."\n";
-
-        echo '<table> '."\n";
+        echo '<tr><th class="data">' . $lang['strtablecolumnlist'] . '</th><th class="data">&nbsp;</th>';
+        echo '<th class="data required">' . $lang['strindexcolumnlist'] . '</th></tr>' . "\n";
+        echo '<tr><td class="data1">' . $selColumns->fetch() . '</td>' . "\n";
+        echo '<td class="data1">' . $buttonRemove->fetch() . $buttonAdd->fetch() . '</td>';
+        echo '<td class="data1">' . $selIndex->fetch() . '</td></tr>' . "\n";
+        echo '</table>' . "\n";
+
+        echo '<table> ' . "\n";
         echo '<tr>';
-        echo '<th class="data left required" scope="row">'.$lang['strindextype'].'</th>';
+        echo '<th class="data left required" scope="row">' . $lang['strindextype'] . '</th>';
         echo '<td class="data1"><select name="formIndexType">';
         foreach ($data->typIndexes as $v) {
             echo '<option value="', htmlspecialchars($v), '"',
-            ($v == $_POST['formIndexType']) ? ' selected="selected"' : '', '>', htmlspecialchars($v), '</option>'."\n";
+            ($v == $_POST['formIndexType']) ? ' selected="selected"' : '', '>', htmlspecialchars($v), '</option>' . "\n";
         }
-        echo '</select></td></tr>'."\n";
+        echo '</select></td></tr>' . "\n";
         echo '<tr>';
         echo "<th class=\"data left\" scope=\"row\"><label for=\"formUnique\">{$lang['strunique']}</label></th>";
         echo '<td class="data1"><input type="checkbox" id="formUnique" name="formUnique"', (isset($_POST['formUnique']) ? 'checked="checked"' : ''), ' /></td>';
         echo '</tr>';
         echo '<tr>';
         echo "<th class=\"data left\" scope=\"row\">{$lang['strwhere']}</th>";
-        echo '<td class="data1">(<input name="formWhere" size="32" maxlength="'.$data->_maxNameLen.'" value="'.htmlspecialchars($_POST['formWhere']).'" />)</td>';
+        echo '<td class="data1">(<input name="formWhere" size="32" maxlength="' . $data->_maxNameLen . '" value="' . htmlspecialchars($_POST['formWhere']) . '" />)</td>';
         echo '</tr>';
 
         // Tablespace (if there are any)
         if ($data->hasTablespaces() && $tablespaces->recordCount() > 0) {
-            echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strtablespace']}</th>"."\n";
-            echo "\t\t<td class=\"data1\">\n\t\t\t<select name=\"formSpc\">"."\n";
+            echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strtablespace']}</th>" . "\n";
+            echo "\t\t<td class=\"data1\">\n\t\t\t<select name=\"formSpc\">" . "\n";
             // Always offer the default (empty) option
             echo "\t\t\t\t<option value=\"\"",
-            ($_POST['formSpc'] == '') ? ' selected="selected"' : '', '></option>'."\n";
+            ($_POST['formSpc'] == '') ? ' selected="selected"' : '', '></option>' . "\n";
             // Display all other tablespaces
             while (!$tablespaces->EOF) {
                 $spcname = htmlspecialchars($tablespaces->fields['spcname']);
                 echo "\t\t\t\t<option value=\"{$spcname}\"",
-                ($spcname == $_POST['formSpc']) ? ' selected="selected"' : '', ">{$spcname}</option>"."\n";
+                ($spcname == $_POST['formSpc']) ? ' selected="selected"' : '', ">{$spcname}</option>" . "\n";
                 $tablespaces->moveNext();
             }
-            echo "\t\t\t</select>\n\t\t</td>\n\t</tr>"."\n";
+            echo "\t\t\t</select>\n\t\t</td>\n\t</tr>" . "\n";
         }
 
         if ($data->hasConcurrentIndexBuild()) {
@@ -427,13 +427,13 @@ 
 
         echo '</table>';
 
-        echo '<p><input type="hidden" name="action" value="save_create_index" />'."\n";
+        echo '<p><input type="hidden" name="action" value="save_create_index" />' . "\n";
         echo $misc->form;
-        echo '<input type="hidden" name="subject" value="', htmlspecialchars($subject), '" />'."\n";
-        echo '<input type="hidden" name="'.$subject.'" value="', htmlspecialchars($object), '" />'."\n";
-        echo "<input type=\"submit\" value=\"{$lang['strcreate']}\" />"."\n";
-        echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" /></p>"."\n";
-        echo '</form>'."\n";
+        echo '<input type="hidden" name="subject" value="', htmlspecialchars($subject), '" />' . "\n";
+        echo '<input type="hidden" name="' . $subject . '" value="', htmlspecialchars($object), '" />' . "\n";
+        echo "<input type=\"submit\" value=\"{$lang['strcreate']}\" />" . "\n";
+        echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" /></p>" . "\n";
+        echo '</form>' . "\n";
     }
 
     /**
@@ -501,17 +501,17 @@ 
             $this->printTrail('index');
             $this->printTitle($lang['strdrop'], 'pg.index.drop');
 
-            echo '<p>', sprintf($lang['strconfdropindex'], $misc->printVal($_REQUEST['index'])), '</p>'."\n";
+            echo '<p>', sprintf($lang['strconfdropindex'], $misc->printVal($_REQUEST['index'])), '</p>' . "\n";
 
-            echo '<form action="'.SUBFOLDER.'/src/views/indexes.php" method="post">'."\n";
-            echo '<input type="hidden" name="action" value="drop_index" />'."\n";
-            echo '<input type="hidden" name="table" value="', htmlspecialchars($object), '" />'."\n";
-            echo '<input type="hidden" name="index" value="', htmlspecialchars($_REQUEST['index']), '" />'."\n";
+            echo '<form action="' . SUBFOLDER . '/src/views/indexes.php" method="post">' . "\n";
+            echo '<input type="hidden" name="action" value="drop_index" />' . "\n";
+            echo '<input type="hidden" name="table" value="', htmlspecialchars($object), '" />' . "\n";
+            echo '<input type="hidden" name="index" value="', htmlspecialchars($_REQUEST['index']), '" />' . "\n";
             echo $misc->form;
-            echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$lang['strcascade']}</label></p>"."\n";
-            echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />"."\n";
-            echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />"."\n";
-            echo '</form>'."\n";
+            echo "<p><input type=\"checkbox\" id=\"cascade\" name=\"cascade\" /> <label for=\"cascade\">{$lang['strcascade']}</label></p>" . "\n";
+            echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />" . "\n";
+            echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />" . "\n";
+            echo '</form>' . "\n";
         } else {
             $status = $data->dropIndex($_POST['index'], isset($_POST['cascade']));
             if ($status == 0) {

src/controllers/TablespacesController.php

Spacing +3 added lines, -3 removed lines

@@ -190,7 +190,7 @@ 
                 $_POST['comment'] = ($data->hasSharedComments()) ? $tablespace->fields['spccomment'] : '';
             }
 
-            echo '<form action="'.SUBFOLDER."/src/views/tablespaces.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/tablespaces.php\" method=\"post\">\n";
             echo $misc->form;
             echo "<table>\n";
             echo "<tr><th class=\"data left required\">{$lang['strname']}</th>\n";
@@ -267,7 +267,7 @@ 
 
             echo '<p>', sprintf($lang['strconfdroptablespace'], $misc->printVal($_REQUEST['tablespace'])), "</p>\n";
 
-            echo '<form action="'.SUBFOLDER."/src/views/tablespaces.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/tablespaces.php\" method=\"post\">\n";
             echo $misc->form;
             echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
             echo '<input type="hidden" name="tablespace" value="', htmlspecialchars($_REQUEST['tablespace']), "\" />\n";
@@ -319,7 +319,7 @@ 
         $this->printTitle($lang['strcreatetablespace'], 'pg.tablespace.create');
         $this->printMsg($msg);
 
-        echo '<form action="'.SUBFOLDER."/src/views/tablespaces.php\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/tablespaces.php\" method=\"post\">\n";
         echo $misc->form;
         echo "<table>\n";
         echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strname']}</th>\n";

src/controllers/DataimportController.php

Spacing +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
          * @param $parser
          * @param $cdata
          */
-        $_charHandler = function ($parser, $cdata) use (&$state, &$curr_col_val) {
+        $_charHandler = function($parser, $cdata) use (&$state, &$curr_col_val) {
             if ($state == 'COLUMN') {
                 $curr_col_val .= $cdata;
             }
@@ -49,7 +49,7 @@ 
          * @param $name
          * @param $attrs
          */
-        $_startElement = function ($parser, $name, $attrs) use ($data, $misc, &$state, &$curr_col_name, &$curr_col_null) {
+        $_startElement = function($parser, $name, $attrs) use ($data, $misc, &$state, &$curr_col_name, &$curr_col_null) {
             switch ($name) {
                 case 'DATA':
                     if ($state != 'XML') {
@@ -112,7 +112,7 @@ 
          * @param $parser
          * @param $name
          */
-        $_endElement = function ($parser, $name) use ($data, $misc, &$state, &$curr_col_name, &$curr_col_null, &$curr_col_val) {
+        $_endElement = function($parser, $name) use ($data, $misc, &$state, &$curr_col_name, &$curr_col_null, &$curr_col_val) {
             switch ($name) {
                 case 'DATA':
                     $state = 'READ_DATA';

src/controllers/RulesController.php

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
         }
 
         // Different header if we're view rules or table rules
-        $this->printHeader($_REQUEST[$_REQUEST['subject']].' - '.$lang['strrules']);
+        $this->printHeader($_REQUEST[$_REQUEST['subject']] . ' - ' . $lang['strrules']);
         $this->printBody();
 
         switch ($action) {
@@ -182,7 +182,7 @@ 
             $this->printTitle($lang['strcreaterule'], 'pg.rule.create');
             $this->printMsg($msg);
 
-            echo '<form action="'.SUBFOLDER."/src/views/rules.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/rules.php\" method=\"post\">\n";
             echo "<table>\n";
             echo "<tr><th class=\"data left required\">{$lang['strname']}</th>\n";
             echo "<td class=\"data1\"><input name=\"name\" size=\"16\" maxlength=\"{$data->_maxNameLen}\" value=\"",
@@ -250,7 +250,7 @@ 
             echo '<p>', sprintf($lang['strconfdroprule'], $misc->printVal($_REQUEST['rule']),
                 $misc->printVal($_REQUEST[$_REQUEST['reltype']])), "</p>\n";
 
-            echo '<form action="'.SUBFOLDER."/src/views/rules.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/rules.php\" method=\"post\">\n";
             echo "<input type=\"hidden\" name=\"action\" value=\"drop\" />\n";
             echo '<input type="hidden" name="subject" value="', htmlspecialchars($_REQUEST['reltype']), "\" />\n";
             echo '<input type="hidden" name="', htmlspecialchars($_REQUEST['reltype']),

src/controllers/OperatorsController.php

Spacing +1 added lines, -1 removed lines

@@ -251,7 +251,7 @@
 
             echo '<p>', sprintf($lang['strconfdropoperator'], $misc->printVal($_REQUEST['operator'])), "</p>\n";
 
-            echo '<form action="'.SUBFOLDER."/src/views/operators.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/operators.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="operator" value="', htmlspecialchars($_REQUEST['operator']), "\" />\n";

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=\"",