From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 18 Apr 2007 09:09:06 +0000 (+0000)
Subject: Only display error messages if necessary
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5feb59d1e1771d10f9179804d57dcb7102e384ec;p=gosa.git

Only display error messages if necessary


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

diff --git a/plugins/gofon/phoneaccount/class_phoneAccount.inc b/plugins/gofon/phoneaccount/class_phoneAccount.inc
index 579ab01b7..3a985f37c 100644
--- a/plugins/gofon/phoneaccount/class_phoneAccount.inc
+++ b/plugins/gofon/phoneaccount/class_phoneAccount.inc
@@ -73,16 +73,20 @@ class phoneAccount extends plugin
      *  and first server as default if necessary.
      * Check if connection is successfull for the selected server $this->goFonHomeServer
      */
+
+    /* Set available server */
+    if(isset($_SESSION['config']->data['SERVERS']['FON'])){
+      $this->goFonHomeServers = $_SESSION['config']->data['SERVERS']['FON'];
+    }
+
     $a_SETUP= array();
-    if(array_key_exists('config',$_SESSION) &&
+    if($this->is_account &&
+       array_key_exists('config',$_SESSION) &&
        array_key_exists('SERVERS',$_SESSION['config']->data) &&
        array_key_exists('FON',$_SESSION['config']->data['SERVERS']) &&
        is_callable("mysql_connect")
        ) {
 
-      /* Set available server */
-      $this->goFonHomeServers = $_SESSION['config']->data['SERVERS']['FON'];
-
       /* Servers defined? Watch here... */
       if (count($this->goFonHomeServers)){
 
diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index 95960749a..ac113fde2 100644
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -98,7 +98,7 @@ class mailAccount extends plugin
     } else {
       $this->folder_prefix= "user.";
     }
-    
+   
     /* This is not a new account, parse additional attributes */
     if (($dn != NULL) && ($dn != "new") && $this->is_account){