From c2e22ebf3096843d2a20fbcb190486024273233e Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 27 Aug 2008 07:54:13 +0000 Subject: [PATCH] Added scalix group support git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@12282 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/groups/class_scalixGroup.inc | 12 +++++++++++ .../personal/scalix/class_scalixAccount.inc | 20 +++++++++++++------ plugins/personal/scalix/generic.tpl | 9 +++++++-- 3 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 plugins/admin/groups/class_scalixGroup.inc diff --git a/plugins/admin/groups/class_scalixGroup.inc b/plugins/admin/groups/class_scalixGroup.inc new file mode 100644 index 000000000..21a65c1e5 --- /dev/null +++ b/plugins/admin/groups/class_scalixGroup.inc @@ -0,0 +1,12 @@ + diff --git a/plugins/personal/scalix/class_scalixAccount.inc b/plugins/personal/scalix/class_scalixAccount.inc index c47522a72..315f4cd9d 100644 --- 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 7072bb144..906c6acb1 100644 --- a/plugins/personal/scalix/generic.tpl +++ b/plugins/personal/scalix/generic.tpl @@ -2,11 +2,13 @@

 {t}Generic{/t}

+ +{if !$scalixGroup} + + +{/if}
{$must}
@@ -16,6 +18,8 @@
@@ -25,8 +29,9 @@
- +{if !$scalixGroup}

 

@@ -64,6 +69,7 @@
+{/if} @@ -86,7 +92,6 @@ - -- 2.30.2