Fixed a set of errors

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

diff --git a/include/class_MultiSelectWindow.inc b/include/class_MultiSelectWindow.inc
index 8e9f0feda64735c37b1cb5c1104530083c0d712e..cee65eec483a4078d425a69ff474e225ae2b3190 100644 (file)
--- a/include/class_MultiSelectWindow.inc
+++ b/include/class_MultiSelectWindow.inc
@@ -370,7 +370,11 @@ class MultiSelectWindow{
                           this is posted by the parent class MultiSelectWindow */
                        if(isset($_GET['act'])&& ($_GET['act'] == "dep_open")){
                                $s_entry = base64_decode($_GET['dep_id']);
-                               $this->selectedBase = $this->config->departments[trim($s_entry)];
+        if (!isset($this->config->departments[$s_entry])){
+          print_red(_("Error: The requested subtree has an inconsistent DN encoding, check your LDAP!"));
+        } else {
+                               $this->selectedBase = $this->config->departments[$s_entry];
+        }
                        }
 
                        /* back to the roots ^^ */

diff --git a/include/class_mail-methods-cyrus.inc b/include/class_mail-methods-cyrus.inc
index 76e3908ea9b778ece293100f952ef15ef968e143..a8e563b604c06349afc0b33902e21a60df0bae02 100644 (file)
--- a/include/class_mail-methods-cyrus.inc
+++ b/include/class_mail-methods-cyrus.inc
@@ -36,7 +36,7 @@ class mailMethodCyrus extends mailMethod
     /* Connect to IMAP server. I don't want to see these warning here... */
     $this->gosaMailServer= $gosaMailServer;
     if (!isset($this->config[$gosaMailServer])){
-      print_red(_("Warning: Account has an invalid mailserver string! Please check the mail server settings in the mail tab."));
+      print_red(_("Warning: Account has an invalid mailserver string!"));
     } else {
       $cfg= $this->config[$gosaMailServer];
     }

diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc
index d77066f6915f63686f99efb24f6e85e7fdc91b19..cdfea0c4728de77c62b377fee1eaf2fcbd8f83bf 100644 (file)
--- a/plugins/admin/departments/class_departmentManagement.inc
+++ b/plugins/admin/departments/class_departmentManagement.inc
@@ -55,10 +55,11 @@ class departmentManagement extends plugin
 
   function execute()
   {
+    global $config;
+  
     /* Call parent execute */
     plugin::execute();
 
-
     /***************
       Var init 
      ***************/
@@ -68,7 +69,7 @@ class departmentManagement extends plugin
     /* Reload departments */
     $this->config->get_departments();
     $this->config->make_idepartments();
-    $_SESSION['config']= $this->config;
+    $config= $this->config;
 
     $smarty                                            = get_smarty();
     $display                                   = "";

diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index 08abd5fb17e5dbeca7091ab29f2662e0570b2b0b..29ab414ef6034793c0fa24492f05dfa2ca416727 100644 (file)
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -126,7 +126,9 @@ class mailAccount extends plugin
         }else{
           /* Could not connect to ldap.
            */
-          $this->gosaMailQuota = $this->attrs['gosaMailQuota'][0];
+          if (isset($this->attrs['gosaMailQuota'][0])){
+            $this->gosaMailQuota = $this->attrs['gosaMailQuota'][0];
+          }
         }
       }
     }