From e5e340e525f51a318def41e087301b015c661ff1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@novell.com>
Date: Wed, 21 Jul 2010 10:16:30 +0200
Subject: [PATCH] Proper propagating of overrided values.

---
 libraries/common.lib.php   | 42 ++++++++++++++++++++++----------------
 libraries/export/latex.php | 12 +++++------
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index ca4a02db1..a8c32fc09 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2832,16 +2832,22 @@ $mapping = array(
  *
  * @param string Text where to do expansion.
  * @param function Function to call for escaping variable values.
+ * @param array Array with overrides for default parameters (obtained from GLOBALS).
  */
-function PMA_expandUserString($string, $escape = NULL) {
+function PMA_expandUserString($string, $escape = NULL, $updates = array()) {
     /* Content */
-    $http_host = PMA_getenv('HTTP_HOST') ? PMA_getenv('HTTP_HOST') : '';
-    $server_name = $GLOBALS['cfg']['Server']['host'];
-    $server_verbose = $GLOBALS['cfg']['Server']['verbose'];
-    $server_verbose_or_name = !empty($GLOBALS['cfg']['Server']['verbose']) ? $GLOBALS['cfg']['Server']['verbose'] : $GLOBALS['cfg']['Server']['host'];
-    $database = $GLOBALS['db'];
-    $table = $GLOBALS['table'];
-    $phpmyadmin_version = 'phpMyAdmin ' . PMA_VERSION;
+    $vars['http_host'] = PMA_getenv('HTTP_HOST') ? PMA_getenv('HTTP_HOST') : '';
+    $vars['server_name'] = $GLOBALS['cfg']['Server']['host'];
+    $vars['server_verbose'] = $GLOBALS['cfg']['Server']['verbose'];
+    $vars['server_verbose_or_name'] = !empty($GLOBALS['cfg']['Server']['verbose']) ? $GLOBALS['cfg']['Server']['verbose'] : $GLOBALS['cfg']['Server']['host'];
+    $vars['database'] = $GLOBALS['db'];
+    $vars['table'] = $GLOBALS['table'];
+    $vars['phpmyadmin_version'] = 'phpMyAdmin ' . PMA_VERSION;
+
+    /* Update forced variables */
+    foreach($updates as $key => $val) {
+        $vars[$key] = $val;
+    }
 
     /* Replacement mapping */
     /*
@@ -2849,16 +2855,16 @@ function PMA_expandUserString($string, $escape = NULL) {
      * might still have it in cookies.
      */
     $replace = array(
-        '@HTTP_HOST@' => $http_host,
-        '@SERVER@' => $server_name,
-        '__SERVER__' => $server_name,
-        '@VERBOSE@' => $server_verbose,
-        '@VSERVER@' => $server_verbose_or_name,
-        '@DATABASE@' => $database,
-        '__DB__' => $database,
-        '@TABLE@' => $table,
-        '__TABLE__' => $table,
-        '@PHPMYADMIN@' => $phpmyadmin_version,
+        '@HTTP_HOST@' => $vars['http_host'],
+        '@SERVER@' => $vars['server_name'],
+        '__SERVER__' => $vars['server_name'],
+        '@VERBOSE@' => $vars['server_verbose'],
+        '@VSERVER@' => $vars['server_verbose_or_name'],
+        '@DATABASE@' => $vars['database'],
+        '__DB__' => $vars['database'],
+        '@TABLE@' => $vars['table'],
+        '__TABLE__' => $vars['table'],
+        '@PHPMYADMIN@' => $vars['phpmyadmin_version'],
         );
 
     /* Optional escaping */
diff --git a/libraries/export/latex.php b/libraries/export/latex.php
index 922bce7a1..056b69f33 100644
--- a/libraries/export/latex.php
+++ b/libraries/export/latex.php
@@ -212,8 +212,8 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
 
     $buffer .= ' \\hline \\endhead \\hline \\endfoot \\hline ' . $crlf;
     if (isset($GLOBALS['latex_caption'])) {
-        $buffer .= ' \\caption{' . PMA_expandUserString($GLOBALS['latex_data_caption'], 'PMA_texEscape')
-                   . '} \\label{' . PMA_expandUserString($GLOBALS['latex_data_label']) . '} \\\\';
+        $buffer .= ' \\caption{' . PMA_expandUserString($GLOBALS['latex_data_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
+                   . '} \\label{' . PMA_expandUserString($GLOBALS['latex_data_label'], NULL, array('table' => $table, 'database' => $db)) . '} \\\\';
     }
     if (!PMA_exportOutputHandler($buffer)) {
         return FALSE;
@@ -231,7 +231,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
             return FALSE;
         }
         if (isset($GLOBALS['latex_caption'])) {
-            if (!PMA_exportOutputHandler('\\caption{' . PMA_expandUserString($GLOBALS['latex_data_continued_caption'], 'PMA_texEscape') . '} \\\\ ')) return FALSE;
+            if (!PMA_exportOutputHandler('\\caption{' . PMA_expandUserString($GLOBALS['latex_data_continued_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db)) . '} \\\\ ')) return FALSE;
         }
         if (!PMA_exportOutputHandler($buffer . '\\endhead \\endfoot' . $crlf)) {
             return FALSE;
@@ -378,14 +378,14 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
 
     // Table caption for first page and label
     if (isset($GLOBALS['latex_caption'])) {
-        $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_caption'], 'PMA_texEscape')
-                   . '} \\label{' . PMA_expandUserString($GLOBALS['latex_structure_label'])
+        $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
+                   . '} \\label{' . PMA_expandUserString($GLOBALS['latex_structure_label'], NULL, array('table' => $table, 'database' => $db))
                    . '} \\\\' . $crlf;
     }
     $buffer .= $header . ' \\\\ \\hline \\hline' . $crlf . '\\endfirsthead' . $crlf;
     // Table caption on next pages
     if (isset($GLOBALS['latex_caption'])) {
-        $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_continued_caption'], 'PMA_texEscape')
+        $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_continued_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
                    . '} \\\\ ' . $crlf;
     }
     $buffer .= $header . ' \\\\ \\hline \\hline \\endhead \\endfoot ' . $crlf;