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

Configurable file name templates (RFE #1226941).

Browse Source
This commit is contained in:
Michal Čihař
2005-06-24 12:17:07 +00:00
parent b8746b6e09
commit c6f540be72
5 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -8,6 +8,9 @@ $Source$
2005-06-24 Michal Čihař <michal@cihar.com> 2005-06-24 Michal Čihař <michal@cihar.com>
* tbl_change.php, tbl_properties_links.php, libraries/export/sql.php: * tbl_change.php, tbl_properties_links.php, libraries/export/sql.php:
Remove error reporting. Remove error reporting.
* config.inc.php, libraries/common.lib.php,
libraries/config_import.lib.php, libraries/display_export.lib.php:
Configurable file name templates (RFE #1226941).
2005-06-24 Marc Delisle <lem9@users.sourceforge.net> 2005-06-24 Marc Delisle <lem9@users.sourceforge.net>
* db_operations.php: problem renaming a db * db_operations.php: problem renaming a db

3
config.inc.php
View File

@@ -323,6 +323,9 @@ $cfg['Export']['asfile'] = FALSE;
$cfg['Export']['onserver'] = FALSE; $cfg['Export']['onserver'] = FALSE;
$cfg['Export']['onserver_overwrite'] = FALSE; $cfg['Export']['onserver_overwrite'] = FALSE;
$cfg['Export']['remember_file_template'] = TRUE; $cfg['Export']['remember_file_template'] = TRUE;
$cfg['Export']['file_template_table'] = '__TABLE__';
$cfg['Export']['file_template_database'] = '__DB__';
$cfg['Export']['file_template_server'] = '__SERVER__';
$cfg['Export']['htmlexcel_columns'] = FALSE; $cfg['Export']['htmlexcel_columns'] = FALSE;
$cfg['Export']['htmlexcel_null'] = 'NULL'; $cfg['Export']['htmlexcel_null'] = 'NULL';

2
libraries/common.lib.php
View File

@@ -142,7 +142,7 @@ if (isset($cfg['FileRevision'])) {
} else { } else {
$cfg['FileRevision'] = array(1, 1); $cfg['FileRevision'] = array(1, 1);
} }
if ($cfg['FileRevision'][0] < 2 || ($cfg['FileRevision'][0] == 2 && $cfg['FileRevision'][1] < 52)) { if ($cfg['FileRevision'][0] < 2 || ($cfg['FileRevision'][0] == 2 && $cfg['FileRevision'][1] < 56)) {
require_once('./libraries/config_import.lib.php'); require_once('./libraries/config_import.lib.php');
} }

9
libraries/config_import.lib.php
View File

@@ -1135,6 +1135,15 @@ if (!isset($cfg['Export']['onserver_overwrite'])) {
if (!isset($cfg['Export']['remember_file_template'])) { if (!isset($cfg['Export']['remember_file_template'])) {
$cfg['Export']['remember_file_template'] = TRUE; $cfg['Export']['remember_file_template'] = TRUE;
} }
if (!isset($cfg['Export']['file_template_table'])) {
$cfg['Export']['file_template_table'] = '__TABLE__';
}
if (!isset($cfg['Export']['file_template_database'])) {
$cfg['Export']['file_template_database'] = '__DB__';
}
if (!isset($cfg['Export']['file_template_server'])) {
$cfg['Export']['file_template_server'] = '__SERVER__';
}
if (!isset($cfg['Export']['csv_null'])) { if (!isset($cfg['Export']['csv_null'])) {
$cfg['Export']['csv_null'] = 'NULL'; $cfg['Export']['csv_null'] = 'NULL';
} }

6
libraries/display_export.lib.php
View File

@@ -659,19 +659,19 @@ if (isset($table) && !empty($table) && !isset($num_tables)) {
if (isset($_COOKIE) && !empty($_COOKIE['pma_db_filename_template'])) { if (isset($_COOKIE) && !empty($_COOKIE['pma_db_filename_template'])) {
echo $_COOKIE['pma_db_filename_template']; echo $_COOKIE['pma_db_filename_template'];
} else { } else {
echo '__DB__'; echo $GLOBALS['cfg']['Export']['file_template_database'];
} }
} elseif ($export_type == 'table') { } elseif ($export_type == 'table') {
if (isset($_COOKIE) && !empty($_COOKIE['pma_table_filename_template'])) { if (isset($_COOKIE) && !empty($_COOKIE['pma_table_filename_template'])) {
echo $_COOKIE['pma_table_filename_template']; echo $_COOKIE['pma_table_filename_template'];
} else { } else {
echo '__TABLE__'; echo $GLOBALS['cfg']['Export']['file_template_table'];
} }
} else { } else {
if (isset($_COOKIE) && !empty($_COOKIE['pma_server_filename_template'])) { if (isset($_COOKIE) && !empty($_COOKIE['pma_server_filename_template'])) {
echo $_COOKIE['pma_server_filename_template']; echo $_COOKIE['pma_server_filename_template'];
} else { } else {
echo '__SERVER__'; echo $GLOBALS['cfg']['Export']['file_template_server'];
} }
} }
echo '" '; echo '" ';