dded check to avoid / in department names

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

diff --git a/plugins/admin/departments/class_departmentGeneric.inc b/plugins/admin/departments/class_departmentGeneric.inc
index 3b50131dba4363bf2a9b8c43be0c183689176952..b1fd4b313884f6bf7a3843ae0fb6c71786af6107 100644 (file)
--- a/plugins/admin/departments/class_departmentGeneric.inc
+++ b/plugins/admin/departments/class_departmentGeneric.inc
@@ -74,9 +74,9 @@ class department extends plugin
        $bases  = $this->config->idepartments;
        $tmp    = array();      
        foreach($bases as $dn=>$base){
-               
+               $fixed = str_replace("/","\\",$this->dn);
                /* Only attach departments which are not a subtree of this one */
-               if(!preg_match("/".$this->dn."/",$dn)){
+               if(!preg_match("/".$fixed."/",$dn)){
                        $tmp[$dn]=$base;
                }
        }
@@ -162,7 +162,7 @@ class department extends plugin
                $message[]= _("The field 'Name' contains the reserved word 'incoming'.".
                                " Please choose another name.");
        }
-       if (preg_match ('/[,#+:=>\\\\]/', $this->ou)){
+       if (preg_match ('/[,#+:=>\\\\\/]/', $this->ou)){
                $message[]= _("The field 'Name' contains invalid characters.");
        }
        if (!is_phone_nr($this->telephoneNumber)){