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

Rename db_* files to drop useless _details part.

Browse Source
This commit is contained in:
Michal Čihař
2006-10-25 12:25:01 +00:00
parent ad06b4a991
commit cac4247057
34 changed files with 93 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql.php
View File

@@ -42,7 +42,7 @@ if (empty($goto)) {
if (!isset($err_url)) {
$err_url = (!empty($back) ? $back : $goto)
. '?' . PMA_generate_common_url(isset($db) ? $db : '')
. ((strpos(' ' . $goto, 'db_details') != 1 && isset($table)) ? '&table=' . urlencode($table) : '');
. ((strpos(' ' . $goto, 'db_') != 1 && isset($table)) ? '&table=' . urlencode($table) : '');
} // end if
// Coming from a bookmark dialog
@@ -155,7 +155,7 @@ if (isset($btnDrop) && $btnDrop == $strNo) {
$goto = $back;
}
if ($is_gotofile) {
if (strpos(' ' . $goto, 'db_details') == 1 && isset($table) && strlen($table)) {
if (strpos(' ' . $goto, 'db_') == 1 && isset($table) && strlen($table)) {
unset($table);
}
$active_page = $goto;
@@ -368,7 +368,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
// Displays an error message if required and stop parsing the script
if ($error = PMA_DBI_getError()) {
require_once './libraries/header.inc.php';
$full_err_url = (preg_match('@^(db_details|tbl_)@', $err_url))
$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);
@@ -602,7 +602,7 @@ if ($num_rows < 1 || $is_affected) {
// Ok, here is an explanation for the !$is_select.
// The form generated by sql_query_form.lib.php
// and db_details.php has many submit buttons
// and db_sql.php has many submit buttons
// on the same form, and some confusion arises from the
// fact that $zero_rows is sent for every case.
// The $zero_rows containing $strSuccess and sent with
@@ -629,16 +629,16 @@ if ($num_rows < 1 || $is_affected) {
if (isset($table)) {
unset($table);
}
$goto = 'db_details.php';
$goto = 'db_sql.php';
}
if (strpos($goto, 'db_details') === 0 && ! $is_db) {
if (strpos($goto, 'db_') === 0 && ! $is_db) {
if (isset($db)) {
unset($db);
}
$goto = 'main.php';
}
// Loads to target script
if (strpos($goto, 'db_details') === 0
if (strpos($goto, 'db_') === 0
|| strpos($goto, 'tbl_') === 0) {
$js_to_run = 'functions.js';
}
@@ -670,7 +670,7 @@ else {
require './libraries/tbl_info.inc.php';
require './libraries/tbl_links.inc.php';
} elseif (isset($db) && strlen($db)) {
require './libraries/db_details_common.inc.php';
require './libraries/db_common.inc.php';
require './libraries/db_info.inc.php';
} else {
require './libraries/server_common.inc.php';