scrutinizer fixes

1 files changed, 27 insertions, 27 deletions

diff --git a/src/controllers/SqleditController.php b/src/controllers/SqleditController.php
index f110573c..d33652a5 100644
--- a/src/controllers/SqleditController.php
+++ b/src/controllers/SqleditController.php
@@ -67,7 +67,7 @@ class SqleditController extends BaseController
 
         $default_html = $this->printTabs($this->misc->getNavTabs('popup'), 'sql', false);
 
-        $default_html .= '<form action="' . \SUBFOLDER . '/src/views/sql" method="post" enctype="multipart/form-data" class="sqlform" id="sqlform" target="detail">';
+        $default_html .= '<form action="'.\SUBFOLDER.'/src/views/sql" method="post" enctype="multipart/form-data" class="sqlform" id="sqlform" target="detail">';
         $default_html .= "\n";
         $default_html .= $this->printConnection('sql', false);
 
@@ -77,14 +77,14 @@ class SqleditController extends BaseController
         $default_html .= '<label>';
         $default_html .= $this->misc->printHelp($this->lang['strsearchpath'], 'pg.schema.search_path', false);
 
-        $default_html .= ': <input type="text" name="search_path" id="search_path" size="45" value="' . $search_path . '" />';
+        $default_html .= ': <input type="text" name="search_path" id="search_path" size="45" 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";
 
@@ -95,9 +95,9 @@ class SqleditController extends BaseController
             $max_size = $this->misc->inisizeToBytes(ini_get('upload_max_filesize'));
             if (is_double($max_size) && $max_size > 0) {
                 $default_html .= '<p class="upload_sql_script">';
-                $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">' . $this->lang['struploadscript'] . '</label>';
+                $default_html .= '<label for="script">'.$this->lang['struploadscript'].'</label>';
                 $default_html .= '&nbsp;&nbsp; <input class="btn btn-small"  id="script" name="script" type="file" /></p>';
                 $default_html .= "</p>\n";
             }
@@ -106,15 +106,15 @@ class SqleditController extends BaseController
         // Check that file uploads are enabled
         $checked = (isset($_REQUEST['paginate']) ? ' checked="checked"' : '');
 
-        $default_html .= '<p><input type="submit" class="btn btn-small" name="execute" accesskey="r" value="' . $this->lang['strexecute'] . '" />';
+        $default_html .= '<p><input type="submit" class="btn btn-small" name="execute" accesskey="r" value="'.$this->lang['strexecute'].'" />';
         $default_html .= "\n";
 
-        $default_html .= '<input type="reset" class="btn btn-small"  accesskey="q" value="' . $this->lang['strreset'] . '" /></p>';
+        $default_html .= '<input type="reset" class="btn btn-small"  accesskey="q" value="'.$this->lang['strreset'].'" /></p>';
         $default_html .= "\n";
 
         $default_html .= '<p>';
         $default_html .= '<label for="paginate">';
-        $default_html .= '<input type="checkbox" id="paginate" name="paginate"' . $checked . ' />&nbsp;' . $this->lang['strpaginate'] . '&nbsp;';
+        $default_html .= '<input type="checkbox" id="paginate" name="paginate"'.$checked.' />&nbsp;'.$this->lang['strpaginate'].'&nbsp;';
         $default_html .= "</label>\n";
         $default_html .= "</p>\n";
 
@@ -142,29 +142,29 @@ class SqleditController extends BaseController
 
         $default_html .= "<form action=\"database\" method=\"post\" target=\"detail\">\n";
         $default_html .= $this->printConnection('find', false);
-        $default_html .= '<p><input class="focusme" name="term" id="term" value="' . htmlspecialchars($_REQUEST['term']) . "\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" />\n";
+        $default_html .= '<p><input class="focusme" name="term" id="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 id='filter' name=\"filter\">\n";
-        $default_html .= "\t<option value=\"\"" . ('' == $_REQUEST['filter'] ? ' selected="selected" ' : '') . ">{$this->lang['strallobjects']}</option>\n";
-        $default_html .= "\t<option value=\"SCHEMA\"" . ('SCHEMA' == $_REQUEST['filter'] ? ' selected="selected" ' : '') . ">{$this->lang['strschemas']}</option>\n";
-        $default_html .= "\t<option value=\"TABLE\"" . ('TABLE' == $_REQUEST['filter'] ? ' selected="selected" ' : '') . ">{$this->lang['strtables']}</option>\n";
-        $default_html .= "\t<option value=\"VIEW\"" . ('VIEW' == $_REQUEST['filter'] ? ' selected="selected" ' : '') . ">{$this->lang['strviews']}</option>\n";
-        $default_html .= "\t<option value=\"SEQUENCE\"" . ('SEQUENCE' == $_REQUEST['filter'] ? ' selected="selected" ' : '') . ">{$this->lang['strsequences']}</option>\n";
-        $default_html .= "\t<option value=\"COLUMN\"" . ('COLUMN' == $_REQUEST['filter'] ? ' selected="selected" ' : '') . ">{$this->lang['strcolumns']}</option>\n";
-        $default_html .= "\t<option value=\"RULE\"" . ('RULE' == $_REQUEST['filter'] ? ' selected="selected" ' : '') . ">{$this->lang['strrules']}</option>\n";
-        $default_html .= "\t<option value=\"INDEX\"" . ('INDEX' == $_REQUEST['filter'] ? ' selected="selected" ' : '') . ">{$this->lang['strindexes']}</option>\n";
-        $default_html .= "\t<option value=\"TRIGGER\"" . ('TRIGGER' == $_REQUEST['filter'] ? ' selected="selected" ' : '') . ">{$this->lang['strtriggers']}</option>\n";
-        $default_html .= "\t<option value=\"CONSTRAINT\"" . ('CONSTRAINT' == $_REQUEST['filter'] ? ' selected="selected" ' : '') . ">{$this->lang['strconstraints']}</option>\n";
-        $default_html .= "\t<option value=\"FUNCTION\"" . ('FUNCTION' == $_REQUEST['filter'] ? ' selected="selected" ' : '') . ">{$this->lang['strfunctions']}</option>\n";
-        $default_html .= "\t<option value=\"DOMAIN\"" . ('DOMAIN' == $_REQUEST['filter'] ? ' selected="selected" ' : '') . ">{$this->lang['strdomains']}</option>\n";
+        $default_html .= "\t<option value=\"\"".('' == $_REQUEST['filter'] ? ' selected="selected" ' : '').">{$this->lang['strallobjects']}</option>\n";
+        $default_html .= "\t<option value=\"SCHEMA\"".('SCHEMA' == $_REQUEST['filter'] ? ' selected="selected" ' : '').">{$this->lang['strschemas']}</option>\n";
+        $default_html .= "\t<option value=\"TABLE\"".('TABLE' == $_REQUEST['filter'] ? ' selected="selected" ' : '').">{$this->lang['strtables']}</option>\n";
+        $default_html .= "\t<option value=\"VIEW\"".('VIEW' == $_REQUEST['filter'] ? ' selected="selected" ' : '').">{$this->lang['strviews']}</option>\n";
+        $default_html .= "\t<option value=\"SEQUENCE\"".('SEQUENCE' == $_REQUEST['filter'] ? ' selected="selected" ' : '').">{$this->lang['strsequences']}</option>\n";
+        $default_html .= "\t<option value=\"COLUMN\"".('COLUMN' == $_REQUEST['filter'] ? ' selected="selected" ' : '').">{$this->lang['strcolumns']}</option>\n";
+        $default_html .= "\t<option value=\"RULE\"".('RULE' == $_REQUEST['filter'] ? ' selected="selected" ' : '').">{$this->lang['strrules']}</option>\n";
+        $default_html .= "\t<option value=\"INDEX\"".('INDEX' == $_REQUEST['filter'] ? ' selected="selected" ' : '').">{$this->lang['strindexes']}</option>\n";
+        $default_html .= "\t<option value=\"TRIGGER\"".('TRIGGER' == $_REQUEST['filter'] ? ' selected="selected" ' : '').">{$this->lang['strtriggers']}</option>\n";
+        $default_html .= "\t<option value=\"CONSTRAINT\"".('CONSTRAINT' == $_REQUEST['filter'] ? ' selected="selected" ' : '').">{$this->lang['strconstraints']}</option>\n";
+        $default_html .= "\t<option value=\"FUNCTION\"".('FUNCTION' == $_REQUEST['filter'] ? ' selected="selected" ' : '').">{$this->lang['strfunctions']}</option>\n";
+        $default_html .= "\t<option value=\"DOMAIN\"".('DOMAIN' == $_REQUEST['filter'] ? ' selected="selected" ' : '').">{$this->lang['strdomains']}</option>\n";
         if ($this->conf['show_advanced']) {
-            $default_html .= "\t<option value=\"AGGREGATE\"" . ('AGGREGATE' == $_REQUEST['filter'] ? ' selected="selected" ' : '') . ">{$this->lang['straggregates']}</option>\n";
-            $default_html .= "\t<option value=\"TYPE\"" . ('TYPE' == $_REQUEST['filter'] ? ' selected="selected" ' : '') . ">{$this->lang['strtypes']}</option>\n";
-            $default_html .= "\t<option value=\"OPERATOR\"" . ('OPERATOR' == $_REQUEST['filter'] ? ' selected="selected" ' : '') . ">{$this->lang['stroperators']}</option>\n";
-            $default_html .= "\t<option value=\"OPCLASS\"" . ('OPCLASS' == $_REQUEST['filter'] ? ' selected="selected" ' : '') . ">{$this->lang['stropclasses']}</option>\n";
-            $default_html .= "\t<option value=\"CONVERSION\"" . ('CONVERSION' == $_REQUEST['filter'] ? ' selected="selected" ' : '') . ">{$this->lang['strconversions']}</option>\n";
-            $default_html .= "\t<option value=\"LANGUAGE\"" . ('LANGUAGE' == $_REQUEST['filter'] ? ' selected="selected" ' : '') . ">{$this->lang['strlanguages']}</option>\n";
+            $default_html .= "\t<option value=\"AGGREGATE\"".('AGGREGATE' == $_REQUEST['filter'] ? ' selected="selected" ' : '').">{$this->lang['straggregates']}</option>\n";
+            $default_html .= "\t<option value=\"TYPE\"".('TYPE' == $_REQUEST['filter'] ? ' selected="selected" ' : '').">{$this->lang['strtypes']}</option>\n";
+            $default_html .= "\t<option value=\"OPERATOR\"".('OPERATOR' == $_REQUEST['filter'] ? ' selected="selected" ' : '').">{$this->lang['stroperators']}</option>\n";
+            $default_html .= "\t<option value=\"OPCLASS\"".('OPCLASS' == $_REQUEST['filter'] ? ' selected="selected" ' : '').">{$this->lang['stropclasses']}</option>\n";
+            $default_html .= "\t<option value=\"CONVERSION\"".('CONVERSION' == $_REQUEST['filter'] ? ' selected="selected" ' : '').">{$this->lang['strconversions']}</option>\n";
+            $default_html .= "\t<option value=\"LANGUAGE\"".('LANGUAGE' == $_REQUEST['filter'] ? ' selected="selected" ' : '').">{$this->lang['strlanguages']}</option>\n";
         }
         $default_html .= "</select>\n";