From 40ce002c99a59d591629016effd41172b783fa96 Mon Sep 17 00:00:00 2001 From: cajus Date: Fri, 11 Dec 2009 14:04:15 +0000 Subject: [PATCH] Added auto proposal for CalFBURL git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14892 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../connectivity/kolab/class_kolabAccount.inc | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/gosa-plugins/kolab/personal/connectivity/kolab/class_kolabAccount.inc b/gosa-plugins/kolab/personal/connectivity/kolab/class_kolabAccount.inc index 696f2b358..f817ce7d6 100644 --- a/gosa-plugins/kolab/personal/connectivity/kolab/class_kolabAccount.inc +++ b/gosa-plugins/kolab/personal/connectivity/kolab/class_kolabAccount.inc @@ -67,10 +67,10 @@ class kolabAccount extends plugin if(count($this->kolabDelegate)){ $this->is_account = true; } - foreach(array("calFBURL") as $attr){ - if(!empty($this->$attr)){ - $this->is_account = true; - } + + /* Propose FreeBusy URL if empty */ + if(!empty($this->calFBURL)){ + $this->is_account = true; } /* Transfer account states for this union */ @@ -82,6 +82,7 @@ class kolabAccount extends plugin $this->is_account = false; $this->mail_Account = false; } + } @@ -89,9 +90,15 @@ class kolabAccount extends plugin */ function execute() { - /* Call parent execute */ - plugin::execute(); + /* Call parent execute */ + plugin::execute(); + /* Fill proposed FB URL if empty */ + if (empty($this->calFBURL)) { + $this->calFBURL= "https://".$this->parent->by_object['mailAccount']->gosaMailServer. + "/freebusy/".$this->parent->by_object['mailAccount']->mail.".ifb"; + } + /* Log view */ if($this->is_account && !$this->view_logged){ $this->view_logged = TRUE; -- 2.30.2