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

go back to the previous calling script that is not a confirmation form in case of error

Browse Source
This commit is contained in:
Loïc Chapeaux
2001-08-20 16:55:17 +00:00
parent 387bd70155
commit 9fc66f3eae
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -19,6 +19,9 @@ $Source$
* lib.inc.php3; sql.php3: optimized a bit and started to work on feature * lib.inc.php3; sql.php3: optimized a bit and started to work on feature
#444767 (Other cases for display=simple). #444767 (Other cases for display=simple).
* user_details.php3: fixed some javascript bugs. * user_details.php3: fixed some javascript bugs.
* tbl_change.php3, lines 26 & 31: added some mysql_die() calls.
* lib.inc.php3, lines 135 & 147: go back to the previous calling script
that is not a confirmation form.
2001-08-19 Olivier M<>ller <om@omnis.ch> 2001-08-19 Olivier M<>ller <om@omnis.ch>
* db_readdump.php3: if file contains mutiple queries, only show this line: * db_readdump.php3: if file contains mutiple queries, only show this line:

7
lib.inc.php3
View File

@@ -132,6 +132,7 @@ if (!defined('__LIB_INC__')){
if (empty($the_query)) { if (empty($the_query)) {
$the_query = $GLOBALS['sql_query']; $the_query = $GLOBALS['sql_query'];
} }
$hist = (isset($GLOBALS['btnDrop'])) ? -2 : -1;
echo '<b>'. $GLOBALS['strError'] . '</b>' . "\n"; echo '<b>'. $GLOBALS['strError'] . '</b>' . "\n";
if (!empty($the_query)) { if (!empty($the_query)) {
@@ -143,7 +144,7 @@ if (!defined('__LIB_INC__')){
echo '<p>' . "\n"; echo '<p>' . "\n";
echo ' ' . $GLOBALS['strMySQLSaid'] . '&nbsp;' . htmlspecialchars($error_message) . "\n"; echo ' ' . $GLOBALS['strMySQLSaid'] . '&nbsp;' . htmlspecialchars($error_message) . "\n";
echo '</p>' . "\n"; echo '</p>' . "\n";
echo '<a href="javascript:history.go(-1)">' . $GLOBALS['strBack'] . '</a>'; echo '<a href="javascript:history.go(' . $hist . ')">' . $GLOBALS['strBack'] . '</a>';
include('./footer.inc.php3'); include('./footer.inc.php3');
exit(); exit();
@@ -941,7 +942,7 @@ var errorMsg2 = '<?php echo(str_replace('\'', '\\\'', $GLOBALS['strNotValidNumbe
} }
mysql_field_seek($dt_result, 0); mysql_field_seek($dt_result, 0);
if (!$is_simple if (!$is_simple
&& (!isset($SelectNumRows) || $SelectNumRows > $GLOBALS['cfgMaxRows'])) { && (!isset($SelectNumRows) || $SelectNumRows > 1)) {
show_table_navigation($pos_next, $pos_prev, $dt_result); show_table_navigation($pos_next, $pos_prev, $dt_result);
} else { } else {
echo "\n" . '<br /><br />' . "\n"; echo "\n" . '<br /><br />' . "\n";
@@ -1192,7 +1193,7 @@ var errorMsg2 = '<?php echo(str_replace('\'', '\\\'', $GLOBALS['strNotValidNumbe
<?php <?php
echo "\n"; echo "\n";
if (!$is_simple if (!$is_simple
&& (!isset($SelectNumRows) || $SelectNumRows > $GLOBALS['cfgMaxRows'])) { && (!isset($SelectNumRows) || $SelectNumRows > 1)) {
show_table_navigation($pos_next, $pos_prev, $dt_result); show_table_navigation($pos_next, $pos_prev, $dt_result);
} else { } else {
echo "\n" . '<br />' . "\n"; echo "\n" . '<br />' . "\n";