Monotone-Parent: 03c1031b520e0b1094e5e7cf635bc6be4d30dac3

Monotone-Revision: 935cf293ec636367ef64469ec9130956087caa1e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-05-31T21:04:56
Monotone-Branch: ca.inverse.sogo

UI/MailerUI/UIxMailUserRightsEditor.m

@@ -23,12 +23,22 @@
 #import <Foundation/NSArray.h>
 #import <Foundation/NSEnumerator.h>
 #import <NGObjWeb/WORequest.h>
+#import <SoObjects/Mailer/SOGoMailFolder.h>
 #import <SoObjects/SOGo/SOGoPermissions.h>
 
 #import "UIxMailUserRightsEditor.h"
 
 @implementation UIxMailUserRightsEditor
 
+- (BOOL) conformsToRFC4314
+{
+  SOGoMailFolder *co;
+
+  co = [self clientObject];
+
+  return ([[co class] imapAclStyle] == rfc4314);
+}
+
 - (void) setUserCanReadMails: (BOOL) userCanReadMails
 {
   if (userCanReadMails)

UI/Templates/MailerUI/UIxMailUserRightsEditor.wox

@@ -52,21 +52,23 @@
 	  var:checked="userCanCreateSubfolders"/><var:string
 	  label:value="Add subfolders to this folder"/></label>
       <br/>
-      <label><input type="checkbox" class="checkBox"
-	  const:name="FolderEraser"
-	  var:checked="userCanRemoveFolder"/><var:string
-	  label:value="Remove this folder"/></label>
-      <br/>
       <label><input type="checkbox" class="checkBox"
 	  const:name="ObjectEraser"
 	  var:checked="userCanEraseMails"/><var:string
 	  label:value="Erase mails from this folder"/></label>
       <br/>
+      <var:if condition="conformsToRFC4314">
+      <label><input type="checkbox" class="checkBox"
+	  const:name="FolderEraser"
+	  var:checked="userCanRemoveFolder"/><var:string
+	  label:value="Remove this folder"/></label>
+      <br/>
       <label><input type="checkbox" class="checkBox"
 	  const:name="MailExpunger"
 	  var:checked="userCanExpungeFolder"/><var:string
 	  label:value="Expunge this folder"/></label>
       <br/>
+      </var:if>
       <label><input type="checkbox" class="checkBox"
 	  const:name="MailAdministrator"
 	  var:checked="userIsAdministrator"/><var:string