From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 7 Sep 2010 12:44:59 +0000 (+0000)
Subject: Updated groupware stuff
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=03d192e20b93d530f9b14d6b79780bb3cb259e00;p=gosa.git

Updated groupware stuff


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

diff --git a/gosa-plugins/groupware/personal/groupware/class_groupware.inc b/gosa-plugins/groupware/personal/groupware/class_groupware.inc
index df9031e71..b420f5ff7 100644
--- a/gosa-plugins/groupware/personal/groupware/class_groupware.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_groupware.inc
@@ -149,6 +149,14 @@ class groupware extends plugin
             }
         }
 
+        // Check if we were able to initialize the account already.
+        if($this->rpcError){
+            $smarty = get_smarty();
+            $smarty->assign("initFailed", !$this->accountInitialized);
+            $smarty->assign("rpcError", $this->rpcError);
+            return($smarty->fetch(get_template_path("generic.tpl",TRUE,dirname(__FILE__))));
+        }
+
         /****************
           Filter editor
          ****************/
@@ -363,6 +371,14 @@ class groupware extends plugin
     function save_object()
     {
         if(isset($_POST['groupwarePluginPosted'])){
+
+            // We ran into a communication error with the backend. 
+            // Try a simple communication operation with the backend 
+            //  again and let us see if it works.
+            if(isset($_POST['retry'])){
+                $this->rpcExec('getCapabilities');
+            }
+
             foreach($this->attributes as $attr){
                 if(isset($_POST[$attr])){
                     $this->$attr = get_post($attr);
diff --git a/gosa-plugins/groupware/personal/groupware/generic.tpl b/gosa-plugins/groupware/personal/groupware/generic.tpl
index a4d1e936f..9f7973cfa 100644
--- a/gosa-plugins/groupware/personal/groupware/generic.tpl
+++ b/gosa-plugins/groupware/personal/groupware/generic.tpl
@@ -318,6 +318,5 @@
     {/if}
 </table>
 {/if}
-
-<input type='hidden' name='groupwarePluginPosted' value='1'>
 {/if}
+<input type='hidden' name='groupwarePluginPosted' value='1'>