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

Removed PMA_htmlFormat function as it caused HTML entities to be quoted twice

Browse Source
This commit is contained in:
Michal Čihař
2003-03-24 16:07:56 +00:00
parent 5e61b3c7c8
commit 07ca76320b
2 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -12,7 +12,9 @@ $Source$
tbl_properties_structure.php3: Show result of CHECK/OPTIMIZE/REPAIR tbl_properties_structure.php3: Show result of CHECK/OPTIMIZE/REPAIR
queries for multiple tables. queries for multiple tables.
* db_details_structure.php3: Display correctly table names that contain * db_details_structure.php3: Display correctly table names that contain
html entities. HTML entities.
* libraries/build_dump.lib.php3: Removed PMA_htmlFormat function as it
caused HTML entities to be quoted twice.
2003-03-23 Marc Delisle <lem9@users.sourceforge.net> 2003-03-23 Marc Delisle <lem9@users.sourceforge.net>
* libraries/sqlparser.lib.php3, libraries/config_import.lib.php3, * libraries/sqlparser.lib.php3, libraries/config_import.lib.php3,

44
libraries/build_dump.lib.php3
View File

@@ -12,22 +12,6 @@
if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){
define('PMA_BUILD_DUMP_LIB_INCLUDED', 1); define('PMA_BUILD_DUMP_LIB_INCLUDED', 1);
/**
* Uses the 'htmlspecialchars()' php function on databases, tables and fields
* name if the dump has to be displayed on screen.
*
* @param string the string to format
*
* @return string the formatted string
*
* @access private
*/
function PMA_htmlFormat($a_string = '')
{
return (empty($GLOBALS['asfile']) ? htmlspecialchars($a_string) : $a_string);
} // end of the 'PMA_htmlFormat()' function
/** /**
* Returns $table's CREATE definition * Returns $table's CREATE definition
* *
@@ -43,8 +27,6 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){
* @global boolean whether to use backquotes to allow the use of special * @global boolean whether to use backquotes to allow the use of special
* characters in database, table and fields names or not * characters in database, table and fields names or not
* *
* @see PMA_htmlFormat()
*
* @access public * @access public
*/ */
function PMA_getTableDef($db, $table, $crlf, $error_url, $comments = false) function PMA_getTableDef($db, $table, $crlf, $error_url, $comments = false)
@@ -85,7 +67,7 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){
$schema_create .= $new_crlf; $schema_create .= $new_crlf;
if (!empty($drop)) { if (!empty($drop)) {
$schema_create .= 'DROP TABLE IF EXISTS ' . PMA_backquote(PMA_htmlFormat($table), $use_backquotes) . ';' . $crlf; $schema_create .= 'DROP TABLE IF EXISTS ' . PMA_backquote($table, $use_backquotes) . ';' . $crlf;
} }
if ($comments) { if ($comments) {
@@ -128,7 +110,7 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){
$tmpres[1] = substr($tmpres[1], 0, 13) $tmpres[1] = substr($tmpres[1], 0, 13)
. (($use_backquotes) ? PMA_backquote($tmpres[0]) : $tmpres[0]) . (($use_backquotes) ? PMA_backquote($tmpres[0]) : $tmpres[0])
. substr($tmpres[1], $pos); . substr($tmpres[1], $pos);
$schema_create .= str_replace("\n", $crlf, PMA_htmlFormat($tmpres[1])); $schema_create .= str_replace("\n", $crlf, $tmpres[1]);
} }
$schema_create .= $auto_increment; $schema_create .= $auto_increment;
@@ -149,14 +131,14 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){
} // end if MySQL >= 3.23.21 } // end if MySQL >= 3.23.21
// For MySQL < 3.23.20 // For MySQL < 3.23.20
$schema_create .= 'CREATE TABLE ' . PMA_htmlFormat(PMA_backquote($table), $use_backquotes) . ' (' . $crlf; $schema_create .= 'CREATE TABLE ' . PMA_backquote($table, $use_backquotes) . ' (' . $crlf;
$local_query = 'SHOW FIELDS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($db); $local_query = 'SHOW FIELDS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($db);
$result = PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $error_url); $result = PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $error_url);
while ($row = PMA_mysql_fetch_array($result)) { while ($row = PMA_mysql_fetch_array($result)) {
$schema_create .= ' ' . PMA_htmlFormat(PMA_backquote($row['Field'], $use_backquotes)) . ' ' . $row['Type']; $schema_create .= ' ' . PMA_backquote($row['Field'], $use_backquotes) . ' ' . $row['Type'];
if (isset($row['Default']) && $row['Default'] != '') { if (isset($row['Default']) && $row['Default'] != '') {
$schema_create .= ' DEFAULT \'' . PMA_htmlFormat(PMA_sqlAddslashes($row['Default'])) . '\''; $schema_create .= ' DEFAULT \'' . PMA_sqlAddslashes($row['Default']) . '\'';
} }
if ($row['Null'] != 'YES') { if ($row['Null'] != 'YES') {
$schema_create .= ' NOT NULL'; $schema_create .= ' NOT NULL';
@@ -193,9 +175,9 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){
$index[$kname] = array(); $index[$kname] = array();
} }
if ($sub_part > 1) { if ($sub_part > 1) {
$index[$kname][] = PMA_htmlFormat(PMA_backquote($row['Column_name'], $use_backquotes)) . '(' . $sub_part . ')'; $index[$kname][] = PMA_backquote($row['Column_name'], $use_backquotes) . '(' . $sub_part . ')';
} else { } else {
$index[$kname][] = PMA_htmlFormat(PMA_backquote($row['Column_name'], $use_backquotes)); $index[$kname][] = PMA_backquote($row['Column_name'], $use_backquotes);
} }
} // end while } // end while
mysql_free_result($result); mysql_free_result($result);
@@ -282,10 +264,10 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){
// Sets the scheme // Sets the scheme
if (isset($GLOBALS['showcolumns'])) { if (isset($GLOBALS['showcolumns'])) {
$fields = implode(', ', $field_set); $fields = implode(', ', $field_set);
$schema_insert = 'INSERT INTO ' . PMA_backquote(PMA_htmlFormat($table), $use_backquotes) $schema_insert = 'INSERT INTO ' . PMA_backquote($table, $use_backquotes)
. ' (' . PMA_htmlFormat($fields) . ') VALUES ('; . ' (' . $fields . ') VALUES (';
} else { } else {
$schema_insert = 'INSERT INTO ' . PMA_backquote(PMA_htmlFormat($table), $use_backquotes) $schema_insert = 'INSERT INTO ' . PMA_backquote($table, $use_backquotes)
. ' VALUES ('; . ' VALUES (';
} }
@@ -422,10 +404,10 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){
$schema_insert = '('; $schema_insert = '(';
} else { } else {
if (isset($GLOBALS['showcolumns'])) { if (isset($GLOBALS['showcolumns'])) {
$schema_insert = 'INSERT INTO ' . PMA_backquote(PMA_htmlFormat($table), $use_backquotes) $schema_insert = 'INSERT INTO ' . PMA_backquote($table, $use_backquotes)
. ' ' . PMA_htmlFormat($table_list) . ' VALUES ('; . ' ' . $table_list . ' VALUES (';
} else { } else {
$schema_insert = 'INSERT INTO ' . PMA_backquote(PMA_htmlFormat($table), $use_backquotes) $schema_insert = 'INSERT INTO ' . PMA_backquote($table, $use_backquotes)
. ' VALUES ('; . ' VALUES (';
} }
$is_first_row = FALSE; $is_first_row = FALSE;