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

* db_readdump.php3: if file contains mutiple queries, only show this line:

Browse Source 
"Your SQL-query has been executed successfully: The content of your
           file has been inserted. (131 Instructions)" instead of showing twice
           (result + textarea) the whole file, which could be problematic with
           large dumps.
        * db_details: removed $sql_query_cpy stuff (was used by db_readdump.php3)
This commit is contained in:
Olivier Müller
2001-08-19 12:46:17 +00:00
parent 862ebba12b
commit 4ab699c90f
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@@ -5,13 +5,22 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2001-08-19 Olivier M<>ller <om@omnis.ch>
* db_readdump.php3: if file contains mutiple queries, only show this line:
"Your SQL-query has been executed successfully: The content of your
file has been inserted. (131 Instructions)" instead of showing twice
(result + textarea) the whole file, which could be problematic with
large dumps.
* db_details: removed $sql_query_cpy stuff (was used by db_readdump.php3)
* lang/*: $strInstructions (used in db_readdump.php3)
2001-08-19 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2001-08-19 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* tbl_change.php3: do not modify blob/binaries if $cfgProtectBlob is true * tbl_change.php3: do not modify blob/binaries if $cfgProtectBlob is true
and merged a little optimization (lines 69-71). and merged a little optimization (lines 69-71).
* main.php3; db_details.php3; tbl_properties.php3; db_readdump.php3; * main.php3; db_details.php3; tbl_properties.php3; db_readdump.php3;
lib.inc.php3: once a query has been executed phpMyAdmin now moves back lib.inc.php3: once a query has been executed phpMyAdmin now moves back
to the calling script (rather than db_details.php3 everytime) as soon as to the calling script (rather than db_details.php3 everytime) as soon as
the current database/table exists, else it moves back to a "parent" the current database/table exists, else it moves back to a "parent"
script (the welcome page/'db_details.php3' if the current script (the welcome page/'db_details.php3' if the current
database/table has has been dropped. database/table has has been dropped.

7
db_details.php3
View File

@@ -309,12 +309,7 @@ $url_query = 'lang=' . $lang
. '&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') {
// This script has been called by db_readdump.php3 if (get_magic_quotes_gpc()) {
if (isset($sql_query_cpy)) {
$query_to_display = $sql_query_cpy;
}
// Other cases
else if (get_magic_quotes_gpc()) {
$query_to_display = stripslashes($sql_query); $query_to_display = stripslashes($sql_query);
} }
else { else {

9
db_readdump.php3
View File

@@ -70,9 +70,6 @@ if (!empty($prev_sql_query)) {
} }
} }
// Copy the query, used for display purposes only
$sql_query_cpy = $sql_query;
/** /**
* Executes the query * Executes the query
@@ -120,6 +117,9 @@ if ($sql_query != '') {
} // end if } // end if
// be nice with bandwidth...
$sql_query = "";
/** /**
* Go back to the calling script * Go back to the calling script
*/ */
@@ -127,7 +127,8 @@ require('./header.inc.php3');
if (isset($my_die)) { if (isset($my_die)) {
mysql_die('', $my_die); mysql_die('', $my_die);
} }
$message = $strSuccess;
$message = "$strSuccess: $strTheContent ($pieces_count $strInstructions) &nbsp;";
if (!isset($goto) if (!isset($goto)
|| ($goto != 'db_details.php3' && $goto != 'tbl_properties.php3')) { || ($goto != 'db_details.php3' && $goto != 'tbl_properties.php3')) {
$goto = 'db_details.php3'; $goto = 'db_details.php3';