webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-28 07:41:55 +03:00
Code Activity

Remove dead code

Browse Source 
Signed-off-by: Marc Delisle <marc@infomarc.info>
This commit is contained in:
Marc Delisle
2014-09-09 09:21:27 -04:00
parent 3cd1d69f8b
commit 9f65021d1e
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/server_privileges.lib.php
View File

@@ -1674,15 +1674,14 @@ function PMA_updatePassword($err_url, $username, $hostname)
/**
* Revokes privileges and get message and SQL query for privileges revokes
*
* @param string $db_and_table wildcard Escaped database+table specification
* @param string $dbname database name
* @param string $tablename table name
* @param string $username username
* @param string $hostname host name
* @param string $dbname database name
* @param string $tablename table name
* @param string $username username
* @param string $hostname host name
*
* @return array ($message, $sql_query)
*/
function PMA_getMessageAndSqlQueryForPrivilegesRevoke($db_and_table, $dbname,
function PMA_getMessageAndSqlQueryForPrivilegesRevoke($dbname,
$tablename, $username, $hostname
) {
$db_and_table = PMA_wildcardEscapeForGrant($dbname, $tablename);
@@ -2672,7 +2671,6 @@ function PMA_getUserSpecificRights($tables, $user_host_condition, $dbname)
}
$result = $GLOBALS['dbi']->query($sql_query);
$sql_query = '';
while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
if (isset($db_rights[$row[$dbOrTableName]])) {
@@ -4396,7 +4394,6 @@ function PMA_addUserAndCreateDatabase($_error, $real_sql_query, $sql_query,
*/
function PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password)
{
$sql_query = '';
$create_user_real = 'CREATE USER \''
. PMA_Util::sqlAddSlashes($username) . '\'@\''
. PMA_Util::sqlAddSlashes($hostname) . '\'';

1
server_privileges.php
View File

@@ -223,7 +223,6 @@ if (! empty($_REQUEST['changeUserGroup']) && $cfgRelation['menuswork']
*/
if (isset($_REQUEST['revokeall'])) {
list ($message, $sql_query) = PMA_getMessageAndSqlQueryForPrivilegesRevoke(
$db_and_table,
(isset($dbname) ? $dbname : ''),
(isset($tablename) ? $tablename : ''),
$username, $hostname

3
test/libraries/PMA_server_privileges_test.php
View File

@@ -734,7 +734,6 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
public function testPMAGetMessageAndSqlQueryForPrivilegesRevoke()
{
$dbname = 'pma_dbname';
$db_and_table = 'pma_dbname.pma_tablename';
$username = 'pma_username';
$hostname = 'pma_hostname';
$tablename = 'pma_tablename';
@@ -747,7 +746,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$_POST['max_questions'] = 1000;
list ($message, $sql_query)
= PMA_getMessageAndSqlQueryForPrivilegesRevoke(
$db_and_table, $dbname, $tablename, $username, $hostname
$dbname, $tablename, $username, $hostname
);
$this->assertEquals(