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

bugfixes

Browse Source
This commit is contained in:
Alexander M. Turek
2003-01-11 12:52:42 +00:00
parent 62bc1a3f15
commit 320c4d6817
7 changed files with 97 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -5,6 +5,13 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-01-11 Alexander M. Turek <rabus@users.sourceforge.net>
* server_*.php3:
- The messages are now displayed by server_links.inc.php3, so
server_common.inc.php3 may be included earlier;
- Beautified code.
* server_privileges.php3: Wrong GRANT syntax.
2003-01-10 Marc Delisle <lem9@users.sourceforge.net> 2003-01-10 Marc Delisle <lem9@users.sourceforge.net>
* tbl_change.php3: bug 665885, wrong back link after sql error * tbl_change.php3: bug 665885, wrong back link after sql error
* lang/spanish: update, thanks to Dr. med. Daniel Hinostroza C. * lang/spanish: update, thanks to Dr. med. Daniel Hinostroza C.

7
server_common.inc.php3
View File

@@ -37,13 +37,6 @@ $err_url = 'main.php3' . $url_query;
*/ */
require('./header.inc.php3'); require('./header.inc.php3');
/**
* Displays a message
*/
if (!empty($message)) {
PMA_showMessage($message);
}
/** /**
* Checks for superuser privileges * Checks for superuser privileges
*/ */

12
server_links.inc.php3
View File

@@ -10,8 +10,7 @@ $server_links_count_tabs = 0;
/** /**
* If coming from a Show MySQL link on the home page, * Put something in $sub_part
* put something in $sub_part
*/ */
if (!isset($sub_part)) { if (!isset($sub_part)) {
$sub_part = ''; $sub_part = '';
@@ -27,6 +26,14 @@ if ($is_superuser) {
} }
/**
* Displays a message
*/
if (!empty($message)) {
PMA_showMessage($message);
}
/** /**
* Displays tab links * Displays tab links
*/ */
@@ -50,4 +57,3 @@ echo PMA_printTab($strServerTabProcesslist, 'server_processlist.php3', $url_quer
</tr> </tr>
</table> </table>
<br /> <br />

107
server_privileges.php3
View File

@@ -4,15 +4,26 @@
/** /**
* Gets some core libraries * Does the common work
*/ */
if (!defined('PMA_GRAB_GLOBALS_INCLUDED')) { $js_to_run = 'server_privileges.js';
include('./libraries/grab_globals.lib.php3'); require('./server_common.inc.php3');
}
if (!defined('PMA_COMMON_LIB_INCLUDED')) {
include('./libraries/common.lib.php3'); /**
* Checks if the user is allowed to do what he tries to...
*/
if (!$is_superuser) {
include('./server_links.inc.php3');
echo '<h2>' . "\n"
. ' ' . $strPrivileges . "\n"
. '</h2>' . "\n"
. $strNoPrivileges . "\n";
include('./footer.inc.php3');
exit;
} }
/** /**
* Extracts the privilege information of a priv table row * Extracts the privilege information of a priv table row
* *
@@ -289,6 +300,7 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = TRUE, $indent =
echo $spaces . '</table>' . "\n"; echo $spaces . '</table>' . "\n";
} // end of the 'PMA_displayPrivTable()' function } // end of the 'PMA_displayPrivTable()' function
/** /**
* Adds a user * Adds a user
*/ */
@@ -322,21 +334,6 @@ if (!empty($adduser_submit)) {
} else { } else {
if (PMA_MYSQL_INT_VERSION >= 32211) { if (PMA_MYSQL_INT_VERSION >= 32211) {
$real_sql_query = 'GRANT ' . join(', ', PMA_extractPrivInfo()) . ' ON *.* TO "' . $username . '"@"' . $hostname . '"'; $real_sql_query = 'GRANT ' . join(', ', PMA_extractPrivInfo()) . ' ON *.* TO "' . $username . '"@"' . $hostname . '"';
if ((isset($Grant_priv) && $Grant_priv == 'Y') || isset($max_questions) || isset($max_connections) || isset($max_updates)) {
$real_sql_query .= 'WITH';
if (isset($Grant_priv) && $Grant_priv == 'Y') {
$real_sql_query .= ' GRANT OPTION';
}
if (isset($max_questions)) {
$real_sql_query .= ' MAX_QUERIES_PER_HOUR ' . (int)$max_questions;
}
if (isset($max_connections)) {
$real_sql_query .= ' MAX_CONNECTIONS_PER_HOUR ' . (int)$max_connections;
}
if (isset($max_updates)) {
$real_sql_query .= ' MAX_UPDATES_PER_HOUR ' . (int)$max_updates;
}
}
if ($pred_password != 'none') { if ($pred_password != 'none') {
$pma_pw_hidden = ''; $pma_pw_hidden = '';
for ($i = 0; $i < strlen($pma_pw); $i++) { for ($i = 0; $i < strlen($pma_pw); $i++) {
@@ -347,6 +344,28 @@ if (!empty($adduser_submit)) {
} else { } else {
$sql_query = $real_sql_query; $sql_query = $real_sql_query;
} }
if ((isset($Grant_priv) && $Grant_priv == 'Y') || isset($max_questions) || isset($max_connections) || isset($max_updates)) {
$real_sql_query .= 'WITH';
$sql_query .= 'WITH';
if (isset($Grant_priv) && $Grant_priv == 'Y') {
$real_sql_query .= ' GRANT OPTION';
$sql_query .= ' GRANT OPTION';
}
if (isset($max_questions)) {
$real_sql_query .= ' MAX_QUERIES_PER_HOUR ' . (int)$max_questions;
$sql_query .= ' MAX_QUERIES_PER_HOUR ' . (int)$max_questions;
}
if (isset($max_connections)) {
$real_sql_query .= ' MAX_CONNECTIONS_PER_HOUR ' . (int)$max_connections;
$sql_query .= ' MAX_CONNECTIONS_PER_HOUR ' . (int)$max_connections;
}
if (isset($max_updates)) {
$real_sql_query .= ' MAX_UPDATES_PER_HOUR ' . (int)$max_updates;
$sql_query .= ' MAX_UPDATES_PER_HOUR ' . (int)$max_updates;
}
}
$real_sql_query .= ';';
$sql_query .= ';';
PMA_mysql_query($real_sql_query, $userlink) or PMA_mysqlDie(PMA_mysql_error($userlink)); PMA_mysql_query($real_sql_query, $userlink) or PMA_mysqlDie(PMA_mysql_error($userlink));
unset($real_sql_query); unset($real_sql_query);
$message = $strAddUserMessage; $message = $strAddUserMessage;
@@ -376,6 +395,7 @@ if (!empty($adduser_submit)) {
} }
} }
/** /**
* Updates privileges * Updates privileges
*/ */
@@ -427,6 +447,7 @@ if (!empty($update_privs)) {
} }
} }
/** /**
* Revokes Privileges * Revokes Privileges
*/ */
@@ -450,6 +471,7 @@ if (!empty($revokeall)) {
} }
} }
/** /**
* Updates the password * Updates the password
*/ */
@@ -477,12 +499,11 @@ if (!empty($change_pw)) {
} }
} }
/** /**
* Deletes users * Deletes users
*/ */
if (!empty($delete)) { if (!empty($delete)) {
PMA_mysql_query('USE `mysql`;', $userlink) or PMA_mysqlDie(PMA_mysql_error($userlink), 'USE `mysql`;');
$is_superuser = TRUE;
$queries = array(); $queries = array();
for ($i = 0; isset($selected_usr[$i]); $i++) { for ($i = 0; isset($selected_usr[$i]); $i++) {
list($this_user, $this_host) = explode('@', $selected_usr[$i]); list($this_user, $this_host) = explode('@', $selected_usr[$i]);
@@ -520,7 +541,8 @@ if (!empty($delete)) {
$message = $strError . ': ' . $strDeleteNoUsersSelected; $message = $strError . ': ' . $strDeleteNoUsersSelected;
} else { } else {
if ($mode == 3) { if ($mode == 3) {
$queries[] = '# ' . $strReloadingThePrivileges . ' ...' . "\n" . 'FLUSH PRIVILEGES;'; $queries[] = '# ' . $strReloadingThePrivileges . ' ...';
$queries[] = 'FLUSH PRIVILEGES;';
} }
while (list(, $sql_query) = each($queries)) { while (list(, $sql_query) = each($queries)) {
if (substr($sql_query, 0, 1) != '#') { if (substr($sql_query, 0, 1) != '#') {
@@ -533,6 +555,7 @@ if (!empty($delete)) {
unset($queries); unset($queries);
} }
/** /**
* Reloads the privilege tables into memory * Reloads the privilege tables into memory
*/ */
@@ -545,29 +568,16 @@ if (!empty($flush_privileges)) {
} }
} }
/**
* Does the common work
*/
$js_to_run = 'server_privileges.js';
require('./server_common.inc.php3');
/** /**
* Displays the links * Displays the links
*/ */
require('./server_links.inc.php3'); require('./server_links.inc.php3');
/**
* Checks if the user is allowed to do what he tries to...
*/
if (!$is_superuser) {
echo '<h2>' . "\n"
. ' ' . $strPrivileges . "\n"
. '</h2>' . "\n"
. $strNoPrivileges . "\n";
include('./footer.inc.php3');
exit;
}
/**
* Displays the page
*/
if (empty($adduser)) { if (empty($adduser)) {
if (!isset($username)) { if (!isset($username)) {
// No username is given --> display the overview // No username is given --> display the overview
@@ -684,7 +694,8 @@ if (empty($adduser)) {
. ' </ul>' . "\n" . ' </ul>' . "\n"
. '</form>' . "\n" . '</form>' . "\n"
. '<div>' . "\n" . '<div>' . "\n"
. ' ' . sprintf($strFlushPrivilegesNote, '<a href="server_privileges.php3?' . $url_query . '&amp;flush_privileges=1">', '</a>'); . ' ' . sprintf($strFlushPrivilegesNote, '<a href="server_privileges.php3?' . $url_query . '&amp;flush_privileges=1">', '</a>') . "\n"
. '</div>' . "\n";
} }
} else if (isset($username)) { } else if (isset($username)) {
if (!isset($hostname)) { if (!isset($hostname)) {
@@ -901,7 +912,7 @@ if (empty($adduser)) {
. ' <select name="pred_username" id="select_pred_username" title="' . $strUserName . '" class="textfield"' . "\n" . ' <select name="pred_username" id="select_pred_username" title="' . $strUserName . '" class="textfield"' . "\n"
. ' onchange="if (this.value == \'any\') { username.value = \'\'; } else if (this.value == \'userdefined\') { username.focus(); username.select(); }">' . "\n" . ' onchange="if (this.value == \'any\') { username.value = \'\'; } else if (this.value == \'userdefined\') { username.focus(); username.select(); }">' . "\n"
. ' <option value="any"' . ((isset($pred_username) && $pred_username == 'any') ? ' selected="selected"' : '') . '>' . $strAnyUser . '</option>' . "\n" . ' <option value="any"' . ((isset($pred_username) && $pred_username == 'any') ? ' selected="selected"' : '') . '>' . $strAnyUser . '</option>' . "\n"
. ' <option value="userdefined"' . ((isset($pred_username) && $pred_username == 'userdefined') ? ' selected="selected"' : '') . '>' . $strUseTextField . ':</option>' . "\n" . ' <option value="userdefined"' . ((!isset($pred_username) || $pred_username == 'userdefined') ? ' selected="selected"' : '') . '>' . $strUseTextField . ':</option>' . "\n"
. ' </select>' . "\n" . ' </select>' . "\n"
. ' </td>' . "\n" . ' </td>' . "\n"
. ' <td bgcolor="' . $cfg['BgcolorTwo'] . '">' . "\n" . ' <td bgcolor="' . $cfg['BgcolorTwo'] . '">' . "\n"
@@ -926,11 +937,9 @@ if (empty($adduser)) {
unset($thishost); unset($thishost);
} }
} }
if (empty($thishost)) { echo ' onchange="if (this.value == \'any\') { hostname.value = \'%\'; } else if (this.value == \'localhost\') { hostname.value = \'localhost\'; } '
echo ' onchange="if (this.value == \'any\') { hostname.value = \'%\'; } else if (this.value == \'localhost\') { hostname.value = \'localhost\'; } else if (this.value == \'userdefined\') { hostname.focus(); hostname.select(); }">' . "\n"; . (empty($thishost) ? '' : 'else if (this.value == \'thishost\') { hostname.value = \'' . addslashes(htmlspecialchars($thishost)) . '\'; } ')
} else { . 'else if (this.value == \'userdefined\') { hostname.focus(); hostname.select(); }">' . "\n";
echo ' onchange="if (this.value == \'any\') { hostname.value = \'%\'; } else if (this.value == \'localhost\') { hostname.value = \'localhost\'; } else if (this.value == \'thishost\') { hostname.value = \'' . addslashes(htmlspecialchars($thishost)) . '\'; } else if (this.value == \'userdefined\') { hostname.focus(); hostname.select(); }">' . "\n";
}
unset($row); unset($row);
echo ' <option value="any"' . ((isset($pred_hostname) && $pred_hostname == 'any') ? ' selected="selected"' : '') . '>' . $strAnyHost . '</option>' . "\n" echo ' <option value="any"' . ((isset($pred_hostname) && $pred_hostname == 'any') ? ' selected="selected"' : '') . '>' . $strAnyHost . '</option>' . "\n"
. ' <option value="localhost"' . ((isset($pred_hostname) && $pred_hostname == 'localhost') ? ' selected="selected"' : '') . '>' . $strLocalhost . '</option>' . "\n"; . ' <option value="localhost"' . ((isset($pred_hostname) && $pred_hostname == 'localhost') ? ' selected="selected"' : '') . '>' . $strLocalhost . '</option>' . "\n";
@@ -955,7 +964,7 @@ if (empty($adduser)) {
. ' <select name="pred_password" id="select_pred_password" title="' . $strPassword . '" class="textfield"' . "\n" . ' <select name="pred_password" id="select_pred_password" title="' . $strPassword . '" class="textfield"' . "\n"
. ' onchange="if (this.value == \'none\') { pma_pw.value = \'\'; pma_pw2.value = \'\'; } else if (this.value == \'userdefined\') { pma_pw.focus(); pma_pw.select(); }">' . "\n" . ' onchange="if (this.value == \'none\') { pma_pw.value = \'\'; pma_pw2.value = \'\'; } else if (this.value == \'userdefined\') { pma_pw.focus(); pma_pw.select(); }">' . "\n"
. ' <option value="none">' . $strNoPassword . '</option>' . "\n" . ' <option value="none">' . $strNoPassword . '</option>' . "\n"
. ' <option value="userdefined">' . $strUseTextField . ':</option>' . "\n" . ' <option value="userdefined" selected="selected">' . $strUseTextField . ':</option>' . "\n"
. ' </select>' . "\n" . ' </select>' . "\n"
. ' </td>' . "\n" . ' </td>' . "\n"
. ' <td bgcolor="' . $cfg['BgcolorTwo'] . '">' . "\n" . ' <td bgcolor="' . $cfg['BgcolorTwo'] . '">' . "\n"
@@ -980,9 +989,11 @@ if (empty($adduser)) {
. '</form>' . "\n"; . '</form>' . "\n";
} // end if (empty($adduser)) ... else ... } // end if (empty($adduser)) ... else ...
/** /**
* Displays the footer * Displays the footer
*/ */
echo "\n\n";
require('./footer.inc.php3'); require('./footer.inc.php3');
?> ?>

19
server_processlist.php3
View File

@@ -4,14 +4,10 @@
/** /**
* Gets some core libraries * Does the common work
*/ */
if (!defined('PMA_GRAB_GLOBALS_INCLUDED')) { require('./server_common.inc.php3');
include('./libraries/grab_globals.lib.php3');
}
if (!defined('PMA_COMMON_LIB_INCLUDED')) {
include('./libraries/common.lib.php3');
}
/** /**
* Kills a selected process * Kills a selected process
@@ -25,16 +21,13 @@ if (!empty($kill)) {
} }
} }
/**
* Does the common work
*/
require('./server_common.inc.php3');
/** /**
* Displays the links * Displays the links
*/ */
require('./server_links.inc.php3'); require('./server_links.inc.php3');
/** /**
* Displays the sub-page heading * Displays the sub-page heading
*/ */
@@ -42,6 +35,7 @@ echo '<h2>' . "\n"
. ' ' . $strProcesslist . "\n" . ' ' . $strProcesslist . "\n"
. '</h2>' . "\n"; . '</h2>' . "\n";
/** /**
* Checks if the user is allowed to do what he tries to... * Checks if the user is allowed to do what he tries to...
*/ */
@@ -51,6 +45,7 @@ if (!$is_superuser && !$cfg['ShowMysqlVars']) {
exit; exit;
} }
/** /**
* Sends the query and buffers the result * Sends the query and buffers the result
*/ */
@@ -63,6 +58,7 @@ while ($row = PMA_mysql_fetch_array($res, MYSQL_ASSOC)) {
unset($res); unset($res);
unset($row); unset($row);
/** /**
* Displays the page * Displays the page
*/ */
@@ -103,6 +99,7 @@ while (list($name, $value) = each($serverProcesses)) {
</table> </table>
<?php <?php
/** /**
* Sends the footer * Sends the footer
*/ */

6
server_status.php3
View File

@@ -8,11 +8,13 @@
*/ */
require('./server_common.inc.php3'); require('./server_common.inc.php3');
/** /**
* Displays the links * Displays the links
*/ */
require('./server_links.inc.php3'); require('./server_links.inc.php3');
/** /**
* Displays the sub-page heading * Displays the sub-page heading
*/ */
@@ -20,6 +22,7 @@ echo '<h2>' . "\n"
. ' ' . $strServerStatus . "\n" . ' ' . $strServerStatus . "\n"
. '</h2>' . "\n"; . '</h2>' . "\n";
/** /**
* Checks if the user is allowed to do what he tries to... * Checks if the user is allowed to do what he tries to...
*/ */
@@ -29,6 +32,7 @@ if (!$is_superuser && !$cfg['ShowMysqlInfo']) {
exit; exit;
} }
/** /**
* Sends the query and buffers the result * Sends the query and buffers the result
*/ */
@@ -40,6 +44,7 @@ while ($row = PMA_mysql_fetch_row($res)) {
unset($res); unset($res);
unset($row); unset($row);
/** /**
* Displays the page * Displays the page
*/ */
@@ -235,6 +240,7 @@ unset($useBgcolorOne);
<?php <?php
/** /**
* Sends the footer * Sends the footer
*/ */

8
server_variables.php3
View File

@@ -8,11 +8,13 @@
*/ */
require('./server_common.inc.php3'); require('./server_common.inc.php3');
/** /**
* Displays the links * Displays the links
*/ */
require('./server_links.inc.php3'); require('./server_links.inc.php3');
/** /**
* Displays the sub-page heading * Displays the sub-page heading
*/ */
@@ -20,6 +22,7 @@ echo '<h2>' . "\n"
. ' ' . $strServerVars . "\n" . ' ' . $strServerVars . "\n"
. '</h2>' . "\n"; . '</h2>' . "\n";
/** /**
* Checks if the user is allowed to do what he tries to... * Checks if the user is allowed to do what he tries to...
*/ */
@@ -29,8 +32,9 @@ if (!$is_superuser && !$cfg['ShowMysqlVars']) {
exit; exit;
} }
/** /**
* Sends the queries and buffers the result * Sends the queries and buffers the results
*/ */
if (PMA_MYSQL_INT_VERSION >= 40003) { if (PMA_MYSQL_INT_VERSION >= 40003) {
$res = @PMA_mysql_query('SHOW SESSION VARIABLES;', $userlink) or PMA_mysqlDie(PMA_mysql_error($userlink), 'SHOW SESSION VARIABLES;'); $res = @PMA_mysql_query('SHOW SESSION VARIABLES;', $userlink) or PMA_mysqlDie(PMA_mysql_error($userlink), 'SHOW SESSION VARIABLES;');
@@ -53,6 +57,7 @@ if (PMA_MYSQL_INT_VERSION >= 40003) {
unset($res); unset($res);
unset($row); unset($row);
/** /**
* Displays the page * Displays the page
*/ */
@@ -93,6 +98,7 @@ while (list($name, $value) = each($serverVars)) {
</table> </table>
<?php <?php
/** /**
* Sends the footer * Sends the footer
*/ */