Fixed filtering for mail dialog

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

diff --git a/include/functions.inc b/include/functions.inc
index ed1364b9816bc06e46aef2bc4d3153925d42c1ed..f586a0c66fe067134896b646ed45ddf23feb5009 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -178,7 +178,7 @@ function get_template_path($filename= '', $plugin= FALSE, $path= "")
 {
   global $config, $BASE_DIR;
 
-  if (!isset($config->data['MAIN']['THEME'])){
+  if (!@isset($config->data['MAIN']['THEME'])){
     $theme= 'default';
   } else {
     $theme= $config->data['MAIN']['THEME'];

diff --git a/include/php_setup.inc b/include/php_setup.inc
index 08f75dfc1360279ca3ebdbc03822d41e030631f7..c6769741cf2e655bdff4ada2bd1594980f1d9443 100644 (file)
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -96,8 +96,10 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
         $type= "-";
       }
       $args= "";
-      foreach ($ct['args'] as $arg){
-        $args.= htmlentities("\"$arg\", ");
+      if (isset($ct['args'])){
+        foreach ($ct['args'] as $arg){
+          $args.= htmlentities("\"$arg\", ");
+        }
       }
       $args= preg_replace("/, $/", "", $args);
       if ($args == ""){

diff --git a/plugins/admin/groups/class_groupMail.inc b/plugins/admin/groups/class_groupMail.inc
index fa55b9185946e3467b57a65e5835c9bc59185690..9829102ba6f147165f59fe29579a555bbcfdf1c6 100644 (file)
--- a/plugins/admin/groups/class_groupMail.inc
+++ b/plugins/admin/groups/class_groupMail.inc
@@ -613,7 +613,7 @@ class mailgroup extends plugin
       $message[]= _("Please enter a valid email addres in 'Primary address' field.");
     }
     $ldap->cd($this->config->current['BASE']);
-    $ldap->search ("(&(|(mail=".$this->mail.")(gosaMailAlternateAddress=".
+    $ldap->search ("(&(!(objectClass=gosaUserTemplate))(|(mail=".$this->mail.")(gosaMailAlternateAddress=".
         $this->mail."))(!(uid=".$this->cn."))(!(cn=".$this->cn.")))");
     if ($ldap->count() != 0){
       $message[]= _("The primary address you've entered is already in use.");

diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index 1ea0bd98f46ea56ee5e455b040432d56d924a276..da7a772b802ac03b38aef7788a2fdb68180afa72 100644 (file)
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -689,7 +689,7 @@ class mailAccount extends plugin
       }
     }
     $ldap->cd($this->config->current['BASE']);
-    $ldap->search ("(&(objectClass=gosaMailAccount)(!(objectClass=gosaUserTemplate))(|(mail=".$this->mail.")(gosaMailAlternateAddress=".
+    $ldap->search ("(&(!(objectClass=gosaUserTemplate))(|(mail=".$this->mail.")(gosaMailAlternateAddress=".
         $this->mail."))(!(uid=".$this->uid."))(!(cn=".$this->uid.")))", array("uid"));
     if ($ldap->count() != 0){
       $message[]= _("The primary address you've entered is already in use.");