diff --git a/ChangeLog b/ChangeLog
index b95e263cd..aca26e896 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,23 @@ $Id$
 $Source$
 
 2003-03-10 Garvin Hicking <me@supergarv.de>
+    * header.inc.php3, header_printview.inc.php3, index.php3,
+      left.php3, queryframe.php3, querywindow.php3, 
+      transformation_wrapper.php3, css/phpmyadmin.css.php3,
+      libraries/common.lib.php3, libraries/db_table_exists.lib.php3,
+      libraries/functions.js, libraries/header_http.inc.php3, 
+      libraries/header_meta_style.inc.php3, libraries/left.js
+      libraries/sqlparser.lib.php3:
+      Massive code-cleanup. Put all stylesheets into new central file
+      css/phpmyadmin.css.php3. To reduce overhead in this file, the
+      common.lib.php3 has a new variable to determine whether the full
+      code structure or only those codes needed for the stylesheet class
+      is parsed. This is to prevent duplicated code, even though it looks
+      somehow ugly. The stylesheet is now embedded via a <link rel>-
+      directive and should also be able to be cached by the browser.
+      See patch #699454.
+      Also some unneccessary code was removed from querywindow/wrapper.
+    
     * tbl_change.php3: Patch #697541 to prevent non-associative MySQL
       fieldnames to be mapped to false keys for display.
 
diff --git a/css/phpmyadmin.css.php3 b/css/phpmyadmin.css.php3
new file mode 100644
index 000000000..61a354d23
--- /dev/null
+++ b/css/phpmyadmin.css.php3
@@ -0,0 +1,206 @@
+<?php
+/* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
+
+chdir('..');
+$is_minimum_common = TRUE;
+require('./libraries/grab_globals.lib.php3');
+require('./libraries/common.lib.php3');
+
+// Gets the default font sizes
+// garvin: TODO: Should be optimized to not include the whole common.lib.php3 bunch
+// but only functions used to determine browser heritage.
+PMA_setFontSizes();
+
+$ctype = 'css';
+require('./libraries/header_http.inc.php3');
+
+if (!isset($js_frame)) {
+    $js_frame = 'left';
+}
+
+if ($js_frame == 'left') {
+/************************************************************************************
+ * LEFT FRAME
+ ************************************************************************************/
+
+    /**
+     * Add styles for positioned layers
+     */
+    if (isset($num_dbs) && $num_dbs == '0') {
+    ?>
+/* No layer effects neccessary */
+div     {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
+input   {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>}
+select  {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; background-color: #ffffff; color: #000000}
+.heada  {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
+.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none}
+.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
+.tblItem:hover {color: #FF0000; text-decoration: underline}
+    <?php
+    } else {
+        if (isset($js_capable) && $js_capable != '0') {
+            // Brian Birtles : This is not the ideal method of doing this
+            // but under the 7th June '00 Mozilla build (and many before
+            // it) Mozilla did not treat text between <style> tags as
+            // style information unless it was written with the one call
+            // to write().
+            if (isset($js_isDOM) && $js_isDOM != '0') {
+            ?>
+/* Layer effects neccessary: capable && is_DOM is set. We found a recent CSS-Browser */
+div {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
+.heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
+.headaCnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000}
+.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none; display: block}
+.child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none; display: none}
+.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
+.tblItem:hover {color: #FF0000; text-decoration: underline}'
+            <?php
+            } else { 
+            ?>
+/* Layer effeccts neccessary: capable, but no is_DOM. We found an older CSS-Browser */
+div {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
+.heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
+.headaCnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000}
+            <?php
+                if (isset($js_isIE4) && $js_isIE4 != '0') {
+                ?>
+/* Additional effects for IE4 */
+.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none; display: block}
+.child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none; display: none}
+.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
+.tblItem:hover {color: #FF0000; text-decoration: underline}
+                <?php
+                }
+                 else {
+                ?>
+/* Additional effects for NON-IE4 */
+.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none; position: absolute; visibility: hidden}
+.child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; position: absolute; visibility: hidden}
+.item, .tblItem {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
+                <?php
+                }
+            }
+        } else {
+        ?>
+/* Additional effects for left frame not required or not possible because of lacking CSS-capability. */
+div {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
+.heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
+.headaCnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000}
+.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none}
+.child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
+.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
+.tblItem:hover {color: #FF0000; text-decoration: underline}
+        <?php
+        }
+    }
+    ?>
+/* Always enabled stylesheets (left frame) */
+body {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>}
+    <?php
+} elseif ($js_frame == 'print') {
+/************************************************************************************
+ * PRINT VIEW
+ ************************************************************************************/
+
+    ?>
+/* For printview */
+body  {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000; background-color: #ffffff}
+h1    {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold}
+table {border-width:1px; border-color:#000000; border-style:solid; border-collapse:collapse; border-spacing:0}
+th    {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold; color: #000000; background-color: #ffffff; border-width:1px; border-color:#000000; border-style:solid; padding:2px}
+td    {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000; background-color: #ffffff; border-width:1px; border-color:#000000; border-style:solid; padding:2px}
+    <?php
+} else {
+/************************************************************************************
+ * RIGHT FRAME
+ ************************************************************************************/
+
+?>
+/* Always enabled stylesheets (right frame) */
+body {
+    font-family: <?php echo $right_font_family; ?>;
+    font-size: <?php echo $font_size; ?>;
+    color: #000000;
+    <?php
+    if ($GLOBALS['cfg']['RightBgImage'] == '') {
+        echo '    background-image: url(\'./images/vertical_line.png\');' . "\n"
+             . '    background-repeat: repeat-y;' . "\n";
+    } else {
+        echo '    background-image: url(\'' . $GLOBALS['cfg']['RightBgImage'] . '\');' . "\n";
+    } // end if... else...
+    ?>
+    background-color: <?php echo $GLOBALS['cfg']['RightBgColor'] . "\n"; ?>
+}
+
+pre, tt         {font-size: <?php echo $font_size; ?>}
+th              {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold; color: #000000; background-color: <?php echo $GLOBALS['cfg']['ThBgcolor']; ?>}
+td              {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>}
+form            {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>}
+input           {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>}
+input.textfield {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000; background-color: #FFFFFF}
+select          {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000; background-color: #FFFFFF}
+textarea        {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000; background-color: #FFFFFF}
+h1              {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold}
+h2              {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold}
+h3              {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold}
+a:link          {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; text-decoration: none; color: #0000FF}
+a:visited       {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; text-decoration: none; color: #0000FF}
+a:hover         {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; text-decoration: underline; color: #FF0000}
+a.nav:link      {font-family: <?php echo $right_font_family; ?>; color: #000000}
+a.nav:visited   {font-family: <?php echo $right_font_family; ?>; color: #000000}
+a.nav:hover     {font-family: <?php echo $right_font_family; ?>; color: #FF0000}
+a.h1:link       {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold; color: #000000}
+a.h1:active     {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold; color: #000000}
+a.h1:visited    {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold; color: #000000}
+a.h1:hover      {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold; color: #FF0000}
+a.h2:link       {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold; color: #000000}
+a.h2:active     {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold; color: #000000}
+a.h2:visited    {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold; color: #000000}
+a.h2:hover      {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold; color: #FF0000}
+a.drop:link     {font-family: <?php echo $right_font_family; ?>; color: #ff0000}
+a.drop:visited  {font-family: <?php echo $right_font_family; ?>; color: #ff0000}
+a.drop:hover    {font-family: <?php echo $right_font_family; ?>; color: #ffffff; background-color:#ff0000; text-decoration: none}
+dfn             {font-style: normal}
+dfn:hover       {font-style: normal; cursor: help}
+.nav            {font-family: <?php echo $right_font_family; ?>; color: #000000}
+.warning        {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold; color: #FF0000}
+td.topline      {font-size: 1px}
+td.tab          {
+    border-top: 1px solid #999;
+    border-right: 1px solid #666;
+    border-left: 1px solid #999;
+    border-bottom: none;
+    border-radius: 2px;
+    -moz-border-radius: 2px;
+}
+table.tabs      {
+    border-top: none;
+    border-right: none;
+    border-left: none;
+    border-bottom: 1px solid #666;
+}
+
+.print{font-family:arial;font-size:8pt;}
+
+.syntax {font-family: sans-serif; font-size: <?php echo $font_smaller; ?>;}
+.syntax_comment            {}
+.syntax_digit              {}
+.syntax_digit_hex          {}
+.syntax_digit_integer      {}
+.syntax_digit_float        {}
+.syntax_punct              {}
+.syntax_alpha              {text-transform: lowercase;}
+.syntax_alpha_columnType   {text-transform: uppercase;}
+.syntax_alpha_columnAttrib {text-transform: uppercase;}
+.syntax_alpha_reservedWord {text-transform: uppercase; font-weight: bold;}
+.syntax_alpha_functionName {text-transform: uppercase;}
+.syntax_alpha_identifier   {}
+.syntax_alpha_variable     {}
+.syntax_quote              {}
+.syntax_quote_backtick     {}
+    <?php
+    echo PMA_SQP_buildCssData();
+}
+?>
+
diff --git a/header.inc.php3 b/header.inc.php3
index 597fbf2cc..6c93df05f 100755
--- a/header.inc.php3
+++ b/header.inc.php3
@@ -18,135 +18,13 @@ if ($GLOBALS['cfg']['OBGzip']) {
     }
 }
 
+// garvin: For re-usability, moved http-headers and stylesheets
+// to a seperate file. It can now be included by header.inc.php3,
+// queryframe.php3, querywindow.php3.
 
-/**
- * Sends http headers
- */
-// Don't use cache (required for Opera)
-$GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT';
-header('Expires: ' . $GLOBALS['now']); // rfc2616 - Section 14.21
-header('Last-Modified: ' . $GLOBALS['now']);
-header('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
-header('Pragma: no-cache'); // HTTP/1.0
-// Define the charset to be used
-header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
+include('./libraries/header_http.inc.php3');
+include('./libraries/header_meta_style.inc.php3');
 
-
-/**
- * Sends the beginning of the html page then returns to the calling script
- */
-// Gets the font sizes to use
-PMA_setFontSizes();
-// Defines the cell alignment values depending on text direction
-if ($GLOBALS['text_dir'] == 'ltr') {
-    $GLOBALS['cell_align_left']  = 'left';
-    $GLOBALS['cell_align_right'] = 'right';
-} else {
-    $GLOBALS['cell_align_left']  = 'right';
-    $GLOBALS['cell_align_right'] = 'left';
-}
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][2]; ?>" lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][2]; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>">
-
-<head>
-<title>phpMyAdmin</title>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" />
-<?php
-if (!empty($GLOBALS['cfg']['PmaAbsoluteUri'])) {
-    echo '<base href="' . $GLOBALS['cfg']['PmaAbsoluteUri'] . '" />' . "\n";
-}
-?>
-<style type="text/css">
-<!--
-body {
-    font-family: <?php echo $GLOBALS['right_font_family']; ?>;
-    font-size: <?php echo $GLOBALS['font_size']; ?>;
-    color: #000000;
-<?php
-if ($GLOBALS['cfg']['RightBgImage'] == '') {
-    echo '    background-image: url(\'./images/vertical_line.png\');' . "\n"
-         . '    background-repeat: repeat-y;' . "\n";
-} else {
-    echo '    background-image: url(\'' . $GLOBALS['cfg']['RightBgImage'] . '\');' . "\n";
-} // end if... else...
-?>
-    background-color: <?php echo $GLOBALS['cfg']['RightBgColor'] . "\n"; ?>
-}
-pre, tt         {font-size: <?php echo $GLOBALS['font_size']; ?>}
-th              {font-family: <?php echo $GLOBALS['right_font_family']; ?>; font-size: <?php echo $GLOBALS['font_size']; ?>; font-weight: bold; color: #000000; background-color: <?php echo $GLOBALS['cfg']['ThBgcolor']; ?>}
-td              {font-family: <?php echo $GLOBALS['right_font_family']; ?>; font-size: <?php echo $GLOBALS['font_size']; ?>}
-form            {font-family: <?php echo $GLOBALS['right_font_family']; ?>; font-size: <?php echo $GLOBALS['font_size']; ?>}
-input           {font-family: <?php echo $GLOBALS['right_font_family']; ?>; font-size: <?php echo $GLOBALS['font_size']; ?>}
-input.textfield {font-family: <?php echo $GLOBALS['right_font_family']; ?>; font-size: <?php echo $GLOBALS['font_size']; ?>; color: #000000; background-color: #FFFFFF}
-select          {font-family: <?php echo $GLOBALS['right_font_family']; ?>; font-size: <?php echo $GLOBALS['font_size']; ?>; color: #000000; background-color: #FFFFFF}
-textarea        {font-family: <?php echo $GLOBALS['right_font_family']; ?>; font-size: <?php echo $GLOBALS['font_size']; ?>; color: #000000; background-color: #FFFFFF}
-h1              {font-family: <?php echo $GLOBALS['right_font_family']; ?>; font-size: <?php echo $GLOBALS['font_biggest']; ?>; font-weight: bold}
-h2              {font-family: <?php echo $GLOBALS['right_font_family']; ?>; font-size: <?php echo $GLOBALS['font_bigger']; ?>; font-weight: bold}
-h3              {font-family: <?php echo $GLOBALS['right_font_family']; ?>; font-size: <?php echo $GLOBALS['font_size']; ?>; font-weight: bold}
-a:link          {font-family: <?php echo $GLOBALS['right_font_family']; ?>; font-size: <?php echo $GLOBALS['font_size']; ?>; text-decoration: none; color: #0000FF}
-a:visited       {font-family: <?php echo $GLOBALS['right_font_family']; ?>; font-size: <?php echo $GLOBALS['font_size']; ?>; text-decoration: none; color: #0000FF}
-a:hover         {font-family: <?php echo $GLOBALS['right_font_family']; ?>; font-size: <?php echo $GLOBALS['font_size']; ?>; text-decoration: underline; color: #FF0000}
-a.nav:link      {font-family: <?php echo $GLOBALS['right_font_family']; ?>; color: #000000}
-a.nav:visited   {font-family: <?php echo $GLOBALS['right_font_family']; ?>; color: #000000}
-a.nav:hover     {font-family: <?php echo $GLOBALS['right_font_family']; ?>; color: #FF0000}
-a.h1:link       {font-family: <?php echo $GLOBALS['right_font_family']; ?>; font-size: <?php echo $GLOBALS['font_biggest']; ?>; font-weight: bold; color: #000000}
-a.h1:active     {font-family: <?php echo $GLOBALS['right_font_family']; ?>; font-size: <?php echo $GLOBALS['font_biggest']; ?>; font-weight: bold; color: #000000}
-a.h1:visited    {font-family: <?php echo $GLOBALS['right_font_family']; ?>; font-size: <?php echo $GLOBALS['font_biggest']; ?>; font-weight: bold; color: #000000}
-a.h1:hover      {font-family: <?php echo $GLOBALS['right_font_family']; ?>; font-size: <?php echo $GLOBALS['font_biggest']; ?>; font-weight: bold; color: #FF0000}
-a.h2:link       {font-family: <?php echo $GLOBALS['right_font_family']; ?>; font-size: <?php echo $GLOBALS['font_bigger']; ?>; font-weight: bold; color: #000000}
-a.h2:active     {font-family: <?php echo $GLOBALS['right_font_family']; ?>; font-size: <?php echo $GLOBALS['font_bigger']; ?>; font-weight: bold; color: #000000}
-a.h2:visited    {font-family: <?php echo $GLOBALS['right_font_family']; ?>; font-size: <?php echo $GLOBALS['font_bigger']; ?>; font-weight: bold; color: #000000}
-a.h2:hover      {font-family: <?php echo $GLOBALS['right_font_family']; ?>; font-size: <?php echo $GLOBALS['font_bigger']; ?>; font-weight: bold; color: #FF0000}
-a.drop:link     {font-family: <?php echo $GLOBALS['right_font_family']; ?>; color: #ff0000}
-a.drop:visited  {font-family: <?php echo $GLOBALS['right_font_family']; ?>; color: #ff0000}
-a.drop:hover    {font-family: <?php echo $GLOBALS['right_font_family']; ?>; color: #ffffff; background-color:#ff0000; text-decoration: none}
-dfn             {font-style: normal}
-dfn:hover       {font-style: normal; cursor: help}
-.nav            {font-family: <?php echo $GLOBALS['right_font_family']; ?>; color: #000000}
-.warning        {font-family: <?php echo $GLOBALS['right_font_family']; ?>; font-size: <?php echo $GLOBALS['font_size']; ?>; font-weight: bold; color: #FF0000}
-td.topline      {font-size: 1px}
-td.tab          {
-    border-top: 1px solid #999;
-    border-right: 1px solid #666;
-    border-left: 1px solid #999;
-    border-bottom: none;
-    border-radius: 2px;
-    -moz-border-radius: 2px;
-}
-table.tabs      {
-    border-top: none;
-    border-right: none;
-    border-left: none;
-    border-bottom: 1px solid #666;
-}
-
-.print{font-family:arial;font-size:8pt;}
-
-.syntax {font-family: sans-serif; font-size: <?php echo $font_smaller; ?>;}
-.syntax_comment            {}
-.syntax_digit              {}
-.syntax_digit_hex          {}
-.syntax_digit_integer      {}
-.syntax_digit_float        {}
-.syntax_punct              {}
-.syntax_alpha              {text-transform: lowercase;}
-.syntax_alpha_columnType   {text-transform: uppercase;}
-.syntax_alpha_columnAttrib {text-transform: uppercase;}
-.syntax_alpha_reservedWord {text-transform: uppercase; font-weight: bold;}
-.syntax_alpha_functionName {text-transform: uppercase;}
-.syntax_alpha_identifier   {}
-.syntax_alpha_variable     {}
-.syntax_quote              {}
-.syntax_quote_backtick     {}
-<?php
-echo PMA_SQP_buildCssData();
-?>
-//-->
-</style>
-
-<?php
 $title     = '';
 if (isset($GLOBALS['db'])) {
     $title .= str_replace('\'', '\\\'', $GLOBALS['db']);
@@ -246,7 +124,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
     }
     ?>
     
-    if (top.frames.queryframe) {
+    if (top.frames.queryframe && top.frames.queryframe.document && top.frames.queryframe.document.queryframeform) {
         top.frames.queryframe.document.queryframeform.db.value = "<?php echo (isset($db) ? htmlspecialchars($db) : ''); ?>";
         top.frames.queryframe.document.queryframeform.table.value = "<?php echo (isset($table) ? htmlspecialchars($table) : ''); ?>";
     }
diff --git a/header_printview.inc.php3 b/header_printview.inc.php3
index f269165a8..f80d17866 100644
--- a/header_printview.inc.php3
+++ b/header_printview.inc.php3
@@ -15,18 +15,11 @@ if ($cfg['OBGzip']) {
 }
 
 
-/**
- * Sends http headers
- */
-// Don't use cache (required for Opera)
-$now = gmdate('D, d M Y H:i:s') . ' GMT';
-header('Expires: ' . $now); // rfc2616 - Section 14.21
-header('Last-Modified: ' . $now);
-header('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
-header('Pragma: no-cache'); // HTTP/1.0
-// Define the charset to be used
-header('Content-Type: text/html; charset=' . $charset);
+// garvin: For re-usability, moved http-headers 
+// to a seperate file. It can now be included by header.inc.php3,
+// queryframe.php3, querywindow.php3.
 
+include('./libraries/header_http.inc.php3');
 
 /**
  * Sends the beginning of the html page then returns to the calling script
@@ -49,14 +42,7 @@ if ($text_dir == 'ltr') {
 <head>
 <title><?php echo $strSQLResult; ?> - phpMyAdmin <?php echo PMA_VERSION ?></title>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
-<style type="text/css">
-<!--
-body  {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000; background-color: #ffffff}
-h1    {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold}
-table {border-width:1px; border-color:#000000; border-style:solid; border-collapse:collapse; border-spacing:0}
-th    {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold; color: #000000; background-color: #ffffff; border-width:1px; border-color:#000000; border-style:solid; padding:2px}
-td    {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000; background-color: #ffffff; border-width:1px; border-color:#000000; border-style:solid; padding:2px}
-//-->
+<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?js_frame=print" />
 </style>
 </head>
 
diff --git a/index.php3 b/index.php3
index 3b4877b7a..676f79c9c 100755
--- a/index.php3
+++ b/index.php3
@@ -55,11 +55,7 @@ if ($cfg['QueryHistoryDB'] && $cfgRelation['historywork']) {
 <head>
 <title>phpMyAdmin <?php echo PMA_VERSION; ?> - <?php echo $HTTP_HOST; ?></title>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" />
-<style type="text/css">
-<!--
-body  {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>}
-//-->
-</style>
+<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?js_frame=right" />
 </head>
 
 <frameset cols="<?php echo $cfg['LeftWidth']; ?>,*" rows="*">
diff --git a/left.php3 b/left.php3
index 6186c6eff..c3e423556 100755
--- a/left.php3
+++ b/left.php3
@@ -40,18 +40,11 @@ if ($server > 0) {
 }
 
 
-/**
- * Send http headers
- */
-// Don't use cache (required for Opera)
-$now = gmdate('D, d M Y H:i:s') . ' GMT';
-header('Expires: ' . $now);
-header('Last-Modified: ' . $now);
-header('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
-header('Pragma: no-cache'); // HTTP/1.0
-// Define the charset to be used
-header('Content-Type: text/html; charset=' . $charset);
+// garvin: For re-usability, moved http-headers
+// to a seperate file. It can now be included by header.inc.php3,
+// queryframe.php3, querywindow.php3.
 
+include('./libraries/header_http.inc.php3');
 
 /**
  * Displays the frame
@@ -98,69 +91,31 @@ if ($num_dbs > 1 && !$cfg['LeftFrameLight']) {
             }
         } // end if... else if...
     } // end if
-    var fontFamily  = '<?php echo $left_font_family; ?>';
-    var fontSize    = '<?php echo $font_size; ?>';
-    var fontBig     = '<?php echo $font_bigger; ?>';
-    var fontSmall   = '<?php echo $font_smaller; ?>';
+
     var isServer    = <?php echo ($server > 0) ? 'true' : 'false'; ?>;
+
+    document.writeln('<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?js_frame=left&amp;js_capable=' + capable + '&amp;js_isDOM=' + isDOM + '&amp;js_isIE4=' + isIE4 + '" />');
     //-->
     </script>
-    <script src="libraries/left.js" type="text/javascript" language="javascript1.2"></script>
     <noscript>
-        <style type="text/css">
-        <!--
-        div {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-        .heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-        .headaCnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000}
-        .parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none}
-        .child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
-        .item, .item:active, .item:hover, .tblItem, .tblItem:active {color: #333399; text-decoration: none}
-        .tblItem:hover {color: #FF0000; text-decoration: underline}
-        //-->
-        </style>
+        <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?js_frame=left&amp;js_capable=0&amp;js_isDOM=0&amp;js_isIE4=0" />
     </noscript>
 
-    <style type="text/css">
-    <!--
-    body {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>}
-    //-->
-    </style>
+    <script src="libraries/left.js" type="text/javascript" language="javascript1.2"></script>
     <?php
 } // end if ($num_dbs > 1)
 
 else if ($num_dbs == 1) {
     echo "\n";
     ?>
-    <style type="text/css">
-    <!--
-    body {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>}
-    div {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-    .heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-    .headaCnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000}
-    .parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none}
-    .child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
-    .item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
-    .tblItem:hover {color: #FF0000; text-decoration: underline}
-    //-->
-    </style>
+    <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?js_frame=left&amp;js_capable=0&amp;js_isDOM=0&amp;js_isIE4=0" />
     <?php
 } // end if ($num_dbs == 1)
 
 else {
     echo "\n";
     ?>
-    <style type="text/css">
-    <!--
-    body    {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>}
-    div     {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-    input   {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>}
-    select  {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; background-color: #ffffff; color: #000000}
-    .heada  {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-    .parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none}
-    .item, .item:active, .item:hover, .tblItem, .tblItem:active {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
-    .tblItem:hover {color: #FF0000; text-decoration: underline}
-    //-->
-    </style>
+    <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?js_frame=left&amp;num_dbs=0" />
     <?php
 } // end if ($num_dbs < 1)
 
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index d5fa4119d..04bfe1c9f 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -57,7 +57,14 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')) {
      * - other functions, respecting dependencies
      */
 
-
+    /**
+     * Minimum inclusion? (i.e. for the stylesheet builder)
+     */
+     
+    if (!isset($is_minimum_common)) {
+        $is_minimum_common = FALSE;
+    }
+    
     /**
      * Avoids undefined variables in PHP3
      */
@@ -87,7 +94,7 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')) {
     if (!isset($cfgServers) && !isset($cfg['Servers'])) {
         // Creates fake settings
         $cfg = array('DefaultLang'           => 'en-iso-8859-1',
-                     'AllowAnywhereRecoding' => FALSE);
+                        'AllowAnywhereRecoding' => FALSE);
         // Loads the language file
         include('./libraries/select_lang.lib.php3');
         // Sends the Content-Type header
@@ -101,6 +108,7 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')) {
 <head>
 <title>phpMyAdmin</title>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
+
 <style type="text/css">
 <!--
 body  {font-family: sans-serif; font-size: small; color: #000000; background-color: #F5F5F5}
@@ -133,39 +141,43 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
     if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 167) {
         include('./libraries/config_import.lib.php3');
     }
-
-    /**
-     * Includes the language file if it hasn't been included yet
-     */
-    if (!defined('PMA_SELECT_LANG_LIB_INCLUDED')) {
-        include('./libraries/select_lang.lib.php3');
+    
+    if ($is_minimum_common == FALSE) {
+        /**
+         * Includes the language file if it hasn't been included yet
+         */
+        if (!defined('PMA_SELECT_LANG_LIB_INCLUDED')) {
+            include('./libraries/select_lang.lib.php3');
+        }
+    
+        /**
+         * Include MySQL wrappers.
+         */
+        include('./libraries/mysql_wrappers.lib.php3');
     }
-
-    /**
-     * Include MySQL wrappers.
-     */
-    include('./libraries/mysql_wrappers.lib.php3');
-
+    
     /**
      * Gets constants that defines the PHP version number.
      * This include must be located physically before any code that needs to
      * reference the constants, else PHP 3.0.16 won't be happy.
      */
     include('./libraries/defines_php.lib.php3');
-
-    /**
-     * Define $is_upload
-     */
-      $is_upload = (PMA_PHP_INT_VERSION >= 40000 && function_exists('ini_get'))
-           ? ((strtolower(ini_get('file_uploads')) == 'on' || ini_get('file_uploads') == 1) && intval(ini_get('upload_max_filesize')))
-           // loic1: php 3.0.15 and lower bug -> always enabled
-           : (PMA_PHP_INT_VERSION < 30016 || intval(@get_cfg_var('upload_max_filesize')));
-
-    /**
-     * Charset conversion.
-     */
-    include('./libraries/charset_conversion.lib.php3');
-
+    
+    if ($is_minimum_common == FALSE) {
+        /**
+         * Define $is_upload
+         */
+          $is_upload = (PMA_PHP_INT_VERSION >= 40000 && function_exists('ini_get'))
+               ? ((strtolower(ini_get('file_uploads')) == 'on' || ini_get('file_uploads') == 1) && intval(ini_get('upload_max_filesize')))
+               // loic1: php 3.0.15 and lower bug -> always enabled
+               : (PMA_PHP_INT_VERSION < 30016 || intval(@get_cfg_var('upload_max_filesize')));
+    
+        /**
+         * Charset conversion.
+         */
+        include('./libraries/charset_conversion.lib.php3');
+    }
+    
     /**
      * Gets constants that defines the MySQL version number.
      * This include must be located physically before any code that needs to
@@ -174,288 +186,298 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
      * below).
      */
     include('./libraries/defines.lib.php3');
-
+    
+    if ($is_minimum_common == FALSE) {
+        /**
+         * String handling
+         */
+        include('./libraries/string.lib.php3');
+    }
+    
+    if ($is_minimum_common == FALSE) {
+        /**
+         * SQL Parser data
+         */
+        include('./libraries/sqlparser.data.php3');
+    }
+    
     /**
-     * String handling
+     * SQL Parser code
      */
-    include('./libraries/string.lib.php3');
 
-    /**
-     * SQL Parser data and code
-     */
-    include('./libraries/sqlparser.data.php3');
     include('./libraries/sqlparser.lib.php3');
-
-    /**
-     * SQL Validator interface code
-     */
-    include('./libraries/sqlvalidator.lib.php3');
-
+    
+    if ($is_minimum_common == FALSE) {
+        /**
+         * SQL Validator interface code
+         */
+        include('./libraries/sqlvalidator.lib.php3');
+    }
+    
     // If zlib output compression is set in the php configuration file, no
     // output buffering should be run
     if (PMA_PHP_INT_VERSION < 40000
         || (PMA_PHP_INT_VERSION >= 40005 && @ini_get('zlib.output_compression'))) {
         $cfg['OBGzip'] = FALSE;
     }
-
-    /**
-     * Include URL/hidden inputs generating.
-     */
-    include('./libraries/url_generating.lib.php3');
-
-
-    /**
-     * Loads the mysql extensions if it is not loaded yet
-     * staybyte - 26. June 2001
-     */
-    if (((PMA_PHP_INT_VERSION >= 40000 && !@ini_get('safe_mode') && @ini_get('enable_dl'))
-        || (PMA_PHP_INT_VERSION < 40000 && PMA_PHP_INT_VERSION > 30009 && !@get_cfg_var('safe_mode')))
-        && @function_exists('dl')) {
-        if (PMA_PHP_INT_VERSION < 40000) {
-            $extension = 'MySQL';
-        } else {
-            $extension = 'mysql';
-        }
-        if (PMA_IS_WINDOWS) {
-            $suffix = '.dll';
-        } else {
-            $suffix = '.so';
-        }
-        if (!@extension_loaded($extension)) {
-            @dl($extension . $suffix);
-        }
-        if (!@extension_loaded($extension)) {
+    
+    if ($is_minimum_common == FALSE) {
+        /**
+         * Include URL/hidden inputs generating.
+         */
+        include('./libraries/url_generating.lib.php3');
+    
+    
+        /**
+         * Loads the mysql extensions if it is not loaded yet
+         * staybyte - 26. June 2001
+         */
+        if (((PMA_PHP_INT_VERSION >= 40000 && !@ini_get('safe_mode') && @ini_get('enable_dl'))
+            || (PMA_PHP_INT_VERSION < 40000 && PMA_PHP_INT_VERSION > 30009 && !@get_cfg_var('safe_mode')))
+            && @function_exists('dl')) {
+            if (PMA_PHP_INT_VERSION < 40000) {
+                $extension = 'MySQL';
+            } else {
+                $extension = 'mysql';
+            }
+            if (PMA_IS_WINDOWS) {
+                $suffix = '.dll';
+            } else {
+                $suffix = '.so';
+            }
+            if (!@extension_loaded($extension)) {
+                @dl($extension . $suffix);
+            }
+            if (!@extension_loaded($extension)) {
+                echo $strCantLoadMySQL . '<br />' . "\n"
+                     . '<a href="./Documentation.html#faqmysql" target="documentation">' . $GLOBALS['strDocu'] . '</a>' . "\n";
+                exit();
+            }
+        } // end load mysql extension
+    
+        // check whether mysql is available
+        if (!@function_exists('mysql_connect')) {
             echo $strCantLoadMySQL . '<br />' . "\n"
                  . '<a href="./Documentation.html#faqmysql" target="documentation">' . $GLOBALS['strDocu'] . '</a>' . "\n";
             exit();
         }
-    } // end load mysql extension
-
-    // check whether mysql is available
-    if (!@function_exists('mysql_connect')) {
-        echo $strCantLoadMySQL . '<br />' . "\n"
-             . '<a href="./Documentation.html#faqmysql" target="documentation">' . $GLOBALS['strDocu'] . '</a>' . "\n";
-        exit();
-    }
-
-
-
-    /**
-     * Add slashes before "'" and "\" characters so a value containing them can
-     * be used in a sql comparison.
-     *
-     * @param   string   the string to slash
-     * @param   boolean  whether the string will be used in a 'LIKE' clause
-     *                   (it then requires two more escaped sequences) or not
-     * @param   boolean  whether to treat cr/lfs as escape-worthy entities
-                         (converts \n to \\n, \r to \\r)
-
-     *
-     * @return  string   the slashed string
-     *
-     * @access  public
-     */
-    function PMA_sqlAddslashes($a_string = '', $is_like = FALSE, $crlf = FALSE)
-    {
-        if ($is_like) {
-            $a_string = str_replace('\\', '\\\\\\\\', $a_string);
-        } else {
-            $a_string = str_replace('\\', '\\\\', $a_string);
-        }
-        
-        if ($crlf) {
-            $a_string = str_replace("\n", '\n', $a_string);
-            $a_string = str_replace("\r", '\r', $a_string);
-            $a_string = str_replace("\t", '\t', $a_string);
-        }
-        
-        $a_string = str_replace('\'', '\\\'', $a_string);
-
-        return $a_string;
-    } // end of the 'PMA_sqlAddslashes()' function
-
-
-    /**
-     * Add slashes before "_" and "%" characters for using them in MySQL
-     * database, table and field names.
-     * Note: This function does not escape backslashes!
-     *
-     * @param   string   the string to escape
-     *
-     * @return  string   the escaped string
-     *
-     * @access  public
-     */
-    function PMA_escape_mysql_wildcards($name)
-    {
-        $name = str_replace('_', '\\_', $name);
-        $name = str_replace('%', '\\%', $name);
-
-        return $name;
-    } // end of the 'PMA_escape_mysql_wildcards()' function
-
-
-    /**
-     * format sql strings
-     *
-     * @param   mixed    pre-parsed SQL structure
-     *
-     * @return  string   the formatted sql
-     *
-     * @global  array    the configuration array
-     * @global  boolean  whether the current statement is a multiple one or not
-     *
-     * @access  public
-     *
-     * @author  Robin Johnson <robbat2@users.sourceforge.net>
-     */
-    function PMA_formatSql($parsed_sql)
-    {
-        global $cfg;
-
-        // Check that we actually have a valid set of parsed data
-        // well, not quite
-        // first check for the SQL parser having hit an error
-        if (PMA_SQP_isError()) {
-            return $parsed_sql;
-        }
-        // then check for an array
-        if (!is_array($parsed_sql)) {
-            // We don't so just return the input directly
-            // This is intended to be used for when the SQL Parser is turned off
-            $formatted_sql = '<pre>' . "\n"
-                           . $parsed_sql . "\n"
-                           . '</pre>';
+    
+    
+        /**
+         * Add slashes before "'" and "\" characters so a value containing them can
+         * be used in a sql comparison.
+         *
+         * @param   string   the string to slash
+         * @param   boolean  whether the string will be used in a 'LIKE' clause
+         *                   (it then requires two more escaped sequences) or not
+         * @param   boolean  whether to treat cr/lfs as escape-worthy entities
+         *                   (converts \n to \\n, \r to \\r)
+         *
+         * @return  string   the slashed string
+         *
+         * @access  public
+         */
+        function PMA_sqlAddslashes($a_string = '', $is_like = FALSE, $crlf = FALSE)
+        {
+            if ($is_like) {
+                $a_string = str_replace('\\', '\\\\\\\\', $a_string);
+            } else {
+                $a_string = str_replace('\\', '\\\\', $a_string);
+            }
+            
+            if ($crlf) {
+                $a_string = str_replace("\n", '\n', $a_string);
+                $a_string = str_replace("\r", '\r', $a_string);
+                $a_string = str_replace("\t", '\t', $a_string);
+            }
+            
+            $a_string = str_replace('\'', '\\\'', $a_string);
+    
+            return $a_string;
+        } // end of the 'PMA_sqlAddslashes()' function
+    
+    
+        /**
+         * Add slashes before "_" and "%" characters for using them in MySQL
+         * database, table and field names.
+         * Note: This function does not escape backslashes!
+         *
+         * @param   string   the string to escape
+         *
+         * @return  string   the escaped string
+         *
+         * @access  public
+         */
+        function PMA_escape_mysql_wildcards($name)
+        {
+            $name = str_replace('_', '\\_', $name);
+            $name = str_replace('%', '\\%', $name);
+    
+            return $name;
+        } // end of the 'PMA_escape_mysql_wildcards()' function
+    
+    
+        /**
+         * format sql strings
+         *
+         * @param   mixed    pre-parsed SQL structure
+         *
+         * @return  string   the formatted sql
+         *
+         * @global  array    the configuration array
+         * @global  boolean  whether the current statement is a multiple one or not
+         *
+         * @access  public
+         *
+         * @author  Robin Johnson <robbat2@users.sourceforge.net>
+         */
+        function PMA_formatSql($parsed_sql)
+        {
+            global $cfg;
+    
+            // Check that we actually have a valid set of parsed data
+            // well, not quite
+            // first check for the SQL parser having hit an error
+            if (PMA_SQP_isError()) {
+                return $parsed_sql;
+            }
+            // then check for an array
+            if (!is_array($parsed_sql)) {
+                // We don't so just return the input directly
+                // This is intended to be used for when the SQL Parser is turned off
+                $formatted_sql = '<pre>' . "\n"
+                                . $parsed_sql . "\n"
+                                . '</pre>';
+                return $formatted_sql;
+            }
+    
+            $formatted_sql        = '';
+    
+            switch ($cfg['SQP']['fmtType']) {
+                case 'none':
+                    $formatted_sql = PMA_SQP_formatNone($parsed_sql);
+                    break;
+                case 'html':
+                    $formatted_sql = PMA_SQP_formatHtml($parsed_sql,'color');
+                    break;
+                case 'text':
+                    //$formatted_sql = PMA_SQP_formatText($parsed_sql);
+                    $formatted_sql = PMA_SQP_formatHtml($parsed_sql,'text');
+                    break;
+                default:
+                    break;
+            } // end switch
+    
             return $formatted_sql;
-        }
-
-        $formatted_sql        = '';
-
-        switch ($cfg['SQP']['fmtType']) {
-            case 'none':
-                $formatted_sql = PMA_SQP_formatNone($parsed_sql);
-                break;
-            case 'html':
-                $formatted_sql = PMA_SQP_formatHtml($parsed_sql,'color');
-                break;
-            case 'text':
-                //$formatted_sql = PMA_SQP_formatText($parsed_sql);
-                $formatted_sql = PMA_SQP_formatHtml($parsed_sql,'text');
-                break;
-            default:
-                break;
-        } // end switch
-
-        return $formatted_sql;
-    } // end of the "PMA_formatSql()" function
-
-
-    /**
-     * Displays a MySQL error message in the right frame.
-     *
-     * @param   string   the error mesage
-     * @param   string   the sql query that failed
-     * @param   boolean  whether to show a "modify" link or not
-     * @param   string   the "back" link url (full path is not required)
-     *
-     * @global  array    the configuration array
-     *
-     * @access  public
-     */
-    function PMA_mysqlDie($error_message = '', $the_query = '',
-                          $is_modify_link = TRUE, $back_url = '')
-    {
-        global $cfg;
-
-        if (empty($GLOBALS['is_header_sent'])) {
-            include('./header.inc.php3');
-        }
-
-        if (!$error_message) {
-            $error_message = PMA_mysql_error();
-        }
-        if (!$the_query && !empty($GLOBALS['sql_query'])) {
-            $the_query = $GLOBALS['sql_query'];
-        }
-
-        // --- Added to solve bug #641765
-        // Robbat2 - 12 January 2003, 9:46PM
-        // Revised, Robbat2 - 13 Janurary 2003, 2:59PM
-        if (PMA_SQP_isError()) {
-            $parsed_sql = $the_query;
-        } else {
-            $parsed_sql = PMA_SQP_parse($the_query);
-        }
-        // ---
-
-        echo '<p><b>'. $GLOBALS['strError'] . '</b></p>' . "\n";
-        // if the config password is wrong, or the MySQL server does not
-        // respond, do not show the query that would reveal the
-        // username/password
-        if (!empty($the_query) && !strstr($the_query, 'connect')) {
+        } // end of the "PMA_formatSql()" function
+    
+    
+        /**
+         * Displays a MySQL error message in the right frame.
+         *
+         * @param   string   the error mesage
+         * @param   string   the sql query that failed
+         * @param   boolean  whether to show a "modify" link or not
+         * @param   string   the "back" link url (full path is not required)
+         *
+         * @global  array    the configuration array
+         *
+         * @access  public
+         */
+        function PMA_mysqlDie($error_message = '', $the_query = '',
+                                $is_modify_link = TRUE, $back_url = '')
+        {
+            global $cfg;
+    
+            if (empty($GLOBALS['is_header_sent'])) {
+                include('./header.inc.php3');
+            }
+    
+            if (!$error_message) {
+                $error_message = PMA_mysql_error();
+            }
+            if (!$the_query && !empty($GLOBALS['sql_query'])) {
+                $the_query = $GLOBALS['sql_query'];
+            }
+    
             // --- Added to solve bug #641765
             // Robbat2 - 12 January 2003, 9:46PM
             // Revised, Robbat2 - 13 Janurary 2003, 2:59PM
             if (PMA_SQP_isError()) {
-                echo PMA_SQP_getErrorString();
+                $parsed_sql = $the_query;
+            } else {
+                $parsed_sql = PMA_SQP_parse($the_query);
             }
             // ---
-            echo '<p>' . "\n";
-            echo '    ' . $GLOBALS['strSQLQuery'] . '&nbsp;:&nbsp;' . "\n";
-            if ($is_modify_link && isset($db)) {
-                echo '    ['
-                     . '<a href="db_details.php3?' . PMA_generate_common_url($GLOBALS['db']) . '&amp;sql_query=' . urlencode($the_query) . '&amp;show_query=1">' . $GLOBALS['strEdit'] . '</a>'
-                     . ']' . "\n";
+    
+            echo '<p><b>'. $GLOBALS['strError'] . '</b></p>' . "\n";
+            // if the config password is wrong, or the MySQL server does not
+            // respond, do not show the query that would reveal the
+            // username/password
+            if (!empty($the_query) && !strstr($the_query, 'connect')) {
+                // --- Added to solve bug #641765
+                // Robbat2 - 12 January 2003, 9:46PM
+                // Revised, Robbat2 - 13 Janurary 2003, 2:59PM
+                if (PMA_SQP_isError()) {
+                    echo PMA_SQP_getErrorString();
+                }
+                // ---
+                echo '<p>' . "\n";
+                echo '    ' . $GLOBALS['strSQLQuery'] . '&nbsp;:&nbsp;' . "\n";
+                if ($is_modify_link && isset($db)) {
+                    echo '    ['
+                            . '<a href="db_details.php3?' . PMA_generate_common_url($GLOBALS['db']) . '&amp;sql_query=' . urlencode($the_query) . '&amp;show_query=1">' . $GLOBALS['strEdit'] . '</a>'
+                            . ']' . "\n";
+                } // end if
+                echo '</p>' . "\n"
+                        . '<p>' . "\n"
+                        . '    ' . PMA_formatSql($parsed_sql) . "\n"
+                        . '</p>' . "\n";
             } // end if
-            echo '</p>' . "\n"
-                 . '<p>' . "\n"
-                 . '    ' . PMA_formatSql($parsed_sql) . "\n"
-                 . '</p>' . "\n";
-        } // end if
-        if (!empty($error_message)) {
-            $error_message = htmlspecialchars($error_message);
-            $error_message = ereg_replace("((\015\012)|(\015)|(\012)){3,}", "\n\n", $error_message);
-        }
-        echo '<p>' . "\n"
-             . '    ' . $GLOBALS['strMySQLSaid'] . '<br />' . "\n"
-             . '</p>' . "\n";
-        echo '<pre>' . "\n"
-             . $error_message . "\n"
-             . '</pre>' . "\n";
-
-
-        if (!empty($back_url)) {
-            echo '<a href="' . $back_url . '">' . $GLOBALS['strBack'] . '</a>';
-        }
-        echo "\n";
-
-        include('./footer.inc.php3');
-        exit();
-    } // end of the 'PMA_mysqlDie()' function
-
-
-    /**
-     * Defines whether a string exists inside an array or not
-     *
-     * @param   string   string to search for
-     * @param   mixed    array to search into
-     *
-     * @return  integer  the rank of the $toFind string in the array or '-1' if
-     *                   it hasn't been found
-     *
-     * @access  public
-     */
-    function PMA_isInto($toFind = '', &$in)
-    {
-        $max = count($in);
-        for ($i = 0; $i < $max && ($toFind != $in[$i]); $i++) {
-            // void();
-        }
-
-        return ($i < $max) ? $i : -1;
-    }  // end of the 'PMA_isInto()' function
-
-
+            if (!empty($error_message)) {
+                $error_message = htmlspecialchars($error_message);
+                $error_message = ereg_replace("((\015\012)|(\015)|(\012)){3,}", "\n\n", $error_message);
+            }
+            echo '<p>' . "\n"
+                    . '    ' . $GLOBALS['strMySQLSaid'] . '<br />' . "\n"
+                    . '</p>' . "\n";
+            echo '<pre>' . "\n"
+                    . $error_message . "\n"
+                    . '</pre>' . "\n";
+    
+    
+            if (!empty($back_url)) {
+                echo '<a href="' . $back_url . '">' . $GLOBALS['strBack'] . '</a>';
+            }
+            echo "\n";
+    
+            include('./footer.inc.php3');
+            exit();
+        } // end of the 'PMA_mysqlDie()' function
+    
+    
+        /**
+         * Defines whether a string exists inside an array or not
+         *
+         * @param   string   string to search for
+         * @param   mixed    array to search into
+         *
+         * @return  integer  the rank of the $toFind string in the array or '-1' if
+         *                   it hasn't been found
+         *
+         * @access  public
+         */
+        function PMA_isInto($toFind = '', &$in)
+        {
+            $max = count($in);
+            for ($i = 0; $i < $max && ($toFind != $in[$i]); $i++) {
+                // void();
+            }
+    
+            return ($i < $max) ? $i : -1;
+        }  // end of the 'PMA_isInto()' function
+    }
+    
     /**
      * Determines the font sizes to use depending on the os and browser of the
      * user.
@@ -494,14 +516,14 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
             $font_biggest  = 'large';
             $font_bigger   = 'medium';
             $font_smaller  = (PMA_USR_BROWSER_AGENT == 'IE')
-                           ? '90%'
-                           : 'x-small';
+                            ? '90%'
+                            : 'x-small';
             $font_smallest = 'x-small';
         }
         // Some mac browsers need also smaller default fonts size (OmniWeb &
         // Opera)...
         else if (PMA_USR_OS == 'Mac'
-                 && (PMA_USR_BROWSER_AGENT == 'OMNIWEB' || PMA_USR_BROWSER_AGENT == 'OPERA')) {
+                    && (PMA_USR_BROWSER_AGENT == 'OMNIWEB' || PMA_USR_BROWSER_AGENT == 'OPERA')) {
             $font_size     = 'x-small';
             $font_biggest  = 'large';
             $font_bigger   = 'medium';
@@ -510,8 +532,8 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
         }
         // ... but most of them (except IE 5+ & NS 6+) need bigger fonts
         else if ((PMA_USR_OS == 'Mac'
-                 && ((PMA_USR_BROWSER_AGENT != 'IE' && PMA_USR_BROWSER_AGENT != 'MOZILLA')
-                     || PMA_USR_BROWSER_VER < 5))
+                    && ((PMA_USR_BROWSER_AGENT != 'IE' && PMA_USR_BROWSER_AGENT != 'MOZILLA')
+                        || PMA_USR_BROWSER_VER < 5))
                 || PMA_USR_BROWSER_AGENT == 'KONQUEROR') {
             $font_size     = 'medium';
             $font_biggest  = 'x-large';
@@ -521,7 +543,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
         }
         // OS/2 browser
         else if (PMA_USR_OS == 'OS/2'
-                 && PMA_USR_BROWSER_AGENT == 'OPERA') {
+                    && PMA_USR_BROWSER_AGENT == 'OPERA') {
             $font_size     = 'small';
             $font_biggest  = 'medium';
             $font_bigger   = 'medium';
@@ -538,1284 +560,1285 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
 
         return TRUE;
     } // end of the 'PMA_setFontSizes()' function
-
-
-    /**
-     * $cfg['PmaAbsoluteUri'] is a required directive else cookies won't be
-     * set properly and, depending on browsers, inserting or updating a
-     * record might fail
-     */
-    $display_pmaAbsoluteUri_warning = 0;
-
-    // Olivier: Setup a default value to let the people and lazy syadmins
-    //          work anyway, but display a big warning on the main.php3
-    //          page.
-    if (empty($cfg['PmaAbsoluteUri'])) {
-        if (!empty($_SERVER)) {
-            $SERVER_ARRAY = '_SERVER';
-        } else if (!empty($HTTP_SERVER_VARS)) {
-            $SERVER_ARRAY = 'HTTP_SERVER_VARS';
-        } else {
-            $SERVER_ARRAY = 'GLOBALS';
-        } // end if
-        if (isset(${$SERVER_ARRAY}['HTTP_HOST'])) {
-            $HTTP_HOST = ${$SERVER_ARRAY}['HTTP_HOST'];
-        }
-        if (isset(${$SERVER_ARRAY}['HTTPS'])) {
-            $HTTPS = ${$SERVER_ARRAY}['HTTPS'];
-        }
-        if (isset(${$SERVER_ARRAY}['SERVER_PORT'])) {
-            $SERVER_PORT = ${$SERVER_ARRAY}['SERVER_PORT'];
-        }
-        if (isset(${$SERVER_ARRAY}['REQUEST_URI'])) {
-            $REQUEST_URI = ${$SERVER_ARRAY}['REQUEST_URI'];
-        }
-        if (isset(${$SERVER_ARRAY}['PATH_INFO'])) {
-            $PATH_INFO = ${$SERVER_ARRAY}['PATH_INFO'];
-        }
-        $port_in_HTTP_HOST              = (strpos($HTTP_HOST, ':') > 0);
-        $cfg['PmaAbsoluteUri']          = ((!empty($HTTPS) && strtolower($HTTPS) != 'off') ? 'https' : 'http') . '://'
-                                        . $HTTP_HOST;
-
-        // if $cfg['PmaAbsoluteUri'] is empty and port == 80 or port == 443, do not add ":80" or ":443"
-        // to the generated URL -> prevents a double password query in case of http authentication.
-
-        if (!(!$port_in_HTTP_HOST && !empty($SERVER_PORT) && ($SERVER_PORT == 80 || $SERVER_PORT == 443))) {
-            $cfg['PmaAbsoluteUri']      .= ((!empty($SERVER_PORT) && !$port_in_HTTP_HOST) ? ':' . $SERVER_PORT : '');
-        }
-
-        // rabus: if php is in CGI mode, $PHP_SELF often contains the path to the CGI executable.
-        //   This is why we try to get the path from $REQUEST_URI or $PATH_INFO first.
-        if (isset($REQUEST_URI)) {
-            $cfg['PmaAbsoluteUri']      .= substr($REQUEST_URI, 0, strrpos($REQUEST_URI, '/') + 1);
-        } else if (isset($PATH_INFO)) {
-            $cfg['PmaAbsoluteUri']      .= substr($PATH_INFO, 0, strrpos($PATH_INFO, '/') + 1);
-        } else {
-            $cfg['PmaAbsoluteUri']      .= substr($PHP_SELF, 0, strrpos($PHP_SELF, '/') + 1);
-        }
-
-        // We display the warning by default, but not if it is disabled thru
-        // via the $cfg['PmaAbsoluteUri_DisableWarning'] variable.
-        // This is intended for sysadmins that actually want the default
-        // behaviour of auto-detection due to their setup.
-        // See the mailing list message:
-        // http://sourceforge.net/mailarchive/forum.php?thread_id=859093&forum_id=2141
-        if ($cfg['PmaAbsoluteUri_DisableWarning'] == FALSE) {
-            $display_pmaAbsoluteUri_warning = 1;
-        }
-    }
-    // Adds a trailing slash et the end of the phpMyAdmin uri if it does not
-    // exist
-    else if (substr($cfg['PmaAbsoluteUri'], -1) != '/') {
-        $cfg['PmaAbsoluteUri'] .= '/';
-    }
-
-
-    /**
-     * Make sure $cfg['DefaultTabDatabase'] and $cfg['DefaultTabTable'] are set.
-     * Todo: check if it is set to a *valid* value.
-     */
-    if (empty($cfg['DefaultTabDatabase'])) {
-        $cfg['DefaultTabDatabase'] = 'db_details_structure.php3';
-    }
-
-    if (empty($cfg['DefaultTabTable'])) {
-        $cfg['DefaultTabTable']    = 'tbl_properties_structure.php3';
-    }
-
-
-    /**
-     * Use mysql_connect() or mysql_pconnect()?
-     */
-    $connect_func = ($cfg['PersistentConnections']) ? 'mysql_pconnect' : 'mysql_connect';
-    $dblist       = array();
-
-
-    /**
-     * Gets the valid servers list and parameters
-     */
-    reset($cfg['Servers']);
-    while (list($key, $val) = each($cfg['Servers'])) {
-        // Don't use servers with no hostname
-        if ( ($val['connect_type'] == 'tcp') && empty($val['host']) ) {
-            unset($cfg['Servers'][$key]);
-        }
-
-        // Final solution to bug #582890
-        // If we are using a socket connection
-        // and there is nothing in the verbose server name
-        // or the host field, then generate a name for the server
-        // in the form of "Server 2", localized of course!
-        if ( ($val['connect_type'] == 'socket') && empty($val['host']) && empty($val['verbose']) ) {
-            $cfg['Servers'][$key]['verbose'] = sprintf($GLOBALS['strServer'], $key);
-            $val['verbose']                  = sprintf($GLOBALS['strServer'],$key);
-        }
-    }
-
-    if (empty($server) || !isset($cfg['Servers'][$server]) || !is_array($cfg['Servers'][$server])) {
-        $server = $cfg['ServerDefault'];
-    }
-
-
-    /**
-     * If no server is selected, make sure that $cfg['Server'] is empty (so
-     * that nothing will work), and skip server authentication.
-     * We do NOT exit here, but continue on without logging into any server.
-     * This way, the welcome page will still come up (with no server info) and
-     * present a choice of servers in the case that there are multiple servers
-     * and '$cfg['ServerDefault'] = 0' is set.
-     */
-    if ($server == 0) {
-        $cfg['Server'] = array();
-    }
-
-    /**
-     * Otherwise, set up $cfg['Server'] and do the usual login stuff.
-     */
-    else if (isset($cfg['Servers'][$server])) {
-        $cfg['Server'] = $cfg['Servers'][$server];
-
-        // Check how the config says to connect to the server
-        $server_port   = (empty($cfg['Server']['port']))
-                       ? ''
-                       : ':' . $cfg['Server']['port'];
-        if (strtolower($cfg['Server']['connect_type']) == 'tcp') {
-            $cfg['Server']['socket'] = '';
-        }
-        $server_socket = (empty($cfg['Server']['socket']) || PMA_PHP_INT_VERSION < 30010)
-                       ? ''
-                       : ':' . $cfg['Server']['socket'];
-        if (PMA_PHP_INT_VERSION >= 40300) {
-            $client_flags = ($cfg['Server']['compress'] ? MYSQL_CLIENT_COMPRESS : 0);
-        }
-
-        // Gets the authentication library that fits the $cfg['Server'] settings
-        // and run authentication
-        include('./libraries/auth/' . $cfg['Server']['auth_type'] . '.auth.lib.php3');
-        if (!PMA_auth_check()) {
-            PMA_auth();
-        } else {
-            PMA_auth_set_user();
-        }
-
-        // Check IP-based Allow/Deny rules as soon as possible to reject the
-        // user
-        // Based on mod_access in Apache:
-        // http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/aaa/mod_access.c?rev=1.37&content-type=text/vnd.viewcvs-markup
-        // Look at: "static int check_dir_access(request_rec *r)"
-        // Robbat2 - May 10, 2002
-        if (isset($cfg['Server']['AllowDeny']) && $cfg['Server']['AllowDeny']['order']) {
-            include('./libraries/ip_allow_deny.lib.php3');
-
-            $allowDeny_forbidden         = FALSE; // default
-            if ($cfg['Server']['AllowDeny']['order'] == 'allow,deny') {
-                $allowDeny_forbidden     = TRUE;
-                if (PMA_allowDeny('allow')) {
-                    $allowDeny_forbidden = FALSE;
-                }
-                if (PMA_allowDeny('deny')) {
-                    $allowDeny_forbidden = TRUE;
-                }
-            } else if ($cfg['Server']['AllowDeny']['order'] == 'deny,allow') {
-                if (PMA_allowDeny('deny')) {
-                    $allowDeny_forbidden = TRUE;
-                }
-                if (PMA_allowDeny('allow')) {
-                    $allowDeny_forbidden = FALSE;
-                }
-            } else if ($cfg['Server']['AllowDeny']['order'] == 'explicit') {
-                if (PMA_allowDeny('allow')
-                    && !PMA_allowDeny('deny')) {
-                    $allowDeny_forbidden = FALSE;
-                } else {
-                    $allowDeny_forbidden = TRUE;
-                }
-            } // end if... else if... else if
-
-            // Ejects the user if banished
-            if ($allowDeny_forbidden) {
-               PMA_auth_fails();
-            }
-            unset($allowDeny_forbidden); //Clean up after you!
-        } // end if
-
-        // The user can work with only some databases
-        if (isset($cfg['Server']['only_db']) && $cfg['Server']['only_db'] != '') {
-            if (is_array($cfg['Server']['only_db'])) {
-                $dblist   = $cfg['Server']['only_db'];
+    
+    
+    if ($is_minimum_common == FALSE) {
+        /**
+         * $cfg['PmaAbsoluteUri'] is a required directive else cookies won't be
+         * set properly and, depending on browsers, inserting or updating a
+         * record might fail
+         */
+        $display_pmaAbsoluteUri_warning = 0;
+    
+        // Olivier: Setup a default value to let the people and lazy syadmins
+        //          work anyway, but display a big warning on the main.php3
+        //          page.
+        if (empty($cfg['PmaAbsoluteUri'])) {
+            if (!empty($_SERVER)) {
+                $SERVER_ARRAY = '_SERVER';
+            } else if (!empty($HTTP_SERVER_VARS)) {
+                $SERVER_ARRAY = 'HTTP_SERVER_VARS';
             } else {
-                $dblist[] = $cfg['Server']['only_db'];
-            }
-        } // end if
-
-        if (PMA_PHP_INT_VERSION >= 40000) {
-            $bkp_track_err = @ini_set('track_errors', 1);
-        }
-
-        // Try to connect MySQL with the control user profile (will be used to
-        // get the privileges list for the current user but the true user link
-        // must be open after this one so it would be default one for all the
-        // scripts)
-        if ($cfg['Server']['controluser'] != '') {
-            if (PMA_PHP_INT_VERSION >= 40300) {
-                $dbh            = @$connect_func(
-                                      $cfg['Server']['host'] . $server_port . $server_socket,
-                                      $cfg['Server']['controluser'],
-                                      $cfg['Server']['controlpass'],
-                                      FALSE,
-                                      $client_flags
-                                  );
-            } else {
-                $dbh            = @$connect_func(
-                                      $cfg['Server']['host'] . $server_port . $server_socket,
-                                      $cfg['Server']['controluser'],
-                                      $cfg['Server']['controlpass']
-                                  );
-            }
-            if ($dbh == FALSE) {
-                if (PMA_mysql_error()) {
-                    $conn_error = PMA_mysql_error();
-                } else if (isset($php_errormsg)) {
-                    $conn_error = $php_errormsg;
-                } else {
-                    $conn_error = 'Cannot connect: invalid settings.';
-                }
-                $local_query    = $connect_func . '('
-                                . $cfg['Server']['host'] . $server_port . $server_socket . ', '
-                                . $cfg['Server']['controluser'] . ', '
-                                . $cfg['Server']['controlpass']
-                                . (PMA_PHP_INT_VERSION >= 40300 ? ', FALSE, ' . $client_flags : '')
-                                . ')';
-                if (empty($GLOBALS['is_header_sent'])) {
-                    include('./header.inc.php3');
-                }
-                //PMA_mysqlDie($conn_error, $local_query, FALSE);
-                PMA_mysqlDie($conn_error, '', FALSE);
+                $SERVER_ARRAY = 'GLOBALS';
             } // end if
-        } // end if
-
-        // Pass #1 of DB-Config to read in master level DB-Config will go here
-        // Robbat2 - May 11, 2002
-
-        // Connects to the server (validates user's login)
-        if (PMA_PHP_INT_VERSION >= 40300) {
-            $userlink           = @$connect_func(
-                                      $cfg['Server']['host'] . $server_port . $server_socket,
-                                      $cfg['Server']['user'],
-                                      $cfg['Server']['password'],
-                                      FALSE,
-                                      $client_flags
-                                  );
-        } else {
-            $userlink           = @$connect_func(
-                                      $cfg['Server']['host'] . $server_port . $server_socket,
-                                      $cfg['Server']['user'],
-                                      $cfg['Server']['password']
-                                  );
-
+            if (isset(${$SERVER_ARRAY}['HTTP_HOST'])) {
+                $HTTP_HOST = ${$SERVER_ARRAY}['HTTP_HOST'];
+            }
+            if (isset(${$SERVER_ARRAY}['HTTPS'])) {
+                $HTTPS = ${$SERVER_ARRAY}['HTTPS'];
+            }
+            if (isset(${$SERVER_ARRAY}['SERVER_PORT'])) {
+                $SERVER_PORT = ${$SERVER_ARRAY}['SERVER_PORT'];
+            }
+            if (isset(${$SERVER_ARRAY}['REQUEST_URI'])) {
+                $REQUEST_URI = ${$SERVER_ARRAY}['REQUEST_URI'];
+            }
+            if (isset(${$SERVER_ARRAY}['PATH_INFO'])) {
+                $PATH_INFO = ${$SERVER_ARRAY}['PATH_INFO'];
+            }
+            $port_in_HTTP_HOST              = (strpos($HTTP_HOST, ':') > 0);
+            $cfg['PmaAbsoluteUri']          = ((!empty($HTTPS) && strtolower($HTTPS) != 'off') ? 'https' : 'http') . '://'
+                                            . $HTTP_HOST;
+    
+            // if $cfg['PmaAbsoluteUri'] is empty and port == 80 or port == 443, do not add ":80" or ":443"
+            // to the generated URL -> prevents a double password query in case of http authentication.
+    
+            if (!(!$port_in_HTTP_HOST && !empty($SERVER_PORT) && ($SERVER_PORT == 80 || $SERVER_PORT == 443))) {
+                $cfg['PmaAbsoluteUri']      .= ((!empty($SERVER_PORT) && !$port_in_HTTP_HOST) ? ':' . $SERVER_PORT : '');
+            }
+    
+            // rabus: if php is in CGI mode, $PHP_SELF often contains the path to the CGI executable.
+            //   This is why we try to get the path from $REQUEST_URI or $PATH_INFO first.
+            if (isset($REQUEST_URI)) {
+                $cfg['PmaAbsoluteUri']      .= substr($REQUEST_URI, 0, strrpos($REQUEST_URI, '/') + 1);
+            } else if (isset($PATH_INFO)) {
+                $cfg['PmaAbsoluteUri']      .= substr($PATH_INFO, 0, strrpos($PATH_INFO, '/') + 1);
+            } else {
+                $cfg['PmaAbsoluteUri']      .= substr($PHP_SELF, 0, strrpos($PHP_SELF, '/') + 1);
+            }
+    
+            // We display the warning by default, but not if it is disabled thru
+            // via the $cfg['PmaAbsoluteUri_DisableWarning'] variable.
+            // This is intended for sysadmins that actually want the default
+            // behaviour of auto-detection due to their setup.
+            // See the mailing list message:
+            // http://sourceforge.net/mailarchive/forum.php?thread_id=859093&forum_id=2141
+            if ($cfg['PmaAbsoluteUri_DisableWarning'] == FALSE) {
+                $display_pmaAbsoluteUri_warning = 1;
+            }
         }
-        if ($userlink == FALSE) {
-            PMA_auth_fails();
-        } // end if
-
-        // Pass #2 of DB-Config to read in user level DB-Config will go here
-        // Robbat2 - May 11, 2002
-
-        if (PMA_PHP_INT_VERSION >= 40000) {
-            @ini_set('track_errors', $bkp_track_err);
+        // Adds a trailing slash et the end of the phpMyAdmin uri if it does not
+        // exist
+        else if (substr($cfg['PmaAbsoluteUri'], -1) != '/') {
+            $cfg['PmaAbsoluteUri'] .= '/';
         }
-
-        // If controluser isn't defined, use the current user settings to get
-        // his rights
-        if ($cfg['Server']['controluser'] == '') {
-            $dbh = $userlink;
+    
+    
+        /**
+         * Make sure $cfg['DefaultTabDatabase'] and $cfg['DefaultTabTable'] are set.
+         * Todo: check if it is set to a *valid* value.
+         */
+        if (empty($cfg['DefaultTabDatabase'])) {
+            $cfg['DefaultTabDatabase'] = 'db_details_structure.php3';
         }
-
-        // Runs the "defines.lib.php3" for the second time to get the mysql
-        // release number
-        include('./libraries/defines.lib.php3');
-
-        // if 'only_db' is set for the current user, there is no need to check for
-        // available databases in the "mysql" db
-        $dblist_cnt = count($dblist);
-        if ($dblist_cnt) {
-            $true_dblist  = array();
-            $is_show_dbs  = TRUE;
-            for ($i = 0; $i < $dblist_cnt; $i++) {
-                if ($is_show_dbs && ereg('(^|[^\])(_|%)', $dblist[$i])) {
-                    $local_query = 'SHOW DATABASES LIKE \'' . $dblist[$i] . '\'';
-                    $rs          = PMA_mysql_query($local_query, $dbh);
-                    // "SHOW DATABASES" statement is disabled
-                    if ($i == 0
-                        && (PMA_mysql_error() && mysql_errno() == 1045)) {
-                        $true_dblist[] = str_replace('\\_', '_', str_replace('\\%', '%', $dblist[$i]));
-                        $is_show_dbs   = FALSE;
+    
+        if (empty($cfg['DefaultTabTable'])) {
+            $cfg['DefaultTabTable']    = 'tbl_properties_structure.php3';
+        }
+    
+    
+        /**
+         * Use mysql_connect() or mysql_pconnect()?
+         */
+        $connect_func = ($cfg['PersistentConnections']) ? 'mysql_pconnect' : 'mysql_connect';
+        $dblist       = array();
+    
+    
+        /**
+         * Gets the valid servers list and parameters
+         */
+        reset($cfg['Servers']);
+        while (list($key, $val) = each($cfg['Servers'])) {
+            // Don't use servers with no hostname
+            if ( ($val['connect_type'] == 'tcp') && empty($val['host']) ) {
+                unset($cfg['Servers'][$key]);
+            }
+    
+            // Final solution to bug #582890
+            // If we are using a socket connection
+            // and there is nothing in the verbose server name
+            // or the host field, then generate a name for the server
+            // in the form of "Server 2", localized of course!
+            if ( ($val['connect_type'] == 'socket') && empty($val['host']) && empty($val['verbose']) ) {
+                $cfg['Servers'][$key]['verbose'] = sprintf($GLOBALS['strServer'], $key);
+                $val['verbose']                  = sprintf($GLOBALS['strServer'],$key);
+            }
+        }
+    
+        if (empty($server) || !isset($cfg['Servers'][$server]) || !is_array($cfg['Servers'][$server])) {
+            $server = $cfg['ServerDefault'];
+        }
+    
+    
+        /**
+         * If no server is selected, make sure that $cfg['Server'] is empty (so
+         * that nothing will work), and skip server authentication.
+         * We do NOT exit here, but continue on without logging into any server.
+         * This way, the welcome page will still come up (with no server info) and
+         * present a choice of servers in the case that there are multiple servers
+         * and '$cfg['ServerDefault'] = 0' is set.
+         */
+        if ($server == 0) {
+            $cfg['Server'] = array();
+        }
+    
+        /**
+         * Otherwise, set up $cfg['Server'] and do the usual login stuff.
+         */
+        else if (isset($cfg['Servers'][$server])) {
+            $cfg['Server'] = $cfg['Servers'][$server];
+    
+            // Check how the config says to connect to the server
+            $server_port   = (empty($cfg['Server']['port']))
+                           ? ''
+                           : ':' . $cfg['Server']['port'];
+            if (strtolower($cfg['Server']['connect_type']) == 'tcp') {
+                $cfg['Server']['socket'] = '';
+            }
+            $server_socket = (empty($cfg['Server']['socket']) || PMA_PHP_INT_VERSION < 30010)
+                           ? ''
+                           : ':' . $cfg['Server']['socket'];
+            if (PMA_PHP_INT_VERSION >= 40300) {
+                $client_flags = ($cfg['Server']['compress'] ? MYSQL_CLIENT_COMPRESS : 0);
+            }
+    
+            // Gets the authentication library that fits the $cfg['Server'] settings
+            // and run authentication
+            include('./libraries/auth/' . $cfg['Server']['auth_type'] . '.auth.lib.php3');
+            if (!PMA_auth_check()) {
+                PMA_auth();
+            } else {
+                PMA_auth_set_user();
+            }
+    
+            // Check IP-based Allow/Deny rules as soon as possible to reject the
+            // user
+            // Based on mod_access in Apache:
+            // http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/aaa/mod_access.c?rev=1.37&content-type=text/vnd.viewcvs-markup
+            // Look at: "static int check_dir_access(request_rec *r)"
+            // Robbat2 - May 10, 2002
+            if (isset($cfg['Server']['AllowDeny']) && $cfg['Server']['AllowDeny']['order']) {
+                include('./libraries/ip_allow_deny.lib.php3');
+    
+                $allowDeny_forbidden         = FALSE; // default
+                if ($cfg['Server']['AllowDeny']['order'] == 'allow,deny') {
+                    $allowDeny_forbidden     = TRUE;
+                    if (PMA_allowDeny('allow')) {
+                        $allowDeny_forbidden = FALSE;
                     }
-                    // Debug
-                    // else if (PMA_mysql_error()) {
-                    //    PMA_mysqlDie('', $local_query, FALSE);
-                    // }
-                    while ($row = @PMA_mysql_fetch_row($rs)) {
-                        $true_dblist[] = $row[0];
-                    } // end while
-                    if ($rs) {
+                    if (PMA_allowDeny('deny')) {
+                        $allowDeny_forbidden = TRUE;
+                    }
+                } else if ($cfg['Server']['AllowDeny']['order'] == 'deny,allow') {
+                    if (PMA_allowDeny('deny')) {
+                        $allowDeny_forbidden = TRUE;
+                    }
+                    if (PMA_allowDeny('allow')) {
+                        $allowDeny_forbidden = FALSE;
+                    }
+                } else if ($cfg['Server']['AllowDeny']['order'] == 'explicit') {
+                    if (PMA_allowDeny('allow')
+                        && !PMA_allowDeny('deny')) {
+                        $allowDeny_forbidden = FALSE;
+                    } else {
+                        $allowDeny_forbidden = TRUE;
+                    }
+                } // end if... else if... else if
+    
+                // Ejects the user if banished
+                if ($allowDeny_forbidden) {
+                   PMA_auth_fails();
+                }
+                unset($allowDeny_forbidden); //Clean up after you!
+            } // end if
+    
+            // The user can work with only some databases
+            if (isset($cfg['Server']['only_db']) && $cfg['Server']['only_db'] != '') {
+                if (is_array($cfg['Server']['only_db'])) {
+                    $dblist   = $cfg['Server']['only_db'];
+                } else {
+                    $dblist[] = $cfg['Server']['only_db'];
+                }
+            } // end if
+    
+            if (PMA_PHP_INT_VERSION >= 40000) {
+                $bkp_track_err = @ini_set('track_errors', 1);
+            }
+    
+            // Try to connect MySQL with the control user profile (will be used to
+            // get the privileges list for the current user but the true user link
+            // must be open after this one so it would be default one for all the
+            // scripts)
+            if ($cfg['Server']['controluser'] != '') {
+                if (PMA_PHP_INT_VERSION >= 40300) {
+                    $dbh            = @$connect_func(
+                                          $cfg['Server']['host'] . $server_port . $server_socket,
+                                          $cfg['Server']['controluser'],
+                                          $cfg['Server']['controlpass'],
+                                          FALSE,
+                                          $client_flags
+                                      );
+                } else {
+                    $dbh            = @$connect_func(
+                                          $cfg['Server']['host'] . $server_port . $server_socket,
+                                          $cfg['Server']['controluser'],
+                                          $cfg['Server']['controlpass']
+                                      );
+                }
+                if ($dbh == FALSE) {
+                    if (PMA_mysql_error()) {
+                        $conn_error = PMA_mysql_error();
+                    } else if (isset($php_errormsg)) {
+                        $conn_error = $php_errormsg;
+                    } else {
+                        $conn_error = 'Cannot connect: invalid settings.';
+                    }
+                    $local_query    = $connect_func . '('
+                                    . $cfg['Server']['host'] . $server_port . $server_socket . ', '
+                                    . $cfg['Server']['controluser'] . ', '
+                                    . $cfg['Server']['controlpass']
+                                    . (PMA_PHP_INT_VERSION >= 40300 ? ', FALSE, ' . $client_flags : '')
+                                    . ')';
+                    if (empty($GLOBALS['is_header_sent'])) {
+                        include('./header.inc.php3');
+                    }
+                    //PMA_mysqlDie($conn_error, $local_query, FALSE);
+                    PMA_mysqlDie($conn_error, '', FALSE);
+                } // end if
+            } // end if
+    
+            // Pass #1 of DB-Config to read in master level DB-Config will go here
+            // Robbat2 - May 11, 2002
+    
+            // Connects to the server (validates user's login)
+            if (PMA_PHP_INT_VERSION >= 40300) {
+                $userlink           = @$connect_func(
+                                          $cfg['Server']['host'] . $server_port . $server_socket,
+                                          $cfg['Server']['user'],
+                                          $cfg['Server']['password'],
+                                          FALSE,
+                                          $client_flags
+                                      );
+            } else {
+                $userlink           = @$connect_func(
+                                          $cfg['Server']['host'] . $server_port . $server_socket,
+                                          $cfg['Server']['user'],
+                                          $cfg['Server']['password']
+                                      );
+    
+            }
+            if ($userlink == FALSE) {
+                PMA_auth_fails();
+            } // end if
+    
+            // Pass #2 of DB-Config to read in user level DB-Config will go here
+            // Robbat2 - May 11, 2002
+    
+            if (PMA_PHP_INT_VERSION >= 40000) {
+                @ini_set('track_errors', $bkp_track_err);
+            }
+    
+            // If controluser isn't defined, use the current user settings to get
+            // his rights
+            if ($cfg['Server']['controluser'] == '') {
+                $dbh = $userlink;
+            }
+    
+            // Runs the "defines.lib.php3" for the second time to get the mysql
+            // release number
+            include('./libraries/defines.lib.php3');
+    
+            // if 'only_db' is set for the current user, there is no need to check for
+            // available databases in the "mysql" db
+            $dblist_cnt = count($dblist);
+            if ($dblist_cnt) {
+                $true_dblist  = array();
+                $is_show_dbs  = TRUE;
+                for ($i = 0; $i < $dblist_cnt; $i++) {
+                    if ($is_show_dbs && ereg('(^|[^\])(_|%)', $dblist[$i])) {
+                        $local_query = 'SHOW DATABASES LIKE \'' . $dblist[$i] . '\'';
+                        $rs          = PMA_mysql_query($local_query, $dbh);
+                        // "SHOW DATABASES" statement is disabled
+                        if ($i == 0
+                            && (PMA_mysql_error() && mysql_errno() == 1045)) {
+                            $true_dblist[] = str_replace('\\_', '_', str_replace('\\%', '%', $dblist[$i]));
+                            $is_show_dbs   = FALSE;
+                        }
+                        // Debug
+                        // else if (PMA_mysql_error()) {
+                        //    PMA_mysqlDie('', $local_query, FALSE);
+                        // }
+                        while ($row = @PMA_mysql_fetch_row($rs)) {
+                            $true_dblist[] = $row[0];
+                        } // end while
+                        if ($rs) {
+                            mysql_free_result($rs);
+                        }
+                    } else {
+                        $true_dblist[]     = str_replace('\\_', '_', str_replace('\\%', '%', $dblist[$i]));
+                    } // end if... else...
+                } // end for
+                $dblist       = $true_dblist;
+                unset($true_dblist);
+            } // end if
+    
+            // 'only_db' is empty for the current user...
+            else {
+                // ... first checks whether the "safe_show_database" is on or not
+                //     (if MYSQL supports this)
+                if (PMA_MYSQL_INT_VERSION >= 32330) {
+                    $is_safe_show_dbs = FALSE;
+                    if (PMA_MYSQL_INT_VERSION >= 40002) {
+                        $is_safe_show_dbs = 'ON';
+                    }
+                    else {
+                        $local_query      = 'SHOW VARIABLES LIKE \'safe\\_show\\_database\'';
+                        $rs               = PMA_mysql_query($local_query, $dbh); // Debug: or PMA_mysqlDie('', $local_query, FALSE);
+                        $is_safe_show_dbs = ($rs) ? @PMA_mysql_result($rs, 0, 'Value') : FALSE;
                         mysql_free_result($rs);
                     }
-                } else {
-                    $true_dblist[]     = str_replace('\\_', '_', str_replace('\\%', '%', $dblist[$i]));
-                } // end if... else...
-            } // end for
-            $dblist       = $true_dblist;
-            unset($true_dblist);
-        } // end if
-
-        // 'only_db' is empty for the current user...
-        else {
-            // ... first checks whether the "safe_show_database" is on or not
-            //     (if MYSQL supports this)
-            if (PMA_MYSQL_INT_VERSION >= 32330) {
-                $is_safe_show_dbs = FALSE;
-                if (PMA_MYSQL_INT_VERSION >= 40002) {
-                    $is_safe_show_dbs = 'ON';
-                }
-                else {
-                    $local_query      = 'SHOW VARIABLES LIKE \'safe\\_show\\_database\'';
-                    $rs               = PMA_mysql_query($local_query, $dbh); // Debug: or PMA_mysqlDie('', $local_query, FALSE);
-                    $is_safe_show_dbs = ($rs) ? @PMA_mysql_result($rs, 0, 'Value') : FALSE;
-                    mysql_free_result($rs);
-                }
-                      // ... and if on, try to get the available dbs list
-                if ($is_safe_show_dbs && strtoupper($is_safe_show_dbs) != 'OFF') {
-                    $uva_alldbs   = mysql_list_dbs($userlink);
-                    while ($uva_row = PMA_mysql_fetch_array($uva_alldbs)) {
-                          $dblist[] = $uva_row[0];
-                    } // end while
-                    $dblist_cnt   = count($dblist);
-                    unset($uva_alldbs);
-                } // end if ($is_safe_show_dbs)
-            } //end if (PMA_MYSQL_INT_VERSION)
-
-            // ... else checks for available databases in the "mysql" db
-            if (!$dblist_cnt) {
-                $auth_query   = 'SELECT User, Select_priv '
-                              . 'FROM mysql.user '
-                              . 'WHERE User = \'' . PMA_sqlAddslashes($cfg['Server']['user']) . '\'';
-                $rs           = PMA_mysql_query($auth_query, $dbh); // Debug: or PMA_mysqlDie('', $auth_query, FALSE);
-            } // end
-        } // end if (!$dblist_cnt)
-
-        // Access to "mysql" db allowed and dblist still empty -> gets the
-        // usable db list
-        if (!$dblist_cnt
-            && ($rs && @mysql_numrows($rs))) {
-            $row = PMA_mysql_fetch_array($rs);
-            mysql_free_result($rs);
-            // Correction uva 19991215
-            // Previous code assumed database "mysql" admin table "db" column
-            // "db" contains literal name of user database, and works if so.
-            // Mysql usage generally (and uva usage specifically) allows this
-            // column to contain regular expressions (we have all databases
-            // owned by a given student/faculty/staff beginning with user i.d.
-            // and governed by default by a single set of privileges with
-            // regular expression as key). This breaks previous code.
-            // This maintenance is to fix code to work correctly for regular
-            // expressions.
-            if ($row['Select_priv'] != 'Y') {
-
-                // 1. get allowed dbs from the "mysql.db" table
-                // lem9: User can be blank (anonymous user)
-                $local_query = 'SELECT DISTINCT Db FROM mysql.db WHERE Select_priv = \'Y\' AND (User = \'' . PMA_sqlAddslashes($cfg['Server']['user']) . '\' OR User = \'\')';
-                $rs          = PMA_mysql_query($local_query, $dbh); // Debug: or PMA_mysqlDie('', $local_query, FALSE);
-                if ($rs && @mysql_numrows($rs)) {
-                    // Will use as associative array of the following 2 code
-                    // lines:
-                    //   the 1st is the only line intact from before
-                    //     correction,
-                    //   the 2nd replaces $dblist[] = $row['Db'];
-                    $uva_mydbs = array();
-                    // Code following those 2 lines in correction continues
-                    // populating $dblist[], as previous code did. But it is
-                    // now populated with actual database names instead of
-                    // with regular expressions.
-                    while ($row = PMA_mysql_fetch_array($rs)) {
-                        // loic1: all databases cases - part 1
-                        if (empty($row['Db']) || $row['Db'] == '%') {
-                            $uva_mydbs['%'] = 1;
-                            break;
-                        }
-                        // loic1: avoid multiple entries for dbs
-                        if (!isset($uva_mydbs[$row['Db']])) {
-                            $uva_mydbs[$row['Db']] = 1;
-                        }
-                    } // end while
-                    mysql_free_result($rs);
-                    $uva_alldbs = mysql_list_dbs($dbh);
-                    // loic1: all databases cases - part 2
-                    if (isset($uva_mydbs['%'])) {
+                          // ... and if on, try to get the available dbs list
+                    if ($is_safe_show_dbs && strtoupper($is_safe_show_dbs) != 'OFF') {
+                        $uva_alldbs   = mysql_list_dbs($userlink);
                         while ($uva_row = PMA_mysql_fetch_array($uva_alldbs)) {
-                            $dblist[] = $uva_row[0];
+                              $dblist[] = $uva_row[0];
                         } // end while
+                        $dblist_cnt   = count($dblist);
+                        unset($uva_alldbs);
+                    } // end if ($is_safe_show_dbs)
+                } //end if (PMA_MYSQL_INT_VERSION)
+    
+                // ... else checks for available databases in the "mysql" db
+                if (!$dblist_cnt) {
+                    $auth_query   = 'SELECT User, Select_priv '
+                                  . 'FROM mysql.user '
+                                  . 'WHERE User = \'' . PMA_sqlAddslashes($cfg['Server']['user']) . '\'';
+                    $rs           = PMA_mysql_query($auth_query, $dbh); // Debug: or PMA_mysqlDie('', $auth_query, FALSE);
+                } // end
+            } // end if (!$dblist_cnt)
+    
+            // Access to "mysql" db allowed and dblist still empty -> gets the
+            // usable db list
+            if (!$dblist_cnt
+                && ($rs && @mysql_numrows($rs))) {
+                $row = PMA_mysql_fetch_array($rs);
+                mysql_free_result($rs);
+                // Correction uva 19991215
+                // Previous code assumed database "mysql" admin table "db" column
+                // "db" contains literal name of user database, and works if so.
+                // Mysql usage generally (and uva usage specifically) allows this
+                // column to contain regular expressions (we have all databases
+                // owned by a given student/faculty/staff beginning with user i.d.
+                // and governed by default by a single set of privileges with
+                // regular expression as key). This breaks previous code.
+                // This maintenance is to fix code to work correctly for regular
+                // expressions.
+                if ($row['Select_priv'] != 'Y') {
+    
+                    // 1. get allowed dbs from the "mysql.db" table
+                    // lem9: User can be blank (anonymous user)
+                    $local_query = 'SELECT DISTINCT Db FROM mysql.db WHERE Select_priv = \'Y\' AND (User = \'' . PMA_sqlAddslashes($cfg['Server']['user']) . '\' OR User = \'\')';
+                    $rs          = PMA_mysql_query($local_query, $dbh); // Debug: or PMA_mysqlDie('', $local_query, FALSE);
+                    if ($rs && @mysql_numrows($rs)) {
+                        // Will use as associative array of the following 2 code
+                        // lines:
+                        //   the 1st is the only line intact from before
+                        //     correction,
+                        //   the 2nd replaces $dblist[] = $row['Db'];
+                        $uva_mydbs = array();
+                        // Code following those 2 lines in correction continues
+                        // populating $dblist[], as previous code did. But it is
+                        // now populated with actual database names instead of
+                        // with regular expressions.
+                        while ($row = PMA_mysql_fetch_array($rs)) {
+                            // loic1: all databases cases - part 1
+                            if (empty($row['Db']) || $row['Db'] == '%') {
+                                $uva_mydbs['%'] = 1;
+                                break;
+                            }
+                            // loic1: avoid multiple entries for dbs
+                            if (!isset($uva_mydbs[$row['Db']])) {
+                                $uva_mydbs[$row['Db']] = 1;
+                            }
+                        } // end while
+                        mysql_free_result($rs);
+                        $uva_alldbs = mysql_list_dbs($dbh);
+                        // loic1: all databases cases - part 2
+                        if (isset($uva_mydbs['%'])) {
+                            while ($uva_row = PMA_mysql_fetch_array($uva_alldbs)) {
+                                $dblist[] = $uva_row[0];
+                            } // end while
+                        } // end if
+                        else {
+                            while ($uva_row = PMA_mysql_fetch_array($uva_alldbs)) {
+                                $uva_db = $uva_row[0];
+                                if (isset($uva_mydbs[$uva_db]) && $uva_mydbs[$uva_db] == 1) {
+                                    $dblist[]           = $uva_db;
+                                    $uva_mydbs[$uva_db] = 0;
+                                } else if (!isset($dblist[$uva_db])) {
+                                    reset($uva_mydbs);
+                                    while (list($uva_matchpattern, $uva_value) = each($uva_mydbs)) {
+                                        // loic1: fixed bad regexp
+                                        // TODO: db names may contain characters
+                                        //       that are regexp instructions
+                                        $re        = '(^|(\\\\\\\\)+|[^\])';
+                                        $uva_regex = ereg_replace($re . '%', '\\1.*', ereg_replace($re . '_', '\\1.{1}', $uva_matchpattern));
+                                        // Fixed db name matching
+                                        // 2000-08-28 -- Benjamin Gandon
+                                        if (ereg('^' . $uva_regex . '$', $uva_db)) {
+                                            $dblist[] = $uva_db;
+                                            break;
+                                        }
+                                    } // end while
+                                } // end if ... else if....
+                            } // end while
+                        } // end else
+                        mysql_free_result($uva_alldbs);
+                        unset($uva_mydbs);
                     } // end if
-                    else {
-                        while ($uva_row = PMA_mysql_fetch_array($uva_alldbs)) {
-                            $uva_db = $uva_row[0];
-                            if (isset($uva_mydbs[$uva_db]) && $uva_mydbs[$uva_db] == 1) {
-                                $dblist[]           = $uva_db;
-                                $uva_mydbs[$uva_db] = 0;
-                            } else if (!isset($dblist[$uva_db])) {
-                                reset($uva_mydbs);
-                                while (list($uva_matchpattern, $uva_value) = each($uva_mydbs)) {
-                                    // loic1: fixed bad regexp
-                                    // TODO: db names may contain characters
-                                    //       that are regexp instructions
-                                    $re        = '(^|(\\\\\\\\)+|[^\])';
-                                    $uva_regex = ereg_replace($re . '%', '\\1.*', ereg_replace($re . '_', '\\1.{1}', $uva_matchpattern));
-                                    // Fixed db name matching
-                                    // 2000-08-28 -- Benjamin Gandon
-                                    if (ereg('^' . $uva_regex . '$', $uva_db)) {
-                                        $dblist[] = $uva_db;
-                                        break;
-                                    }
-                                } // end while
-                            } // end if ... else if....
+    
+                    // 2. get allowed dbs from the "mysql.tables_priv" table
+                    $local_query = 'SELECT DISTINCT Db FROM mysql.tables_priv WHERE Table_priv LIKE \'%Select%\' AND User = \'' . PMA_sqlAddslashes($cfg['Server']['user']) . '\'';
+                    $rs          = PMA_mysql_query($local_query, $dbh); // Debug: or PMA_mysqlDie('', $local_query, FALSE);
+                    if ($rs && @mysql_numrows($rs)) {
+                        while ($row = PMA_mysql_fetch_array($rs)) {
+                            if (PMA_isInto($row['Db'], $dblist) == -1) {
+                                $dblist[] = $row['Db'];
+                            }
                         } // end while
-                    } // end else
-                    mysql_free_result($uva_alldbs);
-                    unset($uva_mydbs);
+                        mysql_free_result($rs);
+                    } // end if
                 } // end if
-
-                // 2. get allowed dbs from the "mysql.tables_priv" table
-                $local_query = 'SELECT DISTINCT Db FROM mysql.tables_priv WHERE Table_priv LIKE \'%Select%\' AND User = \'' . PMA_sqlAddslashes($cfg['Server']['user']) . '\'';
-                $rs          = PMA_mysql_query($local_query, $dbh); // Debug: or PMA_mysqlDie('', $local_query, FALSE);
-                if ($rs && @mysql_numrows($rs)) {
-                    while ($row = PMA_mysql_fetch_array($rs)) {
-                        if (PMA_isInto($row['Db'], $dblist) == -1) {
-                            $dblist[] = $row['Db'];
-                        }
-                    } // end while
-                    mysql_free_result($rs);
-                } // end if
-            } // end if
-        } // end building available dbs from the "mysql" db
-
-    } // end server connecting
-    /**
-     * Missing server hostname
-     */
-    else {
-        echo $strHostEmpty;
-    }
-
-
-    /**
-     * Get the list and number of available databases.
-     *
-     * @param   string   the url to go back to in case of error
-     *
-     * @return  boolean  always true
-     *
-     * @global  array    the list of available databases
-     * @global  integer  the number of available databases
-     */
-    function PMA_availableDatabases($error_url = '')
-    {
-        global $dblist;
-        global $num_dbs;
-
-        $num_dbs = count($dblist);
-
-        // 1. A list of allowed databases has already been defined by the
-        //    authentification process -> gets the available databases list
-        if ($num_dbs) {
-            $true_dblist = array();
-            for ($i = 0; $i < $num_dbs; $i++) {
-                $dblink  = @PMA_mysql_select_db($dblist[$i]);
-                if ($dblink) {
-                    $true_dblist[] = $dblist[$i];
-                } // end if
-            } // end for
-            $dblist      = array();
-            $dblist      = $true_dblist;
-            unset($true_dblist);
-            $num_dbs     = count($dblist);
-        } // end if
-
-        // 2. Allowed database list is empty -> gets the list of all databases
-        //    on the server
-        else {
-            $dbs          = mysql_list_dbs() or PMA_mysqlDie('', 'SHOW DATABASES;', FALSE, $error_url);
-            $num_dbs      = ($dbs) ? @mysql_num_rows($dbs) : 0;
-            $real_num_dbs = 0;
-            for ($i = 0; $i < $num_dbs; $i++) {
-                $db_name_tmp = PMA_mysql_dbname($dbs, $i);
-                $dblink      = @PMA_mysql_select_db($db_name_tmp);
-                if ($dblink) {
-                    $dblist[] = $db_name_tmp;
-                    $real_num_dbs++;
-                }
-            } // end for
-            mysql_free_result($dbs);
-            $num_dbs = $real_num_dbs;
-        } // end else
-
-        return TRUE;
-    } // end of the 'PMA_availableDatabases()' function
-
-
-
-    /* ----------------------- Set of misc functions ----------------------- */
-
-
-    /**
-     * Adds backquotes on both sides of a database, table or field name.
-     * Since MySQL 3.23.6 this allows to use non-alphanumeric characters in
-     * these names.
-     *
-     * @param   mixed    the database, table or field name to "backquote" or
-     *                   array of it
-     * @param   boolean  a flag to bypass this function (used by dump
-     *                   functions)
-     *
-     * @return  mixed    the "backquoted" database, table or field name if the
-     *                   current MySQL release is >= 3.23.6, the original one
-     *                   else
-     *
-     * @access  public
-     */
-    function PMA_backquote($a_name, $do_it = TRUE)
-    {
-        if ($do_it
-            && PMA_MYSQL_INT_VERSION >= 32306
-            && !empty($a_name) && $a_name != '*') {
-
-            if (is_array($a_name)) {
-                 $result = array();
-                 reset($a_name);
-                 while(list($key, $val) = each($a_name)) {
-                     $result[$key] = '`' . $val . '`';
-                 }
-                 return $result;
-            } else {
-                return '`' . $a_name . '`';
-            }
-        } else {
-            return $a_name;
-        }
-    } // end of the 'PMA_backquote()' function
-
-
-    /**
-     * Format a string so it can be passed to a javascript function.
-     * This function is used to displays a javascript confirmation box for
-     * "DROP/DELETE/ALTER" queries.
-     *
-     * @param   string   the string to format
-     * @param   boolean  whether to add backquotes to the string or not
-     *
-     * @return  string   the formated string
-     *
-     * @access  public
-     */
-    function PMA_jsFormat($a_string = '', $add_backquotes = TRUE)
-    {
-        if (is_string($a_string)) {
-            $a_string = str_replace('"', '&quot;', $a_string);
-            $a_string = str_replace('\\', '\\\\', $a_string);
-            $a_string = str_replace('\'', '\\\'', $a_string);
-            $a_string = str_replace('#', '\\#', $a_string);
-            $a_string = str_replace("\012", '\\\\n', $a_string);
-            $a_string = str_replace("\015", '\\\\r', $a_string);
-        }
-
-        return (($add_backquotes) ? PMA_backquote($a_string) : $a_string);
-    } // end of the 'PMA_jsFormat()' function
-
-
-    /**
-     * Defines the <CR><LF> value depending on the user OS.
-     *
-     * @return  string   the <CR><LF> value to use
-     *
-     * @access  public
-     */
-    function PMA_whichCrlf()
-    {
-        $the_crlf = "\n";
-
-        // The 'PMA_USR_OS' constant is defined in "./libraries/defines.lib.php3"
-        // Win case
-        if (PMA_USR_OS == 'Win') {
-            $the_crlf = "\r\n";
-        }
-        // Mac case
-        else if (PMA_USR_OS == 'Mac') {
-            $the_crlf = "\r";
-        }
-        // Others
-        else {
-            $the_crlf = "\n";
-        }
-
-        return $the_crlf;
-    } // end of the 'PMA_whichCrlf()' function
-
-
-    /**
-     * Counts and displays the number of records in a table
-     *
-     * Last revision 13 July 2001: Patch for limiting dump size from
-     * vinay@sanisoft.com & girish@sanisoft.com
-     *
-     * @param   string   the current database name
-     * @param   string   the current table name
-     * @param   boolean  whether to retain or to displays the result
-     *
-     * @return  mixed    the number of records if retain is required, true else
-     *
-     * @access  public
-     */
-    function PMA_countRecords($db, $table, $ret = FALSE)
-    {
-        $result = PMA_mysql_query('SELECT COUNT(*) AS num FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table));
-        $num    = ($result) ? PMA_mysql_result($result, 0, 'num') : 0;
-        mysql_free_result($result);
-        if ($ret) {
-            return $num;
-        } else {
-            echo number_format($num, 0, $GLOBALS['number_decimal_separator'], $GLOBALS['number_thousands_separator']);
-            return TRUE;
-        }
-    } // end of the 'PMA_countRecords()' function
-
-
-    /**
-     * Displays a message at the top of the "main" (right) frame
-     *
-     * @param   string  the message to display
-     *
-     * @global  array   the configuration array
-     *
-     * @access  public
-     */
-    function PMA_showMessage($message)
-    {
-        global $cfg;
-
-        // Reloads the navigation frame via JavaScript if required
-        if (isset($GLOBALS['reload']) && $GLOBALS['reload']) {
-            echo "\n";
-            $reload_url = './left.php3?' . PMA_generate_common_url((isset($GLOBALS['db']) ? $GLOBALS['db'] : ''), '', '&');
-            ?>
-<script type="text/javascript" language="javascript1.2">
-<!--
-if (typeof(window.parent) != 'undefined'
-    && typeof(window.parent.frames['nav']) != 'undefined') {
-    window.parent.frames['nav'].location.replace('<?php echo $reload_url; ?>');
-}
-//-->
-</script>
-            <?php
-            unset($GLOBALS['reload']);
-        }
-
-        // Corrects the tooltip text via JS if required
-        else if (!empty($GLOBALS['table']) && $cfg['ShowTooltip'] && PMA_MYSQL_INT_VERSION >= 32303) {
-            $result = @PMA_mysql_query('SHOW TABLE STATUS FROM ' . PMA_backquote($GLOBALS['db']) . ' LIKE \'' . PMA_sqlAddslashes($GLOBALS['table'], TRUE) . '\'');
-            if ($result) {
-                $tbl_status = PMA_mysql_fetch_array($result, MYSQL_ASSOC);
-                $tooltip    = (empty($tbl_status['Comment']))
-                            ? ''
-                            : $tbl_status['Comment'] . ' ';
-                $tooltip .= '(' . $tbl_status['Rows'] . ' ' . $GLOBALS['strRows'] . ')';
-                mysql_free_result($result);
-                $md5_tbl = md5($GLOBALS['table']);
-                echo "\n";
-                ?>
-<script type="text/javascript" language="javascript1.2">
-<!--
-if (typeof(document.getElementById) != 'undefined'
-    && typeof(window.parent.frames['nav']) != 'undefined'
-    && typeof(window.parent.frames['nav'].document) != 'undefined' && typeof(window.parent.frames['nav'].document) != 'unknown'
-    && typeof(window.parent.frames['nav'].document.getElementById('<?php echo 'tbl_' . $md5_tbl; ?>')) != 'undefined'
-    && typeof(window.parent.frames['nav'].document.getElementById('<?php echo 'tbl_' . $md5_tbl; ?>').title) == 'string') {
-    window.parent.frames['nav'].document.getElementById('<?php echo 'tbl_' . $md5_tbl; ?>').title = '<?php echo PMA_jsFormat($tooltip, FALSE); ?>';
-}
-//-->
-</script>
-                <?php
-            } // end if
-        } // end if... else if
-
-        // Checks if the table needs to be repaired after a TRUNCATE query.
-        if (PMA_MYSQL_INT_VERSION >= 40000
-            && isset($GLOBALS['table']) && isset($GLOBALS['sql_query'])
-            && $GLOBALS['sql_query'] == 'TRUNCATE TABLE ' . PMA_backquote($GLOBALS['table'])) {
-            if (!isset($tbl_status)) {
-                $result = @PMA_mysql_query('SHOW TABLE STATUS FROM ' . PMA_backquote($GLOBALS['db']) . ' LIKE \'' . PMA_sqlAddslashes($GLOBALS['table'], TRUE) . '\'');
-                if ($result) {
-                    $tbl_status = PMA_mysql_fetch_array($result, MYSQL_ASSOC);
-                    mysql_free_result($result);
-                }
-            }
-            if (isset($tbl_status) && (int) $tbl_status['Index_length'] > 1024) {
-                @PMA_mysql_query('REPAIR TABLE ' . PMA_backquote($GLOBALS['table']));
-            }
-        }
-        unset($tbl_status);
-
-        echo "\n";
-        ?>
-<div align="<?php echo $GLOBALS['cell_align_left']; ?>">
-    <table border="<?php echo $cfg['Border']; ?>" cellpadding="5">
-    <tr>
-        <td bgcolor="<?php echo $cfg['ThBgcolor']; ?>">
-            <b><?php echo $message; ?></b><br />
-        </td>
-    </tr>
-        <?php
-        if ($cfg['ShowSQL'] == TRUE && !empty($GLOBALS['sql_query'])) {
-            // Basic url query part
-            $url_qpart = '?' . PMA_generate_common_url(isset($GLOBALS['db']) ? $GLOBALS['db'] : '', isset($GLOBALS['table']) ? $GLOBALS['table'] : '');
-            echo "\n";
-            ?>
-    <tr>
-        <td bgcolor="<?php echo $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
-             /* SQL-Parser-Analyzer */
-            $sqlnr = 1;
-            if (!empty($GLOBALS['show_as_php'])) {
-                $new_line = '\';<br />' . "\n" . '            $sql .= \'';
-            }
-            if (isset($new_line)) {
-                 /* SQL-Parser-Analyzer */
-                $query_base = htmlspecialchars($GLOBALS['sql_query']);
-                 /* SQL-Parser-Analyzer */
-                $query_base = ereg_replace("((\015\012)|(\015)|(\012))+", $new_line, $query_base);
-            } else {
-                $query_base = $GLOBALS['sql_query'];
-            }
-            if (!empty($GLOBALS['show_as_php'])) {
-                $query_base = '$sql  = \'' . PMA_sqlAddslashes($query_base);
-            } else if (!empty($GLOBALS['validatequery'])) {
-                $query_base = PMA_validateSQL($query_base);
-            } else {
-                $parsed_sql = PMA_SQP_parse($query_base);
-                $query_base = PMA_formatSql($parsed_sql);
-            }
-
-            // Prepares links that may be displayed to edit/explain the query
-            // (don't go to default pages, we must go to the page
-            // where the query box is available)
-            // (also, I don't see why we should check the goto variable)
-
-            //if (!isset($GLOBALS['goto'])) {
-                //$edit_target = (isset($GLOBALS['table'])) ? $cfg['DefaultTabTable'] : $cfg['DefaultTabDatabase'];
-            $edit_target = isset($GLOBALS['db']) ? (isset($GLOBALS['table']) ? 'tbl_properties.php3' : 'db_details.php3') : '';
-            //} else if ($GLOBALS['goto'] != 'main.php3') {
-            //    $edit_target = $GLOBALS['goto'];
-            //} else {
-            //    $edit_target = '';
-            //}
-
-            if (isset($cfg['SQLQuery']['Edit'])
-                && ($cfg['SQLQuery']['Edit'] == TRUE )
-                && (!empty($edit_target))) {
-
-                $onclick = '';
-                if ($cfg['QueryFrameJS'] && $cfg['QueryFrame']) {
-                    $onclick = 'onclick="focus_querywindow(); return false;"';
-                }
-
-                $edit_link = '&nbsp;[<a href="'
-                           . $edit_target
-                           . $url_qpart
-                           . '&amp;sql_query=' . urlencode($GLOBALS['sql_query']) . '&amp;show_query=1#querybox" ' . $onclick . '>' . $GLOBALS['strEdit'] . '</a>]';
-            } else {
-                $edit_link = '';
-            }
-
-            // Want to have the query explained (Mike Beck 2002-05-22)
-            // but only explain a SELECT (that has not been explained)
-            /* SQL-Parser-Analyzer */
-            if (isset($cfg['SQLQuery']['Explain'])
-                && $cfg['SQLQuery']['Explain'] == TRUE) {
-
-                // Detect if we are validating as well
-                // To preserve the validate uRL data
-                if (!empty($GLOBALS['validatequery'])) {
-                    $explain_link_validate = '&amp;validatequery=1';
-                } else {
-                    $explain_link_validate = '';
-                }
-
-                $explain_link = '&nbsp;[<a href="sql.php3'
-                              . $url_qpart
-                              . $explain_link_validate
-                              . '&amp;sql_query=';
-
-                if (eregi('^SELECT[[:space:]]+', $GLOBALS['sql_query'])) {
-                    $explain_link .= urlencode('EXPLAIN ' . $GLOBALS['sql_query']) . '">' . $GLOBALS['strExplain'];
-                } else if (eregi('^EXPLAIN[[:space:]]+SELECT[[:space:]]+', $GLOBALS['sql_query'])) {
-                    $explain_link .= substr($GLOBALS['sql_query'], 8) . '">' . $GLOBALS['strNoExplain'];
-                } else {
-                    $explain_link = '';
-                }
-                if(!empty($explain_link)) {
-                    $explain_link .= '</a>]';
-                }
-            } else {
-                $explain_link = '';
-            } //show explain
-
-            // Also we would like to get the SQL formed in some nice
-            // php-code (Mike Beck 2002-05-22)
-            if (isset($cfg['SQLQuery']['ShowAsPHP'])
-                && $cfg['SQLQuery']['ShowAsPHP'] == TRUE) {
-                $php_link = '&nbsp;[<a href="sql.php3'
-                          . $url_qpart
-                          . '&amp;show_query=1'
-                          . '&amp;sql_query=' . urlencode($GLOBALS['sql_query'])
-                          . '&amp;show_as_php=';
-
-                if (!empty($GLOBALS['show_as_php'])) {
-                    $php_link .= '0">' . $GLOBALS['strNoPhp'];
-                } else {
-                    $php_link .= '1">' . $GLOBALS['strPhp'];
-                }
-                $php_link .= '</a>]';
-            } else {
-                $php_link = '';
-            } //show as php
-
-            if (isset($cfg['SQLValidator']['use'])
-                && $cfg['SQLValidator']['use'] == TRUE
-                && isset($cfg['SQLQuery']['Validate'])
-                && $cfg['SQLQuery']['Validate'] == TRUE) {
-                $validate_link = '&nbsp;[<a href="sql.php3'
-                               . $url_qpart
-                               . '&amp;show_query=1'
-                               . '&amp;sql_query=' . urlencode($GLOBALS['sql_query'])
-                               . '&amp;validatequery=';
-                if (!empty($GLOBALS['validatequery'])) {
-                    $validate_link .= '0">' .  $GLOBALS['strNoValidateSQL'] ;
-                } else {
-                    $validate_link .= '1">'. $GLOBALS['strValidateSQL'] ;
-                }
-                $validate_link .= '</a>]';
-            } else {
-                $validate_link = '';
-            } //validator
-
-            // Displays the message
-            echo '            ' . $GLOBALS['strSQLQuery'] . '&nbsp;:';
-            if (!empty($edit_target)) {
-                echo $edit_link . $explain_link . $php_link . $validate_link;
-            }
-            echo '<br />' . "\n";
-            echo '            ' . $query_base;
-            // If a 'LIMIT' clause has been programatically added to the query
-            // displays it
-            if (!empty($GLOBALS['sql_limit_to_append'])) {
-                if (!empty($GLOBALS['show_as_php'])) {
-                    echo $GLOBALS['sql_limit_to_append'];
-                } else if (!empty($GLOBALS['validatequery'])) {
-                    // skip the extra bit here
-                } else {
-                    echo '&nbsp;' . PMA_formatSql(PMA_SQP_parse($GLOBALS['sql_limit_to_append']));
-                }
-            }
-
-            //Clean up the end of the PHP
-            if (!empty($GLOBALS['show_as_php'])) {
-                echo '\';';
-            }
-            echo "\n";
-            ?>
-        </td>
-    </tr>
-           <?php
-        }
-        echo "\n";
-        ?>
-    </table>
-</div><br />
-        <?php
-    } // end of the 'PMA_showMessage()' function
-
-
-    /**
-     * Displays a link to the official MySQL documentation
-     *
-     * @param   chapter of "HTML, one page per chapter" documentation
-     * @param   contains name of page/anchor that is being linked
-     *
-     * @return  string  the html link
-     *
-     * @access  public
-     */
-    function PMA_showMySQLDocu($chapter, $link)
-    {
-        if (!empty($GLOBALS['cfg']['MySQLManualBase'])) {
-            if (!empty($GLOBALS['cfg']['MySQLManualType'])) {
-                switch ($GLOBALS['cfg']['MySQLManualType']) {
-                    case 'old':
-                        return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link[0] . '/' . $link[1] . '/' . $link . '.html" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
-                    case 'chapters':
-                        return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/manual_' . $chapter . '.html#' . $link . '" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
-                    case 'big':
-                        return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '#' . $link . '" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
-                    case 'none':
-                        return '';
-                    case 'searchable':
-                    default:
-                        return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link . '.html" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
-                }
-            } else {
-                // no Type defined, show the old one
-                return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link[0] . '/' . $link[1] . '/' . $link . '.html" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
-            }
-        } else {
-            // no URL defined
-            if (!empty($GLOBALS['cfg']['ManualBaseShort'])) {
-                // the old configuration
-                return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link[0] . '/' . $link[1] . '/' . $link . '.html" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
-            } else {
-                return '';
-            }
-        }
-    } // end of the 'PMA_showDocuShort()' function
-
-
-    /**
-     * Formats $value to byte view
-     *
-     * @param    double   the value to format
-     * @param    integer  the sensitiveness
-     * @param    integer  the number of decimals to retain
-     *
-     * @return   array    the formatted value and its unit
-     *
-     * @access  public
-     *
-     * @author   staybyte
-     * @version  1.2 - 18 July 2002
-     */
-    function PMA_formatByteDown($value, $limes = 6, $comma = 0)
-    {
-        $dh           = pow(10, $comma);
-        $li           = pow(10, $limes);
-        $return_value = $value;
-        $unit         = $GLOBALS['byteUnits'][0];
-
-        for ( $d = 6, $ex = 15; $d >= 1; $d--, $ex-=3 ) {
-            if (isset($GLOBALS['byteUnits'][$d]) && $value >= $li * pow(10, $ex)) {
-                $value = round($value / ( pow(1024, $d) / $dh) ) /$dh;
-                $unit = $GLOBALS['byteUnits'][$d];
-                break 1;
-            } // end if
-        } // end for
-
-        if ($unit != $GLOBALS['byteUnits'][0]) {
-            $return_value = number_format($value, $comma, $GLOBALS['number_decimal_separator'], $GLOBALS['number_thousands_separator']);
-        } else {
-            $return_value = number_format($value, 0, $GLOBALS['number_decimal_separator'], $GLOBALS['number_thousands_separator']);
-        }
-
-        return array($return_value, $unit);
-    } // end of the 'PMA_formatByteDown' function
-
-
-    /**
-     * Ensures a database/table/field's name is not a reserved word (for MySQL
-     * releases < 3.23.6)
-     *
-     * @param    string   the name to check
-     * @param    string   the url to go back in case of error
-     *
-     * @return   boolean  true if the name is valid (no return else)
-     *
-     * @access  public
-     *
-     * @author   Dell'Aiera Pol; Olivier Blin
-     */
-    function PMA_checkReservedWords($the_name, $error_url)
-    {
-        // The name contains caracters <> a-z, A-Z and "_" -> not a reserved
-        // word
-        if (!ereg('^[a-zA-Z_]+$', $the_name)) {
-            return TRUE;
-        }
-
-        // Else do the work
-        $filename = 'badwords.txt';
-        if (file_exists($filename)) {
-            // Builds the reserved words array
-            $fd        = fopen($filename, 'r');
-            $contents  = fread($fd, filesize($filename) - 1);
-            fclose ($fd);
-            $word_list = explode("\n", $contents);
-
-            // Do the checking
-            $word_cnt  = count($word_list);
-            for ($i = 0; $i < $word_cnt; $i++) {
-                if (strtolower($the_name) == $word_list[$i]) {
-                    PMA_mysqlDie(sprintf($GLOBALS['strInvalidName'], $the_name), '', FALSE, $error_url);
-                } // end if
-            } // end for
-        } // end if
-    } // end of the 'PMA_checkReservedWords' function
-
-
-    /**
-     * Writes localised date
-     *
-     * @param   string   the current timestamp
-     *
-     * @return  string   the formatted date
-     *
-     * @access  public
-     */
-    function PMA_localisedDate($timestamp = -1)
-    {
-        global $datefmt, $month, $day_of_week;
-
-        if ($timestamp == -1) {
-            $timestamp = time();
-        }
-
-        $date = ereg_replace('%[aA]', $day_of_week[(int)strftime('%w', $timestamp)], $datefmt);
-        $date = ereg_replace('%[bB]', $month[(int)strftime('%m', $timestamp)-1], $date);
-
-        return strftime($date, $timestamp);
-    } // end of the 'PMA_localisedDate()' function
-
-
-    /**
-     * Prints out a tab for tabbed navigation.
-     * If the variables $link and $args ar left empty, an inactive tab is created
-     *
-     * @param   string  the text to be displayed as link
-     * @param   string  main link file, e.g. "test.php3"
-     * @param   string  link arguments
-     * @param   string  link attributes
-     * @param   string  include '?' even though no attributes are set. Can be set empty, should be '?'.
-     * @param   boolean force display TAB as active
-     *
-     * @return  string  two table cells, the first beeing a separator, the second the tab itself
-     *
-     * @access  public
-     */
-    function PMA_printTab($text, $link, $args = '', $attr = '', $sep = '?', $active = false) {
-        global $PHP_SELF, $cfg;
-        global $db_details_links_count_tabs;
-
-        if ((basename($PHP_SELF) == $link || $active)
-            && ($text != $GLOBALS['strEmpty'] && $text != $GLOBALS['strDrop'])) {
-            $bgcolor = 'silver';
-        } else {
-            $bgcolor = '#DFDFDF';
-        }
-
-        $db_details_links_count_tabs++;
-        if (!empty($attr)) {
-            $attr = ' ' . $attr;
-        }
-
-        if ($cfg['LightTabs']) {
-            $out = '';
-            if (strlen($link) > 0) {
-                $out .= '<a href="' . $link . $sep . $args . '"' . $attr . '>'
-                     .  '<nobr><b>' . $text . '</b></a></nobr>';
-            } else {
-                $out .= '<nobr><b>' . $text . '</b></nobr>';
-            }
-            $out = '[ ' . $out . ' ]&nbsp;&nbsp;&nbsp;';
-        } else {
-            $out     = "\n" . '        '
-                     . '<td bgcolor="' . $bgcolor . '" align="center" width="64" nowrap="nowrap" class="tab">'
-                     . "\n" . '            ';
-            if (strlen($link) > 0) {
-                $out .= '<a href="' . $link . $sep . $args . '"' . $attr . '>'
-                     .  '<nobr><b>' . $text . '</b></a></nobr>';
-            } else {
-                $out .= '<nobr><b>' . $text . '</b></nobr>';
-            }
-            $out     .= "\n" . '        '
-                     .  '</td>'
-                     .  "\n" . '        '
-                     .  '<td width="8">&nbsp;</td>';
-        }
-
-        return $out;
-    } // end of the 'PMA_printTab()' function
-
-
-    /**
-     * Displays a link, or a button if the link's URL is too large, to
-     * accommodate some browsers' limitations
-     *
-     * @param  string  the URL
-     * @param  string  the link message
-     * @param  string  js confirmation
-     *
-     * @return string  the results to be echoed or saved in an array
-     */
-    function PMA_linkOrButton($url, $message, $js_conf)
-    {
-        if (strlen($url) <= 2047) {
-            $onclick_url        = (empty($js_conf) ? '' : ' onclick="return confirmLink(this, \'' . $js_conf . '\')"');
-            $link_or_button     = '        <a href="' . $url . '"' . $onclick_url . '>' . "\n"
-                                . '           ' . $message . '</a>' . "\n";
-        }
-        else {
-            $edit_url_parts     = parse_url($url);
-            $query_parts        = explode('&', $edit_url_parts['query']);
-            $link_or_button     = '        <form action="'
-                                . $edit_url_parts['path']
-                                . '" method="post">' . "\n";
-            reset ($query_parts);
-            while (list(, $query_pair) = each($query_parts)) {
-                list($eachvar, $eachval) = explode('=', $query_pair);
-                $link_or_button .= '            <input type="hidden" name="' . str_replace('amp;', '', $eachvar) . '" value="' . htmlspecialchars(urldecode($eachval)) . '" />' . "\n";
-            } // end while
-            $link_or_button     .= '            <input type="submit" value="'
-                                . htmlspecialchars($message) . '" />' . "\n" . '</form>' . "\n";
-        } // end if... else...
-
-        return $link_or_button;
-    } // end of the 'PMA_linkOrButton()' function
-
-
-    /**
-     * Returns a given timespan value in a readable format.
-     *
-     * @param  int     the timespan
-     *
-     * @return string  the formatted value
-     */
-    function PMA_timespanFormat($seconds)
-    {
-        $return_string = '';
-        $days = floor($seconds / 86400);
-        if ($days > 0) {
-            $seconds -= $days * 86400;
-        }
-        $hours = floor($seconds / 3600);
-        if ($days > 0 || $hours > 0) {
-            $seconds -= $hours * 3600;
-        }
-        $minutes = floor($seconds / 60);
-        if ($days > 0 || $hours > 0 || $minutes > 0) {
-            $seconds -= $minutes * 60;
-        }
-        return sprintf($GLOBALS['timespanfmt'], (string)$days, (string)$hours, (string)$minutes, (string)$seconds);
-    }
-
-
-    if (!function_exists('in_array')) {
+            } // end building available dbs from the "mysql" db
+    
+        } // end server connecting
         /**
-         * Searches $haystack for $needle and returns TRUE if it is found in
-         * the array, FALSE otherwise.
-         *
-         * @param  mixed    the 'needle'
-         * @param  array    the 'haystack'
-         *
-         * @return boolean  has $needle been found or not?
+         * Missing server hostname
          */
-        function in_array($needle, $haystack) {
-            while (list(, $value) = each($haystack)) {
-                if ($value == $haystack) {
-                    return TRUE;
-                }
-            }
-            return FALSE;
+        else {
+            echo $strHostEmpty;
         }
-    }
-
-    /**
-     * Takes a string and outputs each character on a line for itself. Used mainly for horizontalflipped display mode.
-     * Takes care of special html-characters.
-     * Fulfills todo-item http://sourceforge.net/tracker/index.php?func=detail&aid=544361&group_id=23067&atid=377411
-     *
-     * @param   string   The string
-     * @param   string   The seperator (defaults to "<br />\n")
-     *
-     * @access  public
-     * @author  Garvin Hicking <me@supergarv.de>
-     * @return  string      The flipped string
-     */
-    function PMA_flipstring($string, $seperator = "<br />\n") {
-        $format_string = '';
-        $charbuff = false;
-
-        for ($i = 0; $i <= strlen($string); $i++) {
-            $char = substr($string, $i, 1);
-            $append = false;
-
-            if ($char == '&') {
-                $format_string .= $charbuff;
-                $charbuff = $char;
-                $append = true;
-            } elseif (!empty($charbuff)) {
-                $charbuff .= $char;
-            } elseif ($char == ';' && !empty($charbuff)) {
-                $format_string .= $charbuff;
-                $charbuff = false;
-                $append = true;
-            }
-            else
-            {
-                $format_string .= $char;
-                $append = true;
-            }
-
-            if ($append && ($i != strlen($string))) {
-                $format_string .= $seperator;
-            }
-        }
-
-        return $format_string;
-    }
-
-    // Kanji encoding convert feature appended by Y.Kawada (2002/2/20)
-    if (PMA_PHP_INT_VERSION >= 40006
-        && @function_exists('mb_convert_encoding')
-        && strpos(' ' . $lang, 'ja-')
-        && file_exists('./libraries/kanji-encoding.lib.php3')) {
-        include('./libraries/kanji-encoding.lib.php3');
-        define('PMA_MULTIBYTE_ENCODING', 1);
-    } // end if
-
-    // garvin: moved from read_dump.php3 because this should be used in tbl_replace_fields.php3 as well.
-    if (!function_exists('is_uploaded_file')) {
+    
+    
         /**
-         * Emulates the 'is_uploaded_file()' function for old php versions.
-         * Grabbed at the php manual:
-         *     http://www.php.net/manual/en/features.file-upload.php
+         * Get the list and number of available databases.
          *
-         * @param   string    the name of the file to check
+         * @param   string   the url to go back to in case of error
          *
-         * @return  boolean   wether the file has been uploaded or not
+         * @return  boolean  always true
+         *
+         * @global  array    the list of available databases
+         * @global  integer  the number of available databases
+         */
+        function PMA_availableDatabases($error_url = '')
+        {
+            global $dblist;
+            global $num_dbs;
+    
+            $num_dbs = count($dblist);
+    
+            // 1. A list of allowed databases has already been defined by the
+            //    authentification process -> gets the available databases list
+            if ($num_dbs) {
+                $true_dblist = array();
+                for ($i = 0; $i < $num_dbs; $i++) {
+                    $dblink  = @PMA_mysql_select_db($dblist[$i]);
+                    if ($dblink) {
+                        $true_dblist[] = $dblist[$i];
+                    } // end if
+                } // end for
+                $dblist      = array();
+                $dblist      = $true_dblist;
+                unset($true_dblist);
+                $num_dbs     = count($dblist);
+            } // end if
+    
+            // 2. Allowed database list is empty -> gets the list of all databases
+            //    on the server
+            else {
+                $dbs          = mysql_list_dbs() or PMA_mysqlDie('', 'SHOW DATABASES;', FALSE, $error_url);
+                $num_dbs      = ($dbs) ? @mysql_num_rows($dbs) : 0;
+                $real_num_dbs = 0;
+                for ($i = 0; $i < $num_dbs; $i++) {
+                    $db_name_tmp = PMA_mysql_dbname($dbs, $i);
+                    $dblink      = @PMA_mysql_select_db($db_name_tmp);
+                    if ($dblink) {
+                        $dblist[] = $db_name_tmp;
+                        $real_num_dbs++;
+                    }
+                } // end for
+                mysql_free_result($dbs);
+                $num_dbs = $real_num_dbs;
+            } // end else
+    
+            return TRUE;
+        } // end of the 'PMA_availableDatabases()' function
+    
+    
+    
+        /* ----------------------- Set of misc functions ----------------------- */
+    
+    
+        /**
+         * Adds backquotes on both sides of a database, table or field name.
+         * Since MySQL 3.23.6 this allows to use non-alphanumeric characters in
+         * these names.
+         *
+         * @param   mixed    the database, table or field name to "backquote" or
+         *                   array of it
+         * @param   boolean  a flag to bypass this function (used by dump
+         *                   functions)
+         *
+         * @return  mixed    the "backquoted" database, table or field name if the
+         *                   current MySQL release is >= 3.23.6, the original one
+         *                   else
          *
          * @access  public
          */
-        function is_uploaded_file($filename) {
-            if (!$tmp_file = @get_cfg_var('upload_tmp_dir')) {
-                $tmp_file = tempnam('','');
-                $deleted  = @unlink($tmp_file);
-                $tmp_file = dirname($tmp_file);
+        function PMA_backquote($a_name, $do_it = TRUE)
+        {
+            if ($do_it
+                && PMA_MYSQL_INT_VERSION >= 32306
+                && !empty($a_name) && $a_name != '*') {
+    
+                if (is_array($a_name)) {
+                     $result = array();
+                     reset($a_name);
+                     while(list($key, $val) = each($a_name)) {
+                         $result[$key] = '`' . $val . '`';
+                     }
+                     return $result;
+                } else {
+                    return '`' . $a_name . '`';
+                }
+            } else {
+                return $a_name;
             }
-            $tmp_file     .= '/' . basename($filename);
-
-            // User might have trailing slash in php.ini...
-            return (ereg_replace('/+', '/', $tmp_file) == $filename);
-        } // end of the 'is_uploaded_file()' emulated function
-    } // end if
-
+        } // end of the 'PMA_backquote()' function
+    
+    
+        /**
+         * Format a string so it can be passed to a javascript function.
+         * This function is used to displays a javascript confirmation box for
+         * "DROP/DELETE/ALTER" queries.
+         *
+         * @param   string   the string to format
+         * @param   boolean  whether to add backquotes to the string or not
+         *
+         * @return  string   the formated string
+         *
+         * @access  public
+         */
+        function PMA_jsFormat($a_string = '', $add_backquotes = TRUE)
+        {
+            if (is_string($a_string)) {
+                $a_string = str_replace('"', '&quot;', $a_string);
+                $a_string = str_replace('\\', '\\\\', $a_string);
+                $a_string = str_replace('\'', '\\\'', $a_string);
+                $a_string = str_replace('#', '\\#', $a_string);
+                $a_string = str_replace("\012", '\\\\n', $a_string);
+                $a_string = str_replace("\015", '\\\\r', $a_string);
+            }
+    
+            return (($add_backquotes) ? PMA_backquote($a_string) : $a_string);
+        } // end of the 'PMA_jsFormat()' function
+    
+    
+        /**
+         * Defines the <CR><LF> value depending on the user OS.
+         *
+         * @return  string   the <CR><LF> value to use
+         *
+         * @access  public
+         */
+        function PMA_whichCrlf()
+        {
+            $the_crlf = "\n";
+    
+            // The 'PMA_USR_OS' constant is defined in "./libraries/defines.lib.php3"
+            // Win case
+            if (PMA_USR_OS == 'Win') {
+                $the_crlf = "\r\n";
+            }
+            // Mac case
+            else if (PMA_USR_OS == 'Mac') {
+                $the_crlf = "\r";
+            }
+            // Others
+            else {
+                $the_crlf = "\n";
+            }
+    
+            return $the_crlf;
+        } // end of the 'PMA_whichCrlf()' function
+    
+    
+        /**
+         * Counts and displays the number of records in a table
+         *
+         * Last revision 13 July 2001: Patch for limiting dump size from
+         * vinay@sanisoft.com & girish@sanisoft.com
+         *
+         * @param   string   the current database name
+         * @param   string   the current table name
+         * @param   boolean  whether to retain or to displays the result
+         *
+         * @return  mixed    the number of records if retain is required, true else
+         *
+         * @access  public
+         */
+        function PMA_countRecords($db, $table, $ret = FALSE)
+        {
+            $result = PMA_mysql_query('SELECT COUNT(*) AS num FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table));
+            $num    = ($result) ? PMA_mysql_result($result, 0, 'num') : 0;
+            mysql_free_result($result);
+            if ($ret) {
+                return $num;
+            } else {
+                echo number_format($num, 0, $GLOBALS['number_decimal_separator'], $GLOBALS['number_thousands_separator']);
+                return TRUE;
+            }
+        } // end of the 'PMA_countRecords()' function
+    
+    
+        /**
+         * Displays a message at the top of the "main" (right) frame
+         *
+         * @param   string  the message to display
+         *
+         * @global  array   the configuration array
+         *
+         * @access  public
+         */
+        function PMA_showMessage($message)
+        {
+            global $cfg;
+    
+            // Reloads the navigation frame via JavaScript if required
+            if (isset($GLOBALS['reload']) && $GLOBALS['reload']) {
+                echo "\n";
+                $reload_url = './left.php3?' . PMA_generate_common_url((isset($GLOBALS['db']) ? $GLOBALS['db'] : ''), '', '&');
+                ?>
+    <script type="text/javascript" language="javascript1.2">
+    <!--
+    if (typeof(window.parent) != 'undefined'
+        && typeof(window.parent.frames['nav']) != 'undefined') {
+        window.parent.frames['nav'].location.replace('<?php echo $reload_url; ?>');
+    }
+    //-->
+    </script>
+                <?php
+                unset($GLOBALS['reload']);
+            }
+    
+            // Corrects the tooltip text via JS if required
+            else if (!empty($GLOBALS['table']) && $cfg['ShowTooltip'] && PMA_MYSQL_INT_VERSION >= 32303) {
+                $result = @PMA_mysql_query('SHOW TABLE STATUS FROM ' . PMA_backquote($GLOBALS['db']) . ' LIKE \'' . PMA_sqlAddslashes($GLOBALS['table'], TRUE) . '\'');
+                if ($result) {
+                    $tbl_status = PMA_mysql_fetch_array($result, MYSQL_ASSOC);
+                    $tooltip    = (empty($tbl_status['Comment']))
+                                ? ''
+                                : $tbl_status['Comment'] . ' ';
+                    $tooltip .= '(' . $tbl_status['Rows'] . ' ' . $GLOBALS['strRows'] . ')';
+                    mysql_free_result($result);
+                    $md5_tbl = md5($GLOBALS['table']);
+                    echo "\n";
+                    ?>
+    <script type="text/javascript" language="javascript1.2">
+    <!--
+    if (typeof(document.getElementById) != 'undefined'
+        && typeof(window.parent.frames['nav']) != 'undefined'
+        && typeof(window.parent.frames['nav'].document) != 'undefined' && typeof(window.parent.frames['nav'].document) != 'unknown'
+        && typeof(window.parent.frames['nav'].document.getElementById('<?php echo 'tbl_' . $md5_tbl; ?>')) != 'undefined'
+        && typeof(window.parent.frames['nav'].document.getElementById('<?php echo 'tbl_' . $md5_tbl; ?>').title) == 'string') {
+        window.parent.frames['nav'].document.getElementById('<?php echo 'tbl_' . $md5_tbl; ?>').title = '<?php echo PMA_jsFormat($tooltip, FALSE); ?>';
+    }
+    //-->
+    </script>
+                    <?php
+                } // end if
+            } // end if... else if
+    
+            // Checks if the table needs to be repaired after a TRUNCATE query.
+            if (PMA_MYSQL_INT_VERSION >= 40000
+                && isset($GLOBALS['table']) && isset($GLOBALS['sql_query'])
+                && $GLOBALS['sql_query'] == 'TRUNCATE TABLE ' . PMA_backquote($GLOBALS['table'])) {
+                if (!isset($tbl_status)) {
+                    $result = @PMA_mysql_query('SHOW TABLE STATUS FROM ' . PMA_backquote($GLOBALS['db']) . ' LIKE \'' . PMA_sqlAddslashes($GLOBALS['table'], TRUE) . '\'');
+                    if ($result) {
+                        $tbl_status = PMA_mysql_fetch_array($result, MYSQL_ASSOC);
+                        mysql_free_result($result);
+                    }
+                }
+                if (isset($tbl_status) && (int) $tbl_status['Index_length'] > 1024) {
+                    @PMA_mysql_query('REPAIR TABLE ' . PMA_backquote($GLOBALS['table']));
+                }
+            }
+            unset($tbl_status);
+    
+            echo "\n";
+            ?>
+    <div align="<?php echo $GLOBALS['cell_align_left']; ?>">
+        <table border="<?php echo $cfg['Border']; ?>" cellpadding="5">
+        <tr>
+            <td bgcolor="<?php echo $cfg['ThBgcolor']; ?>">
+                <b><?php echo $message; ?></b><br />
+            </td>
+        </tr>
+            <?php
+            if ($cfg['ShowSQL'] == TRUE && !empty($GLOBALS['sql_query'])) {
+                // Basic url query part
+                $url_qpart = '?' . PMA_generate_common_url(isset($GLOBALS['db']) ? $GLOBALS['db'] : '', isset($GLOBALS['table']) ? $GLOBALS['table'] : '');
+                echo "\n";
+                ?>
+        <tr>
+            <td bgcolor="<?php echo $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
+                 /* SQL-Parser-Analyzer */
+                $sqlnr = 1;
+                if (!empty($GLOBALS['show_as_php'])) {
+                    $new_line = '\';<br />' . "\n" . '            $sql .= \'';
+                }
+                if (isset($new_line)) {
+                     /* SQL-Parser-Analyzer */
+                    $query_base = htmlspecialchars($GLOBALS['sql_query']);
+                     /* SQL-Parser-Analyzer */
+                    $query_base = ereg_replace("((\015\012)|(\015)|(\012))+", $new_line, $query_base);
+                } else {
+                    $query_base = $GLOBALS['sql_query'];
+                }
+                if (!empty($GLOBALS['show_as_php'])) {
+                    $query_base = '$sql  = \'' . PMA_sqlAddslashes($query_base);
+                } else if (!empty($GLOBALS['validatequery'])) {
+                    $query_base = PMA_validateSQL($query_base);
+                } else {
+                    $parsed_sql = PMA_SQP_parse($query_base);
+                    $query_base = PMA_formatSql($parsed_sql);
+                }
+    
+                // Prepares links that may be displayed to edit/explain the query
+                // (don't go to default pages, we must go to the page
+                // where the query box is available)
+                // (also, I don't see why we should check the goto variable)
+    
+                //if (!isset($GLOBALS['goto'])) {
+                    //$edit_target = (isset($GLOBALS['table'])) ? $cfg['DefaultTabTable'] : $cfg['DefaultTabDatabase'];
+                $edit_target = isset($GLOBALS['db']) ? (isset($GLOBALS['table']) ? 'tbl_properties.php3' : 'db_details.php3') : '';
+                //} else if ($GLOBALS['goto'] != 'main.php3') {
+                //    $edit_target = $GLOBALS['goto'];
+                //} else {
+                //    $edit_target = '';
+                //}
+    
+                if (isset($cfg['SQLQuery']['Edit'])
+                    && ($cfg['SQLQuery']['Edit'] == TRUE )
+                    && (!empty($edit_target))) {
+    
+                    $onclick = '';
+                    if ($cfg['QueryFrameJS'] && $cfg['QueryFrame']) {
+                        $onclick = 'onclick="focus_querywindow(); return false;"';
+                    }
+    
+                    $edit_link = '&nbsp;[<a href="'
+                               . $edit_target
+                               . $url_qpart
+                               . '&amp;sql_query=' . urlencode($GLOBALS['sql_query']) . '&amp;show_query=1#querybox" ' . $onclick . '>' . $GLOBALS['strEdit'] . '</a>]';
+                } else {
+                    $edit_link = '';
+                }
+    
+                // Want to have the query explained (Mike Beck 2002-05-22)
+                // but only explain a SELECT (that has not been explained)
+                /* SQL-Parser-Analyzer */
+                if (isset($cfg['SQLQuery']['Explain'])
+                    && $cfg['SQLQuery']['Explain'] == TRUE) {
+    
+                    // Detect if we are validating as well
+                    // To preserve the validate uRL data
+                    if (!empty($GLOBALS['validatequery'])) {
+                        $explain_link_validate = '&amp;validatequery=1';
+                    } else {
+                        $explain_link_validate = '';
+                    }
+    
+                    $explain_link = '&nbsp;[<a href="sql.php3'
+                                  . $url_qpart
+                                  . $explain_link_validate
+                                  . '&amp;sql_query=';
+    
+                    if (eregi('^SELECT[[:space:]]+', $GLOBALS['sql_query'])) {
+                        $explain_link .= urlencode('EXPLAIN ' . $GLOBALS['sql_query']) . '">' . $GLOBALS['strExplain'];
+                    } else if (eregi('^EXPLAIN[[:space:]]+SELECT[[:space:]]+', $GLOBALS['sql_query'])) {
+                        $explain_link .= substr($GLOBALS['sql_query'], 8) . '">' . $GLOBALS['strNoExplain'];
+                    } else {
+                        $explain_link = '';
+                    }
+                    if(!empty($explain_link)) {
+                        $explain_link .= '</a>]';
+                    }
+                } else {
+                    $explain_link = '';
+                } //show explain
+    
+                // Also we would like to get the SQL formed in some nice
+                // php-code (Mike Beck 2002-05-22)
+                if (isset($cfg['SQLQuery']['ShowAsPHP'])
+                    && $cfg['SQLQuery']['ShowAsPHP'] == TRUE) {
+                    $php_link = '&nbsp;[<a href="sql.php3'
+                              . $url_qpart
+                              . '&amp;show_query=1'
+                              . '&amp;sql_query=' . urlencode($GLOBALS['sql_query'])
+                              . '&amp;show_as_php=';
+    
+                    if (!empty($GLOBALS['show_as_php'])) {
+                        $php_link .= '0">' . $GLOBALS['strNoPhp'];
+                    } else {
+                        $php_link .= '1">' . $GLOBALS['strPhp'];
+                    }
+                    $php_link .= '</a>]';
+                } else {
+                    $php_link = '';
+                } //show as php
+    
+                if (isset($cfg['SQLValidator']['use'])
+                    && $cfg['SQLValidator']['use'] == TRUE
+                    && isset($cfg['SQLQuery']['Validate'])
+                    && $cfg['SQLQuery']['Validate'] == TRUE) {
+                    $validate_link = '&nbsp;[<a href="sql.php3'
+                                   . $url_qpart
+                                   . '&amp;show_query=1'
+                                   . '&amp;sql_query=' . urlencode($GLOBALS['sql_query'])
+                                   . '&amp;validatequery=';
+                    if (!empty($GLOBALS['validatequery'])) {
+                        $validate_link .= '0">' .  $GLOBALS['strNoValidateSQL'] ;
+                    } else {
+                        $validate_link .= '1">'. $GLOBALS['strValidateSQL'] ;
+                    }
+                    $validate_link .= '</a>]';
+                } else {
+                    $validate_link = '';
+                } //validator
+    
+                // Displays the message
+                echo '            ' . $GLOBALS['strSQLQuery'] . '&nbsp;:';
+                if (!empty($edit_target)) {
+                    echo $edit_link . $explain_link . $php_link . $validate_link;
+                }
+                echo '<br />' . "\n";
+                echo '            ' . $query_base;
+                // If a 'LIMIT' clause has been programatically added to the query
+                // displays it
+                if (!empty($GLOBALS['sql_limit_to_append'])) {
+                    if (!empty($GLOBALS['show_as_php'])) {
+                        echo $GLOBALS['sql_limit_to_append'];
+                    } else if (!empty($GLOBALS['validatequery'])) {
+                        // skip the extra bit here
+                    } else {
+                        echo '&nbsp;' . PMA_formatSql(PMA_SQP_parse($GLOBALS['sql_limit_to_append']));
+                    }
+                }
+    
+                //Clean up the end of the PHP
+                if (!empty($GLOBALS['show_as_php'])) {
+                    echo '\';';
+                }
+                echo "\n";
+                ?>
+            </td>
+        </tr>
+               <?php
+            }
+            echo "\n";
+            ?>
+        </table>
+    </div><br />
+            <?php
+        } // end of the 'PMA_showMessage()' function
+    
+    
+        /**
+         * Displays a link to the official MySQL documentation
+         *
+         * @param   chapter of "HTML, one page per chapter" documentation
+         * @param   contains name of page/anchor that is being linked
+         *
+         * @return  string  the html link
+         *
+         * @access  public
+         */
+        function PMA_showMySQLDocu($chapter, $link)
+        {
+            if (!empty($GLOBALS['cfg']['MySQLManualBase'])) {
+                if (!empty($GLOBALS['cfg']['MySQLManualType'])) {
+                    switch ($GLOBALS['cfg']['MySQLManualType']) {
+                        case 'old':
+                            return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link[0] . '/' . $link[1] . '/' . $link . '.html" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
+                        case 'chapters':
+                            return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/manual_' . $chapter . '.html#' . $link . '" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
+                        case 'big':
+                            return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '#' . $link . '" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
+                        case 'none':
+                            return '';
+                        case 'searchable':
+                        default:
+                            return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link . '.html" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
+                    }
+                } else {
+                    // no Type defined, show the old one
+                    return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link[0] . '/' . $link[1] . '/' . $link . '.html" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
+                }
+            } else {
+                // no URL defined
+                if (!empty($GLOBALS['cfg']['ManualBaseShort'])) {
+                    // the old configuration
+                    return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link[0] . '/' . $link[1] . '/' . $link . '.html" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
+                } else {
+                    return '';
+                }
+            }
+        } // end of the 'PMA_showDocuShort()' function
+    
+    
+        /**
+         * Formats $value to byte view
+         *
+         * @param    double   the value to format
+         * @param    integer  the sensitiveness
+         * @param    integer  the number of decimals to retain
+         *
+         * @return   array    the formatted value and its unit
+         *
+         * @access  public
+         *
+         * @author   staybyte
+         * @version  1.2 - 18 July 2002
+         */
+        function PMA_formatByteDown($value, $limes = 6, $comma = 0)
+        {
+            $dh           = pow(10, $comma);
+            $li           = pow(10, $limes);
+            $return_value = $value;
+            $unit         = $GLOBALS['byteUnits'][0];
+    
+            for ( $d = 6, $ex = 15; $d >= 1; $d--, $ex-=3 ) {
+                if (isset($GLOBALS['byteUnits'][$d]) && $value >= $li * pow(10, $ex)) {
+                    $value = round($value / ( pow(1024, $d) / $dh) ) /$dh;
+                    $unit = $GLOBALS['byteUnits'][$d];
+                    break 1;
+                } // end if
+            } // end for
+    
+            if ($unit != $GLOBALS['byteUnits'][0]) {
+                $return_value = number_format($value, $comma, $GLOBALS['number_decimal_separator'], $GLOBALS['number_thousands_separator']);
+            } else {
+                $return_value = number_format($value, 0, $GLOBALS['number_decimal_separator'], $GLOBALS['number_thousands_separator']);
+            }
+    
+            return array($return_value, $unit);
+        } // end of the 'PMA_formatByteDown' function
+    
+    
+        /**
+         * Ensures a database/table/field's name is not a reserved word (for MySQL
+         * releases < 3.23.6)
+         *
+         * @param    string   the name to check
+         * @param    string   the url to go back in case of error
+         *
+         * @return   boolean  true if the name is valid (no return else)
+         *
+         * @access  public
+         *
+         * @author   Dell'Aiera Pol; Olivier Blin
+         */
+        function PMA_checkReservedWords($the_name, $error_url)
+        {
+            // The name contains caracters <> a-z, A-Z and "_" -> not a reserved
+            // word
+            if (!ereg('^[a-zA-Z_]+$', $the_name)) {
+                return TRUE;
+            }
+    
+            // Else do the work
+            $filename = 'badwords.txt';
+            if (file_exists($filename)) {
+                // Builds the reserved words array
+                $fd        = fopen($filename, 'r');
+                $contents  = fread($fd, filesize($filename) - 1);
+                fclose ($fd);
+                $word_list = explode("\n", $contents);
+    
+                // Do the checking
+                $word_cnt  = count($word_list);
+                for ($i = 0; $i < $word_cnt; $i++) {
+                    if (strtolower($the_name) == $word_list[$i]) {
+                        PMA_mysqlDie(sprintf($GLOBALS['strInvalidName'], $the_name), '', FALSE, $error_url);
+                    } // end if
+                } // end for
+            } // end if
+        } // end of the 'PMA_checkReservedWords' function
+    
+    
+        /**
+         * Writes localised date
+         *
+         * @param   string   the current timestamp
+         *
+         * @return  string   the formatted date
+         *
+         * @access  public
+         */
+        function PMA_localisedDate($timestamp = -1)
+        {
+            global $datefmt, $month, $day_of_week;
+    
+            if ($timestamp == -1) {
+                $timestamp = time();
+            }
+    
+            $date = ereg_replace('%[aA]', $day_of_week[(int)strftime('%w', $timestamp)], $datefmt);
+            $date = ereg_replace('%[bB]', $month[(int)strftime('%m', $timestamp)-1], $date);
+    
+            return strftime($date, $timestamp);
+        } // end of the 'PMA_localisedDate()' function
+    
+    
+        /**
+         * Prints out a tab for tabbed navigation.
+         * If the variables $link and $args ar left empty, an inactive tab is created
+         *
+         * @param   string  the text to be displayed as link
+         * @param   string  main link file, e.g. "test.php3"
+         * @param   string  link arguments
+         * @param   string  link attributes
+         * @param   string  include '?' even though no attributes are set. Can be set empty, should be '?'.
+         * @param   boolean force display TAB as active
+         *
+         * @return  string  two table cells, the first beeing a separator, the second the tab itself
+         *
+         * @access  public
+         */
+        function PMA_printTab($text, $link, $args = '', $attr = '', $sep = '?', $active = false) {
+            global $PHP_SELF, $cfg;
+            global $db_details_links_count_tabs;
+    
+            if ((basename($PHP_SELF) == $link || $active)
+                && ($text != $GLOBALS['strEmpty'] && $text != $GLOBALS['strDrop'])) {
+                $bgcolor = 'silver';
+            } else {
+                $bgcolor = '#DFDFDF';
+            }
+    
+            $db_details_links_count_tabs++;
+            if (!empty($attr)) {
+                $attr = ' ' . $attr;
+            }
+    
+            if ($cfg['LightTabs']) {
+                $out = '';
+                if (strlen($link) > 0) {
+                    $out .= '<a href="' . $link . $sep . $args . '"' . $attr . '>'
+                         .  '<nobr><b>' . $text . '</b></a></nobr>';
+                } else {
+                    $out .= '<nobr><b>' . $text . '</b></nobr>';
+                }
+                $out = '[ ' . $out . ' ]&nbsp;&nbsp;&nbsp;';
+            } else {
+                $out     = "\n" . '        '
+                         . '<td bgcolor="' . $bgcolor . '" align="center" width="64" nowrap="nowrap" class="tab">'
+                         . "\n" . '            ';
+                if (strlen($link) > 0) {
+                    $out .= '<a href="' . $link . $sep . $args . '"' . $attr . '>'
+                         .  '<nobr><b>' . $text . '</b></a></nobr>';
+                } else {
+                    $out .= '<nobr><b>' . $text . '</b></nobr>';
+                }
+                $out     .= "\n" . '        '
+                         .  '</td>'
+                         .  "\n" . '        '
+                         .  '<td width="8">&nbsp;</td>';
+            }
+    
+            return $out;
+        } // end of the 'PMA_printTab()' function
+    
+    
+        /**
+         * Displays a link, or a button if the link's URL is too large, to
+         * accommodate some browsers' limitations
+         *
+         * @param  string  the URL
+         * @param  string  the link message
+         * @param  string  js confirmation
+         *
+         * @return string  the results to be echoed or saved in an array
+         */
+        function PMA_linkOrButton($url, $message, $js_conf)
+        {
+            if (strlen($url) <= 2047) {
+                $onclick_url        = (empty($js_conf) ? '' : ' onclick="return confirmLink(this, \'' . $js_conf . '\')"');
+                $link_or_button     = '        <a href="' . $url . '"' . $onclick_url . '>' . "\n"
+                                    . '           ' . $message . '</a>' . "\n";
+            }
+            else {
+                $edit_url_parts     = parse_url($url);
+                $query_parts        = explode('&', $edit_url_parts['query']);
+                $link_or_button     = '        <form action="'
+                                    . $edit_url_parts['path']
+                                    . '" method="post">' . "\n";
+                reset ($query_parts);
+                while (list(, $query_pair) = each($query_parts)) {
+                    list($eachvar, $eachval) = explode('=', $query_pair);
+                    $link_or_button .= '            <input type="hidden" name="' . str_replace('amp;', '', $eachvar) . '" value="' . htmlspecialchars(urldecode($eachval)) . '" />' . "\n";
+                } // end while
+                $link_or_button     .= '            <input type="submit" value="'
+                                    . htmlspecialchars($message) . '" />' . "\n" . '</form>' . "\n";
+            } // end if... else...
+    
+            return $link_or_button;
+        } // end of the 'PMA_linkOrButton()' function
+    
+    
+        /**
+         * Returns a given timespan value in a readable format.
+         *
+         * @param  int     the timespan
+         *
+         * @return string  the formatted value
+         */
+        function PMA_timespanFormat($seconds)
+        {
+            $return_string = '';
+            $days = floor($seconds / 86400);
+            if ($days > 0) {
+                $seconds -= $days * 86400;
+            }
+            $hours = floor($seconds / 3600);
+            if ($days > 0 || $hours > 0) {
+                $seconds -= $hours * 3600;
+            }
+            $minutes = floor($seconds / 60);
+            if ($days > 0 || $hours > 0 || $minutes > 0) {
+                $seconds -= $minutes * 60;
+            }
+            return sprintf($GLOBALS['timespanfmt'], (string)$days, (string)$hours, (string)$minutes, (string)$seconds);
+        }
+    
+    
+        if (!function_exists('in_array')) {
+            /**
+             * Searches $haystack for $needle and returns TRUE if it is found in
+             * the array, FALSE otherwise.
+             *
+             * @param  mixed    the 'needle'
+             * @param  array    the 'haystack'
+             *
+             * @return boolean  has $needle been found or not?
+             */
+            function in_array($needle, $haystack) {
+                while (list(, $value) = each($haystack)) {
+                    if ($value == $haystack) {
+                        return TRUE;
+                    }
+                }
+                return FALSE;
+            }
+        }
+    
+        /**
+         * Takes a string and outputs each character on a line for itself. Used mainly for horizontalflipped display mode.
+         * Takes care of special html-characters.
+         * Fulfills todo-item http://sourceforge.net/tracker/index.php?func=detail&aid=544361&group_id=23067&atid=377411
+         *
+         * @param   string   The string
+         * @param   string   The seperator (defaults to "<br />\n")
+         *
+         * @access  public
+         * @author  Garvin Hicking <me@supergarv.de>
+         * @return  string      The flipped string
+         */
+        function PMA_flipstring($string, $seperator = "<br />\n") {
+            $format_string = '';
+            $charbuff = false;
+    
+            for ($i = 0; $i <= strlen($string); $i++) {
+                $char = substr($string, $i, 1);
+                $append = false;
+    
+                if ($char == '&') {
+                    $format_string .= $charbuff;
+                    $charbuff = $char;
+                    $append = true;
+                } elseif (!empty($charbuff)) {
+                    $charbuff .= $char;
+                } elseif ($char == ';' && !empty($charbuff)) {
+                    $format_string .= $charbuff;
+                    $charbuff = false;
+                    $append = true;
+                }
+                else
+                {
+                    $format_string .= $char;
+                    $append = true;
+                }
+    
+                if ($append && ($i != strlen($string))) {
+                    $format_string .= $seperator;
+                }
+            }
+    
+            return $format_string;
+        }
+    
+        // Kanji encoding convert feature appended by Y.Kawada (2002/2/20)
+        if (PMA_PHP_INT_VERSION >= 40006
+            && @function_exists('mb_convert_encoding')
+            && strpos(' ' . $lang, 'ja-')
+            && file_exists('./libraries/kanji-encoding.lib.php3')) {
+            include('./libraries/kanji-encoding.lib.php3');
+            define('PMA_MULTIBYTE_ENCODING', 1);
+        } // end if
+    
+        // garvin: moved from read_dump.php3 because this should be used in tbl_replace_fields.php3 as well.
+        if (!function_exists('is_uploaded_file')) {
+            /**
+             * Emulates the 'is_uploaded_file()' function for old php versions.
+             * Grabbed at the php manual:
+             *     http://www.php.net/manual/en/features.file-upload.php
+             *
+             * @param   string    the name of the file to check
+             *
+             * @return  boolean   wether the file has been uploaded or not
+             *
+             * @access  public
+             */
+            function is_uploaded_file($filename) {
+                if (!$tmp_file = @get_cfg_var('upload_tmp_dir')) {
+                    $tmp_file = tempnam('','');
+                    $deleted  = @unlink($tmp_file);
+                    $tmp_file = dirname($tmp_file);
+                }
+                $tmp_file     .= '/' . basename($filename);
+    
+                // User might have trailing slash in php.ini...
+                return (ereg_replace('/+', '/', $tmp_file) == $filename);
+            } // end of the 'is_uploaded_file()' emulated function
+        } // end if
+    } // end if: minimal common.lib needed?
 } // $__PMA_COMMON_LIB__
 ?>
diff --git a/libraries/db_table_exists.lib.php3 b/libraries/db_table_exists.lib.php3
index 594d72d29..4896bae60 100755
--- a/libraries/db_table_exists.lib.php3
+++ b/libraries/db_table_exists.lib.php3
@@ -13,7 +13,9 @@ if (!isset($is_db) || !$is_db) {
         $is_db = @PMA_mysql_select_db($db);
     }
     if (empty($db) || !$is_db) {
-        header('Location: ' . $cfg['PmaAbsoluteUri'] . 'main.php3?' . PMA_generate_common_url('', '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
+        if (!isset($is_transformation_wrapper)) {
+            header('Location: ' . $cfg['PmaAbsoluteUri'] . 'main.php3?' . PMA_generate_common_url('', '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
+        }
         exit();
     }
 } // end if (ensures db exists)
@@ -24,7 +26,9 @@ if (!isset($is_table) || !$is_table) {
     }
     if (empty($table)
         || !($is_table && @mysql_numrows($is_table))) {
-        header('Location: ' . $cfg['PmaAbsoluteUri'] . 'db_details.php3?' . PMA_generate_common_url($db, '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
+        if (!isset($is_transformation_wrapper)) {
+            header('Location: ' . $cfg['PmaAbsoluteUri'] . 'db_details.php3?' . PMA_generate_common_url($db, '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
+        }
         exit();
     } else if (isset($is_table)) {
         mysql_free_result($is_table);
diff --git a/libraries/functions.js b/libraries/functions.js
index 519f2a9a7..cb25aeee5 100644
--- a/libraries/functions.js
+++ b/libraries/functions.js
@@ -555,8 +555,8 @@ function setCheckboxes(the_form, do_check)
     var elts      = (typeof(document.forms[the_form].elements['selected_db[]']) != 'undefined')
                   ? document.forms[the_form].elements['selected_db[]']
                   : (typeof(document.forms[the_form].elements['selected_tbl[]']) != 'undefined')
-		  ? document.forms[the_form].elements['selected_tbl[]']
-		  : document.forms[the_form].elements['selected_fld[]'];
+          ? document.forms[the_form].elements['selected_tbl[]']
+          : document.forms[the_form].elements['selected_fld[]'];
     var elts_cnt  = (typeof(elts.length) != 'undefined')
                   ? elts.length
                   : 0;
diff --git a/libraries/header_http.inc.php3 b/libraries/header_http.inc.php3
new file mode 100644
index 000000000..8743e02ae
--- /dev/null
+++ b/libraries/header_http.inc.php3
@@ -0,0 +1,23 @@
+<?php
+/* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
+
+/**
+ * Sends http headers
+ */
+// Don't use cache (required for Opera)
+$ctype = (isset($ctype) ? $ctype : 'html');
+if ($ctype == 'css') {
+        header('Content-Type: text/css; charset=ISO-8859-1');
+} else {
+    $GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT';
+    header('Expires: ' . $GLOBALS['now']); // rfc2616 - Section 14.21
+    header('Last-Modified: ' . $GLOBALS['now']);
+    header('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
+    header('Pragma: no-cache'); // HTTP/1.0
+    if (!isset($is_transformation_wrapper)) {
+        // Define the charset to be used
+        header('Content-Type: text/' . $ctype . '; charset=' . $GLOBALS['charset']);
+    }
+}
+?>
\ No newline at end of file
diff --git a/libraries/header_meta_style.inc.php3 b/libraries/header_meta_style.inc.php3
new file mode 100644
index 000000000..d4c4475f7
--- /dev/null
+++ b/libraries/header_meta_style.inc.php3
@@ -0,0 +1,31 @@
+<?php
+/* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
+
+/**
+ * Sends the beginning of the html page then returns to the calling script
+ */
+// Gets the font sizes to use
+PMA_setFontSizes();
+// Defines the cell alignment values depending on text direction
+if ($GLOBALS['text_dir'] == 'ltr') {
+    $GLOBALS['cell_align_left']  = 'left';
+    $GLOBALS['cell_align_right'] = 'right';
+} else {
+    $GLOBALS['cell_align_left']  = 'right';
+    $GLOBALS['cell_align_right'] = 'left';
+}
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][2]; ?>" lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][2]; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>">
+
+<head>
+<title>phpMyAdmin</title>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" />
+<?php
+if (!empty($GLOBALS['cfg']['PmaAbsoluteUri'])) {
+    echo '<base href="' . $GLOBALS['cfg']['PmaAbsoluteUri'] . '" />' . "\n";
+}
+?>
+<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?js_frame=right" />
diff --git a/libraries/left.js b/libraries/left.js
index 4f4daa6c9..603dbd6d3 100644
--- a/libraries/left.js
+++ b/libraries/left.js
@@ -252,64 +252,4 @@ function hilightBase(el, theColor)
   return true;
 } // end of the 'hilightBase()' function
 
-
-/**
- * Add styles for positioned layers
- */
-if (capable) {
-    // Brian Birtles : This is not the ideal method of doing this
-    // but under the 7th June '00 Mozilla build (and many before
-    // it) Mozilla did not treat text between <style> tags as
-    // style information unless it was written with the one call
-    // to write().
-    if (isDOM) {
-      var lstyle = '<style type="text\/css">'
-                 + '<!--'
-                 + 'div {font-family: ' + fontFamily + '; font-size: ' + fontSize + '; color: #000000}'
-                 + '.heada {font-family: ' + fontFamily + '; font-size: ' + fontSize + '; color: #000000}'
-                 + '.headaCnt {font-family: ' + fontFamily + '; font-size: ' + fontSmall + '; color: #000000}'
-                 + '.parent {font-family: ' + fontFamily + '; color: #000000; text-decoration: none; display: block}'
-                 + '.child {font-family: ' + fontFamily + '; font-size: ' + fontSmall + '; color: #333399; text-decoration: none; display: none}'
-                 + '.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: ' + fontSmall + '; color: #333399; text-decoration: none}'
-                 + '.tblItem:hover {color: #FF0000; text-decoration: underline}'
-                 + '\/\/-->'
-                 + '<\/style>';
-      document.write(lstyle);
-    }
-    else {
-      document.writeln('<style type="text\/css">');
-      document.writeln('<!--');
-      document.writeln('div {font-family: ' + fontFamily + '; font-size: ' + fontSize + '; color: #000000}');
-      document.writeln('.heada {font-family: ' + fontFamily + '; font-size: ' + fontSize + '; color: #000000}');
-      document.writeln('.headaCnt {font-family: ' + fontFamily + '; font-size: ' + fontSmall + '; color: #000000}');
-      if (isIE4) {
-        document.writeln('.parent {font-family: ' + fontFamily + '; color: #000000; text-decoration: none; display: block}');
-        document.writeln('.child {font-family: ' + fontFamily + '; font-size: ' + fontSmall + '; color: #333399; text-decoration: none; display: none}');
-        document.writeln('.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: ' + fontSmall + '; color: #333399; text-decoration: none}');
-        document.writeln('.tblItem:hover {color: #FF0000; text-decoration: underline}');
-      }
-      else { // NS4 case
-        document.writeln('.parent {font-family: ' + fontFamily + '; color: #000000; text-decoration: none; position: absolute; visibility: hidden}');
-        document.writeln('.child {font-family: ' + fontFamily + '; font-size: ' + fontSmall + '; color: #333399; position: absolute; visibility: hidden}');
-        document.writeln('.item, .tblItem {font-family: ' + fontFamily + '; font-size: ' + fontSmall + '; color: #333399; text-decoration: none}');
-      }
-      document.writeln('\/\/-->');
-      document.writeln('<\/style>');
-    }
-}
-else {
-    document.writeln('<style type="text\/css">');
-    document.writeln('<!--');
-    document.writeln('div {font-family: ' + fontFamily + '; font-size: ' + fontSize + '; color: #000000}');
-    document.writeln('.heada {font-family: ' + fontFamily + '; font-size: ' + fontSize + '; color: #000000}');
-    document.writeln('.headaCnt {font-family: ' + fontFamily + '; font-size: ' + fontSmall + '; color: #000000}');
-    document.writeln('.parent {font-family: ' + fontFamily + '; color: #000000; text-decoration: none}');
-    document.writeln('.child {font-family: ' + fontFamily + '; font-size: ' + fontSmall + '; color: #333399; text-decoration: none}');
-    document.writeln('.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: ' + fontSmall + '; color: #333399; text-decoration: none}');
-    document.writeln('.tblItem:hover {color: #FF0000; text-decoration: underline}');
-    document.writeln('\/\/-->');
-    document.writeln('<\/style>');
-} // end of adding styles
-
-
 window.onload = initIt;
diff --git a/libraries/sqlparser.lib.php3 b/libraries/sqlparser.lib.php3
index ad02b7fe2..623992f8b 100644
--- a/libraries/sqlparser.lib.php3
+++ b/libraries/sqlparser.lib.php3
@@ -34,1630 +34,1638 @@
 if (!defined('PMA_SQP_LIB_INCLUDED')) {
     define('PMA_SQP_LIB_INCLUDED', 1);
 
-
     /**
-     * Include the string library as we use it heavily
+     * Minimum inclusion? (i.e. for the stylesheet builder)
      */
-    if (!defined('PMA_STR_LIB_INCLUDED')) {
-        include('./libraries/string.lib.php3');
-    }
-
-    /**
-     * Include data for the SQL Parser
-     */
-    if (!defined('PMA_SQP_DATA_INCLUDED')) {
-        include('./libraries/sqlparser.data.php3');
-    }
-
-    if (!defined('DEBUG_TIMING')) {
-        function PMA_SQP_arrayAdd(&$arr, $type, $data, &$arrsize)
-        {
-            $arr[] = array('type' => $type, 'data' => $data);
-            $arrsize++;
-        } // end of the "PMA_SQP_arrayAdd()" function
-    } else {
-        function PMA_SQP_arrayAdd(&$arr, $type, $data, &$arrsize)
-        {
-            global $timer;
-
-            $t     = $timer;
-            $arr[] = array('type' => $type, 'data' => $data , 'time' => $t);
-            $timer = microtime();
-            $arrsize++;
-        } // end of the "PMA_SQP_arrayAdd()" function
-    } // end if... else...
-
-
-    /**
-     * Reset the error variable for the SQL parser 
-     *
-     * @access public
-     */
-    // Added, Robbat2 - 13 Janurary 2003, 2:59PM
-    function PMA_SQP_resetError() {
-        global $SQP_errorString;
-        $SQP_errorString = '';
-        unset($SQP_errorString);
+     
+    if (!isset($is_minimum_common)) {
+        $is_minimum_common = FALSE;
     }
     
-    /**
-     * Get the contents of the error variable for the SQL parser 
-     *
-     * @return string Error string from SQL parser
-     *
-     * @access public
-     */
-    // Added, Robbat2 - 13 Janurary 2003, 2:59PM
-    function PMA_SQP_getErrorString() {
-        global $SQP_errorString;
-        return isset($SQP_errorString) ? $SQP_errorString : '';
-    }
-
-    /**
-     * Check if the SQL parser hit an error
-     *
-     * @return boolean error state
-     *
-     * @access public
-     */
-    // Added, Robbat2 - 13 Janurary 2003, 2:59PM
-    function PMA_SQP_isError() {
-        global $SQP_errorString;
-        return isset($SQP_errorString) && !empty($SQP_errorString);
-    }
-
-    /**
-     * Set an error message for the system
-     *
-     * @param  string  The error message
-     * @param  string  The failing SQL query
-     *
-     * @access private
-     * @scope SQL Parser internal
-     */
-    // Revised, Robbat2 - 13 Janurary 2003, 2:59PM
-    function PMA_SQP_throwError($message, $sql)
-    {
-
-        global $SQP_errorString;
-        $SQP_errorString = '<p>'.$GLOBALS['strSQLParserUserError'] . '</p>' . "\n"
-            . '<pre>' . "\n"
-            . 'ERROR: ' . $message . "\n"
-            . 'SQL: ' . $sql .  "\n"
-            . '</pre>' . "\n";
-
-        /*
-        // Removed to solve bug #641765 - Robbat2 - 12 January 2003, 9:46PM
-        flush();
-        if (PMA_PHP_INT_VERSION >= 40200 && @function_exists('ob_flush')) {
-            ob_flush();
+    if ($is_minimum_common == FALSE) {
+        /**
+         * Include the string library as we use it heavily
+         */
+        if (!defined('PMA_STR_LIB_INCLUDED')) {
+            include('./libraries/string.lib.php3');
         }
-        */
-    } // end of the "PMA_SQP_throwError()" function
-
-
-    /**
-     * Do display the bug report
-     *
-     * @param  string  The error message
-     * @param  string  The failing SQL query
-     *
-     * @access public
-     */
-    function PMA_SQP_bug($message, $sql)
-    {
-        $debugstr = 'ERROR: ' . $message . "\n";
-        $debugstr .= 'CVS: $Id$' . "\n";
-        $debugstr .= 'MySQL: '.PMA_MYSQL_STR_VERSION . "\n";
-        $debugstr .= 'USR OS, AGENT, VER: ' . PMA_USR_OS . ' ' . PMA_USR_BROWSER_AGENT . ' ' . PMA_USR_BROWSER_VER . "\n";
-        $debugstr .= 'PMA: ' . PMA_VERSION . "\n";
-        $debugstr .= 'PHP VER,OS: ' . PMA_PHP_STR_VERSION . ' ' . PHP_OS . "\n";
-        $debugstr .= 'LANG: ' . $GLOBALS['lang'] . "\n";
-        $debugstr .= 'SQL: ' . $sql;
-
-        $encodedstr     = $debugstr;
-        if (PMA_PHP_INT_VERSION >= 40001 && @function_exists('gzcompress')) {
-            $encodedstr = gzcompress($debugstr, 9);
+    
+        /**
+         * Include data for the SQL Parser
+         */
+        if (!defined('PMA_SQP_DATA_INCLUDED')) {
+            include('./libraries/sqlparser.data.php3');
         }
-        $encodedstr     = preg_replace("/(\015\012)|(\015)|(\012)/", '<br />' . "\n", chunk_split(base64_encode($encodedstr)));
-
-        echo $GLOBALS['strSQLParserBugMessage'] . '<br />' . "\n"
-             . '----' . $GLOBALS['strBeginCut'] . '----' . '<br />' . "\n"
-             . $encodedstr . "\n"
-             . '----' . $GLOBALS['strEndCut'] . '----' . '<br />' . "\n";
-
-        flush();
-        if (PMA_PHP_INT_VERSION >= 40200 && @function_exists('ob_flush')) {
-            ob_flush();
+    
+        if (!defined('DEBUG_TIMING')) {
+            function PMA_SQP_arrayAdd(&$arr, $type, $data, &$arrsize)
+            {
+                $arr[] = array('type' => $type, 'data' => $data);
+                $arrsize++;
+            } // end of the "PMA_SQP_arrayAdd()" function
+        } else {
+            function PMA_SQP_arrayAdd(&$arr, $type, $data, &$arrsize)
+            {
+                global $timer;
+    
+                $t     = $timer;
+                $arr[] = array('type' => $type, 'data' => $data , 'time' => $t);
+                $timer = microtime();
+                $arrsize++;
+            } // end of the "PMA_SQP_arrayAdd()" function
+        } // end if... else...
+    
+    
+        /**
+         * Reset the error variable for the SQL parser 
+         *
+         * @access public
+         */
+        // Added, Robbat2 - 13 Janurary 2003, 2:59PM
+        function PMA_SQP_resetError() {
+            global $SQP_errorString;
+            $SQP_errorString = '';
+            unset($SQP_errorString);
         }
-
-        echo '----' . $GLOBALS['strBeginRaw'] . '----<br />' . "\n"
-             . '<pre>' . "\n"
-             . $debugstr
-             . '</pre>' . "\n"
-             . '----' . $GLOBALS['strEndRaw'] . '----<br />' . "\n";
-
-        flush();
-        if (PMA_PHP_INT_VERSION >= 40200 && @function_exists('ob_flush')) {
-            ob_flush();
+        
+        /**
+         * Get the contents of the error variable for the SQL parser 
+         *
+         * @return string Error string from SQL parser
+         *
+         * @access public
+         */
+        // Added, Robbat2 - 13 Janurary 2003, 2:59PM
+        function PMA_SQP_getErrorString() {
+            global $SQP_errorString;
+            return isset($SQP_errorString) ? $SQP_errorString : '';
         }
-    } // end of the "PMA_SQP_bug()" function
-
-
-    /**
-     * Parses the SQL queries
-     *
-     * @param  string   The SQL query list
-     *
-     * @return mixed    Most of times, nothing...
-     *
-     * @global array    The current PMA configuration
-     * @global array    MySQL column attributes
-     * @global array    MySQL reserved words
-     * @global array    MySQL column types
-     * @global array    MySQL function names
-     * @global integer  MySQL column attributes count
-     * @global integer  MySQL reserved words count
-     * @global integer  MySQL column types count
-     * @global integer  MySQL function names count
-     *
-     * @access public
-     */
-    function PMA_SQP_parse($sql)
-    {
-        global $cfg;
-        global $PMA_SQPdata_column_attrib, $PMA_SQPdata_reserved_word, $PMA_SQPdata_column_type, $PMA_SQPdata_function_name,
-        $PMA_SQPdata_column_attrib_cnt, $PMA_SQPdata_reserved_word_cnt, $PMA_SQPdata_column_type_cnt, $PMA_SQPdata_function_name_cnt;
-
-        // if the SQL parser is disabled just return the original query string
-        if ($cfg['SQP']['enable'] == FALSE) {
-            // Debug : echo 'FALSE';
-            return $sql;
+    
+        /**
+         * Check if the SQL parser hit an error
+         *
+         * @return boolean error state
+         *
+         * @access public
+         */
+        // Added, Robbat2 - 13 Janurary 2003, 2:59PM
+        function PMA_SQP_isError() {
+            global $SQP_errorString;
+            return isset($SQP_errorString) && !empty($SQP_errorString);
         }
-
-        // rabus: Convert all line feeds to Unix style
-        $sql = str_replace("\r\n", "\n", $sql);
-        $sql = str_replace("\r", "\n", $sql);
-
-        $len = $GLOBALS['PMA_strlen']($sql);
-        if ($len == 0) {
-            return array();
-        }
-
-        $sql_array               = array();
-        $sql_array['raw']        = $sql;
-        $count1                  = 0;
-        $count2                  = 0;
-        $punct_queryend          = ';';
-        $punct_qualifier         = '.';
-        $punct_listsep           = ',';
-        $punct_level_plus        = '(';
-        $punct_level_minus       = ')';
-        $digit_floatdecimal      = '.';
-        $digit_hexset            = 'x';
-        $bracket_list            = '()[]{}';
-        $allpunct_list           =  '-,;:!?/.^~\*&%+<=>|';
-        $allpunct_list_pair      = array (
-            0 => '!=',
-            1 => '&&',
-            2 => ':=',
-            3 => '<<',
-            4 => '<=',
-            5 => '<=>',
-            6 => '<>',
-            7 => '>=',
-            8 => '>>',
-            9 => '||'
-        );
-        $allpunct_list_pair_size = 10; //count($allpunct_list_pair);
-        $quote_list              = '\'"`';
-        $arraysize               = 0;
-
-        while ($count2 < $len) {
-            $c      = $sql[$count2];
-            $count1 = $count2;
-
-            if (($c == "\n")) {
-                $count2++;
-                PMA_SQP_arrayAdd($sql_array, 'white_newline', '', $arraysize);
-                continue;
+    
+        /**
+         * Set an error message for the system
+         *
+         * @param  string  The error message
+         * @param  string  The failing SQL query
+         *
+         * @access private
+         * @scope SQL Parser internal
+         */
+        // Revised, Robbat2 - 13 Janurary 2003, 2:59PM
+        function PMA_SQP_throwError($message, $sql)
+        {
+    
+            global $SQP_errorString;
+            $SQP_errorString = '<p>'.$GLOBALS['strSQLParserUserError'] . '</p>' . "\n"
+                . '<pre>' . "\n"
+                . 'ERROR: ' . $message . "\n"
+                . 'SQL: ' . $sql .  "\n"
+                . '</pre>' . "\n";
+    
+            /*
+            // Removed to solve bug #641765 - Robbat2 - 12 January 2003, 9:46PM
+            flush();
+            if (PMA_PHP_INT_VERSION >= 40200 && @function_exists('ob_flush')) {
+                ob_flush();
             }
-
-            // Checks for white space
-            if (PMA_STR_isSpace($c)) {
-                $count2++;
-                continue;
+            */
+        } // end of the "PMA_SQP_throwError()" function
+    
+    
+        /**
+         * Do display the bug report
+         *
+         * @param  string  The error message
+         * @param  string  The failing SQL query
+         *
+         * @access public
+         */
+        function PMA_SQP_bug($message, $sql)
+        {
+            $debugstr = 'ERROR: ' . $message . "\n";
+            $debugstr .= 'CVS: $Id$' . "\n";
+            $debugstr .= 'MySQL: '.PMA_MYSQL_STR_VERSION . "\n";
+            $debugstr .= 'USR OS, AGENT, VER: ' . PMA_USR_OS . ' ' . PMA_USR_BROWSER_AGENT . ' ' . PMA_USR_BROWSER_VER . "\n";
+            $debugstr .= 'PMA: ' . PMA_VERSION . "\n";
+            $debugstr .= 'PHP VER,OS: ' . PMA_PHP_STR_VERSION . ' ' . PHP_OS . "\n";
+            $debugstr .= 'LANG: ' . $GLOBALS['lang'] . "\n";
+            $debugstr .= 'SQL: ' . $sql;
+    
+            $encodedstr     = $debugstr;
+            if (PMA_PHP_INT_VERSION >= 40001 && @function_exists('gzcompress')) {
+                $encodedstr = gzcompress($debugstr, 9);
             }
-
-            // Checks for comment lines.
-            // MySQL style #
-            // C style /* */
-            // ANSI style --
-            if (($c == '#')
-                || (($count2 + 1 < $len) && ($c == '/') && ($sql[$count2 + 1] == '*'))
-                || (($count2 + 2 < $len) && ($c == '-') && ($sql[$count2 + 1] == '-') && (($sql[$count2 + 2] == ' ') || ($sql[$count2 + 2] == "\n")))) {
-                $count2++;
-                $pos  = 0;
-                $type = 'bad';
-                switch ($c) {
-                    case '#':
-                        $type = 'mysql';
-                    case '-':
-                        $type = 'ansi';
-                        $pos  = $GLOBALS['PMA_strpos']($sql, "\n", $count2);
-                        break;
-                    case '/':
-                        $type = 'c';
-                        $pos  = $GLOBALS['PMA_strpos']($sql, '*/', $count2);
-                        $pos  += 2;
-                        break;
-                    default:
-                        break;
-                } // end switch
-                $count2 = ($pos < $count2) ? $len : $pos;
-                $str    = $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1);
-                PMA_SQP_arrayAdd($sql_array, 'comment_' . $type, $str, $arraysize);
-                continue;
-            } // end if
-
-            // Checks for something inside quotation marks
-            if (PMA_STR_strInStr($c, $quote_list)) {
-                $startquotepos   = $count2;
-                $quotetype       = $c;
-                $count2++;
-                $escaped         = FALSE;
-                $escaped_escaped = FALSE;
-                $pos             = $count2;
-                $oldpos          = 0;
-                do {
-                    $oldpos = $pos;
-                    $pos    = $GLOBALS['PMA_strpos'](' ' . $sql, $quotetype, $oldpos + 1) - 1;
-                    // ($pos === FALSE)
-                    if ($pos < 0) {
-                        $debugstr = $GLOBALS['strSQPBugUnclosedQuote'] . ' @ ' . $startquotepos. "\n"
-                                  . 'STR: ' . $quotetype;
-                        PMA_SQP_throwError($debugstr, $sql);
-                        return $sql;
-                    }
-
-                    // If the quote is the first character, it can't be
-                    // escaped, so don't do the rest of the code
-                    if ($pos == 0) {
-                        break;
-                    }
-
-                    // Checks for MySQL escaping using a \
-                    // And checks for ANSI escaping using the $quotetype character
-                    if (($pos < $len) && PMA_STR_charIsEscaped($sql, $pos)) {
-                        $pos ++;
-                        continue;
-                    } else if (($pos + 1 < $len) && ($sql[$pos] == $quotetype) && ($sql[$pos + 1] == $quotetype)) {
-                        $pos = $pos + 2;
-                        continue;
-                    } else {
-                        break;
-                    }
-                } while ($len > $pos); // end do
-
-                $count2       = $pos;
-                $count2++;
-                $type         = 'quote_';
-                switch ($quotetype) {
-                    case '\'':
-                        $type .= 'single';
-                        break;
-                    case '"':
-                        $type .= 'double';
-                        break;
-                    case '`':
-                        $type .= 'backtick';
-                        break;
-                    default:
-                        break;
-                } // end switch
-                $data = $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1);
-                PMA_SQP_arrayAdd($sql_array, $type, $data, $arraysize);
-                continue;
+            $encodedstr     = preg_replace("/(\015\012)|(\015)|(\012)/", '<br />' . "\n", chunk_split(base64_encode($encodedstr)));
+    
+            echo $GLOBALS['strSQLParserBugMessage'] . '<br />' . "\n"
+                 . '----' . $GLOBALS['strBeginCut'] . '----' . '<br />' . "\n"
+                 . $encodedstr . "\n"
+                 . '----' . $GLOBALS['strEndCut'] . '----' . '<br />' . "\n";
+    
+            flush();
+            if (PMA_PHP_INT_VERSION >= 40200 && @function_exists('ob_flush')) {
+                ob_flush();
             }
-
-            // Checks for brackets
-            if (PMA_STR_strInStr($c, $bracket_list)) {
-                // All bracket tokens are only one item long
-                $count2++;
-                $type_type     = '';
-                if (PMA_STR_strInStr($c, '([{')) {
-                    $type_type = 'open';
-                } else {
-                    $type_type = 'close';
-                }
-
-                $type_style     = '';
-                if (PMA_STR_strInStr($c, '()')) {
-                    $type_style = 'round';
-                } elseif (PMA_STR_strInStr($c, '[]')) {
-                    $type_style = 'square';
-                } else {
-                    $type_style = 'curly';
-                }
-
-                $type = 'punct_bracket_' . $type_type . '_' . $type_style;
-                PMA_SQP_arrayAdd($sql_array, $type, $c, $arraysize);
-                continue;
+    
+            echo '----' . $GLOBALS['strBeginRaw'] . '----<br />' . "\n"
+                 . '<pre>' . "\n"
+                 . $debugstr
+                 . '</pre>' . "\n"
+                 . '----' . $GLOBALS['strEndRaw'] . '----<br />' . "\n";
+    
+            flush();
+            if (PMA_PHP_INT_VERSION >= 40200 && @function_exists('ob_flush')) {
+                ob_flush();
             }
-
-            // Checks for punct
-            if (PMA_STR_strInStr($c, $allpunct_list)) {
-                while (($count2 < $len) && PMA_STR_strInStr($sql[$count2], $allpunct_list)) {
+        } // end of the "PMA_SQP_bug()" function
+    
+    
+        /**
+         * Parses the SQL queries
+         *
+         * @param  string   The SQL query list
+         *
+         * @return mixed    Most of times, nothing...
+         *
+         * @global array    The current PMA configuration
+         * @global array    MySQL column attributes
+         * @global array    MySQL reserved words
+         * @global array    MySQL column types
+         * @global array    MySQL function names
+         * @global integer  MySQL column attributes count
+         * @global integer  MySQL reserved words count
+         * @global integer  MySQL column types count
+         * @global integer  MySQL function names count
+         *
+         * @access public
+         */
+        function PMA_SQP_parse($sql)
+        {
+            global $cfg;
+            global $PMA_SQPdata_column_attrib, $PMA_SQPdata_reserved_word, $PMA_SQPdata_column_type, $PMA_SQPdata_function_name,
+            $PMA_SQPdata_column_attrib_cnt, $PMA_SQPdata_reserved_word_cnt, $PMA_SQPdata_column_type_cnt, $PMA_SQPdata_function_name_cnt;
+    
+            // if the SQL parser is disabled just return the original query string
+            if ($cfg['SQP']['enable'] == FALSE) {
+                // Debug : echo 'FALSE';
+                return $sql;
+            }
+    
+            // rabus: Convert all line feeds to Unix style
+            $sql = str_replace("\r\n", "\n", $sql);
+            $sql = str_replace("\r", "\n", $sql);
+    
+            $len = $GLOBALS['PMA_strlen']($sql);
+            if ($len == 0) {
+                return array();
+            }
+    
+            $sql_array               = array();
+            $sql_array['raw']        = $sql;
+            $count1                  = 0;
+            $count2                  = 0;
+            $punct_queryend          = ';';
+            $punct_qualifier         = '.';
+            $punct_listsep           = ',';
+            $punct_level_plus        = '(';
+            $punct_level_minus       = ')';
+            $digit_floatdecimal      = '.';
+            $digit_hexset            = 'x';
+            $bracket_list            = '()[]{}';
+            $allpunct_list           =  '-,;:!?/.^~\*&%+<=>|';
+            $allpunct_list_pair      = array (
+                0 => '!=',
+                1 => '&&',
+                2 => ':=',
+                3 => '<<',
+                4 => '<=',
+                5 => '<=>',
+                6 => '<>',
+                7 => '>=',
+                8 => '>>',
+                9 => '||'
+            );
+            $allpunct_list_pair_size = 10; //count($allpunct_list_pair);
+            $quote_list              = '\'"`';
+            $arraysize               = 0;
+    
+            while ($count2 < $len) {
+                $c      = $sql[$count2];
+                $count1 = $count2;
+    
+                if (($c == "\n")) {
                     $count2++;
+                    PMA_SQP_arrayAdd($sql_array, 'white_newline', '', $arraysize);
+                    continue;
                 }
-                $l = $count2 - $count1;
-                if ($l == 1) {
-                    $punct_data = $c;
-                } else {
-                    $punct_data = $GLOBALS['PMA_substr']($sql, $count1, $l);
+    
+                // Checks for white space
+                if (PMA_STR_isSpace($c)) {
+                    $count2++;
+                    continue;
                 }
-
-                // Special case, sometimes, althought two characters are
-                // adjectent directly, they ACTUALLY need to be seperate
-                if ($l == 1) {
-                    $t_suffix         = '';
-                    switch ($punct_data) {
-                        case $punct_queryend:
-                            $t_suffix = '_queryend';
+    
+                // Checks for comment lines.
+                // MySQL style #
+                // C style /* */
+                // ANSI style --
+                if (($c == '#')
+                    || (($count2 + 1 < $len) && ($c == '/') && ($sql[$count2 + 1] == '*'))
+                    || (($count2 + 2 < $len) && ($c == '-') && ($sql[$count2 + 1] == '-') && (($sql[$count2 + 2] == ' ') || ($sql[$count2 + 2] == "\n")))) {
+                    $count2++;
+                    $pos  = 0;
+                    $type = 'bad';
+                    switch ($c) {
+                        case '#':
+                            $type = 'mysql';
+                        case '-':
+                            $type = 'ansi';
+                            $pos  = $GLOBALS['PMA_strpos']($sql, "\n", $count2);
                             break;
-                        case $punct_qualifier:
-                            $t_suffix = '_qualifier';
-                            break;
-                        case $punct_listsep:
-                            $t_suffix = '_listsep';
+                        case '/':
+                            $type = 'c';
+                            $pos  = $GLOBALS['PMA_strpos']($sql, '*/', $count2);
+                            $pos  += 2;
                             break;
                         default:
                             break;
-                    }
-                    PMA_SQP_arrayAdd($sql_array, 'punct' . $t_suffix, $punct_data, $arraysize);
-                }
-                else if (PMA_STR_binarySearchInArr($punct_data, $allpunct_list_pair, $allpunct_list_pair_size)) {
-                    // Ok, we have one of the valid combined punct expressions
-                    PMA_SQP_arrayAdd($sql_array, 'punct', $punct_data, $arraysize);
-                }
-                else {
-                    // Bad luck, lets split it up more
-                    $first  = $punct_data[0];
-                    $first2 = $punct_data[0] . $punct_data[1];
-                    $last2  = $punct_data[$l - 2] . $punct_data[$l - 1];
-                    $last   = $punct_data[$l - 1];
-                    if (($first == ',') || ($first == ';') || ($first == '.') || ($first = '*')) {
-                        $count2     = $count1 + 1;
-                        $punct_data = $first;
-                    } else if (($last2 == '/*') || ($last2 == '--')) {
-                        $count2     -= 2;
-                        $punct_data = $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1);
-                    } else if (($last == '-') || ($last == '+') || ($last == '!')) {
-                        $count2--;
-                        $punct_data = $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1);
-                    } else {
-                        $debugstr =  $GLOBALS['strSQPBugUnknownPunctuation'] . ' @ ' . ($count1+1) . "\n"
-                                  . 'STR: ' . $punct_data;
-                        PMA_SQP_throwError($debugstr, $sql);
-                        return $sql;
-                    }
-                    PMA_SQP_arrayAdd($sql_array, 'punct', $punct_data, $arraysize);
+                    } // end switch
+                    $count2 = ($pos < $count2) ? $len : $pos;
+                    $str    = $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1);
+                    PMA_SQP_arrayAdd($sql_array, 'comment_' . $type, $str, $arraysize);
                     continue;
-                } // end if... else if... else
-                continue;
-            }
-
-            // Checks for alpha
-            if (PMA_STR_isSqlIdentifier($c, FALSE) || ($c == '@')) {
-                $count2 ++;
-
-                //TODO: a @ can also be present in expressions like
-                // FROM 'user'@'%'
-                // in this case, the @ is wrongly marked as alpha_variable
-
-                $is_sql_variable         = ($c == '@');
-                $is_digit                = (!$is_sql_variable) && PMA_STR_isDigit($c);
-                $is_hex_digit            = ($is_digit) && ($c == '0') && ($count2 < $len) && ($sql[$count2] == 'x');
-                $is_float_digit          = FALSE;
-                $is_float_digit_exponent = FALSE;
-
-                if ($is_hex_digit) {
+                } // end if
+    
+                // Checks for something inside quotation marks
+                if (PMA_STR_strInStr($c, $quote_list)) {
+                    $startquotepos   = $count2;
+                    $quotetype       = $c;
                     $count2++;
-                }
-
-                while (($count2 < $len) && PMA_STR_isSqlIdentifier($sql[$count2], ($is_sql_variable || $is_digit))) {
-                    $c2 = $sql[$count2];
-                    if ($is_sql_variable && ($c2 == '.')) {
-                        $count2++;
-                        continue;
-                    }
-                    if ($is_digit && (!$is_hex_digit) && ($c2 == '.')) {
-                        $count2++;
-                        if (!$is_float_digit) {
-                            $is_float_digit = TRUE;
-                            continue;
-                        } else {
-                            $debugstr = $GLOBALS['strSQPBugInvalidIdentifer'] . ' @ ' . ($count1+1) . "\n"
-                                      . 'STR: ' . $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1);
+                    $escaped         = FALSE;
+                    $escaped_escaped = FALSE;
+                    $pos             = $count2;
+                    $oldpos          = 0;
+                    do {
+                        $oldpos = $pos;
+                        $pos    = $GLOBALS['PMA_strpos'](' ' . $sql, $quotetype, $oldpos + 1) - 1;
+                        // ($pos === FALSE)
+                        if ($pos < 0) {
+                            $debugstr = $GLOBALS['strSQPBugUnclosedQuote'] . ' @ ' . $startquotepos. "\n"
+                                      . 'STR: ' . $quotetype;
                             PMA_SQP_throwError($debugstr, $sql);
                             return $sql;
                         }
-                    }
-                    if ($is_digit && (!$is_hex_digit) && (($c2 == 'e') || ($c2 == 'E'))) {
-                        if (!$is_float_digit_exponent) {
-                            $is_float_digit_exponent = TRUE;
-                            $is_float_digit          = TRUE;
-                            $count2++;
+    
+                        // If the quote is the first character, it can't be
+                        // escaped, so don't do the rest of the code
+                        if ($pos == 0) {
+                            break;
+                        }
+    
+                        // Checks for MySQL escaping using a \
+                        // And checks for ANSI escaping using the $quotetype character
+                        if (($pos < $len) && PMA_STR_charIsEscaped($sql, $pos)) {
+                            $pos ++;
+                            continue;
+                        } else if (($pos + 1 < $len) && ($sql[$pos] == $quotetype) && ($sql[$pos + 1] == $quotetype)) {
+                            $pos = $pos + 2;
                             continue;
                         } else {
-                            $is_digit                = FALSE;
-                            $is_float_digit          = FALSE;
+                            break;
                         }
-                    }
-                    if (($is_hex_digit && PMA_STR_isHexDigit($c2)) || ($is_digit && PMA_STR_isDigit($c2))) {
-                        $count2++;
-                        continue;
-                    } else {
-                        $is_digit     = FALSE;
-                        $is_hex_digit = FALSE;
-                    }
-
+                    } while ($len > $pos); // end do
+    
+                    $count2       = $pos;
                     $count2++;
-                } // end while
-
-                $l    = $count2 - $count1;
-                $str  = $GLOBALS['PMA_substr']($sql, $count1, $l);
-
-                $type = '';
-                if ($is_digit) {
-                    $type     = 'digit';
-                    if ($is_float_digit) {
-                        $type .= '_float';
-                    } else if ($is_hex_digit) {
-                        $type .= '_hex';
-                    } else {
-                        $type .= '_integer';
-                    }
-                }
-                else {
-                    if ($is_sql_variable != FALSE) {
-                        $type = 'alpha_variable';
-                    } else {
-                        $type = 'alpha';
-                    }
-                } // end if... else....
-                PMA_SQP_arrayAdd($sql_array, $type, $str, $arraysize);
-
-                continue;
-            }
-
-            // DEBUG
-            $count2++;
-
-            $debugstr = 'C1 C2 LEN: ' . $count1 . ' ' . $count2 . ' ' . $len .  "\n"
-                      . 'STR: ' . $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1) . "\n";
-            PMA_SQP_bug($debugstr, $sql);
-            return $sql;
-
-        } // end while ($count2 < $len)
-
-
-        if ($arraysize > 0) {
-          $t_next     = $sql_array[0]['type'];
-          $t_prev     = '';
-          $t_cur      = '';
-        }
-
-        for ($i = 0; $i < $arraysize; $i++) {
-          $t_prev     = $t_cur;
-          $t_cur      = $t_next;
-          if (($i + 1) < $arraysize) {
-            $t_next = $sql_array[$i + 1]['type'];
-          } else {
-            $t_next = '';
-          }
-          if ($t_cur == 'alpha') {
-            $t_suffix     = '_identifier';
-            $d_cur_upper  = strtoupper($sql_array[$i]['data']);
-            if (($t_next == 'punct_qualifier') || ($t_prev == 'punct_qualifier')) {
-              $t_suffix = '_identifier';
-            } else if (($t_next == 'punct_bracket_open_round')
-            && PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_function_name, $PMA_SQPdata_function_name_cnt)) {
-              $t_suffix = '_functionName';
-            } else if (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_column_type, $PMA_SQPdata_column_type_cnt))  {
-              $t_suffix = '_columnType';
-                  // Temporary fix for BUG #621357
-              //TODO FIX PROPERLY NEEDS OVERHAUL OF SQL TOKENIZER
-              if($d_cur_upper == 'SET' && $t_next != 'punct_bracket_open_round') {
-                $t_suffix = '_reservedWord';
-              }
-              //END OF TEMPORARY FIX
-            } else if (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_reserved_word, $PMA_SQPdata_reserved_word_cnt)) {
-              $t_suffix = '_reservedWord';
-            } else if (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_column_attrib, $PMA_SQPdata_column_attrib_cnt)) {
-              $t_suffix = '_columnAttrib';
-            } else {
-              // Do nothing
-            }
-            $sql_array[$i]['type'] .= $t_suffix;
-          }
-        } // end for
-
-        // Stores the size of the array inside the array, as count() is a slow
-        // operation.
-        $sql_array['len'] = $arraysize;
-
-        // Sends the data back
-        return $sql_array;
-    } // end of the "PMA_SQP_parse()" function
-
-   /**
-    * Checks for token types being what we want...
-    *
-    * @param  string String of type that we have
-    * @param  string String of type that we want
-    * 
-    * @return boolean result of check
-    * 
-    * @access private
-    */
-    function PMA_SQP_typeCheck($toCheck, $whatWeWant) 
-    {
-        $typeSeperator = '_';
-        if(strcmp($whatWeWant, $toCheck) == 0) {
-            return TRUE;
-        } else {
-            //if(strpos($whatWeWant, $typeSeperator) === FALSE) {
-            // PHP3 compatible (works unless there is a real ff character)
-            if(!strpos("\xff" . $whatWeWant, $typeSeperator)) {
-                return strncmp($whatWeWant, $toCheck , strpos($toCheck, $typeSeperator)) == 0;
-            } else {
-                return FALSE;
-            }
-        }
-    }
-
-
-    /**
-     * Analyzes SQL queries
-     *
-     * @param  array   The SQL queries
-     *
-     * @return array   The analyzed SQL queries
-     *
-     * @access public
-     */
-    function PMA_SQP_analyze($arr)
-    {
-        $result          = array();
-        $size            = $arr['len'];
-        $subresult       = array(
-            'querytype'      => '',
-            'select_expr_clause'=> '', // the whole stuff between SELECT and FROM , except DISTINCT
-            'from_clause'=> '',
-            'group_by_clause'=> '',
-            'order_by_clause'=> '',
-            'having_clause'  => '',
-            'where_clause'   => '',
-            'queryflags'     => array(),
-            'select_expr'    => array(),
-            'table_ref'      => array()
-        );
-        $subresult_empty = $subresult;
-        $seek_queryend         = FALSE;
-        $seen_end_of_table_ref = FALSE;
-
-        // for SELECT EXTRACT(YEAR_MONTH FROM CURDATE())
-        // we must not use CURDATE as a table_ref
-        // so we track wether we are in the EXTRACT()
-        $in_extract          = FALSE;
-
-/* Description of analyzer results
- *
- * lem9: db, table, column, alias
- *      ------------------------
- *
- * Inside the $subresult array, we create ['select_expr'] and ['table_ref'] arrays.
- *
- * The SELECT syntax (simplified) is
- *
- * SELECT 
- *    select_expression,...
- *    [FROM [table_references]
- *
- *
- * ['select_expr'] is filled with each expression, the key represents the 
- * expression position in the list (0-based) (so we don't lose track of 
- * multiple occurences of the same column).
- *
- * ['table_ref'] is filled with each table ref, same thing for the key.
- *
- * I create all sub-values empty, even if they are
- * not present (for example no select_expression alias).
- *
- * There is a debug section at the end of the main loop, if you want to
- * see the exact contents of select_expr and table_ref
- *
- * lem9: queryflags
- *       ----------
- * 
- * In $subresult, array 'queryflags' is filled, according to what we 
- * find in the query.
- *
- * Currently, those are generated:
- *
- * ['queryflags']['need_confirm'] = 1; if the query needs confirmation
- * ['queryflags']['select_from'] = 1; if this is a real SELECT...FROM
- *
- * lem9:  query clauses
- *        -------------
- *        
- * The select is splitted in those clauses:
- * ['select_expr_clause']
- * ['from_clause']
- * ['group_by_clause']
- * ['order_by_clause']
- * ['having_clause']
- * ['where_clause']
- */
-        // must be sorted
-        // TODO: current logic checks for only one word, so I put only the
-        // first word of the reserved expressions that end a table ref;
-        // maybe this is not ok (the first word might mean something else)
-//        $words_ending_table_ref = array(
-//            'FOR UPDATE',
-//            'GROUP BY',
-//            'HAVING',
-//            'LIMIT',
-//            'LOCK IN SHARE MODE',
-//            'ORDER BY',
-//            'PROCEDURE',
-//            'UNION',
-//            'WHERE'
-//        );
-        $words_ending_table_ref = array(
-            'FOR',
-            'GROUP',
-            'HAVING',
-            'LIMIT',
-            'LOCK',
-            'ORDER',
-            'PROCEDURE',
-            'UNION',
-            'WHERE'
-        );
-        $words_ending_table_ref_cnt = 9; //count($words_ending_table_ref);
-
-        $words_ending_clauses = array(
-            'FOR',
-            'LIMIT',
-            'LOCK',
-            'PROCEDURE',
-            'UNION'
-        );
-        $words_ending_clauses_cnt = 5; //count($words_ending_clauses);
-
-
-
-
-        // must be sorted
-        $supported_query_types = array(
-            'SELECT'
-            /*
-            // Support for these additional query types will come later on.
-            'DELETE',
-            'INSERT',
-            'REPLACE',
-            'TRUNCATE',
-            'UPDATE'
-            'EXPLAIN',
-            'DESCRIBE',
-            'SHOW',
-            'CREATE',
-            'SET',
-            'ALTER'
-            */
-        );
-        $supported_query_types_cnt = count($supported_query_types);
-
-        // loop #1 for each token: select_expr, table_ref for SELECT
-
-        for ($i = 0; $i < $size; $i++) {
-//echo "trace <b>"  . $arr[$i]['data'] . "</b> (" . $arr[$i]['type'] . ")<br>";
-
-            // High speed seek for locating the end of the current query
-            if ($seek_queryend == TRUE) {
-                if ($arr[$i]['type'] == 'punct_queryend') {
-                    $seek_queryend = FALSE;
-                } else {
-                    continue;
-                } // end if (type == punct_queryend)
-            } // end if ($seek_queryend)
-
-            // TODO: when we find a UNION, should we split
-            // in another subresult?
-            if ($arr[$i]['type'] == 'punct_queryend') {
-                $result[]  = $subresult;
-                $subresult = $subresult_empty;
-                continue;
-            } // end if (type == punct_queryend)
-
-// ==============================================================
-            if ($arr[$i]['type'] == 'punct_bracket_open_round') {
-                if ($in_extract) {
-                    $number_of_brackets_in_extract++;
-                }
-            }
-// ==============================================================
-            if ($arr[$i]['type'] == 'punct_bracket_close_round') {
-                if ($in_extract) {
-                    $number_of_brackets_in_extract--;
-                    if ($number_of_brackets_in_extract == 0) {
-                       $in_extract = FALSE;
-                    }
-                }
-            }
-// ==============================================================
-            if ($arr[$i]['type'] == 'alpha_functionName') {
-                $upper_data = strtoupper($arr[$i]['data']);
-                if ($upper_data =='EXTRACT') {
-                    $in_extract = TRUE;
-                    $number_of_brackets_in_extract = 0;
-                }
-            }
-
-// ==============================================================
-            if ($arr[$i]['type'] == 'alpha_reservedWord') {
-                // We don't know what type of query yet, so run this
-                if ($subresult['querytype'] == '') {
-                    $subresult['querytype'] = strtoupper($arr[$i]['data']);
-                } // end if (querytype was empty)
-
-                // Check if we support this type of query
-                if (!PMA_STR_binarySearchInArr($subresult['querytype'], $supported_query_types, $supported_query_types_cnt)) {
-                    // Skip ahead to the next one if we don't
-                    $seek_queryend = TRUE;
-                    continue; 
-                } // end if (query not supported)
-
-                // upper once
-                $upper_data = strtoupper($arr[$i]['data']);
-                //TODO: reset for each query?
-
-                if ($upper_data == 'SELECT') {
-                    $seen_from = FALSE;
-                    $previous_was_identifier = FALSE;
-                    $current_select_expr = -1;
-                    $seen_end_of_table_ref = FALSE;
-                } // end if ( data == SELECT)
-
-                if ($upper_data =='FROM' && !$in_extract) {
-                    $current_table_ref = -1;
-                    $seen_from = TRUE;
-                    $previous_was_identifier = FALSE;
-                    $save_table_ref = TRUE;
-                } // end if (data == FROM)
-
-                // here, do not 'continue' the loop, as we have more work for 
-                // reserved words below 
-            } // end if (type == alpha_reservedWord)
-
-// ==============================
-            if (($arr[$i]['type'] == 'quote_backtick')
-             || ($arr[$i]['type'] == 'quote_double')
-             || ($arr[$i]['type'] == 'quote_single')
-             || ($arr[$i]['type'] == 'alpha_identifier')) {
-
-                switch ($arr[$i]['type']) {
-                    case 'alpha_identifier':
-                        $identifier = $arr[$i]['data'];
-                        break;
-                    
-                //TODO: check embedded double quotes or backticks?
-                // and/or remove just the first and last character?
-                    case 'quote_backtick':
-                        $identifier = str_replace('`','',$arr[$i]['data']);
-                        break;
-                    case 'quote_double':
-                        $identifier = str_replace('"','',$arr[$i]['data']);
-                        break;                    
-                    case 'quote_single':
-                        $identifier = str_replace("'","",$arr[$i]['data']);
-                        break;
-                } // end switch
-                         
-                if ($subresult['querytype'] == 'SELECT') {
-                    if (!$seen_from) {
-                        if ($previous_was_identifier) {
-                            // found alias for this select_expr, save it
-                            $alias_for_select_expr = $identifier;
-                        } else {
-                            $chain[] = $identifier;
-                            $previous_was_identifier = TRUE;
-
-                        } // end if !$previous_was_identifier
-                    } else {
-                        // ($seen_from) 
-                        if ($save_table_ref && !$seen_end_of_table_ref) {
-                            if ($previous_was_identifier) {
-                                // found alias for table ref
-                                // save it for later
-                                $alias_for_table_ref = $identifier;
-                            } else {
-                                $chain[] = $identifier;
-                                $previous_was_identifier = TRUE;
-
-                            } // end if ($previous_was_identifier)
-                        } // end if ($save_table_ref &&!$seen_end_of_table_ref)
-                    } // end if (!$seen_from)
-                } // end if (querytype SELECT)
-            } // end if ( quote_backtick or double quote or alpha_identifier)
-
-// ===================================
-            if ($arr[$i]['type'] == 'punct_qualifier') {
-                // to be able to detect an identifier following another
-                $previous_was_identifier = FALSE;
-                continue;
-            } // end if (punct_qualifier)
-
-            // TODO: check if 3 identifiers following one another -> error
-
-            //    s a v e    a    s e l e c t    e x p r
-            // finding a list separator or FROM
-            // means that we must save the current chain of identifiers
-            // into a select expression
-
-            // for now, we only save a select expression if it contains
-            // at least one identifier, as we are interested in checking
-            // the columns and table names, so in "select * from persons",
-            // the "*" is not saved
-
-            if (isset($chain) && !$seen_end_of_table_ref
-               && (   (!$seen_from
-                   && $arr[$i]['type'] == 'punct_listsep')
-                  || ($arr[$i]['type'] == 'alpha_reservedWord' && $upper_data == 'FROM')) ) {
-                $size_chain = count($chain);
-                $current_select_expr++;
-                $subresult['select_expr'][$current_select_expr] = array(
-                  'expr' => '',
-                  'alias' => '',
-                  'db'   => '',
-                  'table_name' => '',
-                  'table_true_name' => '',
-                  'column' => ''       
-                 );
-
-                if (!empty($alias_for_select_expr)) {
-                    // we had found an alias for this select expression
-                    $subresult['select_expr'][$current_select_expr]['alias'] = $alias_for_select_expr;
-                    unset($alias_for_select_expr);
-                }
-                // there is at least a column
-                $subresult['select_expr'][$current_select_expr]['column'] = $chain[$size_chain - 1];
-                $subresult['select_expr'][$current_select_expr]['expr'] = $chain[$size_chain - 1];
-       
-                // maybe a table
-                if ($size_chain > 1) {
-                    $subresult['select_expr'][$current_select_expr]['table_name'] = $chain[$size_chain - 2];
-                    // we assume for now that this is also the true name
-                    $subresult['select_expr'][$current_select_expr]['table_true_name'] = $chain[$size_chain - 2];
-                    $subresult['select_expr'][$current_select_expr]['expr'] 
-                     = $subresult['select_expr'][$current_select_expr]['table_name']
-                      . '.' . $subresult['select_expr'][$current_select_expr]['expr']; 
-                } // end if ($size_chain > 1)
-
-                // maybe a db
-                if ($size_chain > 2) {
-                    $subresult['select_expr'][$current_select_expr]['db'] = $chain[$size_chain - 3];
-                    $subresult['select_expr'][$current_select_expr]['expr'] 
-                     = $subresult['select_expr'][$current_select_expr]['db']
-                      . '.' . $subresult['select_expr'][$current_select_expr]['expr']; 
-                } // end if ($size_chain > 2)
-                unset($chain);
-   
-                // TODO: explain this:
-                if (($arr[$i]['type'] == 'alpha_reservedWord')
-                 && ($upper_data != 'FROM')) {
-                    $previous_was_identifier = TRUE;
-                }
-
-            } // end if (save a select expr)
-
-
-            //======================================
-            //    s a v e    a    t a b l e    r e f
-            //======================================
-
-            // maybe we just saw the end of table refs
-            // but the last table ref has to be saved
-            // or we are at the last token (TODO: there could be another 
-            // query after this one)
-            // or we just got a reserved word
-
-            if (isset($chain) && $seen_from && $save_table_ref
-             && ($arr[$i]['type'] == 'punct_listsep'
-               || ($arr[$i]['type'] == 'alpha_reservedWord' && $upper_data!="AS")
-               || $seen_end_of_table_ref 
-               || $i==$size-1 )) {
-
-                $size_chain = count($chain);
-                $current_table_ref++;
-                $subresult['table_ref'][$current_table_ref] = array(
-                  'expr'            => '',
-                  'db'              => '',
-                  'table_name'      => '',
-                  'table_alias'     => '',
-                  'table_true_name' => ''
-                 );
-                if (!empty($alias_for_table_ref)) {
-                    $subresult['table_ref'][$current_table_ref]['table_alias'] = $alias_for_table_ref;
-                    unset($alias_for_table_ref);
-                }
-                $subresult['table_ref'][$current_table_ref]['table_name'] = $chain[$size_chain - 1];
-                // we assume for now that this is also the true name
-                $subresult['table_ref'][$current_table_ref]['table_true_name'] = $chain[$size_chain - 1];
-                $subresult['table_ref'][$current_table_ref]['expr'] 
-                     = $subresult['table_ref'][$current_table_ref]['table_name'];
-                // maybe a db
-                if ($size_chain > 1) {
-                    $subresult['table_ref'][$current_table_ref]['db'] = $chain[$size_chain - 2];
-                    $subresult['table_ref'][$current_table_ref]['expr'] 
-                     = $subresult['table_ref'][$current_table_ref]['db']
-                      . '.' . $subresult['table_ref'][$current_table_ref]['expr']; 
-                } // end if ($size_chain > 1)
-
-                // add the table alias into the whole expression
-                $subresult['table_ref'][$current_table_ref]['expr'] 
-                 .= ' ' . $subresult['table_ref'][$current_table_ref]['table_alias'];
-
-                unset($chain);
-                $previous_was_identifier = TRUE;
-                //continue;
-
-            } // end if (save a table ref)
-
-
-            // when we have found all table refs, 
-            // for each table_ref alias, put the true name of the table
-            // in the corresponding select expressions
-
-            if (isset($current_table_ref) && ($seen_end_of_table_ref || $i == $size-1)) {
-                for ($tr=0; $tr <= $current_table_ref; $tr++) {
-                    $alias = $subresult['table_ref'][$tr]['table_alias'];
-                    $truename = $subresult['table_ref'][$tr]['table_true_name'];
-                    for ($se=0; $se <= $current_select_expr; $se++) {
-                        if (!empty($alias) && $subresult['select_expr'][$se]['table_true_name']
-                           == $alias) {
-                            $subresult['select_expr'][$se]['table_true_name']
-                             = $truename; 
-                        } // end if (found the alias)
-                    } // end for (select expressions)
-
-                } // end for (table refs)
-            } // end if (set the true names)
-
-
-           // e n d i n g    l o o p  #1
-           // set the $previous_was_identifier to FALSE if the current
-           // token is not an identifier
-           if (($arr[$i]['type'] != 'alpha_identifier')
-            && ($arr[$i]['type'] != 'quote_double')
-            && ($arr[$i]['type'] != 'quote_single')
-            && ($arr[$i]['type'] != 'quote_backtick')) {
-               $previous_was_identifier = FALSE;
-           } // end if
-
-           // however, if we are on AS, we must keep the $previous_was_identifier
-           if (($arr[$i]['type'] == 'alpha_reservedWord')
-            && ($upper_data == 'AS'))  {
-               $previous_was_identifier = TRUE;
-           }
-
-           if (($arr[$i]['type'] == 'alpha_reservedWord')
-            && ($upper_data =='ON' || $upper_data =='USING')) {
-               $save_table_ref = FALSE;
-           } // end if (data == ON)
-
-           if (($arr[$i]['type'] == 'alpha_reservedWord')
-            && ($upper_data =='JOIN' || $upper_data =='FROM')) {
-               $save_table_ref = TRUE;
-           } // end if (data == JOIN)
-
-           // no need to check the end of table ref if we already did
-           // TODO: maybe add "&& $seen_from"
-           if (!$seen_end_of_table_ref) {
-               // if this is the last token, it implies that we have
-               // seen the end of table references
-               // Check for the end of table references
-               if (($i == $size-1)
-               || ($arr[$i]['type'] == 'alpha_reservedWord'
-                  && PMA_STR_binarySearchInArr($upper_data, $words_ending_table_ref, $words_ending_table_ref_cnt))) {
-                   $seen_end_of_table_ref = TRUE;
-
-                   // to be able to save the last table ref, but do not
-                   // set it true if we found a word like "ON" that has
-                   // already set it to false
-                   if (isset($save_table_ref) && $save_table_ref != FALSE) {
-                      $save_table_ref = TRUE;
-                   } //end if
-
-               } // end if (check for end of table ref)
-           } //end if (!$seen_end_of_table_ref)
-
-           if ($seen_end_of_table_ref) {
-               $save_table_ref = FALSE;
-           } // end if
-
-        } // end for $i (loop #1)
-
-        // -------------------------------------------------------
-        // This is a big hunk of debugging code by Marc for this.
-        // -------------------------------------------------------
-        /* 
-          if (isset($current_select_expr)) { 
-           for ($trace=0; $trace<=$current_select_expr; $trace++) {
-
-           echo "<br>";
-           reset ($subresult['select_expr'][$trace]);
-           while (list ($key, $val) = each ($subresult['select_expr'][$trace])) 
-           echo "sel expr $trace $key => $val<br />\n";
-           }
-          }
-
-          if (isset($current_table_ref)) { 
-           for ($trace=0; $trace<=$current_table_ref; $trace++) {
-
-           echo "<br>";
-           reset ($subresult['table_ref'][$trace]);
-           while (list ($key, $val) = each ($subresult['table_ref'][$trace])) 
-           echo "table ref $trace $key => $val<br />\n";
-           }
-          }
-        */ 
-        // -------------------------------------------------------
-
-
-        // loop #2: for queryflags
-        //          ,querytype (for queries != 'SELECT')
-        //
-        // This is not in the loop 1 to keep logic simple
-
-        // we will also need this queryflag in loop 2 
-        // so set it here
-        if (isset($current_table_ref) && $current_table_ref > -1) { 
-            $subresult['queryflags']['select_from'] = 1;
-        }
-
-        $seen_reserved_word = FALSE;
-        $seen_group = FALSE;
-        $seen_order = FALSE;
-        $in_group_by = FALSE; // true when we are into the GROUP BY clause
-        $in_order_by = FALSE; // true when we are into the ORDER BY clause
-        $in_having = FALSE; // true when we are into the HAVING clause
-        $in_select_expr = FALSE; // true when we are into the select expr clause
-        $in_where = FALSE; // true when we are into the WHERE clause
-        $in_from = FALSE; 
-
-        for ($i = 0; $i < $size; $i++) {
-//echo "trace loop2 <b>"  . $arr[$i]['data'] . "</b> (" . $arr[$i]['type'] . ")<br>";
-
-           // need_confirm
-           //
-           // check for reserved words that will have to generate
-           // a confirmation request later in sql.php3
-           // the cases are:
-           //   DROP TABLE
-           //   DROP DATABASE
-           //   ALTER TABLE... DROP
-           //   DELETE FROM... 
-           //
-           // this code is not used for confirmations coming from functions.js 
-
-           // TODO: check for punct_queryend
-
-           if ($arr[$i]['type'] == 'alpha_reservedWord') {
-               $upper_data = strtoupper($arr[$i]['data']);
-               if (!$seen_reserved_word) {
-                   $first_reserved_word = $upper_data;
-                   $subresult['querytype'] = $upper_data;
-                   $seen_reserved_word = TRUE;
- 
-                   // if the first reserved word is DROP or DELETE,
-                   // we know this is a query that needs to be confirmed
-                   if ($first_reserved_word=='DROP' 
-                       || $first_reserved_word == 'DELETE') {
-                      $subresult['queryflags']['need_confirm'] = 1;
-                   }
-               } else {
-                   if ($upper_data=='DROP' && $first_reserved_word=='ALTER') {
-                      $subresult['queryflags']['need_confirm'] = 1;
-                   } 
-               }
-
-               if ($upper_data == 'SELECT') {
-                   $in_select_expr = TRUE; 
-                   $select_expr_clause = '';
-               }
- 
-               // if this is a real SELECT...FROM
-               if ($upper_data == 'FROM' && isset($subresult['queryflags']['select_from']) && $subresult['queryflags']['select_from'] == 1) {
-                   $in_from = TRUE; 
-                   $from_clause = '';
-                   $in_select_expr = FALSE; 
-               }
-
-
-               // (we could have less resetting of variables to FALSE
-               // if we trust that the query respects the standard
-               // MySQL order for clauses)
-
-               // we use $seen_group and $seen_order because we are looking
-               // for the BY
-               if ($upper_data == 'GROUP') {
-                   $seen_group = TRUE;
-                   $seen_order = FALSE;
-                   $in_having = FALSE;
-                   $in_order_by = FALSE;
-                   $in_where = FALSE;
-                   $in_select_expr = FALSE; 
-                   $in_from = FALSE; 
-               }
-               if ($upper_data == 'ORDER') {
-                   $seen_order = TRUE;
-                   $seen_group = FALSE;
-                   $in_having = FALSE;
-                   $in_group_by = FALSE;
-                   $in_where = FALSE;
-                   $in_select_expr = FALSE; 
-                   $in_from = FALSE; 
-               }
-               if ($upper_data == 'HAVING') {
-                   $in_having = TRUE;
-                   $having_clause = '';
-                   $seen_group = FALSE;
-                   $seen_order = FALSE;
-                   $in_group_by = FALSE;
-                   $in_order_by = FALSE;
-                   $in_where = FALSE;
-                   $in_select_expr = FALSE; 
-                   $in_from = FALSE; 
-               }
-
-               if ($upper_data == 'WHERE') {
-                   $in_where = TRUE;
-                   $where_clause = '';
-                   $seen_group = FALSE;
-                   $seen_order = FALSE;
-                   $in_group_by = FALSE;
-                   $in_order_by = FALSE;
-                   $in_having = FALSE;
-                   $in_select_expr = FALSE; 
-                   $in_from = FALSE; 
-               }
-
-               if ($upper_data == 'BY') {
-                   if ($seen_group) {
-                       $in_group_by = TRUE;
-                       $group_by_clause = '';
-                   }
-                   if ($seen_order) {
-                       $in_order_by = TRUE;
-                       $order_by_clause = '';
-                   }
-               }
-
-               // if we find one of the words that could end the clause
-               if (PMA_STR_binarySearchInArr($upper_data, $words_ending_clauses, $words_ending_clauses_cnt)) {
-
-                   $in_group_by = FALSE;
-                   $in_order_by = FALSE;
-                   $in_having   = FALSE; 
-                   $in_where    = FALSE;
-                   $in_select_expr = FALSE;
-                   $in_from = FALSE; 
-               }
-
-           } // endif (reservedWord)
-
-
-           // do not add a blank after a function name
-
-           $sep=' ';
-           if ($arr[$i]['type'] == 'alpha_functionName') {
-               $sep='';
-           }
-
-           if ($in_select_expr && $upper_data != 'SELECT' && $upper_data != 'DISTINCT') {
-               $select_expr_clause .= $arr[$i]['data'] . $sep;
-           }
-           if ($in_from && $upper_data != 'FROM') {
-               $from_clause .= $arr[$i]['data'] . $sep;
-           }
-           if ($in_group_by && $upper_data != 'GROUP' && $upper_data != 'BY') {
-               $group_by_clause .= $arr[$i]['data'] . $sep;
-           }
-           if ($in_order_by && $upper_data != 'ORDER' && $upper_data != 'BY') {
-               $order_by_clause .= $arr[$i]['data'] . $sep;
-           }
-           if ($in_having && $upper_data != 'HAVING') {
-               $having_clause .= $arr[$i]['data'] . $sep;
-           }
-           if ($in_where && $upper_data != 'WHERE') {
-               $where_clause .= $arr[$i]['data'] . $sep;
-           }
-
-           // clear $upper_data for next iteration
-           $upper_data='';
-
-        } // end for $i (loop #2)
-
-        if (isset($select_expr_clause)) {
-            $subresult['select_expr_clause'] = $select_expr_clause;
-        }
-        if (isset($from_clause)) {
-            $subresult['from_clause'] = $from_clause;
-        }
-        if (isset($group_by_clause)) {
-            $subresult['group_by_clause'] = $group_by_clause;
-        }
-        if (isset($order_by_clause)) {
-            $subresult['order_by_clause'] = $order_by_clause;
-        }
-        if (isset($having_clause)) {
-            $subresult['having_clause'] = $having_clause;
-        }
-        if (isset($where_clause)) {
-            $subresult['where_clause'] = $where_clause;
-        }
-
-
-        // They are naughty and didn't have a trailing semi-colon,
-        // then still handle it properly
-        if ($subresult['querytype'] != '') {
-            $result[] = $subresult;
-        }
-        return $result;
-    } // end of the "PMA_SQP_analyze()" function
-
-
-    /**
-     * Colorizes SQL queries html formatted
-     *
-     * @param  array   The SQL queries html formatted
-     *
-     * @return array   The colorized SQL queries
-     *
-     * @access public
-     */
-    function PMA_SQP_formatHtml_colorize($arr)
-    {
-        $i         = $GLOBALS['PMA_strpos']($arr['type'], '_');
-        $class     = '';
-        if ($i > 0) {
-            $class = 'syntax_' . $GLOBALS['PMA_substr']($arr['type'], 0, $i) . ' ';
-        }
-
-        $class     .= 'syntax_' . $arr['type'];
-
-        //TODO: check why adding a "\n" after the </span> would cause extra 
-        //      blanks to be displayed:
-        //      SELECT p . person_name
-
-        return '<span class="' . $class . '">' . htmlspecialchars($arr['data']) . '</span>';
-    } // end of the "PMA_SQP_formatHtml_colorize()" function
-
-
-    /**
-     * Formats SQL queries to html
-     *
-     * @param  array   The SQL queries
-     *
-     * @return string  The formatted SQL queries
-     *
-     * @access public
-     */
-    function PMA_SQP_formatHtml($arr, $mode='color')
-    {
-        // first check for the SQL parser having hit an error
-        if (PMA_SQP_isError()) {
-            return $arr;
-        }
-        // then check for an array 
-        if (!is_array($arr)) {
-            return $arr;
-        }
-        // else do it properly
-        switch ($mode) {
-            case 'color':
-                $str                                = '<span class="syntax">';
-                $html_line_break                    = '<br />';
-                break;
-            case 'query_only':
-                $str                                = '';
-                $html_line_break                    = ' ';
-                break;
-            case 'text':
-                $str                                = '';
-                $html_line_break                    = '<br />';
-                break;
-        } // end switch
-        $indent                                     = 0;
-        $bracketlevel                               = 0;
-        $functionlevel                              = 0;
-        $infunction                                 = FALSE;
-        $space_punct_listsep                        = ' ';
-        $space_punct_listsep_function_name          = ' ';
-        // $space_alpha_reserved_word = '<br />'."\n";
-        $space_alpha_reserved_word                  = ' ';
-
-        $keywords_with_brackets_1before            = array(
-            'INDEX',
-            'KEY',
-            'ON',
-            'USING'
-        );
-        $keywords_with_brackets_1before_cnt        = 4;
-
-        $keywords_with_brackets_2before            = array(
-            'IGNORE',
-            'INDEX',
-            'INTO',
-            'KEY',
-            'PRIMARY',
-            'PROCEDURE',
-            'REFERENCES',
-            'UNIQUE',
-            'USE'
-        );
-        // $keywords_with_brackets_2before_cnt = count($keywords_with_brackets_2before);
-        $keywords_with_brackets_2before_cnt        = 9;
-
-        // These reserved words do NOT get a newline placed near them.
-        $keywords_no_newline               = array(
-            'AND',
-            'AS',
-            'ASC',
-            'DESC',
-            'IS',
-            'NOT',
-            'NULL',
-            'ON',
-            'OR'
-        );
-        $keywords_no_newline_cnt           = 9;
-
-        $arraysize = $arr['len'];
-        $typearr   = array();
-        if ($arraysize >= 0) {
-            $typearr[0] = '';
-            $typearr[1] = '';
-            $typearr[2] = '';
-            $typearr[3] = $arr[0]['type'];
-        }
-
-        for ($i = 0; $i < $arraysize; $i++) {
-            //DEBUG echo "<b>" . $arr[$i]['data'] . "</b> " . $arr[$i]['type'] . "<br />";
-            $before = '';
-            $after  = '';
-            $indent = 0;
-            // array_shift($typearr);
-            /*
-            0 prev2
-            1 prev
-            2 current
-            3 next
-            */
-            if (($i + 1) < $arraysize) {
-                // array_push($typearr, $arr[$i + 1]['type']);
-                $typearr[4] = $arr[$i + 1]['type'];
-            } else {
-                //array_push($typearr, NULL);
-                $typearr[4] = '';
-            }
-
-            for ($j=0; $j<4; $j++) {
-                $typearr[$j] = $typearr[$j + 1];
-            }
-
-            switch ($typearr[2]) {
-                case 'white_newline':
-//                    $after      = '<br />';
-                    $before     = '';
-                    break;
-                case 'punct_bracket_open_round':
-                    $bracketlevel++;
-                    $infunction = FALSE;
-                    // Make sure this array is sorted!
-                    if (($typearr[1] == 'alpha_functionName') || ($typearr[1] == 'alpha_columnType') || ($typearr[1] == 'punct')
-                        || ($typearr[3] == 'digit_integer') || ($typearr[3] == 'digit_hex') || ($typearr[3] == 'digit_float')
-                        || (($typearr[0] == 'alpha_reservedWord')
-                            && PMA_STR_binarySearchInArr(strtoupper($arr[$i - 2]['data']), $keywords_with_brackets_2before, $keywords_with_brackets_2before_cnt))
-                        || (($typearr[1] == 'alpha_reservedWord')
-                            && PMA_STR_binarySearchInArr(strtoupper($arr[$i - 1]['data']), $keywords_with_brackets_1before, $keywords_with_brackets_1before_cnt))
-                        ) {
-                        $functionlevel++;
-                        $infunction = TRUE;
-                        $after      .= ' ';
-                    } else {
-                        $indent++;
-                        $after      .= ($mode != 'query_only' ? '<div class="syntax_indent' . $indent . '">' : ' ');
-                    }
-                    break;
-                case 'alpha_identifier':
-                    if (($typearr[1] == 'punct_qualifier') || ($typearr[3] == 'punct_qualifier')) {
-                        $after      = '';
-                        $before     = '';
-                    }
-                    if (($typearr[3] == 'alpha_columnType') || ($typearr[3] == 'alpha_identifier')) {
-                        $after      .= ' ';
-                    }
-                    break;
-                case 'punct_qualifier':
-                    $before         = '';
-                    $after          = '';
-                    break;
-                case 'punct_listsep':
-                    if ($infunction == TRUE) {
-                        $after      .= $space_punct_listsep_function_name;
-                    } else {
-                        $after      .= $space_punct_listsep;
-                    }
-                    break;
-                case 'punct_queryend':
-                    if (($typearr[3] != 'comment_mysql') && ($typearr[3] != 'comment_ansi')) {
-                        $after     .= $html_line_break;
-                        $after     .= $html_line_break;
-                    }
-                    $space_punct_listsep               = ' ';
-                    $space_punct_listsep_function_name = ' ';
-                    $space_alpha_reserved_word         = ' ';
-                    break;
-                case 'comment_mysql':
-                case 'comment_ansi':
-                    $after         .= $html_line_break;
-                    break;
-                case 'punct':
-                    $after         .= ' ';
-                    $before        .= ' ';
-                    break;
-                case 'punct_bracket_close_round':
-                    $bracketlevel--;
-                    if ($infunction == TRUE) {
-                        $functionlevel--;
-                        $after     .= ' ';
-                        $before    .= ' ';
-                    } else {
-                        $indent--;
-                        $before    .= ($mode != 'query_only' ? '</div>' : ' ');
-                    }
-                    $infunction    = ($functionlevel > 0) ? TRUE : FALSE;
-                    break;
-                case 'alpha_columnType':
-                    if ($typearr[3] == 'alpha_columnAttrib') {
-                        $after     .= ' ';
-                    }
-                    if ($typearr[1] == 'alpha_columnType') {
-                        $before    .= ' ';
-                    }
-                    break;
-                case 'alpha_columnAttrib':
-
-                    // ALTER TABLE tbl_name AUTO_INCREMENT = 1
-                    if ($typearr[1] == 'alpha_identifier') {
-                        $before .= ' ';
-                    }
-                    if (($typearr[3] == 'alpha_columnAttrib') || ($typearr[3] == 'quote_single')) {
-                        $after     .= ' ';
-                    }
-                    break;
-                case 'alpha_reservedWord':
-                    //$upper         = $arr[$i]['data'];
-                    $arr[$i]['data'] = strtoupper($arr[$i]['data']);
-                    if ((($typearr[1] != 'alpha_reservedWord')
-                        || (($typearr[1] == 'alpha_reservedWord')
-                            && PMA_STR_binarySearchInArr(strtoupper($arr[$i - 1]['data']), $keywords_no_newline, $keywords_no_newline_cnt)))
-                        && ($typearr[1] != 'punct_level_plus')
-                        && (!PMA_STR_binarySearchInArr($arr[$i]['data'], $keywords_no_newline, $keywords_no_newline_cnt))) {
-                        // do not put a space before the first token, because
-                        // we use a lot of eregi() checking for the first
-                        // reserved word at beginning of query
-                        if ($i > 0) {
-                            $before    .= $space_alpha_reserved_word;
-                        }
-                    } else {
-                        $before    .= ' ';
-                    }
-
-                    switch ($arr[$i]['data']) {
-                        case 'CREATE':
-                            $space_punct_listsep       = $html_line_break;
-                            $space_alpha_reserved_word = ' ';
+                    $type         = 'quote_';
+                    switch ($quotetype) {
+                        case '\'':
+                            $type .= 'single';
                             break;
-                        case 'EXPLAIN':
-                        case 'DESCRIBE':
-                        case 'SET':
-                        case 'ALTER':
-                        case 'DELETE':
-                        case 'SHOW':
-                        case 'DROP':
-                        case 'UPDATE':
-                        case 'TRUNCATE':
-                        case 'ANALYZE':
-                        case 'ANALYSE':
-                            $space_punct_listsep       = $html_line_break;
-                            $space_alpha_reserved_word = ' ';
+                        case '"':
+                            $type .= 'double';
                             break;
-                        case 'INSERT':
-                        case 'REPLACE':
-                            $space_punct_listsep       = $html_line_break;
-                            $space_alpha_reserved_word = $html_line_break;
-                            break;
-                        case 'VALUES':
-                            $space_punct_listsep       = ' ';
-                            $space_alpha_reserved_word = $html_line_break;
-                            break;
-                        case 'SELECT':
-                            $space_punct_listsep       = ' ';
-                            $space_alpha_reserved_word = $html_line_break;
+                        case '`':
+                            $type .= 'backtick';
                             break;
                         default:
                             break;
-                    } // end switch ($arr[$i]['data'])
-
-                    $after         .= ' ';
-                    break;
-                case 'digit_integer':
-                case 'digit_float':
-                case 'digit_hex':
-                    //TODO: could there be other types preceding a digit?
-                    if ($typearr[1] == 'alpha_reservedWord') {
-                        $after .= ' ';
+                    } // end switch
+                    $data = $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1);
+                    PMA_SQP_arrayAdd($sql_array, $type, $data, $arraysize);
+                    continue;
+                }
+    
+                // Checks for brackets
+                if (PMA_STR_strInStr($c, $bracket_list)) {
+                    // All bracket tokens are only one item long
+                    $count2++;
+                    $type_type     = '';
+                    if (PMA_STR_strInStr($c, '([{')) {
+                        $type_type = 'open';
+                    } else {
+                        $type_type = 'close';
                     }
-                    if ($infunction && $typearr[3] == 'punct_bracket_close_round') {
-                        $after     .= ' ';
+    
+                    $type_style     = '';
+                    if (PMA_STR_strInStr($c, '()')) {
+                        $type_style = 'round';
+                    } elseif (PMA_STR_strInStr($c, '[]')) {
+                        $type_style = 'square';
+                    } else {
+                        $type_style = 'curly';
                     }
-                    break;
-                case 'quote_double':
-                case 'quote_single':
-                    // workaround: for the query
-                    // REVOKE SELECT ON `base2\_db`.* FROM 'user'@'%'
-                    // the @ is incorrectly marked as alpha_variable
-                    // in the parser, and here, the '%' gets a blank before,
-                    // which is a syntax error
-                    if ($typearr[1]!='alpha_variable') {
-                        $before        .= ' ';
+    
+                    $type = 'punct_bracket_' . $type_type . '_' . $type_style;
+                    PMA_SQP_arrayAdd($sql_array, $type, $c, $arraysize);
+                    continue;
+                }
+    
+                // Checks for punct
+                if (PMA_STR_strInStr($c, $allpunct_list)) {
+                    while (($count2 < $len) && PMA_STR_strInStr($sql[$count2], $allpunct_list)) {
+                        $count2++;
                     }
-                    if ($infunction && $typearr[3] == 'punct_bracket_close_round') {
-                        $after     .= ' ';
+                    $l = $count2 - $count1;
+                    if ($l == 1) {
+                        $punct_data = $c;
+                    } else {
+                        $punct_data = $GLOBALS['PMA_substr']($sql, $count1, $l);
                     }
-                    break;
-                case 'quote_backtick':
-                    if ($typearr[3] != 'punct_qualifier') {
-                        $after     .= ' ';
+    
+                    // Special case, sometimes, althought two characters are
+                    // adjectent directly, they ACTUALLY need to be seperate
+                    if ($l == 1) {
+                        $t_suffix         = '';
+                        switch ($punct_data) {
+                            case $punct_queryend:
+                                $t_suffix = '_queryend';
+                                break;
+                            case $punct_qualifier:
+                                $t_suffix = '_qualifier';
+                                break;
+                            case $punct_listsep:
+                                $t_suffix = '_listsep';
+                                break;
+                            default:
+                                break;
+                        }
+                        PMA_SQP_arrayAdd($sql_array, 'punct' . $t_suffix, $punct_data, $arraysize);
                     }
-                    if ($typearr[1] != 'punct_qualifier') {
-                        $before    .= ' ';
+                    else if (PMA_STR_binarySearchInArr($punct_data, $allpunct_list_pair, $allpunct_list_pair_size)) {
+                        // Ok, we have one of the valid combined punct expressions
+                        PMA_SQP_arrayAdd($sql_array, 'punct', $punct_data, $arraysize);
                     }
-                    break;
-                default:
-                    break;
-            } // end switch ($typearr[2])
-
-/*
-            if ($typearr[3] != 'punct_qualifier') {
-                $after             .= ' ';
+                    else {
+                        // Bad luck, lets split it up more
+                        $first  = $punct_data[0];
+                        $first2 = $punct_data[0] . $punct_data[1];
+                        $last2  = $punct_data[$l - 2] . $punct_data[$l - 1];
+                        $last   = $punct_data[$l - 1];
+                        if (($first == ',') || ($first == ';') || ($first == '.') || ($first = '*')) {
+                            $count2     = $count1 + 1;
+                            $punct_data = $first;
+                        } else if (($last2 == '/*') || ($last2 == '--')) {
+                            $count2     -= 2;
+                            $punct_data = $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1);
+                        } else if (($last == '-') || ($last == '+') || ($last == '!')) {
+                            $count2--;
+                            $punct_data = $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1);
+                        } else {
+                            $debugstr =  $GLOBALS['strSQPBugUnknownPunctuation'] . ' @ ' . ($count1+1) . "\n"
+                                      . 'STR: ' . $punct_data;
+                            PMA_SQP_throwError($debugstr, $sql);
+                            return $sql;
+                        }
+                        PMA_SQP_arrayAdd($sql_array, 'punct', $punct_data, $arraysize);
+                        continue;
+                    } // end if... else if... else
+                    continue;
+                }
+    
+                // Checks for alpha
+                if (PMA_STR_isSqlIdentifier($c, FALSE) || ($c == '@')) {
+                    $count2 ++;
+    
+                    //TODO: a @ can also be present in expressions like
+                    // FROM 'user'@'%'
+                    // in this case, the @ is wrongly marked as alpha_variable
+    
+                    $is_sql_variable         = ($c == '@');
+                    $is_digit                = (!$is_sql_variable) && PMA_STR_isDigit($c);
+                    $is_hex_digit            = ($is_digit) && ($c == '0') && ($count2 < $len) && ($sql[$count2] == 'x');
+                    $is_float_digit          = FALSE;
+                    $is_float_digit_exponent = FALSE;
+    
+                    if ($is_hex_digit) {
+                        $count2++;
+                    }
+    
+                    while (($count2 < $len) && PMA_STR_isSqlIdentifier($sql[$count2], ($is_sql_variable || $is_digit))) {
+                        $c2 = $sql[$count2];
+                        if ($is_sql_variable && ($c2 == '.')) {
+                            $count2++;
+                            continue;
+                        }
+                        if ($is_digit && (!$is_hex_digit) && ($c2 == '.')) {
+                            $count2++;
+                            if (!$is_float_digit) {
+                                $is_float_digit = TRUE;
+                                continue;
+                            } else {
+                                $debugstr = $GLOBALS['strSQPBugInvalidIdentifer'] . ' @ ' . ($count1+1) . "\n"
+                                          . 'STR: ' . $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1);
+                                PMA_SQP_throwError($debugstr, $sql);
+                                return $sql;
+                            }
+                        }
+                        if ($is_digit && (!$is_hex_digit) && (($c2 == 'e') || ($c2 == 'E'))) {
+                            if (!$is_float_digit_exponent) {
+                                $is_float_digit_exponent = TRUE;
+                                $is_float_digit          = TRUE;
+                                $count2++;
+                                continue;
+                            } else {
+                                $is_digit                = FALSE;
+                                $is_float_digit          = FALSE;
+                            }
+                        }
+                        if (($is_hex_digit && PMA_STR_isHexDigit($c2)) || ($is_digit && PMA_STR_isDigit($c2))) {
+                            $count2++;
+                            continue;
+                        } else {
+                            $is_digit     = FALSE;
+                            $is_hex_digit = FALSE;
+                        }
+    
+                        $count2++;
+                    } // end while
+    
+                    $l    = $count2 - $count1;
+                    $str  = $GLOBALS['PMA_substr']($sql, $count1, $l);
+    
+                    $type = '';
+                    if ($is_digit) {
+                        $type     = 'digit';
+                        if ($is_float_digit) {
+                            $type .= '_float';
+                        } else if ($is_hex_digit) {
+                            $type .= '_hex';
+                        } else {
+                            $type .= '_integer';
+                        }
+                    }
+                    else {
+                        if ($is_sql_variable != FALSE) {
+                            $type = 'alpha_variable';
+                        } else {
+                            $type = 'alpha';
+                        }
+                    } // end if... else....
+                    PMA_SQP_arrayAdd($sql_array, $type, $str, $arraysize);
+    
+                    continue;
+                }
+    
+                // DEBUG
+                $count2++;
+    
+                $debugstr = 'C1 C2 LEN: ' . $count1 . ' ' . $count2 . ' ' . $len .  "\n"
+                          . 'STR: ' . $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1) . "\n";
+                PMA_SQP_bug($debugstr, $sql);
+                return $sql;
+    
+            } // end while ($count2 < $len)
+    
+    
+            if ($arraysize > 0) {
+              $t_next     = $sql_array[0]['type'];
+              $t_prev     = '';
+              $t_cur      = '';
+            }
+    
+            for ($i = 0; $i < $arraysize; $i++) {
+              $t_prev     = $t_cur;
+              $t_cur      = $t_next;
+              if (($i + 1) < $arraysize) {
+                $t_next = $sql_array[$i + 1]['type'];
+              } else {
+                $t_next = '';
+              }
+              if ($t_cur == 'alpha') {
+                $t_suffix     = '_identifier';
+                $d_cur_upper  = strtoupper($sql_array[$i]['data']);
+                if (($t_next == 'punct_qualifier') || ($t_prev == 'punct_qualifier')) {
+                  $t_suffix = '_identifier';
+                } else if (($t_next == 'punct_bracket_open_round')
+                && PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_function_name, $PMA_SQPdata_function_name_cnt)) {
+                  $t_suffix = '_functionName';
+                } else if (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_column_type, $PMA_SQPdata_column_type_cnt))  {
+                  $t_suffix = '_columnType';
+                      // Temporary fix for BUG #621357
+                  //TODO FIX PROPERLY NEEDS OVERHAUL OF SQL TOKENIZER
+                  if($d_cur_upper == 'SET' && $t_next != 'punct_bracket_open_round') {
+                    $t_suffix = '_reservedWord';
+                  }
+                  //END OF TEMPORARY FIX
+                } else if (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_reserved_word, $PMA_SQPdata_reserved_word_cnt)) {
+                  $t_suffix = '_reservedWord';
+                } else if (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_column_attrib, $PMA_SQPdata_column_attrib_cnt)) {
+                  $t_suffix = '_columnAttrib';
+                } else {
+                  // Do nothing
+                }
+                $sql_array[$i]['type'] .= $t_suffix;
+              }
+            } // end for
+    
+            // Stores the size of the array inside the array, as count() is a slow
+            // operation.
+            $sql_array['len'] = $arraysize;
+    
+            // Sends the data back
+            return $sql_array;
+        } // end of the "PMA_SQP_parse()" function
+    
+       /**
+        * Checks for token types being what we want...
+        *
+        * @param  string String of type that we have
+        * @param  string String of type that we want
+        * 
+        * @return boolean result of check
+        * 
+        * @access private
+        */
+        function PMA_SQP_typeCheck($toCheck, $whatWeWant) 
+        {
+            $typeSeperator = '_';
+            if(strcmp($whatWeWant, $toCheck) == 0) {
+                return TRUE;
+            } else {
+                //if(strpos($whatWeWant, $typeSeperator) === FALSE) {
+                // PHP3 compatible (works unless there is a real ff character)
+                if(!strpos("\xff" . $whatWeWant, $typeSeperator)) {
+                    return strncmp($whatWeWant, $toCheck , strpos($toCheck, $typeSeperator)) == 0;
+                } else {
+                    return FALSE;
+                }
             }
-            $after                 .= "\n";
-*/
-            $str .= $before . ($mode=='color' ? PMA_SQP_formatHTML_colorize($arr[$i]) : $arr[$i]['data']). $after;
-        } // end for
-        if ($mode=='color') {
-            $str .= '</span>';
         }
-
-        return $str;
-    } // end of the "PMA_SQP_formatHtml()" function
-
+    
+    
+        /**
+         * Analyzes SQL queries
+         *
+         * @param  array   The SQL queries
+         *
+         * @return array   The analyzed SQL queries
+         *
+         * @access public
+         */
+        function PMA_SQP_analyze($arr)
+        {
+            $result          = array();
+            $size            = $arr['len'];
+            $subresult       = array(
+                'querytype'      => '',
+                'select_expr_clause'=> '', // the whole stuff between SELECT and FROM , except DISTINCT
+                'from_clause'=> '',
+                'group_by_clause'=> '',
+                'order_by_clause'=> '',
+                'having_clause'  => '',
+                'where_clause'   => '',
+                'queryflags'     => array(),
+                'select_expr'    => array(),
+                'table_ref'      => array()
+            );
+            $subresult_empty = $subresult;
+            $seek_queryend         = FALSE;
+            $seen_end_of_table_ref = FALSE;
+    
+            // for SELECT EXTRACT(YEAR_MONTH FROM CURDATE())
+            // we must not use CURDATE as a table_ref
+            // so we track wether we are in the EXTRACT()
+            $in_extract          = FALSE;
+    
+    /* Description of analyzer results
+     *
+     * lem9: db, table, column, alias
+     *      ------------------------
+     *
+     * Inside the $subresult array, we create ['select_expr'] and ['table_ref'] arrays.
+     *
+     * The SELECT syntax (simplified) is
+     *
+     * SELECT 
+     *    select_expression,...
+     *    [FROM [table_references]
+     *
+     *
+     * ['select_expr'] is filled with each expression, the key represents the 
+     * expression position in the list (0-based) (so we don't lose track of 
+     * multiple occurences of the same column).
+     *
+     * ['table_ref'] is filled with each table ref, same thing for the key.
+     *
+     * I create all sub-values empty, even if they are
+     * not present (for example no select_expression alias).
+     *
+     * There is a debug section at the end of the main loop, if you want to
+     * see the exact contents of select_expr and table_ref
+     *
+     * lem9: queryflags
+     *       ----------
+     * 
+     * In $subresult, array 'queryflags' is filled, according to what we 
+     * find in the query.
+     *
+     * Currently, those are generated:
+     *
+     * ['queryflags']['need_confirm'] = 1; if the query needs confirmation
+     * ['queryflags']['select_from'] = 1; if this is a real SELECT...FROM
+     *
+     * lem9:  query clauses
+     *        -------------
+     *        
+     * The select is splitted in those clauses:
+     * ['select_expr_clause']
+     * ['from_clause']
+     * ['group_by_clause']
+     * ['order_by_clause']
+     * ['having_clause']
+     * ['where_clause']
+     */
+            // must be sorted
+            // TODO: current logic checks for only one word, so I put only the
+            // first word of the reserved expressions that end a table ref;
+            // maybe this is not ok (the first word might mean something else)
+    //        $words_ending_table_ref = array(
+    //            'FOR UPDATE',
+    //            'GROUP BY',
+    //            'HAVING',
+    //            'LIMIT',
+    //            'LOCK IN SHARE MODE',
+    //            'ORDER BY',
+    //            'PROCEDURE',
+    //            'UNION',
+    //            'WHERE'
+    //        );
+            $words_ending_table_ref = array(
+                'FOR',
+                'GROUP',
+                'HAVING',
+                'LIMIT',
+                'LOCK',
+                'ORDER',
+                'PROCEDURE',
+                'UNION',
+                'WHERE'
+            );
+            $words_ending_table_ref_cnt = 9; //count($words_ending_table_ref);
+    
+            $words_ending_clauses = array(
+                'FOR',
+                'LIMIT',
+                'LOCK',
+                'PROCEDURE',
+                'UNION'
+            );
+            $words_ending_clauses_cnt = 5; //count($words_ending_clauses);
+    
+    
+    
+    
+            // must be sorted
+            $supported_query_types = array(
+                'SELECT'
+                /*
+                // Support for these additional query types will come later on.
+                'DELETE',
+                'INSERT',
+                'REPLACE',
+                'TRUNCATE',
+                'UPDATE'
+                'EXPLAIN',
+                'DESCRIBE',
+                'SHOW',
+                'CREATE',
+                'SET',
+                'ALTER'
+                */
+            );
+            $supported_query_types_cnt = count($supported_query_types);
+    
+            // loop #1 for each token: select_expr, table_ref for SELECT
+    
+            for ($i = 0; $i < $size; $i++) {
+    //echo "trace <b>"  . $arr[$i]['data'] . "</b> (" . $arr[$i]['type'] . ")<br>";
+    
+                // High speed seek for locating the end of the current query
+                if ($seek_queryend == TRUE) {
+                    if ($arr[$i]['type'] == 'punct_queryend') {
+                        $seek_queryend = FALSE;
+                    } else {
+                        continue;
+                    } // end if (type == punct_queryend)
+                } // end if ($seek_queryend)
+    
+                // TODO: when we find a UNION, should we split
+                // in another subresult?
+                if ($arr[$i]['type'] == 'punct_queryend') {
+                    $result[]  = $subresult;
+                    $subresult = $subresult_empty;
+                    continue;
+                } // end if (type == punct_queryend)
+    
+    // ==============================================================
+                if ($arr[$i]['type'] == 'punct_bracket_open_round') {
+                    if ($in_extract) {
+                        $number_of_brackets_in_extract++;
+                    }
+                }
+    // ==============================================================
+                if ($arr[$i]['type'] == 'punct_bracket_close_round') {
+                    if ($in_extract) {
+                        $number_of_brackets_in_extract--;
+                        if ($number_of_brackets_in_extract == 0) {
+                           $in_extract = FALSE;
+                        }
+                    }
+                }
+    // ==============================================================
+                if ($arr[$i]['type'] == 'alpha_functionName') {
+                    $upper_data = strtoupper($arr[$i]['data']);
+                    if ($upper_data =='EXTRACT') {
+                        $in_extract = TRUE;
+                        $number_of_brackets_in_extract = 0;
+                    }
+                }
+    
+    // ==============================================================
+                if ($arr[$i]['type'] == 'alpha_reservedWord') {
+                    // We don't know what type of query yet, so run this
+                    if ($subresult['querytype'] == '') {
+                        $subresult['querytype'] = strtoupper($arr[$i]['data']);
+                    } // end if (querytype was empty)
+    
+                    // Check if we support this type of query
+                    if (!PMA_STR_binarySearchInArr($subresult['querytype'], $supported_query_types, $supported_query_types_cnt)) {
+                        // Skip ahead to the next one if we don't
+                        $seek_queryend = TRUE;
+                        continue; 
+                    } // end if (query not supported)
+    
+                    // upper once
+                    $upper_data = strtoupper($arr[$i]['data']);
+                    //TODO: reset for each query?
+    
+                    if ($upper_data == 'SELECT') {
+                        $seen_from = FALSE;
+                        $previous_was_identifier = FALSE;
+                        $current_select_expr = -1;
+                        $seen_end_of_table_ref = FALSE;
+                    } // end if ( data == SELECT)
+    
+                    if ($upper_data =='FROM' && !$in_extract) {
+                        $current_table_ref = -1;
+                        $seen_from = TRUE;
+                        $previous_was_identifier = FALSE;
+                        $save_table_ref = TRUE;
+                    } // end if (data == FROM)
+    
+                    // here, do not 'continue' the loop, as we have more work for 
+                    // reserved words below 
+                } // end if (type == alpha_reservedWord)
+    
+    // ==============================
+                if (($arr[$i]['type'] == 'quote_backtick')
+                 || ($arr[$i]['type'] == 'quote_double')
+                 || ($arr[$i]['type'] == 'quote_single')
+                 || ($arr[$i]['type'] == 'alpha_identifier')) {
+    
+                    switch ($arr[$i]['type']) {
+                        case 'alpha_identifier':
+                            $identifier = $arr[$i]['data'];
+                            break;
+                        
+                    //TODO: check embedded double quotes or backticks?
+                    // and/or remove just the first and last character?
+                        case 'quote_backtick':
+                            $identifier = str_replace('`','',$arr[$i]['data']);
+                            break;
+                        case 'quote_double':
+                            $identifier = str_replace('"','',$arr[$i]['data']);
+                            break;                    
+                        case 'quote_single':
+                            $identifier = str_replace("'","",$arr[$i]['data']);
+                            break;
+                    } // end switch
+                             
+                    if ($subresult['querytype'] == 'SELECT') {
+                        if (!$seen_from) {
+                            if ($previous_was_identifier) {
+                                // found alias for this select_expr, save it
+                                $alias_for_select_expr = $identifier;
+                            } else {
+                                $chain[] = $identifier;
+                                $previous_was_identifier = TRUE;
+    
+                            } // end if !$previous_was_identifier
+                        } else {
+                            // ($seen_from) 
+                            if ($save_table_ref && !$seen_end_of_table_ref) {
+                                if ($previous_was_identifier) {
+                                    // found alias for table ref
+                                    // save it for later
+                                    $alias_for_table_ref = $identifier;
+                                } else {
+                                    $chain[] = $identifier;
+                                    $previous_was_identifier = TRUE;
+    
+                                } // end if ($previous_was_identifier)
+                            } // end if ($save_table_ref &&!$seen_end_of_table_ref)
+                        } // end if (!$seen_from)
+                    } // end if (querytype SELECT)
+                } // end if ( quote_backtick or double quote or alpha_identifier)
+    
+    // ===================================
+                if ($arr[$i]['type'] == 'punct_qualifier') {
+                    // to be able to detect an identifier following another
+                    $previous_was_identifier = FALSE;
+                    continue;
+                } // end if (punct_qualifier)
+    
+                // TODO: check if 3 identifiers following one another -> error
+    
+                //    s a v e    a    s e l e c t    e x p r
+                // finding a list separator or FROM
+                // means that we must save the current chain of identifiers
+                // into a select expression
+    
+                // for now, we only save a select expression if it contains
+                // at least one identifier, as we are interested in checking
+                // the columns and table names, so in "select * from persons",
+                // the "*" is not saved
+    
+                if (isset($chain) && !$seen_end_of_table_ref
+                   && (   (!$seen_from
+                       && $arr[$i]['type'] == 'punct_listsep')
+                      || ($arr[$i]['type'] == 'alpha_reservedWord' && $upper_data == 'FROM')) ) {
+                    $size_chain = count($chain);
+                    $current_select_expr++;
+                    $subresult['select_expr'][$current_select_expr] = array(
+                      'expr' => '',
+                      'alias' => '',
+                      'db'   => '',
+                      'table_name' => '',
+                      'table_true_name' => '',
+                      'column' => ''       
+                     );
+    
+                    if (!empty($alias_for_select_expr)) {
+                        // we had found an alias for this select expression
+                        $subresult['select_expr'][$current_select_expr]['alias'] = $alias_for_select_expr;
+                        unset($alias_for_select_expr);
+                    }
+                    // there is at least a column
+                    $subresult['select_expr'][$current_select_expr]['column'] = $chain[$size_chain - 1];
+                    $subresult['select_expr'][$current_select_expr]['expr'] = $chain[$size_chain - 1];
+           
+                    // maybe a table
+                    if ($size_chain > 1) {
+                        $subresult['select_expr'][$current_select_expr]['table_name'] = $chain[$size_chain - 2];
+                        // we assume for now that this is also the true name
+                        $subresult['select_expr'][$current_select_expr]['table_true_name'] = $chain[$size_chain - 2];
+                        $subresult['select_expr'][$current_select_expr]['expr'] 
+                         = $subresult['select_expr'][$current_select_expr]['table_name']
+                          . '.' . $subresult['select_expr'][$current_select_expr]['expr']; 
+                    } // end if ($size_chain > 1)
+    
+                    // maybe a db
+                    if ($size_chain > 2) {
+                        $subresult['select_expr'][$current_select_expr]['db'] = $chain[$size_chain - 3];
+                        $subresult['select_expr'][$current_select_expr]['expr'] 
+                         = $subresult['select_expr'][$current_select_expr]['db']
+                          . '.' . $subresult['select_expr'][$current_select_expr]['expr']; 
+                    } // end if ($size_chain > 2)
+                    unset($chain);
+       
+                    // TODO: explain this:
+                    if (($arr[$i]['type'] == 'alpha_reservedWord')
+                     && ($upper_data != 'FROM')) {
+                        $previous_was_identifier = TRUE;
+                    }
+    
+                } // end if (save a select expr)
+    
+    
+                //======================================
+                //    s a v e    a    t a b l e    r e f
+                //======================================
+    
+                // maybe we just saw the end of table refs
+                // but the last table ref has to be saved
+                // or we are at the last token (TODO: there could be another 
+                // query after this one)
+                // or we just got a reserved word
+    
+                if (isset($chain) && $seen_from && $save_table_ref
+                 && ($arr[$i]['type'] == 'punct_listsep'
+                   || ($arr[$i]['type'] == 'alpha_reservedWord' && $upper_data!="AS")
+                   || $seen_end_of_table_ref 
+                   || $i==$size-1 )) {
+    
+                    $size_chain = count($chain);
+                    $current_table_ref++;
+                    $subresult['table_ref'][$current_table_ref] = array(
+                      'expr'            => '',
+                      'db'              => '',
+                      'table_name'      => '',
+                      'table_alias'     => '',
+                      'table_true_name' => ''
+                     );
+                    if (!empty($alias_for_table_ref)) {
+                        $subresult['table_ref'][$current_table_ref]['table_alias'] = $alias_for_table_ref;
+                        unset($alias_for_table_ref);
+                    }
+                    $subresult['table_ref'][$current_table_ref]['table_name'] = $chain[$size_chain - 1];
+                    // we assume for now that this is also the true name
+                    $subresult['table_ref'][$current_table_ref]['table_true_name'] = $chain[$size_chain - 1];
+                    $subresult['table_ref'][$current_table_ref]['expr'] 
+                         = $subresult['table_ref'][$current_table_ref]['table_name'];
+                    // maybe a db
+                    if ($size_chain > 1) {
+                        $subresult['table_ref'][$current_table_ref]['db'] = $chain[$size_chain - 2];
+                        $subresult['table_ref'][$current_table_ref]['expr'] 
+                         = $subresult['table_ref'][$current_table_ref]['db']
+                          . '.' . $subresult['table_ref'][$current_table_ref]['expr']; 
+                    } // end if ($size_chain > 1)
+    
+                    // add the table alias into the whole expression
+                    $subresult['table_ref'][$current_table_ref]['expr'] 
+                     .= ' ' . $subresult['table_ref'][$current_table_ref]['table_alias'];
+    
+                    unset($chain);
+                    $previous_was_identifier = TRUE;
+                    //continue;
+    
+                } // end if (save a table ref)
+    
+    
+                // when we have found all table refs, 
+                // for each table_ref alias, put the true name of the table
+                // in the corresponding select expressions
+    
+                if (isset($current_table_ref) && ($seen_end_of_table_ref || $i == $size-1)) {
+                    for ($tr=0; $tr <= $current_table_ref; $tr++) {
+                        $alias = $subresult['table_ref'][$tr]['table_alias'];
+                        $truename = $subresult['table_ref'][$tr]['table_true_name'];
+                        for ($se=0; $se <= $current_select_expr; $se++) {
+                            if (!empty($alias) && $subresult['select_expr'][$se]['table_true_name']
+                               == $alias) {
+                                $subresult['select_expr'][$se]['table_true_name']
+                                 = $truename; 
+                            } // end if (found the alias)
+                        } // end for (select expressions)
+    
+                    } // end for (table refs)
+                } // end if (set the true names)
+    
+    
+               // e n d i n g    l o o p  #1
+               // set the $previous_was_identifier to FALSE if the current
+               // token is not an identifier
+               if (($arr[$i]['type'] != 'alpha_identifier')
+                && ($arr[$i]['type'] != 'quote_double')
+                && ($arr[$i]['type'] != 'quote_single')
+                && ($arr[$i]['type'] != 'quote_backtick')) {
+                   $previous_was_identifier = FALSE;
+               } // end if
+    
+               // however, if we are on AS, we must keep the $previous_was_identifier
+               if (($arr[$i]['type'] == 'alpha_reservedWord')
+                && ($upper_data == 'AS'))  {
+                   $previous_was_identifier = TRUE;
+               }
+    
+               if (($arr[$i]['type'] == 'alpha_reservedWord')
+                && ($upper_data =='ON' || $upper_data =='USING')) {
+                   $save_table_ref = FALSE;
+               } // end if (data == ON)
+    
+               if (($arr[$i]['type'] == 'alpha_reservedWord')
+                && ($upper_data =='JOIN' || $upper_data =='FROM')) {
+                   $save_table_ref = TRUE;
+               } // end if (data == JOIN)
+    
+               // no need to check the end of table ref if we already did
+               // TODO: maybe add "&& $seen_from"
+               if (!$seen_end_of_table_ref) {
+                   // if this is the last token, it implies that we have
+                   // seen the end of table references
+                   // Check for the end of table references
+                   if (($i == $size-1)
+                   || ($arr[$i]['type'] == 'alpha_reservedWord'
+                      && PMA_STR_binarySearchInArr($upper_data, $words_ending_table_ref, $words_ending_table_ref_cnt))) {
+                       $seen_end_of_table_ref = TRUE;
+    
+                       // to be able to save the last table ref, but do not
+                       // set it true if we found a word like "ON" that has
+                       // already set it to false
+                       if (isset($save_table_ref) && $save_table_ref != FALSE) {
+                          $save_table_ref = TRUE;
+                       } //end if
+    
+                   } // end if (check for end of table ref)
+               } //end if (!$seen_end_of_table_ref)
+    
+               if ($seen_end_of_table_ref) {
+                   $save_table_ref = FALSE;
+               } // end if
+    
+            } // end for $i (loop #1)
+    
+            // -------------------------------------------------------
+            // This is a big hunk of debugging code by Marc for this.
+            // -------------------------------------------------------
+            /* 
+              if (isset($current_select_expr)) { 
+               for ($trace=0; $trace<=$current_select_expr; $trace++) {
+    
+               echo "<br>";
+               reset ($subresult['select_expr'][$trace]);
+               while (list ($key, $val) = each ($subresult['select_expr'][$trace])) 
+               echo "sel expr $trace $key => $val<br />\n";
+               }
+              }
+    
+              if (isset($current_table_ref)) { 
+               for ($trace=0; $trace<=$current_table_ref; $trace++) {
+    
+               echo "<br>";
+               reset ($subresult['table_ref'][$trace]);
+               while (list ($key, $val) = each ($subresult['table_ref'][$trace])) 
+               echo "table ref $trace $key => $val<br />\n";
+               }
+              }
+            */ 
+            // -------------------------------------------------------
+    
+    
+            // loop #2: for queryflags
+            //          ,querytype (for queries != 'SELECT')
+            //
+            // This is not in the loop 1 to keep logic simple
+    
+            // we will also need this queryflag in loop 2 
+            // so set it here
+            if (isset($current_table_ref) && $current_table_ref > -1) { 
+                $subresult['queryflags']['select_from'] = 1;
+            }
+    
+            $seen_reserved_word = FALSE;
+            $seen_group = FALSE;
+            $seen_order = FALSE;
+            $in_group_by = FALSE; // true when we are into the GROUP BY clause
+            $in_order_by = FALSE; // true when we are into the ORDER BY clause
+            $in_having = FALSE; // true when we are into the HAVING clause
+            $in_select_expr = FALSE; // true when we are into the select expr clause
+            $in_where = FALSE; // true when we are into the WHERE clause
+            $in_from = FALSE; 
+    
+            for ($i = 0; $i < $size; $i++) {
+    //echo "trace loop2 <b>"  . $arr[$i]['data'] . "</b> (" . $arr[$i]['type'] . ")<br>";
+    
+               // need_confirm
+               //
+               // check for reserved words that will have to generate
+               // a confirmation request later in sql.php3
+               // the cases are:
+               //   DROP TABLE
+               //   DROP DATABASE
+               //   ALTER TABLE... DROP
+               //   DELETE FROM... 
+               //
+               // this code is not used for confirmations coming from functions.js 
+    
+               // TODO: check for punct_queryend
+    
+               if ($arr[$i]['type'] == 'alpha_reservedWord') {
+                   $upper_data = strtoupper($arr[$i]['data']);
+                   if (!$seen_reserved_word) {
+                       $first_reserved_word = $upper_data;
+                       $subresult['querytype'] = $upper_data;
+                       $seen_reserved_word = TRUE;
+     
+                       // if the first reserved word is DROP or DELETE,
+                       // we know this is a query that needs to be confirmed
+                       if ($first_reserved_word=='DROP' 
+                           || $first_reserved_word == 'DELETE') {
+                          $subresult['queryflags']['need_confirm'] = 1;
+                       }
+                   } else {
+                       if ($upper_data=='DROP' && $first_reserved_word=='ALTER') {
+                          $subresult['queryflags']['need_confirm'] = 1;
+                       } 
+                   }
+    
+                   if ($upper_data == 'SELECT') {
+                       $in_select_expr = TRUE; 
+                       $select_expr_clause = '';
+                   }
+     
+                   // if this is a real SELECT...FROM
+                   if ($upper_data == 'FROM' && isset($subresult['queryflags']['select_from']) && $subresult['queryflags']['select_from'] == 1) {
+                       $in_from = TRUE; 
+                       $from_clause = '';
+                       $in_select_expr = FALSE; 
+                   }
+    
+    
+                   // (we could have less resetting of variables to FALSE
+                   // if we trust that the query respects the standard
+                   // MySQL order for clauses)
+    
+                   // we use $seen_group and $seen_order because we are looking
+                   // for the BY
+                   if ($upper_data == 'GROUP') {
+                       $seen_group = TRUE;
+                       $seen_order = FALSE;
+                       $in_having = FALSE;
+                       $in_order_by = FALSE;
+                       $in_where = FALSE;
+                       $in_select_expr = FALSE; 
+                       $in_from = FALSE; 
+                   }
+                   if ($upper_data == 'ORDER') {
+                       $seen_order = TRUE;
+                       $seen_group = FALSE;
+                       $in_having = FALSE;
+                       $in_group_by = FALSE;
+                       $in_where = FALSE;
+                       $in_select_expr = FALSE; 
+                       $in_from = FALSE; 
+                   }
+                   if ($upper_data == 'HAVING') {
+                       $in_having = TRUE;
+                       $having_clause = '';
+                       $seen_group = FALSE;
+                       $seen_order = FALSE;
+                       $in_group_by = FALSE;
+                       $in_order_by = FALSE;
+                       $in_where = FALSE;
+                       $in_select_expr = FALSE; 
+                       $in_from = FALSE; 
+                   }
+    
+                   if ($upper_data == 'WHERE') {
+                       $in_where = TRUE;
+                       $where_clause = '';
+                       $seen_group = FALSE;
+                       $seen_order = FALSE;
+                       $in_group_by = FALSE;
+                       $in_order_by = FALSE;
+                       $in_having = FALSE;
+                       $in_select_expr = FALSE; 
+                       $in_from = FALSE; 
+                   }
+    
+                   if ($upper_data == 'BY') {
+                       if ($seen_group) {
+                           $in_group_by = TRUE;
+                           $group_by_clause = '';
+                       }
+                       if ($seen_order) {
+                           $in_order_by = TRUE;
+                           $order_by_clause = '';
+                       }
+                   }
+    
+                   // if we find one of the words that could end the clause
+                   if (PMA_STR_binarySearchInArr($upper_data, $words_ending_clauses, $words_ending_clauses_cnt)) {
+    
+                       $in_group_by = FALSE;
+                       $in_order_by = FALSE;
+                       $in_having   = FALSE; 
+                       $in_where    = FALSE;
+                       $in_select_expr = FALSE;
+                       $in_from = FALSE; 
+                   }
+    
+               } // endif (reservedWord)
+    
+    
+               // do not add a blank after a function name
+    
+               $sep=' ';
+               if ($arr[$i]['type'] == 'alpha_functionName') {
+                   $sep='';
+               }
+    
+               if ($in_select_expr && $upper_data != 'SELECT' && $upper_data != 'DISTINCT') {
+                   $select_expr_clause .= $arr[$i]['data'] . $sep;
+               }
+               if ($in_from && $upper_data != 'FROM') {
+                   $from_clause .= $arr[$i]['data'] . $sep;
+               }
+               if ($in_group_by && $upper_data != 'GROUP' && $upper_data != 'BY') {
+                   $group_by_clause .= $arr[$i]['data'] . $sep;
+               }
+               if ($in_order_by && $upper_data != 'ORDER' && $upper_data != 'BY') {
+                   $order_by_clause .= $arr[$i]['data'] . $sep;
+               }
+               if ($in_having && $upper_data != 'HAVING') {
+                   $having_clause .= $arr[$i]['data'] . $sep;
+               }
+               if ($in_where && $upper_data != 'WHERE') {
+                   $where_clause .= $arr[$i]['data'] . $sep;
+               }
+    
+               // clear $upper_data for next iteration
+               $upper_data='';
+    
+            } // end for $i (loop #2)
+    
+            if (isset($select_expr_clause)) {
+                $subresult['select_expr_clause'] = $select_expr_clause;
+            }
+            if (isset($from_clause)) {
+                $subresult['from_clause'] = $from_clause;
+            }
+            if (isset($group_by_clause)) {
+                $subresult['group_by_clause'] = $group_by_clause;
+            }
+            if (isset($order_by_clause)) {
+                $subresult['order_by_clause'] = $order_by_clause;
+            }
+            if (isset($having_clause)) {
+                $subresult['having_clause'] = $having_clause;
+            }
+            if (isset($where_clause)) {
+                $subresult['where_clause'] = $where_clause;
+            }
+    
+    
+            // They are naughty and didn't have a trailing semi-colon,
+            // then still handle it properly
+            if ($subresult['querytype'] != '') {
+                $result[] = $subresult;
+            }
+            return $result;
+        } // end of the "PMA_SQP_analyze()" function
+    
+    
+        /**
+         * Colorizes SQL queries html formatted
+         *
+         * @param  array   The SQL queries html formatted
+         *
+         * @return array   The colorized SQL queries
+         *
+         * @access public
+         */
+        function PMA_SQP_formatHtml_colorize($arr)
+        {
+            $i         = $GLOBALS['PMA_strpos']($arr['type'], '_');
+            $class     = '';
+            if ($i > 0) {
+                $class = 'syntax_' . $GLOBALS['PMA_substr']($arr['type'], 0, $i) . ' ';
+            }
+    
+            $class     .= 'syntax_' . $arr['type'];
+    
+            //TODO: check why adding a "\n" after the </span> would cause extra 
+            //      blanks to be displayed:
+            //      SELECT p . person_name
+    
+            return '<span class="' . $class . '">' . htmlspecialchars($arr['data']) . '</span>';
+        } // end of the "PMA_SQP_formatHtml_colorize()" function
+    
+    
+        /**
+         * Formats SQL queries to html
+         *
+         * @param  array   The SQL queries
+         *
+         * @return string  The formatted SQL queries
+         *
+         * @access public
+         */
+        function PMA_SQP_formatHtml($arr, $mode='color')
+        {
+            // first check for the SQL parser having hit an error
+            if (PMA_SQP_isError()) {
+                return $arr;
+            }
+            // then check for an array 
+            if (!is_array($arr)) {
+                return $arr;
+            }
+            // else do it properly
+            switch ($mode) {
+                case 'color':
+                    $str                                = '<span class="syntax">';
+                    $html_line_break                    = '<br />';
+                    break;
+                case 'query_only':
+                    $str                                = '';
+                    $html_line_break                    = ' ';
+                    break;
+                case 'text':
+                    $str                                = '';
+                    $html_line_break                    = '<br />';
+                    break;
+            } // end switch
+            $indent                                     = 0;
+            $bracketlevel                               = 0;
+            $functionlevel                              = 0;
+            $infunction                                 = FALSE;
+            $space_punct_listsep                        = ' ';
+            $space_punct_listsep_function_name          = ' ';
+            // $space_alpha_reserved_word = '<br />'."\n";
+            $space_alpha_reserved_word                  = ' ';
+    
+            $keywords_with_brackets_1before            = array(
+                'INDEX',
+                'KEY',
+                'ON',
+                'USING'
+            );
+            $keywords_with_brackets_1before_cnt        = 4;
+    
+            $keywords_with_brackets_2before            = array(
+                'IGNORE',
+                'INDEX',
+                'INTO',
+                'KEY',
+                'PRIMARY',
+                'PROCEDURE',
+                'REFERENCES',
+                'UNIQUE',
+                'USE'
+            );
+            // $keywords_with_brackets_2before_cnt = count($keywords_with_brackets_2before);
+            $keywords_with_brackets_2before_cnt        = 9;
+    
+            // These reserved words do NOT get a newline placed near them.
+            $keywords_no_newline               = array(
+                'AND',
+                'AS',
+                'ASC',
+                'DESC',
+                'IS',
+                'NOT',
+                'NULL',
+                'ON',
+                'OR'
+            );
+            $keywords_no_newline_cnt           = 9;
+    
+            $arraysize = $arr['len'];
+            $typearr   = array();
+            if ($arraysize >= 0) {
+                $typearr[0] = '';
+                $typearr[1] = '';
+                $typearr[2] = '';
+                $typearr[3] = $arr[0]['type'];
+            }
+    
+            for ($i = 0; $i < $arraysize; $i++) {
+                //DEBUG echo "<b>" . $arr[$i]['data'] . "</b> " . $arr[$i]['type'] . "<br />";
+                $before = '';
+                $after  = '';
+                $indent = 0;
+                // array_shift($typearr);
+                /*
+                0 prev2
+                1 prev
+                2 current
+                3 next
+                */
+                if (($i + 1) < $arraysize) {
+                    // array_push($typearr, $arr[$i + 1]['type']);
+                    $typearr[4] = $arr[$i + 1]['type'];
+                } else {
+                    //array_push($typearr, NULL);
+                    $typearr[4] = '';
+                }
+    
+                for ($j=0; $j<4; $j++) {
+                    $typearr[$j] = $typearr[$j + 1];
+                }
+    
+                switch ($typearr[2]) {
+                    case 'white_newline':
+    //                    $after      = '<br />';
+                        $before     = '';
+                        break;
+                    case 'punct_bracket_open_round':
+                        $bracketlevel++;
+                        $infunction = FALSE;
+                        // Make sure this array is sorted!
+                        if (($typearr[1] == 'alpha_functionName') || ($typearr[1] == 'alpha_columnType') || ($typearr[1] == 'punct')
+                            || ($typearr[3] == 'digit_integer') || ($typearr[3] == 'digit_hex') || ($typearr[3] == 'digit_float')
+                            || (($typearr[0] == 'alpha_reservedWord')
+                                && PMA_STR_binarySearchInArr(strtoupper($arr[$i - 2]['data']), $keywords_with_brackets_2before, $keywords_with_brackets_2before_cnt))
+                            || (($typearr[1] == 'alpha_reservedWord')
+                                && PMA_STR_binarySearchInArr(strtoupper($arr[$i - 1]['data']), $keywords_with_brackets_1before, $keywords_with_brackets_1before_cnt))
+                            ) {
+                            $functionlevel++;
+                            $infunction = TRUE;
+                            $after      .= ' ';
+                        } else {
+                            $indent++;
+                            $after      .= ($mode != 'query_only' ? '<div class="syntax_indent' . $indent . '">' : ' ');
+                        }
+                        break;
+                    case 'alpha_identifier':
+                        if (($typearr[1] == 'punct_qualifier') || ($typearr[3] == 'punct_qualifier')) {
+                            $after      = '';
+                            $before     = '';
+                        }
+                        if (($typearr[3] == 'alpha_columnType') || ($typearr[3] == 'alpha_identifier')) {
+                            $after      .= ' ';
+                        }
+                        break;
+                    case 'punct_qualifier':
+                        $before         = '';
+                        $after          = '';
+                        break;
+                    case 'punct_listsep':
+                        if ($infunction == TRUE) {
+                            $after      .= $space_punct_listsep_function_name;
+                        } else {
+                            $after      .= $space_punct_listsep;
+                        }
+                        break;
+                    case 'punct_queryend':
+                        if (($typearr[3] != 'comment_mysql') && ($typearr[3] != 'comment_ansi')) {
+                            $after     .= $html_line_break;
+                            $after     .= $html_line_break;
+                        }
+                        $space_punct_listsep               = ' ';
+                        $space_punct_listsep_function_name = ' ';
+                        $space_alpha_reserved_word         = ' ';
+                        break;
+                    case 'comment_mysql':
+                    case 'comment_ansi':
+                        $after         .= $html_line_break;
+                        break;
+                    case 'punct':
+                        $after         .= ' ';
+                        $before        .= ' ';
+                        break;
+                    case 'punct_bracket_close_round':
+                        $bracketlevel--;
+                        if ($infunction == TRUE) {
+                            $functionlevel--;
+                            $after     .= ' ';
+                            $before    .= ' ';
+                        } else {
+                            $indent--;
+                            $before    .= ($mode != 'query_only' ? '</div>' : ' ');
+                        }
+                        $infunction    = ($functionlevel > 0) ? TRUE : FALSE;
+                        break;
+                    case 'alpha_columnType':
+                        if ($typearr[3] == 'alpha_columnAttrib') {
+                            $after     .= ' ';
+                        }
+                        if ($typearr[1] == 'alpha_columnType') {
+                            $before    .= ' ';
+                        }
+                        break;
+                    case 'alpha_columnAttrib':
+    
+                        // ALTER TABLE tbl_name AUTO_INCREMENT = 1
+                        if ($typearr[1] == 'alpha_identifier') {
+                            $before .= ' ';
+                        }
+                        if (($typearr[3] == 'alpha_columnAttrib') || ($typearr[3] == 'quote_single')) {
+                            $after     .= ' ';
+                        }
+                        break;
+                    case 'alpha_reservedWord':
+                        //$upper         = $arr[$i]['data'];
+                        $arr[$i]['data'] = strtoupper($arr[$i]['data']);
+                        if ((($typearr[1] != 'alpha_reservedWord')
+                            || (($typearr[1] == 'alpha_reservedWord')
+                                && PMA_STR_binarySearchInArr(strtoupper($arr[$i - 1]['data']), $keywords_no_newline, $keywords_no_newline_cnt)))
+                            && ($typearr[1] != 'punct_level_plus')
+                            && (!PMA_STR_binarySearchInArr($arr[$i]['data'], $keywords_no_newline, $keywords_no_newline_cnt))) {
+                            // do not put a space before the first token, because
+                            // we use a lot of eregi() checking for the first
+                            // reserved word at beginning of query
+                            if ($i > 0) {
+                                $before    .= $space_alpha_reserved_word;
+                            }
+                        } else {
+                            $before    .= ' ';
+                        }
+    
+                        switch ($arr[$i]['data']) {
+                            case 'CREATE':
+                                $space_punct_listsep       = $html_line_break;
+                                $space_alpha_reserved_word = ' ';
+                                break;
+                            case 'EXPLAIN':
+                            case 'DESCRIBE':
+                            case 'SET':
+                            case 'ALTER':
+                            case 'DELETE':
+                            case 'SHOW':
+                            case 'DROP':
+                            case 'UPDATE':
+                            case 'TRUNCATE':
+                            case 'ANALYZE':
+                            case 'ANALYSE':
+                                $space_punct_listsep       = $html_line_break;
+                                $space_alpha_reserved_word = ' ';
+                                break;
+                            case 'INSERT':
+                            case 'REPLACE':
+                                $space_punct_listsep       = $html_line_break;
+                                $space_alpha_reserved_word = $html_line_break;
+                                break;
+                            case 'VALUES':
+                                $space_punct_listsep       = ' ';
+                                $space_alpha_reserved_word = $html_line_break;
+                                break;
+                            case 'SELECT':
+                                $space_punct_listsep       = ' ';
+                                $space_alpha_reserved_word = $html_line_break;
+                                break;
+                            default:
+                                break;
+                        } // end switch ($arr[$i]['data'])
+    
+                        $after         .= ' ';
+                        break;
+                    case 'digit_integer':
+                    case 'digit_float':
+                    case 'digit_hex':
+                        //TODO: could there be other types preceding a digit?
+                        if ($typearr[1] == 'alpha_reservedWord') {
+                            $after .= ' ';
+                        }
+                        if ($infunction && $typearr[3] == 'punct_bracket_close_round') {
+                            $after     .= ' ';
+                        }
+                        break;
+                    case 'quote_double':
+                    case 'quote_single':
+                        // workaround: for the query
+                        // REVOKE SELECT ON `base2\_db`.* FROM 'user'@'%'
+                        // the @ is incorrectly marked as alpha_variable
+                        // in the parser, and here, the '%' gets a blank before,
+                        // which is a syntax error
+                        if ($typearr[1]!='alpha_variable') {
+                            $before        .= ' ';
+                        }
+                        if ($infunction && $typearr[3] == 'punct_bracket_close_round') {
+                            $after     .= ' ';
+                        }
+                        break;
+                    case 'quote_backtick':
+                        if ($typearr[3] != 'punct_qualifier') {
+                            $after     .= ' ';
+                        }
+                        if ($typearr[1] != 'punct_qualifier') {
+                            $before    .= ' ';
+                        }
+                        break;
+                    default:
+                        break;
+                } // end switch ($typearr[2])
+    
+    /*
+                if ($typearr[3] != 'punct_qualifier') {
+                    $after             .= ' ';
+                }
+                $after                 .= "\n";
+    */
+                $str .= $before . ($mode=='color' ? PMA_SQP_formatHTML_colorize($arr[$i]) : $arr[$i]['data']). $after;
+            } // end for
+            if ($mode=='color') {
+                $str .= '</span>';
+            }
+    
+            return $str;
+        } // end of the "PMA_SQP_formatHtml()" function
+    }
 
     /**
      * Builds a CSS rule used for html formatted SQL queries
@@ -1710,41 +1718,41 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
         return $css_string;
     } // end of the "PMA_SQP_buildCssData()" function
 
-
-    /**
-     * Gets SQL queries with no format
-     *
-     * @param  array   The SQL queries list
-     *
-     * @return string  The SQL queries with no format
-     *
-     * @access public
-     */
-    function PMA_SQP_formatNone($arr)
-    {
-        $formatted_sql = htmlspecialchars($arr['raw']);
-        $formatted_sql = ereg_replace("((\015\012)|(\015)|(\012)){3,}", "\n\n", $formatted_sql);
-
-        return $formatted_sql;
-    } // end of the "PMA_SQP_formatNone()" function
-
-
-    /**
-     * Gets SQL queries in text format
-     *
-     * @param  array   The SQL queries list
-     *
-     * @return string  The SQL queries in text format
-     *
-     * @access public
-     */
-    function PMA_SQP_formatText($arr)
-    {
+    if ($is_minimum_common == FALSE) {
         /**
-         * TODO WRITE THIS!
+         * Gets SQL queries with no format
+         *
+         * @param  array   The SQL queries list
+         *
+         * @return string  The SQL queries with no format
+         *
+         * @access public
          */
-         return PMA_SQP_formatNone($arr);
-    } // end of the "PMA_SQP_formatText()" function
-
+        function PMA_SQP_formatNone($arr)
+        {
+            $formatted_sql = htmlspecialchars($arr['raw']);
+            $formatted_sql = ereg_replace("((\015\012)|(\015)|(\012)){3,}", "\n\n", $formatted_sql);
+    
+            return $formatted_sql;
+        } // end of the "PMA_SQP_formatNone()" function
+    
+    
+        /**
+         * Gets SQL queries in text format
+         *
+         * @param  array   The SQL queries list
+         *
+         * @return string  The SQL queries in text format
+         *
+         * @access public
+         */
+        function PMA_SQP_formatText($arr)
+        {
+            /**
+             * TODO WRITE THIS!
+             */
+             return PMA_SQP_formatNone($arr);
+        } // end of the "PMA_SQP_formatText()" function
+    } // end if: minimal common.lib needed?
 } // $__PMA_SQP_LIB__
 ?>
diff --git a/queryframe.php3 b/queryframe.php3
index 971543763..818eaee41 100644
--- a/queryframe.php3
+++ b/queryframe.php3
@@ -25,18 +25,11 @@ if ($cfg['OBGzip']) {
     }
 }
 
-/**
- * Send http headers
- */
-// Don't use cache (required for Opera)
-$now = gmdate('D, d M Y H:i:s') . ' GMT';
-header('Expires: ' . $now);
-header('Last-Modified: ' . $now);
-header('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
-header('Pragma: no-cache'); // HTTP/1.0
-// Define the charset to be used
-header('Content-Type: text/html; charset=' . $charset);
+// garvin: For re-usability, moved http-headers
+// to a seperate file. It can now be included by header.inc.php3,
+// queryframe.php3, querywindow.php3.
 
+include('./libraries/header_http.inc.php3');
 
 /**
  * Displays the frame
@@ -52,18 +45,7 @@ PMA_setFontSizes();
     <title>phpMyAdmin</title>
     <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
     <base<?php if (!empty($cfg['PmaAbsoluteUri'])) echo ' href="' . $cfg['PmaAbsoluteUri'] . '"'; ?> />
-    <style type="text/css">
-    <!--
-    body {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>}
-    div {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-    .heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-    .headaCnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000}
-    .parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none}
-    .child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
-    .item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
-    .tblItem:hover {color: #FF0000; text-decoration: underline}
-    //-->
-    </style>
+    <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?js_frame=left&num_dbs=0" />
 <?php
 if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
 ?>
@@ -82,7 +64,7 @@ function open_querywindow(url) {
        querywindow.opener = self;
     }
 
-	if (window.focus) {
+    if (window.focus) {
         querywindow.focus();
     }
     
diff --git a/querywindow.php3 b/querywindow.php3
index 79774a807..dc9caf9bd 100644
--- a/querywindow.php3
+++ b/querywindow.php3
@@ -39,60 +39,13 @@ if ($server > 0) {
     $num_dbs = 0;
 }
 
+// garvin: For re-usability, moved http-headers and stylesheets
+// to a seperate file. It can now be included by header.inc.php3,
+// queryframe.php3, querywindow.php3.
 
-/**
- * Send http headers
- */
-// Don't use cache (required for Opera)
-$now = gmdate('D, d M Y H:i:s') . ' GMT';
-header('Expires: ' . $now);
-header('Last-Modified: ' . $now);
-header('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
-header('Pragma: no-cache'); // HTTP/1.0
-// Define the charset to be used
-header('Content-Type: text/html; charset=' . $charset);
-
-/**
- * Displays the frame
- */
-// Gets the font sizes to use
-PMA_setFontSizes();
+include('./libraries/header_http.inc.php3');
+include('./libraries/header_meta_style.inc.php3');
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $available_languages[$lang][2]; ?>" lang="<?php echo $available_languages[$lang][2]; ?>" dir="<?php echo $text_dir; ?>">
-
-<head>
-    <title>phpMyAdmin</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
-    <base<?php if (!empty($cfg['PmaAbsoluteUri'])) echo ' href="' . $cfg['PmaAbsoluteUri'] . '"'; ?> />
-    <style type="text/css">
-    <!--
-    body {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>}
-    div {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-    .heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-    .headaCnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000}
-    .parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none}
-    .child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
-    .item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
-    .tblItem:hover {color: #FF0000; text-decoration: underline}
-    td.tab          {
-        border-top: 1px solid #999;
-        border-right: 1px solid #666;
-        border-left: 1px solid #999;
-        border-bottom: none;
-        border-radius: 2px;
-        -moz-border-radius: 2px;
-    }
-    table.tabs      {
-        border-top: none;
-        border-right: none;
-        border-left: none;
-        border-bottom: 1px solid #666;
-    }
-
-    //-->
-    </style>
 
 <script type="text/javascript" language="javascript">    
 <?php
diff --git a/transformation_wrapper.php3 b/transformation_wrapper.php3
index 243bee0ad..9268f4b8c 100644
--- a/transformation_wrapper.php3
+++ b/transformation_wrapper.php3
@@ -2,6 +2,8 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
+$is_transformation_wrapper = true;
+
 /**
  * Get the variables sent or posted to this script and displays the header
  */
@@ -13,73 +15,17 @@ require('./libraries/grab_globals.lib.php3');
 if (!defined('PMA_COMMON_LIB_INCLUDED')) {
     include('./libraries/common.lib.php3');
 }
-if (!defined('PMA_OB_LIB_INCLUDED')) {
-    include('./libraries/ob.lib.php3');
-}
 
 require('./libraries/relation.lib.php3'); // foreign keys
 require('./libraries/transformations.lib.php3'); // Transformations
 $cfgRelation = PMA_getRelationsParam();
 
-
-/**
- * Displays the query submitted and its result
- */
-if (!empty($message)) {
-    if (isset($goto)) {
-        $goto_cpy      = $goto;
-        $goto          = 'tbl_properties.php3?' 
-                       . PMA_generate_common_url($db, $table)
-                       . '&amp;$show_query=1'
-                       . '&amp;sql_query=' . urlencode($disp_query);
-    } else {
-        $show_query = '1';
-    }
-    if (isset($sql_query)) {
-        $sql_query_cpy = $sql_query;
-        unset($sql_query);
-    }
-    if (isset($disp_query)) {
-        $sql_query     = $disp_query;
-    }
-    PMA_showMessage($message);
-    if (isset($goto_cpy)) {
-        $goto          = $goto_cpy;
-        unset($goto_cpy);
-    }
-    if (isset($sql_query_cpy)) {
-        $sql_query     = $sql_query_cpy;
-        unset($sql_query_cpy);
-    }
-}
-
-/**
- * Defines the url to return to in case of error in a sql statement
- */
-if (!isset($goto)) {
-    $goto    = 'db_details.php3';
-}
-if (!ereg('^(db_details|tbl_properties|tbl_select)', $goto)) {
-    $err_url = $goto . "?" . PMA_generate_common_url($db) . "&amp;sql_query=" . urlencode($sql_query);
-} else {
-    $err_url = $goto . '?'
-             . PMA_generate_common_url($db)
-             . ((ereg('^(tbl_properties|tbl_select)', $goto)) ? '&amp;table=' . urlencode($table) : '');
-}
-
-
 /**
  * Ensures db and table are valid, else moves to the "parent" script
  */
 require('./libraries/db_table_exists.lib.php3');
 
 
-/**
- * Sets parameters for links and displays top menu
- */
-$url_query = PMA_generate_common_url($db, $table)
-           . '&amp;goto=tbl_properties.php3';
-
 /**
  * Get the list of the fields of the current table
  */
@@ -89,36 +35,17 @@ if (isset($primary_key)) {
     $local_query = 'SELECT * FROM ' . PMA_backquote($table) . ' WHERE ' . $primary_key;
     $result      = PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url);
     $row         = PMA_mysql_fetch_array($result);
-    // No row returned
-    if (!$row) {
-        unset($row);
-        unset($primary_key);
-        $goto_cpy          = $goto;
-        $goto              = 'tbl_properties.php3?'
-                           . PMA_generate_common_url($db, $table)
-                           . '&amp;$show_query=1'
-                           . '&amp;sql_query=' . urlencode($local_query);
-        if (isset($sql_query)) {
-            $sql_query_cpy = $sql_query;
-            unset($sql_query);
-        }
-        $sql_query         = $local_query;
-        PMA_showMessage($strEmptyResultSet);
-        $goto              = $goto_cpy;
-        unset($goto_cpy);
-        if (isset($sql_query_cpy)) {
-            $sql_query    = $sql_query_cpy;
-            unset($sql_query_cpy);
-        }
-    } // end if (no record returned)
-}
-else
-{
+} else {
     $local_query = 'SELECT * FROM ' . PMA_backquote($table) . ' LIMIT 1';
     $result      = PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url);
-    unset($row);
+    $row         = PMA_mysql_fetch_array($result);
 }
 
+// No row returned
+if (!$row) {
+    exit;
+} // end if (no record returned)
+
 $default_ct = 'application/octet-stream';
 
 if ($cfgRelation['commwork'] && $cfgRelation['mimework']) {
@@ -133,27 +60,21 @@ if ($cfgRelation['commwork'] && $cfgRelation['mimework']) {
     }
 }
 
-/**
- * Sends http headers
- */
-// Don't use cache (required for Opera)
+// garvin: For re-usability, moved http-headers and stylesheets
+// to a seperate file. It can now be included by header.inc.php3,
+// queryframe.php3, querywindow.php3.
 
-if (!isset($noheader)) {
-$GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT';
-header('Expires: ' . $GLOBALS['now']); // rfc2616 - Section 14.21
-header('Last-Modified: ' . $GLOBALS['now']);
-header('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
-header('Pragma: no-cache'); // HTTP/1.0
+include('./libraries/header_http.inc.php3');
 // [MIME]
 $content_type = 'Content-Type: ' . (isset($mime_map[urldecode($transform_key)]['mimetype']) ? str_replace("_", "/", $mime_map[urldecode($transform_key)]['mimetype']) : $default_ct) . (isset($mime_options['charset']) ? $mime_options['charset'] : '');
 header($content_type);
-}
 
 if (!isset($resize)) {
     echo $row[urldecode($transform_key)];
 } else {
     // if image_*__inline.inc.php3 finds that we can resize,
     // it sets $resize to jpeg or png
+   
     $srcImage = imagecreatefromstring($row[urldecode($transform_key)]);
     $srcWidth = ImageSX( $srcImage );
     $srcHeight = ImageSY( $srcImage );
@@ -189,7 +110,6 @@ if (!isset($resize)) {
     }
     ImageDestroy( $srcImage );
     ImageDestroy( $destImage );
-
 }
 
 /**