KTS-1796

"CLONE -No easy way to delete users/User.inc(SUP-163)" Fixed: Added functionality to soft delete a user. Committed By: Jonathan Byrne Reviewed By: Kevin Fourie git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7310 c91229c3-7414-0410-bfa2-8a42b809f60b

KTS-1796
"CLONE -No easy way to delete users/User.inc(SUP-163)" Fixed: Added functionality to soft delete a user. Committed By: Jonathan Byrne Reviewed By: Kevin Fourie git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7310 c91229c3-7414-0410-bfa2-8a42b809f60b
Jonathan Byrne
1 parent 4c36d357
Showing 4 changed files with 138 additions and 63 deletions
lib/session/Session.inc
lib/users/User.inc
plugins/ktcore/admin/userManagement.php
templates/ktcore/principals/useradmin.smarty
@@ -55,7 +55,7 @@ class Session {
             }
         }
-        if ($oUser->getDisabled()) {
+        if ($oUser->getDisabled() == 1) {
             return PEAR::raiseError(_kt("Your account has been disabled.  Please contact the system administrator for assistance."));
         }
@@ -285,7 +285,8 @@ class User extends KTEntity {
     function getList($sWhereClause = null, $aOptions = null) {
 	    if(!is_array($aOptions)) $aOptions = array($aOptions);
 		$aOptions['orderby'] = KTUtil::arrayGet($aOptions, 'orderby', 'name');
-		
+		//if disabled = 2 then the user is deleted
+		$sWhereClause = 'disabled != \'2\'';
         return KTEntityUtil::getList2('User', $sWhereClause, $aOptions);
     }
@@ -388,7 +389,7 @@ class User extends KTEntity {
     function isAnonymous() { return $this->iId == -2; }
     function disable() {
-        $this->setDisabled(true);
+        $this->setDisabled(1);
         $this->update();
         if (KTPluginUtil::pluginIsActive('ktdms.wintools')) {
             require_once(KT_DIR .  '/plugins/wintools/baobabkeyutil.inc.php');
@@ -398,7 +399,7 @@ class User extends KTEntity {
     }
     function enable() {
-        $this->setDisabled(false);
+        $this->setDisabled(0);
         $this->update();
         if (KTPluginUtil::pluginIsActive('ktdms.wintools')) {
             require_once(KT_DIR .  '/plugins/wintools/baobabkeyutil.inc.php');
@@ -417,4 +418,35 @@ class User extends KTEntity {
         }
         return parent::create();
     }
+    
+    function delete()
+    {
+    	$this->setDisabled(2);
+    	$this->setEmailNotification(false);
+    	//change username
+    	$tempUsername = $this->getUsername();
+    	$this->getUserID($tempUsername);
+    	$tempUserID = $this->iId;
+    	$DeletedUsername = 'kt_deleted_'.$tempUsername.'_'.$tempUserID;
+    	$this->setUsername($DeletedUsername);
+    	
+    	//nullify all authentication_xxx fields
+    	$this->setAuthenticationSourceId(null);
+	    $this->setAuthenticationDetails(null);
+	    $this->setAuthenticationDetails2(null);
+		$this->setAuthenticationDetailsInt1(null);
+	    $this->setAuthenticationDetailsInt2(null);
+		$this->setAuthenticationDetailsDate1(null);
+	    $this->setAuthenticationDetailsDate2(null);
+		$this->setAuthenticationDetailsBool1(null);
+	    $this->setAuthenticationDetailsBool2(null);
+    	
+        $this->update();
+        if (KTPluginUtil::pluginIsActive('ktdms.wintools')) {
+            require_once(KT_DIR .  '/plugins/wintools/baobabkeyutil.inc.php');
+            BaobabKeyUtil::allocateUser($this);
+        }
+        return;
+    
+    }
 }
@@ -645,6 +645,7 @@ class KTUserAdminDispatcher extends KTAdminDispatcher {
     // change enabled / disabled status of users
     function do_change_enabled() {
+        
         $this->startTransaction();
         $iLicenses = 0;
         $bRequireLicenses = false;
@@ -655,33 +656,56 @@ class KTUserAdminDispatcher extends KTAdminDispatcher {
         }
         // admin and anonymous are automatically ignored here.
         $iEnabledUsers = User::getNumberEnabledUsers();
- 
-        foreach(KTUtil::arrayGet($_REQUEST, 'disable_user', array()) as $sUserId => $v) {
-            $oUser = User::get((int)$sUserId);
-            if(PEAR::isError($oUser)) { $this->errorRedirectToMain(_kt('Error getting user object')); }                
-            $oUser->disable();
-            $res = $oUser->update();
-            if(PEAR::isError($res)) { $this->errorRedirectToMain(_kt('Error updating user')); }
-            $iEnabledUsers--;
-        }
-
-        foreach(KTUtil::arrayGet($_REQUEST, 'enable_user', array()) as $sUserId => $v) {
-            // check that we haven't hit max user limit
-            if($bRequireLicenses && $iEnabledUsers >= $iLicenses) { 
-                // if so, add to error messages, but commit transaction (break this loop)
-                $_SESSION['KTErrorMessage'][] = _kt('You may only have ') . $iLicenses . _kt(' users enabled at one time.');
-                break;
-            }
-
-            // else enable user
-            $oUser = User::get((int)$sUserId);
-            if(PEAR::isError($oUser)) { $this->errorRedirectToMain(_kt('Error getting user object')); }               
-            $oUser->enable();
-            $res = $oUser->update();
-            if(PEAR::isError($res)) { $this->errorRedirectToMain(_kt('Error updating user')); }
-            $iEnabledUsers++;
-        }
-
+ 		
+ 		if($_REQUEST['update_value'] == 'enable')
+ 		{
+	        foreach(KTUtil::arrayGet($_REQUEST, 'edit_user', array()) as $sUserId => $v) {
+	            // check that we haven't hit max user limit
+	            if($bRequireLicenses && $iEnabledUsers >= $iLicenses) { 
+	                // if so, add to error messages, but commit transaction (break this loop)
+	                $_SESSION['KTErrorMessage'][] = _kt('You may only have ') . $iLicenses . _kt(' users enabled at one time.');
+	                break;
+	            }
+	
+	            // else enable user
+	            $oUser = User::get((int)$sUserId);
+	            if(PEAR::isError($oUser)) { $this->errorRedirectToMain(_kt('Error getting user object')); }               
+	            $oUser->enable();
+	            $res = $oUser->update();
+	            if(PEAR::isError($res)) { $this->errorRedirectToMain(_kt('Error updating user')); }
+	            $iEnabledUsers++;
+	        }
+ 		}
+ 		
+ 		if($_REQUEST['update_value'] == 'disable')
+ 		{
+	        //echo 'got into disable';
+	        //exit;
+	        
+	        foreach(KTUtil::arrayGet($_REQUEST, 'edit_user', array()) as $sUserId => $v) {
+	            $oUser = User::get((int)$sUserId);
+	            if(PEAR::isError($oUser)) { $this->errorRedirectToMain(_kt('Error getting user object')); }                
+	            $oUser->disable();
+	            $res = $oUser->update();
+	            if(PEAR::isError($res)) { $this->errorRedirectToMain(_kt('Error updating user')); }
+	            $iEnabledUsers--;
+	        }
+ 		}
+ 		
+ 		if($_REQUEST['update_value'] == 'delete')
+ 		{
+ 			//echo 'Delete called';
+ 			
+ 			foreach(KTUtil::arrayGet($_REQUEST, 'edit_user', array()) as $sUserId => $v) {
+	            $oUser = User::get((int)$sUserId);
+	            if(PEAR::isError($oUser)) { $this->errorRedirectToMain(_kt('Error getting user object')); }                
+	            $oUser->delete();
+	            $res = $oUser->update();
+	            if(PEAR::isError($res)) { $this->errorRedirectToMain(_kt('Error updating user')); }
+	            $iEnabledUsers--;
+	        }
+ 		}
+ 		
         $this->commitTransaction();
         $this->successRedirectToMain(_kt('Users updated'));
@@ -689,4 +713,4 @@ class KTUserAdminDispatcher extends KTAdminDispatcher {
 }
 -?>
+?>
 \ No newline at end of file
 <h2>{i18n}User Management{/i18n}</h2>
-
+{literal}
+<script type="text/javascript">
+	function updateUser(updateAction)
+	{
+		var hiddenBox = document.getElementById("update_value");
+		hiddenBox.value = updateAction;
+		document.editUserForm.submit();
+	}
+	function confirmDelete ()
+	{
+		if(confirm("Are you sure you want to delete?"))
+		{
+			updateUser('delete');
+		}
+	}
+</script>
+{/literal}
 {if $can_add}
 <fieldset> <legend>{i18n}Add new users{/i18n}</legend> <p
@@ -69,16 +85,16 @@ very slow if you have many users).{/i18n}&lt;/p&gt;
    {if (!empty($search_results))}
 <br />
-<form action="{$smarty.server.PHP_SELF}" method="post">
+<form name="editUserForm" action="{$smarty.server.PHP_SELF}" method="post">
 <table class="kt_collection narrow" cellspacing="0" cellpadding="5">
 <thead>
    <tr>
+   	   <th>&nbsp;</th>
       <th>{i18n}Name{/i18n}</th>
       <th>{i18n}Username{/i18n}</th>
       <th>{i18n}Edit{/i18n}</th>
       <th>{i18n}Enabled{/i18n}</th>
-      <th>{i18n}Enable{/i18n}</th>
-      <th>{i18n}Disable{/i18n}</th>
+       
       <th>{i18n}Group Memberships{/i18n}</th>
       <th>{i18n}Current Groups{/i18n}</th>
    </tr>
@@ -86,39 +102,42 @@ very slow if you have many users).{/i18n}&lt;/p&gt;
 <tbody>
    <!-- do we want to batch here? -->
      {foreach item=oUser from=$search_results}
-     <tr class="{cycle values=odd,even}">
-        <td>{$oUser->getName()}</td>
-        <td>{$oUser->getUsername()}</td>
-        <td><a href="{addQS}action=editUser&user_id={$oUser->getId()}&old_search={$old_search}{/addQS}" class="ktAction ktEdit">{i18n}Edit{/i18n}</a></td>
-        <td class="centered">
-        {if ($oUser->getDisabled())}
-            <span class="ktAction ktDenied" title="{i18n}Disabled{/i18n}">{i18n}Disabled{/i18n}</a>        
-        {else}
-            <span class="ktAction ktAllowed" title="{i18n}Enabled{/i18n}">{i18n}Enabled{/i18n}</a>
-        {/if}
-        </td>
-
-        <td class="centered">
-        {if ($oUser->getDisabled() && $oUser->getId() != ADMIN_USER_ID)}<input type="checkbox" name="enable_user[{$oUser->getId()}]" value="1" />
-        {else}&mdash;{/if}
-        </td>
-        
-        <td class="centered">
-        {if (!$oUser->getDisabled() && $oUser->getId() != ADMIN_USER_ID)}<input type="checkbox" name="disable_user[{$oUser->getId()}]" value="1" />
-        {else}&mdash;{/if}
-        </td>
-        
-
-        <td><a href="{addQS}action=editgroups&user_id={$oUser->getId()}&old_search={$old_search}{/addQS}">{i18n}Manage Groups{/i18n}</a></td>  
-        <td class="title"><span class="descriptiveText">{$context->getGroupStringForUser($oUser)}</span></td>
-     </tr>   
+     {if ($oUser->getDisabled() != 2)}
+	     <tr class="{cycle values=odd,even}">
+	        <td class="centered">
+		{if ($oUser->getId() != ADMIN_USER_ID)}<input type="checkbox" name="edit_user[{$oUser->getId()}]" value="1"/>
+		{else}&mdash;{/if}
+		</td>
+	        <td class="centered">
+		{$oUser->getName()}</td>
+	        <td>{$oUser->getUsername()}</td>
+	        <td><a href="{addQS}action=editUser&user_id={$oUser->getId()}&old_search={$old_search}{/addQS}" class="ktAction ktEdit">{i18n}Edit{/i18n}</a></td>
+	        <td class="centered">
+	        {if ($oUser->getDisabled() == 1)}
+	            <span class="ktAction ktDenied" title="{i18n}Disabled{/i18n}">{i18n}Disabled{/i18n}</a>        
+	        {else}
+	            <span class="ktAction ktAllowed" title="{i18n}Enabled{/i18n}">{i18n}Enabled{/i18n}</a>
+	        {/if}
+	        </td>
+	
+	        
+	        
+	
+	        <td><a href="{addQS}action=editgroups&user_id={$oUser->getId()}&old_search={$old_search}{/addQS}">{i18n}Manage Groups{/i18n}</a></td>  
+	        <td class="title"><span class="descriptiveText">{$context->getGroupStringForUser($oUser)}</span></td>
+	     </tr>
+     {/if}   
      {/foreach}
 </tbody>
 </table>
 <div class="form_actions">
 <input type="hidden" name="action" value="change_enabled" />
-<input type="submit" value="{i18n}Apply Changes{/i18n}" />
+<input type="hidden" name="update_value" id="update_value" value="" />
+<input type="button" value="{i18n}Enable{/i18n}" id="enableButton" onclick="updateUser('enable');">
+<input type="button" value="{i18n}Disable{/i18n}" id="disableButton" onclick="updateUser('disable');">
+<input type="button" value="{i18n}Delete{/i18n}" id="deleteButton" onclick="confirmDelete();">
+
 </div>
 </form>
 {else}