From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 27 Aug 2008 07:47:36 +0000 (+0000)
Subject: Updated scalix
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=17baeaaa7d33ffafa3684ffab9aedd42af3f4677;p=gosa.git

Updated scalix
-Works with groups now


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12281 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-plugins/scalix/personal/scalix/class_scalixAccount.inc b/gosa-plugins/scalix/personal/scalix/class_scalixAccount.inc
index 73338760e..0f8cc811e 100644
--- a/gosa-plugins/scalix/personal/scalix/class_scalixAccount.inc
+++ b/gosa-plugins/scalix/personal/scalix/class_scalixAccount.inc
@@ -317,12 +317,15 @@ class scalixAccount extends plugin
     $this->attrs['scalixEmailAddress']= $this->scalixEmailAddress;    
     
     /* Save boolean vars ... the scalix schema expects them as strings */
+    if(!$this->scalixGroup){
+      $this->attrs['scalixAdministrator'] = $this->scalixAdministrator?"TRUE":"FALSE";
+      $this->attrs['scalixMailboxAdministrator'] = $this->scalixMailboxAdministrator?"TRUE":"FALSE";
+      $this->attrs['scalixLimitOutboundMail'] = $this->scalixLimitOutboundMail?"TRUE":"FALSE";
+      $this->attrs['scalixLimitInboundMail'] = $this->scalixLimitInboundMail?"TRUE":"FALSE";
+      $this->attrs['scalixLimitNotifyUser'] = $this->scalixLimitNotifyUser?"TRUE":"FALSE";
+    }
+    
     $this->attrs['scalixScalixObject'] = $this->scalixScalixObject?"TRUE":"FALSE";
-    $this->attrs['scalixAdministrator'] = $this->scalixAdministrator?"TRUE":"FALSE";
-    $this->attrs['scalixMailboxAdministrator'] = $this->scalixMailboxAdministrator?"TRUE":"FALSE";
-    $this->attrs['scalixLimitOutboundMail'] = $this->scalixLimitOutboundMail?"TRUE":"FALSE";
-    $this->attrs['scalixLimitInboundMail'] = $this->scalixLimitInboundMail?"TRUE":"FALSE";
-    $this->attrs['scalixLimitNotifyUser'] = $this->scalixLimitNotifyUser?"TRUE":"FALSE";
     $this->attrs['scalixHideUserEntry'] = $this->scalixHideUserEntry?"TRUE":"FALSE";
 
     /* Remove Mailquota if = "" */
diff --git a/gosa-plugins/scalix/personal/scalix/generic.tpl b/gosa-plugins/scalix/personal/scalix/generic.tpl
index 913ac3c26..af34000eb 100644
--- a/gosa-plugins/scalix/personal/scalix/generic.tpl
+++ b/gosa-plugins/scalix/personal/scalix/generic.tpl
@@ -2,6 +2,7 @@
  <tr>
   <td style="width:50%; vertical-align:top;">
    <h2><img class="center" alt="" align="middle" src="images/rightarrow.png" />&nbsp;{t}Generic{/t}</h2>
+<!-- Hide user specific attributes when in group mode. -->
    <table summary="">
     <tr>
      <td><label for="scalixMailnode">{t}Scalix mailnode{/t}</label>{$must}</td>
@@ -11,6 +12,7 @@
 {/render}
 	 </td>
     </tr>
+{if !$scalixGroup}
     <tr>
      <td><label for="scalixMailboxClass">{t}Salix mailbox class{/t}</label></td>
      <td>
@@ -22,7 +24,8 @@
 {/render}
      </td>
     </tr>
-{if !$calixGroup}
+
+
     <tr>
      <td><label for="scalixServerLanguage">{t}Scalix server language{/t}</label></td>
      <td>
@@ -34,13 +37,16 @@
 {/render}
      </td>
     </tr>
+{/if} 
    </table>
-   
+  
+{if !$scalixGroup}
    <p class="seperator">&nbsp;</p>
    
    <table summary="">
     <tr>
      <td>
+{if !$scalixGroup}
 {render acl=$scalixAdministratorACL}
 	  <input type=checkbox name="scalixAdministrator" value="1" {$scalixAdministrator}
 	   title="{t}Select for admin capability.{/t}"> {t}Scalix Administrator{/t}
@@ -51,6 +57,7 @@
 	   title="{t}Select for mailbox admin capability.{/t}"> {t}Scalix Mailbox Administrator{/t}
 {/render}
 	  <br>
+{/if}
 {render acl=$scalixHideUserEntryACL}
 	  <input type=checkbox name="scalixHideUserEntry" value="1" {$scalixHideUserEntry}
 	   title="{t}Hide user entry from addressbook.{/t}"> {t}Hide this user entry in Scalix{/t}
@@ -89,6 +96,7 @@
      </td>
     </tr>
    </table>
+{/if}
   </td>
 
   <td style="border-left:1px solid #A0A0A0">
@@ -116,9 +124,7 @@
 {/render}
   </td>
  </tr>
-{/if}
 </table>
-
 <input type="hidden" name="scalixTab" value="scalixTab">
 
 <!-- Place cursor -->