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

some tweaks

Browse Source 
display error an calling page instead of empty page
This commit is contained in:
Sebastian Mendel
2007-10-12 08:08:32 +00:00
parent 51f93af4b0
commit 1950e582e6
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
sql.php
View File

@@ -133,7 +133,7 @@ if (isset($btnDrop) && $btnDrop == $strNo) {
$goto = $back; $goto = $back;
} }
if ($is_gotofile) { if ($is_gotofile) {
if (strpos(' ' . $goto, 'db_') == 1 && strlen($table)) { if (strpos($goto, 'db_') === 0 && strlen($table)) {
$table = ''; $table = '';
} }
$active_page = $goto; $active_page = $goto;
@@ -306,11 +306,21 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
// Displays an error message if required and stop parsing the script // Displays an error message if required and stop parsing the script
if ($error = PMA_DBI_getError()) { if ($error = PMA_DBI_getError()) {
require_once './libraries/header.inc.php'; if ($is_gotofile) {
$full_err_url = (preg_match('@^(db|tbl)_@', $err_url)) if (strpos($goto, 'db_') === 0 && strlen($table)) {
? $err_url . '&show_query=1&sql_query=' . urlencode($sql_query) $table = '';
: $err_url; }
PMA_mysqlDie($error, $full_sql_query, '', $full_err_url); $active_page = $goto;
$message = PMA_Message::raw($error, PMA_Message::ERROR);
require './' . PMA_securePath($goto);
} else {
require_once './libraries/header.inc.php';
$full_err_url = (preg_match('@^(db|tbl)_@', $err_url))
? $err_url . '&show_query=1&sql_query=' . urlencode($sql_query)
: $err_url;
PMA_mysqlDie($error, $full_sql_query, '', $full_err_url);
}
exit;
} }
unset($error); unset($error);
@@ -331,14 +341,12 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
// Checks if the current database has changed // Checks if the current database has changed
// This could happen if the user sends a query like "USE `database`;" // This could happen if the user sends a query like "USE `database`;"
$res = PMA_DBI_query('SELECT DATABASE() AS \'db\';'); $current_db = PMA_DBI_fetch_value('SELECT DATABASE()');
$row = PMA_DBI_fetch_row($res); if ($db !== $current_db) {
if (strlen($db) && is_array($row) && isset($row[0]) && (strcasecmp($db, $row[0]) != 0)) { $db = $current_db;
$db = $row[0];
$reload = 1; $reload = 1;
} }
@PMA_DBI_free_result($res); unset($current_db);
unset($res, $row);
// tmpfile remove after convert encoding appended by Y.Kawada // tmpfile remove after convert encoding appended by Y.Kawada
if (function_exists('PMA_kanji_file_conv') if (function_exists('PMA_kanji_file_conv')
@@ -424,9 +432,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
// SELECT COUNT(*), f1 from t1 group by f1 // SELECT COUNT(*), f1 from t1 group by f1
// and you click to sort on count(*) // and you click to sort on count(*)
// } // }
$cnt_all_result = PMA_DBI_query('SELECT FOUND_ROWS() as count;'); $unlim_num_rows = PMA_DBI_fetch_value('SELECT FOUND_ROWS()');
list($unlim_num_rows) = PMA_DBI_fetch_row($cnt_all_result);
@PMA_DBI_free_result($cnt_all_result);
} // end else "just browsing" } // end else "just browsing"
} else { // not $is_select } else { // not $is_select