HuasoFoundries / phpPgAdmin6

src/controllers/TriggersController.php

Spacing +7 added lines, -7 removed lines

@@ -22,7 +22,7 @@ 
             return $this->doTree();
         }
 
-        $this->printHeader($lang['strtables'].' - '.$_REQUEST['table'].' - '.$lang['strtriggers']);
+        $this->printHeader($lang['strtables'] . ' - ' . $_REQUEST['table'] . ' - ' . $lang['strtriggers']);
         $this->printBody();
 
         switch ($action) {
@@ -99,7 +99,7 @@ 
         $lang = $this->lang;
         $data = $misc->getDatabaseAccessor();
 
-        $tgPre = function (&$rowdata, $actions) use ($data) {
+        $tgPre = function(&$rowdata, $actions) use ($data) {
             // toggle enable/disable trigger per trigger
             if (!$data->phpBool($rowdata->fields['tgenabled'])) {
                 unset($actions['disable']);
@@ -274,7 +274,7 @@ 
                 $_POST['name'] = $triggerdata->fields['tgname'];
             }
 
-            echo '<form action="'.SUBFOLDER."/src/views/triggers.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/triggers.php\" method=\"post\">\n";
             echo "<table>\n";
             echo "<tr><th class=\"data\">{$lang['strname']}</th>\n";
             echo '<td class="data1">';
@@ -310,7 +310,7 @@ 
             echo '<p>', sprintf($lang['strconfdroptrigger'], $misc->printVal($_REQUEST['trigger']),
                 $misc->printVal($_REQUEST['table'])), "</p>\n";
 
-            echo '<form action="'.SUBFOLDER."/src/views/triggers.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/triggers.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="trigger" value="', htmlspecialchars($_REQUEST['trigger']), "\" />\n";
@@ -346,7 +346,7 @@ 
             echo '<p>', sprintf($lang['strconfenabletrigger'], $misc->printVal($_REQUEST['trigger']),
                 $misc->printVal($_REQUEST['table'])), "</p>\n";
 
-            echo '<form action="'.SUBFOLDER."/src/views/triggers.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/triggers.php\" method=\"post\">\n";
             echo "<input type=\"hidden\" name=\"action\" value=\"enable\" />\n";
             echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), "\" />\n";
             echo '<input type="hidden" name="trigger" value="', htmlspecialchars($_REQUEST['trigger']), "\" />\n";
@@ -381,7 +381,7 @@ 
             echo '<p>', sprintf($lang['strconfdisabletrigger'], $misc->printVal($_REQUEST['trigger']),
                 $misc->printVal($_REQUEST['table'])), "</p>\n";
 
-            echo '<form action="'.SUBFOLDER."/src/views/triggers.php\" method=\"post\">\n";
+            echo '<form action="' . SUBFOLDER . "/src/views/triggers.php\" method=\"post\">\n";
             echo "<input type=\"hidden\" name=\"action\" value=\"disable\" />\n";
             echo '<input type="hidden" name="table" value="', htmlspecialchars($_REQUEST['table']), "\" />\n";
             echo '<input type="hidden" name="trigger" value="', htmlspecialchars($_REQUEST['trigger']), "\" />\n";
@@ -440,7 +440,7 @@ 
         $sel3 = new \PHPPgAdmin\XHtml\XHtmlSelect('formFrequency');
         $sel3->set_data($data->triggerFrequency);
 
-        echo '<form action="'.SUBFOLDER."/src/views/triggers.php\" method=\"post\">\n";
+        echo '<form action="' . SUBFOLDER . "/src/views/triggers.php\" method=\"post\">\n";
         echo "<table>\n";
         echo "<tr>\n";
         echo "		<th class=\"data\">{$lang['strname']}</th>\n";

src/controllers/AcinsertController.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
                 echo '<th>';
 
                 if (in_array($h, $fkeynames)) {
-                    echo '<img src="'.$misc->icon('ForeignKey').'" alt="[referenced key]" />';
+                    echo '<img src="' . $misc->icon('ForeignKey') . '" alt="[referenced key]" />';
                 }
 
                 echo htmlentities($h, ENT_QUOTES, 'UTF-8'), '</th>';
@@ -98,7 +98,7 @@ 
                 $js .= "fkl_hasnext=false;\n";
             }
 
-            echo $js.'</script>';
+            echo $js . '</script>';
         } else {
             printf("<p>{$lang['strnofkref']}</p>", "\"{$_POST['f_schema']}\".\"{$_POST['f_table']}\".\"{$fkeynames[$_POST['fattpos']]}\"");
 

src/controllers/DbexportController.php

Spacing +11 added lines, -11 removed lines

@@ -39,7 +39,7 @@ 
 
             // Obtain the pg_dump version number and check if the path is good
             $version = [];
-            preg_match("/(\d+(?:\.\d+)?)(?:\.\d+)?.*$/", exec($exe.' --version'), $version);
+            preg_match("/(\d+(?:\.\d+)?)(?:\.\d+)?.*$/", exec($exe . ' --version'), $version);
 
             $this->prtrace('$exe', $exe, 'version', $version[1]);
 
@@ -77,20 +77,20 @@ 
             }
 
             // Set environmental variables that pg_dump uses
-            putenv('PGPASSWORD='.$server_info['password']);
-            putenv('PGUSER='.$server_info['username']);
+            putenv('PGPASSWORD=' . $server_info['password']);
+            putenv('PGUSER=' . $server_info['username']);
             $hostname = $server_info['host'];
             if ($hostname !== null && $hostname != '') {
-                putenv('PGHOST='.$hostname);
+                putenv('PGHOST=' . $hostname);
             }
             $port = $server_info['port'];
             if ($port !== null && $port != '') {
-                putenv('PGPORT='.$port);
+                putenv('PGPORT=' . $port);
             }
 
             // Build command for executing pg_dump.  '-i' means ignore version differences.
             if (((float) $version[1]) < 9.5) {
-                $cmd = $exe.' -i';
+                $cmd = $exe . ' -i';
             } else {
                 $cmd = $exe;
             }
@@ -105,7 +105,7 @@ 
             switch ($_REQUEST['subject']) {
                 case 'schema':
                     // This currently works for 8.2+ (due to the orthoganl -t -n issue introduced then)
-                    $cmd .= ' -n '.$misc->escapeShellArg("\"{$f_schema}\"");
+                    $cmd .= ' -n ' . $misc->escapeShellArg("\"{$f_schema}\"");
                     break;
                 case 'table':
                 case 'view':
@@ -116,13 +116,13 @@ 
                     // Starting in 8.2, -n and -t are orthagonal, so we now schema qualify
                     // the table name in the -t argument and quote both identifiers
                     if (((float) $version[1]) >= 8.2) {
-                        $cmd .= ' -t '.$misc->escapeShellArg("\"{$f_schema}\".\"{$f_object}\"");
+                        $cmd .= ' -t ' . $misc->escapeShellArg("\"{$f_schema}\".\"{$f_object}\"");
                     } else {
                         // If we are 7.4 or higher, assume they are using 7.4 pg_dump and
                         // set dump schema as well.  Also, mixed case dumping has been fixed
                         // then..
-                        $cmd .= ' -t '.$misc->escapeShellArg($f_object)
-                        .' -n '.$misc->escapeShellArg($f_schema);
+                        $cmd .= ' -t ' . $misc->escapeShellArg($f_object)
+                        .' -n ' . $misc->escapeShellArg($f_schema);
                     }
             }
 
@@ -163,7 +163,7 @@ 
             }
 
             if (!$dumpall) {
-                putenv('PGDATABASE='.$_REQUEST['database']);
+                putenv('PGDATABASE=' . $_REQUEST['database']);
             }
 
             $this->prtrace('ENV VARS', [

src/classes/Highlight.php

Spacing +88 added lines, -91 removed lines

@@ -88,10 +88,10 @@ 
 
         public function __construct()
         {
-            $keyword_replace = function ($keywords, $text, $ncs = false) {
+            $keyword_replace = function($keywords, $text, $ncs = false) {
                 $cm = $ncs ? 'i' : '';
                 foreach ($keywords as $keyword) {
-                    $search[] = "/(\\b$keyword\\b)/".$cm;
+                    $search[] = "/(\\b$keyword\\b)/" . $cm;
                     $replace[] = '<span class="keyword">\\0</span>';
                 }
 
@@ -101,7 +101,7 @@ 
                 return preg_replace($search, $replace, $text);
             };
 
-            $preproc_replace = function ($preproc, $text) {
+            $preproc_replace = function($preproc, $text) {
                 foreach ($preproc as $proc) {
                     $search[] = "/(\\s*#\s*$proc\\b)/";
                     $replace[] = '<span class="keyword">\\0</span>';
@@ -110,11 +110,11 @@ 
                 return preg_replace($search, $replace, $text);
             };
 
-            $sch_syntax_helper = function ($text) {
+            $sch_syntax_helper = function($text) {
                 return $text;
             };
 
-            $syntax_highlight_helper = function ($text, $language) use ($keyword_replace, $preproc_replace) {
+            $syntax_highlight_helper = function($text, $language) use ($keyword_replace, $preproc_replace) {
                 $preproc = [];
                 $preproc['C++'] = [
                     'if',
@@ -1925,60 +1925,58 @@ 
                 }
 
                 $text = array_key_exists($language, $preproc) ?
-                    $preproc_replace($preproc[$language], $text) :
-                    $text;
+                    $preproc_replace($preproc[$language], $text) : $text;
                 $text = array_key_exists($language, $keywords) ?
-                    $keyword_replace($keywords[$language], $text, $ncs) :
-                    $text;
+                    $keyword_replace($keywords[$language], $text, $ncs) : $text;
 
                 return $text;
             };
 
-            $rtrim1 = function ($span, $lang, $ch) use ($syntax_highlight_helper) {
+            $rtrim1 = function($span, $lang, $ch) use ($syntax_highlight_helper) {
                 return $syntax_highlight_helper(substr($span, 0, -1), $lang);
             };
 
-            $rtrim1_htmlesc = function ($span, $lang, $ch) {
+            $rtrim1_htmlesc = function($span, $lang, $ch) {
                 return htmlspecialchars(substr($span, 0, -1));
             };
 
-            $sch_rtrim1 = function ($span, $lang, $ch) use ($sch_syntax_helper) {
+            $sch_rtrim1 = function($span, $lang, $ch) use ($sch_syntax_helper) {
                 return $sch_syntax_helper(substr($span, 0, -1));
             };
 
-            $rtrim2 = function ($span, $lang, $ch) {
+            $rtrim2 = function($span, $lang, $ch) {
                 return substr($span, 0, -2);
             };
 
-            $syn_proc = function ($span, $lang, $ch) use ($syntax_highlight_helper) {
+            $syn_proc = function($span, $lang, $ch) use ($syntax_highlight_helper) {
                 return $syntax_highlight_helper($span, $lang);
             };
 
-            $dash_putback = function ($span, $lang, $ch) use ($syntax_highlight_helper) {
-                return $syntax_highlight_helper('-'.$span, $lang);
+            $dash_putback = function($span, $lang, $ch) use ($syntax_highlight_helper) {
+                return $syntax_highlight_helper('-' . $span, $lang);
             };
 
-            $slash_putback = function ($span, $lang, $ch) use ($syntax_highlight_helper) {
-                return $syntax_highlight_helper('/'.$span, $lang);
+            $slash_putback = function($span, $lang, $ch) use ($syntax_highlight_helper) {
+                return $syntax_highlight_helper('/' . $span, $lang);
             };
 
-            $slash_putback_rtrim1 = function ($span, $lang, $ch) use ($rtrim1) {
-                return $rtrim1('/'.$span, $lang, $ch);
+            $slash_putback_rtrim1 = function($span, $lang, $ch) use ($rtrim1) {
+                return $rtrim1('/' . $span, $lang, $ch);
             };
 
-            $lparen_putback = function ($span, $lang, $ch) use ($syntax_highlight_helper) {
-                return $syntax_highlight_helper('('.$span, $lang);
+            $lparen_putback = function($span, $lang, $ch) use ($syntax_highlight_helper) {
+                return $syntax_highlight_helper('(' . $span, $lang);
             };
 
-            $lparen_putback_rtrim1 = function ($span, $lang, $ch) use ($rtrim1) {
-                return $rtrim1('('.$span, $lang, $ch);
+            $lparen_putback_rtrim1 = function($span, $lang, $ch) use ($rtrim1) {
+                return $rtrim1('(' . $span, $lang, $ch);
             };
 
-            $prepend_xml_opentag = function ($span, $lang, $ch) {
-                return '<span class="xml_tag">&lt;'.$span;
+            $prepend_xml_opentag = function($span, $lang, $ch) {
+                return '<span class="xml_tag">&lt;' . $span;
             };
 
-            $proc_void = function ($span, $lang, $ch) {
+            $proc_void = function($span, $lang, $ch) {
                 return $span;
             };
 
@@ -2324,88 +2322,88 @@ 
             $this->process_end['SQL'] = $this->process_end['C89'];
             $this->process_end['Scheme'] = $sch_syntax_helper;
 
-            $this->edges['C89'][self::NORMAL_TEXT.','.self::DQ_LITERAL] = '<span class="literal">"';
-            $this->edges['C89'][self::NORMAL_TEXT.','.self::SQ_LITERAL] = '<span class="literal">\'';
-            $this->edges['C89'][self::SLASH_BEGIN.','.self::STAR_COMMENT] = '<span class="comment">/*';
-            $this->edges['C89'][self::DQ_LITERAL.','.self::NORMAL_TEXT] = '</span>';
-            $this->edges['C89'][self::SQ_LITERAL.','.self::NORMAL_TEXT] = '</span>';
-            $this->edges['C89'][self::STAR_END.','.self::NORMAL_TEXT] = '</span>';
-
-            $this->edges['Scheme'][self::SCH_NORMAL.','.self::SCH_STRLIT] = '<span class="sch_str">"';
-            $this->edges['Scheme'][self::SCH_NORMAL.','.self::SCH_NUMLIT] = '<span class="sch_num">';
-            $this->edges['Scheme'][self::SCH_NORMAL.','.self::SCH_CHRLIT] = '<span class="sch_chr">#';
-            $this->edges['Scheme'][self::SCH_STRLIT.','.self::SCH_NORMAL] = '</span>';
-            $this->edges['Scheme'][self::SCH_NUMLIT.','.self::SCH_NORMAL] = '</span>';
-            $this->edges['Scheme'][self::SCH_CHRLIT.','.self::SCH_NORMAL] = '</span>';
-
-            $this->edges['SQL'][self::NORMAL_TEXT.','.self::DQ_LITERAL] = '<span class="literal">"';
-            $this->edges['SQL'][self::NORMAL_TEXT.','.self::SQ_LITERAL] = '<span class="literal">\'';
-            $this->edges['SQL'][self::DASH_BEGIN.','.self::LINE_COMMENT] = '<span class="comment">--';
-            $this->edges['SQL'][self::NORMAL_TEXT.','.self::BT_LITERAL] = '`';
-            $this->edges['SQL'][self::DQ_LITERAL.','.self::NORMAL_TEXT] = '</span>';
-            $this->edges['SQL'][self::SQ_LITERAL.','.self::NORMAL_TEXT] = '</span>';
-            $this->edges['SQL'][self::LINE_COMMENT.','.self::NORMAL_TEXT] = '</span>';
+            $this->edges['C89'][self::NORMAL_TEXT . ',' . self::DQ_LITERAL] = '<span class="literal">"';
+            $this->edges['C89'][self::NORMAL_TEXT . ',' . self::SQ_LITERAL] = '<span class="literal">\'';
+            $this->edges['C89'][self::SLASH_BEGIN . ',' . self::STAR_COMMENT] = '<span class="comment">/*';
+            $this->edges['C89'][self::DQ_LITERAL . ',' . self::NORMAL_TEXT] = '</span>';
+            $this->edges['C89'][self::SQ_LITERAL . ',' . self::NORMAL_TEXT] = '</span>';
+            $this->edges['C89'][self::STAR_END . ',' . self::NORMAL_TEXT] = '</span>';
+
+            $this->edges['Scheme'][self::SCH_NORMAL . ',' . self::SCH_STRLIT] = '<span class="sch_str">"';
+            $this->edges['Scheme'][self::SCH_NORMAL . ',' . self::SCH_NUMLIT] = '<span class="sch_num">';
+            $this->edges['Scheme'][self::SCH_NORMAL . ',' . self::SCH_CHRLIT] = '<span class="sch_chr">#';
+            $this->edges['Scheme'][self::SCH_STRLIT . ',' . self::SCH_NORMAL] = '</span>';
+            $this->edges['Scheme'][self::SCH_NUMLIT . ',' . self::SCH_NORMAL] = '</span>';
+            $this->edges['Scheme'][self::SCH_CHRLIT . ',' . self::SCH_NORMAL] = '</span>';
+
+            $this->edges['SQL'][self::NORMAL_TEXT . ',' . self::DQ_LITERAL] = '<span class="literal">"';
+            $this->edges['SQL'][self::NORMAL_TEXT . ',' . self::SQ_LITERAL] = '<span class="literal">\'';
+            $this->edges['SQL'][self::DASH_BEGIN . ',' . self::LINE_COMMENT] = '<span class="comment">--';
+            $this->edges['SQL'][self::NORMAL_TEXT . ',' . self::BT_LITERAL] = '`';
+            $this->edges['SQL'][self::DQ_LITERAL . ',' . self::NORMAL_TEXT] = '</span>';
+            $this->edges['SQL'][self::SQ_LITERAL . ',' . self::NORMAL_TEXT] = '</span>';
+            $this->edges['SQL'][self::LINE_COMMENT . ',' . self::NORMAL_TEXT] = '</span>';
 
             $this->edges['PL/I'] = $this->edges['C89'];
 
             $this->edges['C++'] = $this->edges['C89'];
-            $this->edges['C++'][self::SLASH_BEGIN.','.self::LINE_COMMENT] = '<span class="comment">//';
-            $this->edges['C++'][self::LINE_COMMENT.','.self::NORMAL_TEXT] = '</span>';
+            $this->edges['C++'][self::SLASH_BEGIN . ',' . self::LINE_COMMENT] = '<span class="comment">//';
+            $this->edges['C++'][self::LINE_COMMENT . ',' . self::NORMAL_TEXT] = '</span>';
 
             $this->edges['C'] = $this->edges['C++'];
 
             $this->edges['PHP'] = $this->edges['C++'];
-            $this->edges['PHP'][self::NORMAL_TEXT.','.self::LINE_COMMENT] = '<span class="comment">#';
+            $this->edges['PHP'][self::NORMAL_TEXT . ',' . self::LINE_COMMENT] = '<span class="comment">#';
 
-            $this->edges['Perl'][self::NORMAL_TEXT.','.self::DQ_LITERAL] = '<span class="literal">"';
-            $this->edges['Perl'][self::NORMAL_TEXT.','.self::SQ_LITERAL] = '<span class="literal">\'';
-            $this->edges['Perl'][self::DQ_LITERAL.','.self::NORMAL_TEXT] = '</span>';
-            $this->edges['Perl'][self::SQ_LITERAL.','.self::NORMAL_TEXT] = '</span>';
-            $this->edges['Perl'][self::NORMAL_TEXT.','.self::LINE_COMMENT] = '<span class="comment">#';
-            $this->edges['Perl'][self::LINE_COMMENT.','.self::NORMAL_TEXT] = '</span>';
+            $this->edges['Perl'][self::NORMAL_TEXT . ',' . self::DQ_LITERAL] = '<span class="literal">"';
+            $this->edges['Perl'][self::NORMAL_TEXT . ',' . self::SQ_LITERAL] = '<span class="literal">\'';
+            $this->edges['Perl'][self::DQ_LITERAL . ',' . self::NORMAL_TEXT] = '</span>';
+            $this->edges['Perl'][self::SQ_LITERAL . ',' . self::NORMAL_TEXT] = '</span>';
+            $this->edges['Perl'][self::NORMAL_TEXT . ',' . self::LINE_COMMENT] = '<span class="comment">#';
+            $this->edges['Perl'][self::LINE_COMMENT . ',' . self::NORMAL_TEXT] = '</span>';
 
             $this->edges['Ruby'] = $this->edges['Perl'];
 
             $this->edges['Python'] = $this->edges['Perl'];
 
-            $this->edges['mIRC'][self::NORMAL_TEXT.','.self::DQ_LITERAL] = '<span class="literal">"';
-            $this->edges['mIRC'][self::NORMAL_TEXT.','.self::LINE_COMMENT] = '<span class="comment">;';
-            $this->edges['mIRC'][self::DQ_LITERAL.','.self::NORMAL_TEXT] = '</span>';
-            $this->edges['mIRC'][self::LINE_COMMENT.','.self::NORMAL_TEXT] = '</span>';
+            $this->edges['mIRC'][self::NORMAL_TEXT . ',' . self::DQ_LITERAL] = '<span class="literal">"';
+            $this->edges['mIRC'][self::NORMAL_TEXT . ',' . self::LINE_COMMENT] = '<span class="comment">;';
+            $this->edges['mIRC'][self::DQ_LITERAL . ',' . self::NORMAL_TEXT] = '</span>';
+            $this->edges['mIRC'][self::LINE_COMMENT . ',' . self::NORMAL_TEXT] = '</span>';
 
             $this->edges['VB'] = $this->edges['Perl'];
-            $this->edges['VB'][self::NORMAL_TEXT.','.self::LINE_COMMENT] = '<span class="comment">\'';
+            $this->edges['VB'][self::NORMAL_TEXT . ',' . self::LINE_COMMENT] = '<span class="comment">\'';
 
             $this->edges['Java'] = $this->edges['C++'];
 
             $this->edges['C#'] = $this->edges['Java'];
 
             $this->edges['Pascal'] = $this->edges['C89'];
-            $this->edges['Pascal'][self::PAREN_BEGIN.','.self::STAR_COMMENT] = '<span class="comment">(*';
-            $this->edges['Pascal'][self::PAREN_BEGIN.','.self::DQ_LITERAL] = '<span class="literal">"';
-            $this->edges['Pascal'][self::PAREN_BEGIN.','.self::SQ_LITERAL] = '<span class="literal">\'';
-            $this->edges['Pascal'][self::SLASH_BEGIN.','.self::DQ_LITERAL] = '<span class="literal">"';
-            $this->edges['Pascal'][self::SLASH_BEGIN.','.self::SQ_LITERAL] = '<span class="literal">\'';
-            $this->edges['Pascal'][self::SLASH_BEGIN.','.self::LINE_COMMENT] = '<span class="comment">//';
-            $this->edges['Pascal'][self::NORMAL_TEXT.','.self::BLOCK_COMMENT] = '<span class="comment">{';
-            $this->edges['Pascal'][self::LINE_COMMENT.','.self::NORMAL_TEXT] = '</span>';
-            $this->edges['Pascal'][self::BLOCK_COMMENT.','.self::NORMAL_TEXT] = '</span>';
-
-            $this->edges['XML'][self::NORMAL_TEXT.','.self::HTML_ENTITY] = '<span class="html_entity">&amp;';
-            $this->edges['XML'][self::HTML_ENTITY.','.self::NORMAL_TEXT] = '</span>';
-            $this->edges['XML'][self::HTML_ENTITY.','.self::XML_TAG_BEGIN] = '</span>';
-            $this->edges['XML'][self::XML_TAG.','.self::NORMAL_TEXT] = '&gt;</span>';
-            $this->edges['XML'][self::XML_TAG_BEGIN.','.self::XML_PI] = '<span class="xml_pi">&lt;?';
-            $this->edges['XML'][self::XML_TAG_BEGIN.','.self::LINE_COMMENT] = '<span class="comment">&lt;!';
-            $this->edges['XML'][self::LINE_COMMENT.','.self::NORMAL_TEXT] = '&gt;</span>';
-            $this->edges['XML'][self::XML_TAG.','.self::DQ_LITERAL] = '<span class="literal">"';
-            $this->edges['XML'][self::DQ_LITERAL.','.self::XML_TAG] = '"</span>';
-            $this->edges['XML'][self::DQ_LITERAL.','.self::DQ_ESCAPE] = '<span class="html_entity">&amp;';
-            $this->edges['XML'][self::DQ_ESCAPE.','.self::DQ_LITERAL] = '</span>';
-            $this->edges['XML'][self::XML_TAG.','.self::SQ_LITERAL] = '<span class="literal">\'';
-            $this->edges['XML'][self::SQ_LITERAL.','.self::XML_TAG] = '\'</span>';
-            $this->edges['XML'][self::SQ_LITERAL.','.self::SQ_ESCAPE] = '<span class="html_entity">&amp;';
-            $this->edges['XML'][self::SQ_ESCAPE.','.self::SQ_LITERAL] = '</span>';
+            $this->edges['Pascal'][self::PAREN_BEGIN . ',' . self::STAR_COMMENT] = '<span class="comment">(*';
+            $this->edges['Pascal'][self::PAREN_BEGIN . ',' . self::DQ_LITERAL] = '<span class="literal">"';
+            $this->edges['Pascal'][self::PAREN_BEGIN . ',' . self::SQ_LITERAL] = '<span class="literal">\'';
+            $this->edges['Pascal'][self::SLASH_BEGIN . ',' . self::DQ_LITERAL] = '<span class="literal">"';
+            $this->edges['Pascal'][self::SLASH_BEGIN . ',' . self::SQ_LITERAL] = '<span class="literal">\'';
+            $this->edges['Pascal'][self::SLASH_BEGIN . ',' . self::LINE_COMMENT] = '<span class="comment">//';
+            $this->edges['Pascal'][self::NORMAL_TEXT . ',' . self::BLOCK_COMMENT] = '<span class="comment">{';
+            $this->edges['Pascal'][self::LINE_COMMENT . ',' . self::NORMAL_TEXT] = '</span>';
+            $this->edges['Pascal'][self::BLOCK_COMMENT . ',' . self::NORMAL_TEXT] = '</span>';
+
+            $this->edges['XML'][self::NORMAL_TEXT . ',' . self::HTML_ENTITY] = '<span class="html_entity">&amp;';
+            $this->edges['XML'][self::HTML_ENTITY . ',' . self::NORMAL_TEXT] = '</span>';
+            $this->edges['XML'][self::HTML_ENTITY . ',' . self::XML_TAG_BEGIN] = '</span>';
+            $this->edges['XML'][self::XML_TAG . ',' . self::NORMAL_TEXT] = '&gt;</span>';
+            $this->edges['XML'][self::XML_TAG_BEGIN . ',' . self::XML_PI] = '<span class="xml_pi">&lt;?';
+            $this->edges['XML'][self::XML_TAG_BEGIN . ',' . self::LINE_COMMENT] = '<span class="comment">&lt;!';
+            $this->edges['XML'][self::LINE_COMMENT . ',' . self::NORMAL_TEXT] = '&gt;</span>';
+            $this->edges['XML'][self::XML_TAG . ',' . self::DQ_LITERAL] = '<span class="literal">"';
+            $this->edges['XML'][self::DQ_LITERAL . ',' . self::XML_TAG] = '"</span>';
+            $this->edges['XML'][self::DQ_LITERAL . ',' . self::DQ_ESCAPE] = '<span class="html_entity">&amp;';
+            $this->edges['XML'][self::DQ_ESCAPE . ',' . self::DQ_LITERAL] = '</span>';
+            $this->edges['XML'][self::XML_TAG . ',' . self::SQ_LITERAL] = '<span class="literal">\'';
+            $this->edges['XML'][self::SQ_LITERAL . ',' . self::XML_TAG] = '\'</span>';
+            $this->edges['XML'][self::SQ_LITERAL . ',' . self::SQ_ESCAPE] = '<span class="html_entity">&amp;';
+            $this->edges['XML'][self::SQ_ESCAPE . ',' . self::SQ_LITERAL] = '</span>';
         }
 
         /**
@@ -2441,8 +2439,7 @@ 
 
                 $oldstate = $state;
                 $state = array_key_exists($ch, $this->states[$language][$state]) ?
-                    $this->states[$language][$state][$ch] :
-                    $this->states[$language][$state][0];
+                    $this->states[$language][$state][$ch] : $this->states[$language][$state][0];
 
                 $span .= $ch;
 
@@ -2477,8 +2474,8 @@ 
 
             if ($state != self::NORMAL_TEXT) {
                 if (array_key_exists($language, $this->edges) &&
-                    array_key_exists("$state,".self::NORMAL_TEXT, $this->edges[$language])) {
-                    $output .= $this->edges[$language]["$state,".self::NORMAL_TEXT];
+                    array_key_exists("$state," . self::NORMAL_TEXT, $this->edges[$language])) {
+                    $output .= $this->edges[$language]["$state," . self::NORMAL_TEXT];
                 }
             }
 

src/classes/ContainerUtils.php

Spacing +2 added lines, -2 removed lines

@@ -20,9 +20,9 @@
 
         // but if server_id isn't set, then you will be redirected to intro
         if ($this->container->requestobj->getQueryParam('server') === null) {
-            $destinationurl = SUBFOLDER.'/src/views/intro';
+            $destinationurl = SUBFOLDER . '/src/views/intro';
         } else {
-            $destinationurl = SUBFOLDER.'/src/views/login'.($query_string ? '?'.$query_string : '');
+            $destinationurl = SUBFOLDER . '/src/views/login' . ($query_string ? '?' . $query_string : '');
         }
 
         return $destinationurl;

src/classes/PluginManager.php

Indentation +2 added lines, -2 removed lines

@@ -3,8 +3,8 @@
 namespace PHPPgAdmin;
 
 /**
-     * A class that implements the plugin's system.
-     */
+ * A class that implements the plugin's system.
+ */
     class PluginManager
     {
         /**

Spacing +5 added lines, -5 removed lines

@@ -48,7 +48,7 @@ 
             $plugins = $this->conf['plugins'];
 
             foreach ($plugins as $activated_plugin) {
-                $plugin_file = BASE_PATH.'/src/plugins/'.$activated_plugin.'/plugin.php';
+                $plugin_file = BASE_PATH . '/src/plugins/' . $activated_plugin . '/plugin.php';
 
                 // Verify is the activated plugin exists
                 if (file_exists($plugin_file)) {
@@ -61,7 +61,7 @@ 
                         continue;
                     }
                 } else {
-                    printf($this->lang['strpluginnotfound']."\t\n", $activated_plugin);
+                    printf($this->lang['strpluginnotfound'] . "\t\n", $activated_plugin);
                     exit;
                 }
             }
@@ -85,7 +85,7 @@ 
             $hooks = $plugin->get_hooks();
             foreach ($hooks as $hook => $functions) {
                 if (!in_array($hook, $this->available_hooks)) {
-                    printf($this->lang['strhooknotfound']."\t\n", $hook);
+                    printf($this->lang['strhooknotfound'] . "\t\n", $hook);
                     exit;
                 }
                 $this->hooks[$hook][$plugin_name] = $functions;
@@ -133,7 +133,7 @@ 
         {
             if (!isset($this->plugins_list[$plugin_name])) {
                 // Show an error and stop the application
-                printf($this->lang['strpluginnotfound']."\t\n", $plugin_name);
+                printf($this->lang['strpluginnotfound'] . "\t\n", $plugin_name);
                 exit;
             }
             $plugin = $this->plugins_list[$plugin_name];
@@ -143,7 +143,7 @@ 
                 call_user_func([$plugin, $action]);
             } else {
                 // Show an error and stop the application
-                printf($this->lang['stractionnotfound']."\t\n", $action, $plugin_name);
+                printf($this->lang['stractionnotfound'] . "\t\n", $action, $plugin_name);
                 exit;
             }
         }

src/classes/Misc.php

Spacing +63 added lines, -63 removed lines

@@ -67,7 +67,7 @@ 
 
         if (count($this->conf['servers']) === 1) {
             $info = $this->conf['servers'][0];
-            $this->server_id = $info['host'].':'.$info['port'].':'.$info['sslmode'];
+            $this->server_id = $info['host'] . ':' . $info['port'] . ':' . $info['sslmode'];
         } elseif (isset($_REQUEST['server'])) {
             $this->server_id = $_REQUEST['server'];
         } elseif (isset($_SESSION['webdbLogin']) && count($_SESSION['webdbLogin']) > 0) {
@@ -133,7 +133,7 @@ 
         //\PC::debug(['str' => $str, 'help' => $help], 'printHelp');
         if ($help !== null) {
             $helplink = $this->getHelpLink($help);
-            $str .= '<a class="help" href="'.$helplink.'" title="'.$this->lang['strhelp'].'" target="phppgadminhelp">'.$this->lang['strhelpicon'].'</a>';
+            $str .= '<a class="help" href="' . $helplink . '" title="' . $this->lang['strhelp'] . '" target="phppgadminhelp">' . $this->lang['strhelpicon'] . '</a>';
         }
         if ($do_print) {
             echo $str;
@@ -144,7 +144,7 @@ 
 
     public function getHelpLink($help)
     {
-        return htmlspecialchars(SUBFOLDER.'/help?help='.urlencode($help).'&server='.urlencode($this->getServerId()));
+        return htmlspecialchars(SUBFOLDER . '/help?help=' . urlencode($help) . '&server=' . urlencode($this->getServerId()));
     }
 
     /**
@@ -206,9 +206,9 @@ 
                 $sql = $p1;
                 $inputparams = $p2;
 
-                $error_msg = '<p><b>strsqlerror</b><br />'.nl2br($errmsg).'</p> <p><b>SQL:</b><br />'.nl2br($sql).'</p>	';
+                $error_msg = '<p><b>strsqlerror</b><br />' . nl2br($errmsg) . '</p> <p><b>SQL:</b><br />' . nl2br($sql) . '</p>	';
 
-                echo '<table class="error" cellpadding="5"><tr><td>'.nl2br($error_msg).'</td></tr></table><br />'."\n";
+                echo '<table class="error" cellpadding="5"><tr><td>' . nl2br($error_msg) . '</td></tr></table><br />' . "\n";
 
                 break;
 
@@ -323,7 +323,7 @@ 
 
                 return;
             }
-            $_type = '\PHPPgAdmin\Database\\'.$_type;
+            $_type = '\PHPPgAdmin\Database\\' . $_type;
 
             $this->setServerInfo('platform', $platform, $this->server_id);
             $this->setServerInfo('pgVersion', $_connection->conn->pgVersion, $this->server_id);
@@ -445,7 +445,7 @@ 
 
         // Otherwise, look for it in the conf file
         foreach ($this->conf['servers'] as $idx => $info) {
-            if ($this->server_id == $info['host'].':'.$info['port'].':'.$info['sslmode']) {
+            if ($this->server_id == $info['host'] . ':' . $info['port'] . ':' . $info['sslmode']) {
                 // Automatically use shared credentials if available
                 if (!isset($info['username']) && isset($_SESSION['sharedUsername'])) {
                     $info['username'] = $_SESSION['sharedUsername'];
@@ -620,9 +620,9 @@ 
         }
 
         foreach ($this->conf['servers'] as $idx => $info) {
-            $server_id = $info['host'].':'.$info['port'].':'.$info['sslmode'];
+            $server_id = $info['host'] . ':' . $info['port'] . ':' . $info['sslmode'];
             if ($group === false || isset($group[$idx]) || ($group === 'all')) {
-                $server_id = $info['host'].':'.$info['port'].':'.$info['sslmode'];
+                $server_id = $info['host'] . ':' . $info['port'] . ':' . $info['sslmode'];
 
                 if (isset($logins[$server_id])) {
                     $srvs[$server_id] = $logins[$server_id];
@@ -723,13 +723,13 @@ 
     {
         $href = [];
         if (isset($_REQUEST['server']) && $exclude_from != 'server') {
-            $href[] = 'server='.urlencode($_REQUEST['server']);
+            $href[] = 'server=' . urlencode($_REQUEST['server']);
         }
         if (isset($_REQUEST['database']) && $exclude_from != 'database') {
-            $href[] = 'database='.urlencode($_REQUEST['database']);
+            $href[] = 'database=' . urlencode($_REQUEST['database']);
         }
         if (isset($_REQUEST['schema']) && $exclude_from != 'schema') {
-            $href[] = 'schema='.urlencode($_REQUEST['schema']);
+            $href[] = 'schema=' . urlencode($_REQUEST['schema']);
         }
 
         return htmlentities(implode('&', $href));
@@ -891,10 +891,10 @@ 
         }
 
         if (!isset($vars['url'])) {
-            $vars['url'] = SUBFOLDER.'/redirect';
+            $vars['url'] = SUBFOLDER . '/redirect';
         }
-        if ($vars['url'] == SUBFOLDER.'/redirect' && isset($vars['params']['subject'])) {
-            $vars['url'] = SUBFOLDER.'/redirect/'.$vars['params']['subject'];
+        if ($vars['url'] == SUBFOLDER . '/redirect' && isset($vars['params']['subject'])) {
+            $vars['url'] = SUBFOLDER . '/redirect/' . $vars['params']['subject'];
             unset($vars['params']['subject']);
         }
 
@@ -908,14 +908,14 @@ 
     {
         $form = [];
         if (isset($_REQUEST['server'])) {
-            $form[] = '<input type="hidden" name="server" value="'.htmlspecialchars($_REQUEST['server']).'" />';
+            $form[] = '<input type="hidden" name="server" value="' . htmlspecialchars($_REQUEST['server']) . '" />';
         }
         if (isset($_REQUEST['database'])) {
-            $form[] = '<input type="hidden" name="database" value="'.htmlspecialchars($_REQUEST['database']).'" />';
+            $form[] = '<input type="hidden" name="database" value="' . htmlspecialchars($_REQUEST['database']) . '" />';
         }
 
         if (isset($_REQUEST['schema'])) {
-            $form[] = '<input type="hidden" name="schema" value="'.htmlspecialchars($_REQUEST['schema']).'" />';
+            $form[] = '<input type="hidden" name="schema" value="' . htmlspecialchars($_REQUEST['schema']) . '" />';
         }
         $this->form = implode("\n", $form);
 
@@ -973,7 +973,7 @@ 
             $maxlen = isset($params['cliplen']) && is_int($params['cliplen']) ? $params['cliplen'] : $this->conf['max_chars'];
             $ellipsis = isset($params['ellipsis']) ? $params['ellipsis'] : $lang['strellipsis'];
             if (strlen($str) > $maxlen) {
-                $str = substr($str, 0, $maxlen - 1).$ellipsis;
+                $str = substr($str, 0, $maxlen - 1) . $ellipsis;
             }
         }
 
@@ -1058,23 +1058,23 @@ 
                     $limit = 10 * 1024;
                     $mult = 1;
                     if ($str < $limit * $mult) {
-                        $out = $str.' '.$lang['strbytes'];
+                        $out = $str . ' ' . $lang['strbytes'];
                     } else {
                         $mult *= 1024;
                         if ($str < $limit * $mult) {
-                            $out = floor(($str + $mult / 2) / $mult).' '.$lang['strkb'];
+                            $out = floor(($str + $mult / 2) / $mult) . ' ' . $lang['strkb'];
                         } else {
                             $mult *= 1024;
                             if ($str < $limit * $mult) {
-                                $out = floor(($str + $mult / 2) / $mult).' '.$lang['strmb'];
+                                $out = floor(($str + $mult / 2) / $mult) . ' ' . $lang['strmb'];
                             } else {
                                 $mult *= 1024;
                                 if ($str < $limit * $mult) {
-                                    $out = floor(($str + $mult / 2) / $mult).' '.$lang['strgb'];
+                                    $out = floor(($str + $mult / 2) / $mult) . ' ' . $lang['strgb'];
                                 } else {
                                     $mult *= 1024;
                                     if ($str < $limit * $mult) {
-                                        $out = floor(($str + $mult / 2) / $mult).' '.$lang['strtb'];
+                                        $out = floor(($str + $mult / 2) / $mult) . ' ' . $lang['strtb'];
                                     }
                                 }
                             }
@@ -1120,7 +1120,7 @@ 
             if ($num > 0) {
                 $temp = "<table>\n<tr><td class=\"{$class}\" style=\"vertical-align: top; padding-right: 10px;\"><pre class=\"{$class}\">";
                 for ($i = 1; $i <= $num; $i++) {
-                    $temp .= $i."\n";
+                    $temp .= $i . "\n";
                 }
                 $temp .= "</pre></td><td class=\"{$class}\" style=\"vertical-align: top;\">{$out}</td></tr></table>\n";
                 $out = $temp;
@@ -1370,7 +1370,7 @@ 
                         'icon'    => 'Views',
                     ],
                     'matviews'    => [
-                        'title'   => 'M '.$lang['strviews'],
+                        'title'   => 'M ' . $lang['strviews'],
                         'url'     => 'materializedviews.php',
                         'urlvars' => ['subject' => 'schema'],
                         'help'    => 'pg.matview',
@@ -2003,43 +2003,43 @@ 
     {
         if (is_string($icon)) {
             $path = "/images/themes/{$this->conf['theme']}/{$icon}";
-            if (file_exists(BASE_PATH.$path.'.png')) {
-                return SUBFOLDER.$path.'.png';
+            if (file_exists(BASE_PATH . $path . '.png')) {
+                return SUBFOLDER . $path . '.png';
             }
 
-            if (file_exists(BASE_PATH.$path.'.gif')) {
-                return SUBFOLDER.$path.'.gif';
+            if (file_exists(BASE_PATH . $path . '.gif')) {
+                return SUBFOLDER . $path . '.gif';
             }
 
-            if (file_exists(BASE_PATH.$path.'.ico')) {
-                return SUBFOLDER.$path.'.ico';
+            if (file_exists(BASE_PATH . $path . '.ico')) {
+                return SUBFOLDER . $path . '.ico';
             }
 
             $path = "/images/themes/default/{$icon}";
-            if (file_exists(BASE_PATH.$path.'.png')) {
-                return SUBFOLDER.$path.'.png';
+            if (file_exists(BASE_PATH . $path . '.png')) {
+                return SUBFOLDER . $path . '.png';
             }
 
-            if (file_exists(BASE_PATH.$path.'.gif')) {
-                return SUBFOLDER.$path.'.gif';
+            if (file_exists(BASE_PATH . $path . '.gif')) {
+                return SUBFOLDER . $path . '.gif';
             }
 
-            if (file_exists(BASE_PATH.$path.'.ico')) {
-                return SUBFOLDER.$path.'.ico';
+            if (file_exists(BASE_PATH . $path . '.ico')) {
+                return SUBFOLDER . $path . '.ico';
             }
         } else {
             // Icon from plugins
             $path = "/plugins/{$icon[0]}/images/{$icon[1]}";
-            if (file_exists(BASE_PATH.$path.'.png')) {
-                return SUBFOLDER.$path.'.png';
+            if (file_exists(BASE_PATH . $path . '.png')) {
+                return SUBFOLDER . $path . '.png';
             }
 
-            if (file_exists(BASE_PATH.$path.'.gif')) {
-                return SUBFOLDER.$path.'.gif';
+            if (file_exists(BASE_PATH . $path . '.gif')) {
+                return SUBFOLDER . $path . '.gif';
             }
 
-            if (file_exists(BASE_PATH.$path.'.ico')) {
-                return SUBFOLDER.$path.'.ico';
+            if (file_exists(BASE_PATH . $path . '.ico')) {
+                return SUBFOLDER . $path . '.ico';
             }
         }
 
@@ -2087,7 +2087,7 @@ 
         if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
             $data->fieldClean($str);
 
-            return '"'.$str.'"';
+            return '"' . $str . '"';
         }
 
         return escapeshellcmd($str);
@@ -2125,7 +2125,7 @@ 
         $forcedserver = null;
         if (count($servers) === 1) {
             $forcedserver = $this->server_id;
-            $connection_html .= '<input type="hidden" readonly="readonly" value="'.$this->server_id.'" name="server">';
+            $connection_html .= '<input type="hidden" readonly="readonly" value="' . $this->server_id . '" name="server">';
         } else {
             $connection_html .= '<label>';
             $connection_html .= $this->printHelp($lang['strserver'], 'pg.server', false);
@@ -2137,7 +2137,7 @@ 
                 }
                 $selected = isset($_REQUEST['server']) && $info['id'] == $_REQUEST['server'] ? ' selected="selected"' : '';
                 // not logged on this server
-                $connection_html .= '<option value="'.htmlspecialchars($info['id']).'" '.$selected.'>';
+                $connection_html .= '<option value="' . htmlspecialchars($info['id']) . '" ' . $selected . '>';
                 $connection_html .= htmlspecialchars("{$info['desc']} ({$info['id']})");
                 $connection_html .= "</option>\n";
             }
@@ -2147,7 +2147,7 @@ 
         $connection_html .= "</td><td class=\"popup_select2\" style=\"text-align: right\">\n";
 
         if (count($servers) === 1 && isset($servers[$this->server_id]['useonlydefaultdb']) && $servers[$this->server_id]['useonlydefaultdb'] === true) {
-            $connection_html .= '<input type="hidden" name="database" value="'.htmlspecialchars($servers[$this->server_id]['defaultdb'])."\" />\n";
+            $connection_html .= '<input type="hidden" name="database" value="' . htmlspecialchars($servers[$this->server_id]['defaultdb']) . "\" />\n";
         } else {
 
             // Get the list of all databases
@@ -2166,14 +2166,14 @@ 
                 while (!$databases->EOF) {
                     $dbname = $databases->fields['datname'];
                     $dbselected = isset($_REQUEST['database']) && $dbname == $_REQUEST['database'] ? ' selected="selected"' : '';
-                    $connection_html .= '<option value="'.htmlspecialchars($dbname).'" '.$dbselected.'>'.htmlspecialchars($dbname)."</option>\n";
+                    $connection_html .= '<option value="' . htmlspecialchars($dbname) . '" ' . $dbselected . '>' . htmlspecialchars($dbname) . "</option>\n";
 
                     $databases->moveNext();
                 }
                 $connection_html .= "</select></label>\n";
             } else {
                 $server_info = $misc->getServerInfo();
-                $connection_html .= '<input type="hidden" name="database" value="'.htmlspecialchars($server_info['defaultdb'])."\" />\n";
+                $connection_html .= '<input type="hidden" name="database" value="' . htmlspecialchars($server_info['defaultdb']) . "\" />\n";
             }
         }
 
@@ -2253,38 +2253,38 @@ 
             $fksprops['code'] .= "var constrs = {};\n";
             foreach ($fksprops['byconstr'] as $conid => $props) {
                 $fksprops['code'] .= "constrs.constr_{$conid} = {\n";
-                $fksprops['code'] .= 'pattnums: ['.implode(',', $props['pattnums'])."],\n";
-                $fksprops['code'] .= "f_table:'".addslashes(htmlentities($props['f_table'], ENT_QUOTES, 'UTF-8'))."',\n";
-                $fksprops['code'] .= "f_schema:'".addslashes(htmlentities($props['f_schema'], ENT_QUOTES, 'UTF-8'))."',\n";
+                $fksprops['code'] .= 'pattnums: [' . implode(',', $props['pattnums']) . "],\n";
+                $fksprops['code'] .= "f_table:'" . addslashes(htmlentities($props['f_table'], ENT_QUOTES, 'UTF-8')) . "',\n";
+                $fksprops['code'] .= "f_schema:'" . addslashes(htmlentities($props['f_schema'], ENT_QUOTES, 'UTF-8')) . "',\n";
                 $_ = '';
                 foreach ($props['pattnames'] as $n) {
-                    $_ .= ",'".htmlentities($n, ENT_QUOTES, 'UTF-8')."'";
+                    $_ .= ",'" . htmlentities($n, ENT_QUOTES, 'UTF-8') . "'";
                 }
-                $fksprops['code'] .= 'pattnames: ['.substr($_, 1)."],\n";
+                $fksprops['code'] .= 'pattnames: [' . substr($_, 1) . "],\n";
 
                 $_ = '';
                 foreach ($props['fattnames'] as $n) {
-                    $_ .= ",'".htmlentities($n, ENT_QUOTES, 'UTF-8')."'";
+                    $_ .= ",'" . htmlentities($n, ENT_QUOTES, 'UTF-8') . "'";
                 }
 
-                $fksprops['code'] .= 'fattnames: ['.substr($_, 1)."]\n";
+                $fksprops['code'] .= 'fattnames: [' . substr($_, 1) . "]\n";
                 $fksprops['code'] .= "};\n";
             }
 
             $fksprops['code'] .= "var attrs = {};\n";
             foreach ($fksprops['byfield'] as $attnum => $cstrs) {
-                $fksprops['code'] .= "attrs.attr_{$attnum} = [".implode(',', $fksprops['byfield'][$attnum])."];\n";
+                $fksprops['code'] .= "attrs.attr_{$attnum} = [" . implode(',', $fksprops['byfield'][$attnum]) . "];\n";
             }
 
-            $fksprops['code'] .= "var table='".addslashes(htmlentities($table, ENT_QUOTES, 'UTF-8'))."';";
-            $fksprops['code'] .= "var server='".htmlentities($_REQUEST['server'], ENT_QUOTES, 'UTF-8')."';";
-            $fksprops['code'] .= "var database='".addslashes(htmlentities($_REQUEST['database'], ENT_QUOTES, 'UTF-8'))."';";
-            $fksprops['code'] .= "var subfolder='".SUBFOLDER."';";
+            $fksprops['code'] .= "var table='" . addslashes(htmlentities($table, ENT_QUOTES, 'UTF-8')) . "';";
+            $fksprops['code'] .= "var server='" . htmlentities($_REQUEST['server'], ENT_QUOTES, 'UTF-8') . "';";
+            $fksprops['code'] .= "var database='" . addslashes(htmlentities($_REQUEST['database'], ENT_QUOTES, 'UTF-8')) . "';";
+            $fksprops['code'] .= "var subfolder='" . SUBFOLDER . "';";
             $fksprops['code'] .= "</script>\n";
 
             $fksprops['code'] .= '<div id="fkbg"></div>';
             $fksprops['code'] .= '<div id="fklist"></div>';
-            $fksprops['code'] .= '<script src="'.SUBFOLDER.'/js/ac_insert_row.js" type="text/javascript"></script>';
+            $fksprops['code'] .= '<script src="' . SUBFOLDER . '/js/ac_insert_row.js" type="text/javascript"></script>';
         } else /* we have no foreign keys on this table */
         {
             return false;