From 209f58ff3f67d0fb0b71c930be578ce74ee1bde7 Mon Sep 17 00:00:00 2001
From: Jonathan Ernst <Jonathan@ernstfamily.ch>
Date: Mon, 14 Feb 2005 18:20:48 +0000
Subject: [PATCH] Fix user deletion

---
 admin/adminUsers.php | 8 ++------
 include/user.php     | 7 +++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/admin/adminUsers.php b/admin/adminUsers.php
index 5de02eb..1683e48 100644
--- a/admin/adminUsers.php
+++ b/admin/adminUsers.php
@@ -4,7 +4,7 @@
 /********************/
 
 include("path.php");
-include(BASE."include/"."incl.php");
+include(BASE."include/incl.php");
 
 apidb_header("Admin Users Management");
 
@@ -18,11 +18,7 @@ if(!$_SESSION['current']->hasPriv("admin"))
 if($_REQUEST['action'] == "delete" && is_numeric($_REQUEST['userId']))
 {
     $oUser = new User($_REQUEST['userId']);
-    $sEmail = $oUser->sEmail;
-    if($sEmail)
-    {
-        $oUser->delete();
-    }
+    $oUser->delete();
 }
 
 // search form
diff --git a/include/user.php b/include/user.php
index 6727916..6279536 100644
--- a/include/user.php
+++ b/include/user.php
@@ -141,9 +141,9 @@ class User {
     function delete()
     {
         if(!$this->isLoggedIn()) return false;
-        $hResult2 = query_appdb("DELETE FROM user_privs WHERE id = '".$this->iUserId."'");
-        $hResult3 = query_appdb("DELETE FROM user_prefs WHERE id = '".$this->iUserId."'");
-        return($hResult = query_appdb("DELETE FROM user_list WHERE id = '".$this->iUserId."'"));
+        $hResult2 = query_appdb("DELETE FROM user_privs WHERE userid = '".$this->iUserId."'");
+        $hResult3 = query_appdb("DELETE FROM user_prefs WHERE userid = '".$this->iUserId."'");
+        return($hResult = query_appdb("DELETE FROM user_list WHERE userid = '".$this->iUserId."'"));
     }
 
 
@@ -198,7 +198,6 @@ class User {
     function isMaintainer($iVersionId=null)
     {
         if(!$this->isLoggedIn()) return false;
-
         if($iVersionId)
         {
             $sQuery = "SELECT * FROM appMaintainers WHERE userid = '".$this->iUserId."' AND versionId = '$iVersionId'";