diff --git a/html/includes/authentication/mysql.inc.php b/html/includes/authentication/mysql.inc.php index b86e092b80..c0cac2cf20 100644 --- a/html/includes/authentication/mysql.inc.php +++ b/html/includes/authentication/mysql.inc.php @@ -100,7 +100,15 @@ function get_userid($username) function deluser($username) { + + dbDelete('bill_perms', "`user_name` = ?", array($username)); + dbDelete('devices_perms', "`user_name` = ?", array($username)); + dbDelete('ports_perms', "`user_name` = ?", array($username)); + dbDelete('users_prefs', "`user_name` = ?", array($username)); + dbDelete('users', "`user_name` = ?", array($username)); + return dbDelete('users', "`username` = ?", array($username)); + } diff --git a/html/pages/deluser.inc.php b/html/pages/deluser.inc.php index e49e8433f5..daafbd918f 100644 --- a/html/pages/deluser.inc.php +++ b/html/pages/deluser.inc.php @@ -14,13 +14,15 @@ if ($_SESSION['userlevel'] < '10') { include("includes/error-no-perm.inc.php"); if ($_GET['confirm'] == "yes") { - dbDelete('bill_perms', "`user_id` = ?", array($_GET['user_id'])); - dbDelete('devices_perms', "`user_id` = ?", array($_GET['user_id'])); - dbDelete('ports_perms', "`user_id` = ?", array($_GET['user_id'])); - dbDelete('users_prefs', "`user_id` = ?", array($_GET['user_id'])); - dbDelete('users', "`user_id` = ?", array($_GET['user_id'])); +# del_user($_GET['user_id']); - if (deluser($_GET['user_id'])) { echo("User '$delete_username' deleted!"); } +# dbDelete('bill_perms', "`user_id` = ?", array($_GET['user_id'])); +# dbDelete('devices_perms', "`user_id` = ?", array($_GET['user_id'])); +# dbDelete('ports_perms', "`user_id` = ?", array($_GET['user_id'])); +# dbDelete('users_prefs', "`user_id` = ?", array($_GET['user_id'])); +# dbDelete('users', "`user_id` = ?", array($_GET['user_id'])); + + if (deluser($delete_username)) { echo("