From a93ab11a60f9a243ddd372ccd3022404290b9e9d Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 22 Jul 2014 13:56:36 +0000
Subject: [PATCH] Fix mail ACL popup dialog does not make delete button
 readonly for account owner

---
 mail/inc/class.mail_acl.inc.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mail/inc/class.mail_acl.inc.php b/mail/inc/class.mail_acl.inc.php
index 4cc7e8d928..e1c3ba19a4 100644
--- a/mail/inc/class.mail_acl.inc.php
+++ b/mail/inc/class.mail_acl.inc.php
@@ -62,10 +62,10 @@ class mail_acl
 	}
 
 	/**
-	 * Edit folder ACLs for account(s)
+	 * Edit folder ACLs of account(s)
 	 *
-	 * @param string $msg
-	 * @param array $content
+	 * @param string $content = null
+	 * @param array $msg = ''
 	 *
 	 */
 	function edit(array $content=null ,$msg='')
@@ -157,7 +157,7 @@ class mail_acl
 						$msg .= "\n".lang("Error: Could not save ACL").' '.lang("reason!");
 					}
 					//Send message
-					egw_framework::refresh_opener($msg, 'mail', 'update');
+					egw_framework::refresh_opener($msg, 'mail',null, 'update');
 					if ($button == "apply") break;
 
 
@@ -175,7 +175,7 @@ class mail_acl
 					{
 						error_log(__METHOD__.__LINE__. "()" . "The remove_acl suppose to return an array back, something is wrong there");
 					}
-					egw_framework::refresh_opener($msg, 'mail', 'update');
+					egw_framework::refresh_opener($msg, 'mail', null,'update');
 			}
 		}
 		$readonlys = $sel_options = array();
@@ -184,8 +184,8 @@ class mail_acl
 		//Make the delete buttons readonly for entry filed and account owner
 		foreach($content['grid'] as $key => $field)
 		{
-			if ($field['acc_id'] == $this->mail_bo->icServer->acc_name ||
-					$field['acc_id'][0] == $this->mail_bo->icServer->acc_name)
+			if ($field['acc_id'] == $this->mail_bo->icServer->acc_imap_username ||
+					$field['acc_id'][0] == $this->mail_bo->icServer->acc_imap_username)
 			{
 				$readonlys['grid']['delete['.$key.']'] = true;
 			}