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

LaTeX export uses PMA_expandUserString.

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

8
libraries/common.lib.php
View File

@@ -2830,7 +2830,7 @@ $mapping = array(
/** /**
* Formats user string, expading @VARIABLES@, accepting strftime format string. * Formats user string, expading @VARIABLES@, accepting strftime format string.
*/ */
function PMA_expandUserString($string) { function PMA_expandUserString($string, $escape = NULL) {
/* Content */ /* Content */
$http_host = PMA_getenv('HTTP_HOST') ? PMA_getenv('HTTP_HOST') : ''; $http_host = PMA_getenv('HTTP_HOST') ? PMA_getenv('HTTP_HOST') : '';
$server_name = $GLOBALS['cfg']['Server']['host']; $server_name = $GLOBALS['cfg']['Server']['host'];
@@ -2854,6 +2854,12 @@ function PMA_expandUserString($string) {
'@PHPMYADMIN@' => $phpmyadmin_version, '@PHPMYADMIN@' => $phpmyadmin_version,
); );
if (!is_null($escape)) {
foreach($replace as $key => $val) {
$replace[$key] = $escape($val);
}
}
/* Do the replacement */ /* Do the replacement */
return str_replace(array_keys($replace), array_values($replace), strftime($string)); return str_replace(array_keys($replace), array_values($replace), strftime($string));
} }

18
libraries/export/latex.php
View File

@@ -207,8 +207,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{' . str_replace('__TABLE__', PMA_texEscape($table), $GLOBALS['latex_data_caption']) $buffer .= ' \\caption{' . PMA_expandUserString($GLOBALS['latex_data_caption'], 'PMA_texEscape')
. '} \\label{' . str_replace('__TABLE__', $table, $GLOBALS['latex_data_label']) . '} \\\\'; . '} \\label{' . PMA_expandUserString($GLOBALS['latex_data_label']) . '} \\\\';
} }
if (!PMA_exportOutputHandler($buffer)) { if (!PMA_exportOutputHandler($buffer)) {
return FALSE; return FALSE;
@@ -226,7 +226,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{' . str_replace('__TABLE__', PMA_texEscape($table), $GLOBALS['latex_data_continued_caption']) . '} \\\\ ')) return FALSE; if (!PMA_exportOutputHandler('\\caption{' . PMA_expandUserString($GLOBALS['latex_data_continued_caption'], 'PMA_texEscape') . '} \\\\ ')) return FALSE;
} }
if (!PMA_exportOutputHandler($buffer . '\\endhead \\endfoot' . $crlf)) { if (!PMA_exportOutputHandler($buffer . '\\endhead \\endfoot' . $crlf)) {
return FALSE; return FALSE;
@@ -289,7 +289,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
* *
* @access public * @access public
*/ */
// @@@ Table structure // @@@ Table structure
function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $dummy) function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $dummy)
{ {
global $cfgRelation; global $cfgRelation;
@@ -373,14 +373,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{'. str_replace('__TABLE__', PMA_texEscape($table), $GLOBALS['latex_structure_caption']) $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_caption'], 'PMA_texEscape')
. '} \\label{' . str_replace('__TABLE__', $table, $GLOBALS['latex_structure_label']) . '} \\label{' . PMA_expandUserString($GLOBALS['latex_structure_label'])
. '} \\\\' . $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{'. str_replace('__TABLE__', PMA_texEscape($table), $GLOBALS['latex_structure_continued_caption']) $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_continued_caption'], 'PMA_texEscape')
. '} \\\\ ' . $crlf; . '} \\\\ ' . $crlf;
} }
$buffer .= $header . ' \\\\ \\hline \\hline \\endhead \\endfoot ' . $crlf; $buffer .= $header . ' \\\\ \\hline \\hline \\endhead \\endfoot ' . $crlf;
@@ -425,8 +425,8 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
$field_name = $row['Field']; $field_name = $row['Field'];
$local_buffer = $field_name . "\000" . $type . "\000" $local_buffer = $field_name . "\000" . $type . "\000"
. (($row['Null'] == '' || $row['Null'] == 'NO') ? __('No') : __('Yes')) . (($row['Null'] == '' || $row['Null'] == 'NO') ? __('No') : __('Yes'))
. "\000" . (isset($row['Default']) ? $row['Default'] : ''); . "\000" . (isset($row['Default']) ? $row['Default'] : '');
if ($do_relation && $have_rel) { if ($do_relation && $have_rel) {