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

Misc urlencode use fixes

Browse Source
This commit is contained in:
Loïc Chapeaux
2001-08-29 07:15:40 +00:00
parent 88b021f3bd
commit 9007431f71
11 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -5,6 +5,13 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2001-08-29 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* db_details.php3, line 558: an urlencode call was missing.
* db_details.php3; db_stats.php3; index.php3; left.php3; lib.inc.php3;
main.php3; sql.php3; tbl_properties.php3; tbl_select.php3;
tbl_replace.php3: the $server variable do not need to be urlencoded (it's
an integer).
2001-08-28 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2001-08-28 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* lang/galician.inc.php3, select_lang.inc.php3: new Galician lang thanks to * lang/galician.inc.php3, select_lang.inc.php3: new Galician lang thanks to
Xose Calvo <xosecalvo@terra.es>. Xose Calvo <xosecalvo@terra.es>.

8
db_details.php3
View File

@@ -109,7 +109,7 @@ else if (MYSQL_INT_VERSION >= 32300 && isset($tbl_cache)) {
$table = $sts_data['Name']; $table = $sts_data['Name'];
// Sets parameters for links // Sets parameters for links
$url_query = 'lang=' . $lang $url_query = 'lang=' . $lang
. '&server=' . urlencode($server) . '&server=' . $server
. '&db=' . urlencode($db) . '&db=' . urlencode($db)
. '&table=' . urlencode($table) . '&table=' . urlencode($table)
. '&goto=db_details.php3'; . '&goto=db_details.php3';
@@ -253,7 +253,7 @@ else {
$table = mysql_tablename($tables, $i); $table = mysql_tablename($tables, $i);
// Sets parameters for links // Sets parameters for links
$url_query = 'lang=' . $lang $url_query = 'lang=' . $lang
. '&server=' . urlencode($server) . '&server=' . $server
. '&db=' . urlencode($db) . '&db=' . urlencode($db)
. '&table=' . urlencode($table) . '&table=' . urlencode($table)
. '&goto=db_details.php3'; . '&goto=db_details.php3';
@@ -305,7 +305,7 @@ echo "\n";
* Database work * Database work
*/ */
$url_query = 'lang=' . $lang $url_query = 'lang=' . $lang
. '&server=' . urlencode($server) . '&server=' . $server
. '&db=' . urlencode($db) . '&db=' . urlencode($db)
. '&goto=db_details.php3'; . '&goto=db_details.php3';
if (isset($show_query) && $show_query == 'y') { if (isset($show_query) && $show_query == 'y') {
@@ -555,7 +555,7 @@ if ($cfgAllowUserDropDatabase || $is_superuser) {
?> ?>
<!-- Drop database --> <!-- Drop database -->
<li> <li>
<a href="sql.php3?server=<?php echo $server; ?>&lang=<?php echo $lang; ?>&db=<?php echo $db; ?>&sql_query=<?php echo urlencode('DROP DATABASE ' . backquote($db)); ?>&zero_rows=<?php echo urlencode($strDatabase . ' ' . htmlspecialchars(backquote($db)) . ' ' . $strHasBeenDropped); ?>&goto=main.php3&back=db_details.php3&reload=true"> <a href="sql.php3?server=<?php echo $server; ?>&lang=<?php echo $lang; ?>&db=<?php echo urlencode($db); ?>&sql_query=<?php echo urlencode('DROP DATABASE ' . backquote($db)); ?>&zero_rows=<?php echo urlencode($strDatabase . ' ' . htmlspecialchars(backquote($db)) . ' ' . $strHasBeenDropped); ?>&goto=main.php3&back=db_details.php3&reload=true">
<?php echo $strDropDB . ' ' . htmlspecialchars($db); ?></a> <?php echo $strDropDB . ' ' . htmlspecialchars($db); ?></a>
<?php echo show_docu('manual_Reference.html#DROP_DATABASE') . "\n"; ?> <?php echo show_docu('manual_Reference.html#DROP_DATABASE') . "\n"; ?>
</li> </li>

25
db_stats.php3
View File

@@ -126,7 +126,7 @@ if ($num_dbs > 1) {
$num_tables = @mysql_numrows($tables); $num_tables = @mysql_numrows($tables);
$tot_tables += $num_tables; $tot_tables += $num_tables;
$common_url_query = 'lang=' . $lang $common_url_query = 'lang=' . $lang
. '&server=' . urlencode($server) . '&server=' . $server
. '&db=' . urlencode($db); . '&db=' . urlencode($db);
// Gets size of data and indexes // Gets size of data and indexes
@@ -136,18 +136,17 @@ if ($num_dbs > 1) {
$tot_idx = 0; $tot_idx = 0;
$tot_all = 0; $tot_all = 0;
$local_query = 'SHOW TABLE STATUS FROM ' . $db_clean; $local_query = 'SHOW TABLE STATUS FROM ' . $db_clean;
if ($result = @mysql_query($local_query)) { $result = @mysql_query($local_query);
if (mysql_num_rows($result)) { if (mysql_num_rows($result)) {
while ($row = mysql_fetch_array($result)) { while ($row = mysql_fetch_array($result)) {
$tot_data += $row['Data_length']; $tot_data += $row['Data_length'];
$tot_idx += $row['Index_length']; $tot_idx += $row['Index_length'];
} }
$tot_all = $tot_data + $tot_idx; $tot_all = $tot_data + $tot_idx;
$big_tot_all += $tot_all; $big_tot_all += $tot_all;
$big_tot_idx += $tot_idx; $big_tot_idx += $tot_idx;
$big_tot_data += $tot_data; $big_tot_data += $tot_data;
$results_array[$db] = $tot_all; $results_array[$db] = $tot_all;
}
} }
list($tot_data_format,$unit_data) = format_byte_down($tot_data,3,1); list($tot_data_format,$unit_data) = format_byte_down($tot_data,3,1);

6
index.php3
View File

@@ -17,7 +17,9 @@ if (empty($HTTP_HOST)) {
else if (@getenv('HTTP_HOST')) { else if (@getenv('HTTP_HOST')) {
$HTTP_HOST = getenv('HTTP_HOST'); $HTTP_HOST = getenv('HTTP_HOST');
} }
else $HTTP_HOST=""; else {
$HTTP_HOST = '';
}
} }
@@ -25,7 +27,7 @@ if (empty($HTTP_HOST)) {
* Defines the frameset * Defines the frameset
*/ */
$url_query = 'lang=' . $lang $url_query = 'lang=' . $lang
. '&server=' . urlencode($server) . '&server=' . $server
. (empty($db) ? '' : '&db=' . urlencode($db)); . (empty($db) ? '' : '&db=' . urlencode($db));
?> ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "DTD/xhtml1-frameset.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "DTD/xhtml1-frameset.dtd">

4
left.php3
View File

@@ -185,7 +185,7 @@ if ($num_dbs > 1) {
$tables = @mysql_list_tables($db); $tables = @mysql_list_tables($db);
$num_tables = @mysql_numrows($tables); $num_tables = @mysql_numrows($tables);
$common_url_query = 'lang=' . $lang $common_url_query = 'lang=' . $lang
. '&server=' . urlencode($server) . '&server=' . $server
. '&db=' . urlencode($db); . '&db=' . urlencode($db);
if ($num_tables) { if ($num_tables) {
$num_tables_disp = $num_tables; $num_tables_disp = $num_tables;
@@ -260,7 +260,7 @@ else if ($num_dbs == 1) {
$tables = @mysql_list_tables($db); $tables = @mysql_list_tables($db);
$num_tables = @mysql_numrows($tables); $num_tables = @mysql_numrows($tables);
$common_url_query = 'lang=' . $lang $common_url_query = 'lang=' . $lang
. '&server=' . urlencode($server) . '&server=' . $server
. '&db=' . urlencode($db); . '&db=' . urlencode($db);
if ($num_tables) { if ($num_tables) {
$num_tables_disp = $num_tables; $num_tables_disp = $num_tables;

4
lib.inc.php3
View File

@@ -998,7 +998,7 @@ var errorMsg2 = '<?php echo(str_replace('\'', '\\\'', $GLOBALS['strNotValidNumbe
$sorted_sql_query = $unsorted_sql_query . $sort_order; $sorted_sql_query = $unsorted_sql_query . $sort_order;
} }
$url_query = 'lang=' . $lang $url_query = 'lang=' . $lang
. '&server=' . urlencode($server) . '&server=' . $server
. '&db=' . urlencode($db) . '&db=' . urlencode($db)
. '&table=' . urlencode($table) . '&table=' . urlencode($table)
. '&pos=' . $pos . '&pos=' . $pos
@@ -1081,7 +1081,7 @@ var errorMsg2 = '<?php echo(str_replace('\'', '\\\'', $GLOBALS['strNotValidNumbe
$uva_condition = urlencode(ereg_replace(' ?AND$', '', $uva_condition)); $uva_condition = urlencode(ereg_replace(' ?AND$', '', $uva_condition));
$url_query = 'lang=' . $lang $url_query = 'lang=' . $lang
. '&server=' . urlencode($server) . '&server=' . $server
. '&db=' . urlencode($db) . '&db=' . urlencode($db)
. '&table=' . urlencode($table) . '&table=' . urlencode($table)
. '&pos=' . $pos; . '&pos=' . $pos;

2
main.php3
View File

@@ -143,7 +143,7 @@ if ($server > 0
<?php <?php
echo "\n"; echo "\n";
$common_url_query = 'lang=' . $lang . '&server=' . urlencode($server); $common_url_query = 'lang=' . $lang . '&server=' . $server;
// 1. With authentication // 1. With authentication
if ($cfgServer['adv_auth']) if ($cfgServer['adv_auth'])

6
sql.php3
View File

@@ -54,7 +54,7 @@ if (isset($btnDrop) || isset($navig)) {
if (isset($goto) && $goto == 'sql.php3') { if (isset($goto) && $goto == 'sql.php3') {
$goto = 'sql.php3' $goto = 'sql.php3'
. '?lang=' . $lang . '?lang=' . $lang
. '&server=' . urlencode($server) . '&server=' . $server
. '&db=' . urlencode($db) . '&db=' . urlencode($db)
. '&table=' . urlencode($table) . '&table=' . urlencode($table)
. '&pos=' . $pos . '&pos=' . $pos
@@ -269,7 +269,7 @@ else {
// Insert a new row // Insert a new row
if ($display != 'bkmOnly') { if ($display != 'bkmOnly') {
$url_query = 'lang=' . $lang $url_query = 'lang=' . $lang
. '&server=' . urlencode($server) . '&server=' . $server
. '&db=' . urlencode($db) . '&db=' . urlencode($db)
. '&table=' . urlencode($table) . '&table=' . urlencode($table)
. '&pos=' . $pos . '&pos=' . $pos
@@ -303,7 +303,7 @@ var errorMsg0 = '<?php echo(str_replace('\'', '\\\'', $strFormEmpty)); ?>';
echo ' ' . $strBookmarkLabel . '&nbsp;:' . "\n"; echo ' ' . $strBookmarkLabel . '&nbsp;:' . "\n";
$goto = 'sql.php3' $goto = 'sql.php3'
. '?lang=' . $lang . '?lang=' . $lang
. '&server=' . urlencode($server) . '&server=' . $server
. '&db=' . urlencode($db) . '&db=' . urlencode($db)
. '&table=' . urlencode($table) . '&table=' . urlencode($table)
. '&pos=' . $pos . '&pos=' . $pos

2
tbl_properties.php3
View File

@@ -60,7 +60,7 @@ if (empty($table) || !@mysql_numrows($is_table)) {
* Set parameters for links * Set parameters for links
*/ */
$url_query = 'lang=' . $lang $url_query = 'lang=' . $lang
. '&server=' . urlencode($server) . '&server=' . $server
. '&db=' . urlencode($db) . '&db=' . urlencode($db)
. '&table=' . urlencode($table) . '&table=' . urlencode($table)
. '&goto=tbl_properties.php3'; . '&goto=tbl_properties.php3';

2
tbl_replace.php3
View File

@@ -19,7 +19,7 @@ if (isset($sql_query)) {
if ($goto == 'sql.php3') { if ($goto == 'sql.php3') {
$goto = 'sql.php3?' $goto = 'sql.php3?'
. 'lang=' . $lang . 'lang=' . $lang
. '&server=' . urlencode($server) . '&server=' . $server
. '&db=' . urlencode($db) . '&db=' . urlencode($db)
. '&table=' . urlencode($table) . '&table=' . urlencode($table)
. '&pos=' . $pos . '&pos=' . $pos

2
tbl_select.php3
View File

@@ -171,7 +171,7 @@ else {
} // end if } // end if
$url_query = 'lang=' . $lang $url_query = 'lang=' . $lang
. '&server=' . urlencode($server) . '&server=' . $server
. '&db=' . urlencode($db) . '&db=' . urlencode($db)
. '&table=' . urlencode($table) . '&table=' . urlencode($table)
. '&sql_query=' . urlencode($sql_query) . '&sql_query=' . urlencode($sql_query)