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

modified some of GLOBALS[db]

Browse Source
This commit is contained in:
Thilina Buddika 2012-07-26 02:45:09 +05:30
parent 3bb25380c0
commit fc3c01f628
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db_operations.php
View File

@ -220,7 +220,7 @@ if (!$is_information_schema) {
/**
* database comment
*/
echo PMA_getHtmlForDatabaseComment();
echo PMA_getHtmlForDatabaseComment($db);
}
?>
<div class="operations_half_width">
@ -231,7 +231,7 @@ if (!$is_information_schema) {
* rename database
*/
if ($db != 'mysql') {
echo PMA_getHtmlForRenameDatabase();
echo PMA_getHtmlForRenameDatabase($db);
}
// Drop link if allowed
@ -241,7 +241,7 @@ if (!$is_information_schema) {
&& ! $db_is_information_schema
&& (PMA_DRIZZLE || $db != 'mysql')
) {
echo PMA_getHtmlForDropDatabaseLink();
echo PMA_getHtmlForDropDatabaseLink($db);
}
/**
* Copy database

22
libraries/db_operations.lib.php
View File

@ -14,13 +14,15 @@ if (! defined('PHPMYADMIN')) {
/**
* Get HTML output for database comment
*
* @param $db database name
*
* @return string $html_output
*/
function PMA_getHtmlForDatabaseComment()
function PMA_getHtmlForDatabaseComment($db)
{
$html_output = '<div class="operations_half_width">'
. '<form method="post" action="db_operations.php">'
. PMA_generate_common_hidden_inputs($GLOBALS['db'])
. PMA_generate_common_hidden_inputs($db)
. '<fieldset>'
. '<legend>';
if ($GLOBALS['cfg']['PropertiesIconic']) {
@ -29,7 +31,7 @@ function PMA_getHtmlForDatabaseComment()
$html_output .= __('Database comment: ');
$html_output .= '</legend>';
$html_output .= '<input type="text" name="comment" class="textfield" size="30"'
. 'value="' . htmlspecialchars(PMA_getDBComment($GLOBALS['db'])) . '" />'
. 'value="' . htmlspecialchars(PMA_getDBComment($db)) . '" />'
. '</fieldset>';
$html_output .= '<fieldset class="tblFooters">'
. '<input type="submit" value="' . __('Go') . '" />'
@ -43,9 +45,11 @@ function PMA_getHtmlForDatabaseComment()
/**
* Get HTML output for rename database
*
* @param $db database name
*
* @return string $html_output
*/
function PMA_getHtmlForRenameDatabase()
function PMA_getHtmlForRenameDatabase($db)
{
$html_output = '<div class="operations_half_width">'
. '<form id="rename_db_form" ' . ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax" ' : '')
@ -57,7 +61,7 @@ function PMA_getHtmlForRenameDatabase()
}
$html_output .= '<input type="hidden" name="what" value="data" />'
. '<input type="hidden" name="db_rename" value="true" />'
. PMA_generate_common_hidden_inputs($GLOBALS['db'])
. PMA_generate_common_hidden_inputs($db)
. '<fieldset>'
. '<legend>';
@ -82,13 +86,15 @@ function PMA_getHtmlForRenameDatabase()
/**
* Get HTML for database drop link
*
* @param $db database name
*
* @return string $html_output
*/
function PMA_getHtmlForDropDatabaseLink()
function PMA_getHtmlForDropDatabaseLink($db)
{
$common_functions = PMA_CommonFunctions::getInstance();
$this_sql_query = 'DROP DATABASE ' . $common_functions->backquote($GLOBALS['db']);
$this_sql_query = 'DROP DATABASE ' . $common_functions->backquote($db);
$this_url_params = array(
'sql_query' => $this_sql_query,
'back' => 'db_operations.php',
@ -97,7 +103,7 @@ function PMA_getHtmlForDropDatabaseLink()
'purge' => '1',
'message_to_show' => sprintf(
__('Database %s has been dropped.')
, htmlspecialchars($common_functions->backquote($GLOBALS['db']))
, htmlspecialchars($common_functions->backquote($db))
),
'db' => null,
);