diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index c4bea502f..3b1c4988b 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -927,21 +927,23 @@ if (typeof(document.getElementById) != 'undefined'
         <td bgcolor="<?php echo $GLOBALS['cfg']['BgcolorOne']; ?>">
             <?php
             echo "\n";
+            // Html format the query to be displayed
             // The nl2br function isn't used because its result isn't a valid
             // xhtml1.0 statement before php4.0.5 ("<br>" and not "<br />")
-            //  if we want to show some sql code it is easiest to create it here
+            // If we want to show some sql code it is easiest to create it here
             $sqlnr = 1;
-            if(isset($GLOBALS['showasphp'])){$showasphp = &$GLOBALS['showasphp'];}
-            if(isset($showasphp) and ($showasphp=='true')){
-                $new_line   = '&quot;;<br />' . "\n" . '            $sql .= &quot;';
-            }else{
-                $new_line   = '<br />' . "\n" . '            ';
+            if (!empty($GLOBALS['show_as_php'])) {
+                $new_line = '&quot;;<br />' . "\n" . '            $sql .= &quot;';
+            } else {
+                $new_line = '<br />' . "\n" . '            ';
             }
-            $query_base = htmlspecialchars($GLOBALS['sql_query']);
-            $query_base = ereg_replace("((\015\012)|(\015)|(\012))+", $new_line, $query_base);
-            if(isset($showasphp) and ($showasphp=='true')){
-                $query_base = '$sql  = &quot;'.$query_base;
+            $query_base     = htmlspecialchars($GLOBALS['sql_query']);
+            $query_base     = ereg_replace("((\015\012)|(\015)|(\012))+", $new_line, $query_base);
+            if (!empty($GLOBALS['show_as_php'])) {
+                $query_base = '$sql  = &quot;' . $query_base;
             }
+
+            // Prepares links that may be displayed to edit/explain the query
             if (!isset($GLOBALS['show_query']) || $GLOBALS['show_query'] != 'y') {
                 if (!isset($GLOBALS['goto'])) {
                     $edit_target = (isset($GLOBALS['table'])) ? 'tbl_properties.php3' : 'db_details.php3';
@@ -951,29 +953,32 @@ if (typeof(document.getElementById) != 'undefined'
                     $edit_target = '';
                 }
                 if ($edit_target == 'tbl_properties.php3') {
-                    $edit_link = '<a href="tbl_properties.php3?lang=' . $GLOBALS['lang'] . '&amp;server=' . urlencode($GLOBALS['server']) . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;table=' . urlencode($GLOBALS['table']) . '&amp;sql_query=' . urlencode($GLOBALS['sql_query']) . '&amp;show_query=y#querybox">' . $GLOBALS['strEdit'] . '</a>';
+                    $edit_link = '<a href="tbl_properties.php3?lang=' . $GLOBALS['lang'] . '&amp;server=' . $GLOBALS['server'] . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;table=' . urlencode($GLOBALS['table']) . '&amp;sql_query=' . urlencode($GLOBALS['sql_query']) . '&amp;show_query=y#querybox">' . $GLOBALS['strEdit'] . '</a>';
                 } else if ($edit_target != '') {
-                    $edit_link = '<a href="db_details.php3?lang=' . $GLOBALS['lang'] . '&amp;server=' . urlencode($GLOBALS['server']) . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;sql_query=' . urlencode($GLOBALS['sql_query']) . '&amp;show_query=y#querybox">' . $GLOBALS['strEdit'] . '</a>';
+                    $edit_link = '<a href="db_details.php3?lang=' . $GLOBALS['lang'] . '&amp;server=' . $GLOBALS['server'] . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;sql_query=' . urlencode($GLOBALS['sql_query']) . '&amp;show_query=y#querybox">' . $GLOBALS['strEdit'] . '</a>';
                 }
-                // want to have the query explained (Mike Beck 2002-05-22)
+                // Want to have the query explained (Mike Beck 2002-05-22)
                 // but do not explain an explain (lem9)
-                //
-                if (!ereg('EXPLAIN',$GLOBALS['sql_query'])) {;
-                    $explain_link='[<a href="sql.php3?lang=' . $GLOBALS['lang'] . '&amp;server=' . urlencode($GLOBALS['server']) . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;table=' . urlencode($GLOBALS['table']) . '&amp;sql_query=' . urlencode('EXPLAIN '.$GLOBALS['sql_query']) . '">' . $GLOBALS['strExplain'] . '</a>]&nbsp;';
+                if (!eregi('^EXPLAIN[[:space:]]+', $GLOBALS['sql_query'])) {
+                    $explain_link = '[<a href="sql.php3?lang=' . $GLOBALS['lang'] . '&amp;server=' . $GLOBALS['server'] . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;table=' . urlencode($GLOBALS['table']) . '&amp;sql_query=' . urlencode('EXPLAIN '.$GLOBALS['sql_query']) . '">' . $GLOBALS['strExplain'] . '</a>]&nbsp;';
                 } else {
-                    $explain_link='';
+                    $explain_link = '';
                 }
-                //  Also i would like to get the SQL formed in some nice php-code (Mike Beck 2002-05-22)
-                if(isset($showasphp) and ($showasphp=='true')){
-                    $php_link    ='<a href="sql.php3?lang=' . $GLOBALS['lang'] . '&amp;server=' . urlencode($GLOBALS['server']) . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;table=' . urlencode($GLOBALS['table']) . '&amp;sql_query=' . urlencode($GLOBALS['sql_query']) . '&amp;showasphp=false">' . $GLOBALS['strNoPhp'] . '</a>';
-                }else{
-                    $php_link    ='<a href="sql.php3?lang=' . $GLOBALS['lang'] . '&amp;server=' . urlencode($GLOBALS['server']) . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;table=' . urlencode($GLOBALS['table']) . '&amp;sql_query=' . urlencode($GLOBALS['sql_query']) . '&amp;showasphp=true">' . $GLOBALS['strPhp'] . '</a>';
+                // Also we would like to get the SQL formed in some nice
+                // php-code (Mike Beck 2002-05-22)
+                if (!empty($GLOBALS['show_as_php'])) {
+                    $php_link = '<a href="sql.php3?lang=' . $GLOBALS['lang'] . '&amp;server=' . $GLOBALS['server'] . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;table=' . urlencode($GLOBALS['table']) . '&amp;sql_query=' . urlencode($GLOBALS['sql_query']) . '&amp;show_as_php=0">' . $GLOBALS['strNoPhp'] . '</a>';
+                } else {
+                    $php_link = '<a href="sql.php3?lang=' . $GLOBALS['lang'] . '&amp;server=' . $GLOBALS['server'] . '&amp;db=' . urlencode($GLOBALS['db']) . '&amp;table=' . urlencode($GLOBALS['table']) . '&amp;sql_query=' . urlencode($GLOBALS['sql_query']) . '&amp;show_as_php=1">' . $GLOBALS['strPhp'] . '</a>';
                 }
             }
+
+            // Displays the message
+            echo '            ' . $GLOBALS['strSQLQuery'] . '&nbsp;:';
             if (!empty($edit_target)) {
-                echo '            ' . $GLOBALS['strSQLQuery'] . '&nbsp;:&nbsp;[' . $edit_link . ']&nbsp;' . $explain_link . '[' . $php_link . ']<br />' . "\n";
+                echo '&nbsp;[' . $edit_link . ']&nbsp;' . $explain_link . '[' . $php_link . ']<br />' . "\n";
             } else {
-                echo '            ' . $GLOBALS['strSQLQuery'] . '&nbsp;:<br />' . "\n";
+                echo '<br />' . "\n";
             }
             echo '            ' . $query_base;
             // If a 'LIMIT' clause has been programatically added to the query
@@ -981,9 +986,9 @@ if (typeof(document.getElementById) != 'undefined'
             if (!empty($GLOBALS['sql_limit_to_append'])) {
                 echo $GLOBALS['sql_limit_to_append'];
             }
+            if (!empty($GLOBALS['show_as_php'])) {
+                echo '&quot;;';
             }
-            if(isset($showasphp) and ($showasphp=='true')){
-                echo  '&quot;;';
             echo "\n";
             ?>
         </td>