Added scalix group support

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

diff --git a/plugins/admin/groups/class_scalixGroup.inc b/plugins/admin/groups/class_scalixGroup.inc
new file mode 100644 (file)
index 0000000..21a65c1
--- /dev/null
+++ b/plugins/admin/groups/class_scalixGroup.inc
@@ -0,0 +1,12 @@
+<?php
+
+class scalixGroup extends scalixAccount
+{
+    var $scalixGroup = TRUE;
+
+    var $attributes           = array("scalixMailnode");
+    var $fakeBooleanAttributes= array("scalixHideUserEntry");
+    var $objectclasses        = array("scalixGroupClass");
+}
+
+?>

diff --git a/plugins/personal/scalix/class_scalixAccount.inc b/plugins/personal/scalix/class_scalixAccount.inc
index c47522a72da5077730bea5a26251152bf234a9fa..315f4cd9d5462e0e529717a26c53d1a58f4d83ac 100644 (file)
--- a/plugins/personal/scalix/class_scalixAccount.inc
+++ b/plugins/personal/scalix/class_scalixAccount.inc
@@ -20,8 +20,12 @@ class scalixAccount extends plugin
   /* MUST */
   var $scalixScalixObject= TRUE; //TRUE or FALSE
   var $scalixMailnode= "";
-  /* INDIRECT MUST, scalix will complain if no email was specified */
+
+  /* Indicates whether we have a scalix group or a sclix user account 
+   */
+       var $scalixGroup = FALSE;
   
+  /* INDIRECT MUST, scalix will complain if no email was specified */
   /* MAY */
   var $scalixAdministrator= FALSE;
   var $scalixMailboxAdministrator = FALSE;
@@ -103,6 +107,7 @@ class scalixAccount extends plugin
 
     /* Load templating engine */
     $smarty= get_smarty();
+    $smarty->assign("scalixGroup",$this->scalixGroup);
     $display= "";
 
     /* Do we need to flip is_account state? */
@@ -306,12 +311,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/plugins/personal/scalix/generic.tpl b/plugins/personal/scalix/generic.tpl
index 7072bb1442b84faa1820419b63f705d17a75cb90..906c6acb1ef4478a32927116d584b8dd097f1259 100644 (file)
--- a/plugins/personal/scalix/generic.tpl
+++ b/plugins/personal/scalix/generic.tpl
@@ -2,11 +2,13 @@
  <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>
      <td><input id="scalixMailnode" name="scalixMailnode" size=35 maxlength=65 {$scalixMailnodeACL} value="{$scalixMailnode}"></td>
     </tr>
+{if !$scalixGroup}
     <tr>
      <td><label for="scalixMailboxClass">{t}Scalix mailbox class{/t}</label></td>
      <td>
@@ -16,6 +18,8 @@
       </select>
      </td>
     </tr>
+
+
     <tr>
      <td><label for="scalixServerLanguage">{t}Scalix server language{/t}</label></td>
      <td>
@@ -25,8 +29,9 @@
       </select>
      </td>
     </tr>
+{/if}
    </table>
-   
+{if !$scalixGroup}   
    <p class="seperator">&nbsp;</p>
    
    <table summary="">
@@ -64,6 +69,7 @@
      </td>
     </tr>
    </table>
+{/if}
   </td>
 
   <td style="border-left:1px solid #A0A0A0">
@@ -86,7 +92,6 @@
   </td>
  </tr>
 </table>
-
 <input type="hidden" name="scalixTab" value="scalixTab">
 
 <!-- Place cursor -->