nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper propagating of overrided values.

Browse Source
This commit is contained in:
Michal Čihař
2010-07-21 10:16:30 +02:00
parent cb6716c481
commit e5e340e525
2 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
libraries/common.lib.php
View File

@@ -2832,16 +2832,22 @@ $mapping = array(
* *
* @param string Text where to do expansion. * @param string Text where to do expansion.
* @param function Function to call for escaping variable values. * @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 */ /* Content */
$http_host = PMA_getenv('HTTP_HOST') ? PMA_getenv('HTTP_HOST') : ''; $vars['http_host'] = PMA_getenv('HTTP_HOST') ? PMA_getenv('HTTP_HOST') : '';
$server_name = $GLOBALS['cfg']['Server']['host']; $vars['server_name'] = $GLOBALS['cfg']['Server']['host'];
$server_verbose = $GLOBALS['cfg']['Server']['verbose']; $vars['server_verbose'] = $GLOBALS['cfg']['Server']['verbose'];
$server_verbose_or_name = !empty($GLOBALS['cfg']['Server']['verbose']) ? $GLOBALS['cfg']['Server']['verbose'] : $GLOBALS['cfg']['Server']['host']; $vars['server_verbose_or_name'] = !empty($GLOBALS['cfg']['Server']['verbose']) ? $GLOBALS['cfg']['Server']['verbose'] : $GLOBALS['cfg']['Server']['host'];
$database = $GLOBALS['db']; $vars['database'] = $GLOBALS['db'];
$table = $GLOBALS['table']; $vars['table'] = $GLOBALS['table'];
$phpmyadmin_version = 'phpMyAdmin ' . PMA_VERSION; $vars['phpmyadmin_version'] = 'phpMyAdmin ' . PMA_VERSION;
/* Update forced variables */
foreach($updates as $key => $val) {
$vars[$key] = $val;
}
/* Replacement mapping */ /* Replacement mapping */
/* /*
@@ -2849,16 +2855,16 @@ function PMA_expandUserString($string, $escape = NULL) {
* might still have it in cookies. * might still have it in cookies.
*/ */
$replace = array( $replace = array(
'@HTTP_HOST@' => $http_host, '@HTTP_HOST@' => $vars['http_host'],
'@SERVER@' => $server_name, '@SERVER@' => $vars['server_name'],
'__SERVER__' => $server_name, '__SERVER__' => $vars['server_name'],
'@VERBOSE@' => $server_verbose, '@VERBOSE@' => $vars['server_verbose'],
'@VSERVER@' => $server_verbose_or_name, '@VSERVER@' => $vars['server_verbose_or_name'],
'@DATABASE@' => $database, '@DATABASE@' => $vars['database'],
'__DB__' => $database, '__DB__' => $vars['database'],
'@TABLE@' => $table, '@TABLE@' => $vars['table'],
'__TABLE__' => $table, '__TABLE__' => $vars['table'],
'@PHPMYADMIN@' => $phpmyadmin_version, '@PHPMYADMIN@' => $vars['phpmyadmin_version'],
); );
/* Optional escaping */ /* Optional escaping */

12
libraries/export/latex.php
View File

@@ -212,8 +212,8 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
$buffer .= ' \\hline \\endhead \\hline \\endfoot \\hline ' . $crlf; $buffer .= ' \\hline \\endhead \\hline \\endfoot \\hline ' . $crlf;
if (isset($GLOBALS['latex_caption'])) { if (isset($GLOBALS['latex_caption'])) {
$buffer .= ' \\caption{' . PMA_expandUserString($GLOBALS['latex_data_caption'], 'PMA_texEscape') $buffer .= ' \\caption{' . PMA_expandUserString($GLOBALS['latex_data_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
. '} \\label{' . PMA_expandUserString($GLOBALS['latex_data_label']) . '} \\\\'; . '} \\label{' . PMA_expandUserString($GLOBALS['latex_data_label'], NULL, array('table' => $table, 'database' => $db)) . '} \\\\';
} }
if (!PMA_exportOutputHandler($buffer)) { if (!PMA_exportOutputHandler($buffer)) {
return FALSE; return FALSE;
@@ -231,7 +231,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
return FALSE; return FALSE;
} }
if (isset($GLOBALS['latex_caption'])) { 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)) { if (!PMA_exportOutputHandler($buffer . '\\endhead \\endfoot' . $crlf)) {
return FALSE; return FALSE;
@@ -378,14 +378,14 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
// Table caption for first page and label // Table caption for first page and label
if (isset($GLOBALS['latex_caption'])) { if (isset($GLOBALS['latex_caption'])) {
$buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_caption'], 'PMA_texEscape') $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
. '} \\label{' . PMA_expandUserString($GLOBALS['latex_structure_label']) . '} \\label{' . PMA_expandUserString($GLOBALS['latex_structure_label'], NULL, array('table' => $table, 'database' => $db))
. '} \\\\' . $crlf; . '} \\\\' . $crlf;
} }
$buffer .= $header . ' \\\\ \\hline \\hline' . $crlf . '\\endfirsthead' . $crlf; $buffer .= $header . ' \\\\ \\hline \\hline' . $crlf . '\\endfirsthead' . $crlf;
// Table caption on next pages // Table caption on next pages
if (isset($GLOBALS['latex_caption'])) { 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; . '} \\\\ ' . $crlf;
} }
$buffer .= $header . ' \\\\ \\hline \\hline \\endhead \\endfoot ' . $crlf; $buffer .= $header . ' \\\\ \\hline \\hline \\endhead \\endfoot ' . $crlf;