- [DEV-96] added check on deleting user by itself (Artem)

git-svn-id: svn://svn.zabbix.com/trunk@5247 97f52cf1-0a1b-0410-bd0e-c28be96e8082

3 files changed, 13 insertions, 3 deletions

diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index e8327c45..6306ad2e 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -960,8 +960,12 @@
 		if(isset($userid) && $profile == 0)
 		{
 			$frmUser->AddItemToBottomRow(SPACE);
-			$frmUser->AddItemToBottomRow(new CButtonDelete("Delete selected user?",
-				url_param("form").url_param("config").url_param("userid")));
+			$delete_b = new CButtonDelete("Delete selected user?",url_param("form").url_param("config").url_param("userid"));
+			if($USER_DETAILS['userid'] == $userid){
+				$delete_b->AddOption('disabled','disabled');
+			}	
+
+			$frmUser->AddItemToBottomRow($delete_b);
 		}
 		$frmUser->AddItemToBottomRow(SPACE);
 		$frmUser->AddItemToBottomRow(new CButtonCancel(url_param("config")));
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index 560dd0f5..2a0b8fcb 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -1285,6 +1285,7 @@
 	'S_GROUP_DELETED'=>			'Group deleted',
 	'S_CANNOT_DELETE_GROUP'=>		'Cannot delete group',
 	'S_USER_CANNOT_DISABLE_ITSELF'=>	'User cannot disable itself',
+	'S_USER_CANNOT_DELETE_ITSELF'=>		'User cannot delete itself',
 	'S_CONFIGURATION_OF_USERS_AND_USER_GROUPS'=>'CONFIGURATION OF USERS AND USER GROUPS',
 	'S_USER_GROUPS_BIG'=>			'USER GROUPS',
 	'S_USERS_BIG'=>				'USERS',
diff --git a/frontends/php/include/users.inc.php b/frontends/php/include/users.inc.php
index 3bac4b30..af84528d 100644
--- a/frontends/php/include/users.inc.php
+++ b/frontends/php/include/users.inc.php
@@ -155,10 +155,15 @@
 	# Delete User definition
 
 	function	delete_user($userid){
+		global $USER_DETAILS;
 		if(DBfetch(DBselect('select * from users where userid='.$userid.' and alias='.zbx_dbstr(ZBX_GUEST_USER)))){
 			error(S_CANNOT_DELETE_USER.SPACE."'".ZBX_GUEST_USER."'");
 			return	false;
 		}
+		if(bccomp($USER_DETAILS['userid'],$userid) == 0){
+			error(S_USER_CANNOT_DELETE_ITSELF);
+			return false;
+		}
 		
 		DBexecute('delete from operations where object='.OPERATION_OBJECT_USER.' and objectid='.$userid);
 
@@ -189,7 +194,7 @@
 		global $USER_DETAILS;
 		$res = false;
 		if((bccomp($USER_DETAILS['userid'],$userid) == 0) && ($status==USER_STATUS_DISABLED)){
-			show_error_message(S_USER_CANNOT_DISABLE_ITSELF);
+			error(S_USER_CANNOT_DISABLE_ITSELF);
 		}
 		else{
 			$res = DBexecute('UPDATE users SET status='.$status.' WHERE userid='.zbx_dbstr($userid));