From b7db51250e0e6d5f66761f2dedd5aa77993f0eb9 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 3 Jan 2008 13:55:35 +0000 Subject: [PATCH] Fixed printGeberic. Base wasn't correctly extracted out of dn git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8195 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/plugins/admin/systems/class_printGeneric.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gosa-core/plugins/admin/systems/class_printGeneric.inc b/gosa-core/plugins/admin/systems/class_printGeneric.inc index 1a527e963..effcfc029 100644 --- a/gosa-core/plugins/admin/systems/class_printGeneric.inc +++ b/gosa-core/plugins/admin/systems/class_printGeneric.inc @@ -99,10 +99,10 @@ class printgeneric extends plugin } else { /* Set base and check if the extracted base exists */ - if(preg_match("/".normalizePreg('incomingou')."/",$this->dn)){ - $this->base= preg_replace("/".normalizePreg('incomingou')."/","",dn2base($this->dn)); + if(preg_match("/".normalizePreg(get_ou('incomingou'))."/",$this->dn)){ + $this->base= preg_replace("/".normalizePreg(get_ou('incomingou'))."/","",dn2base($this->dn)); }else{ - $this->base= preg_replace("/".normalizePreg(get_ou('printerou')).",/","",dn2base($this->dn)); + $this->base= preg_replace("/".normalizePreg(get_ou('printerou'))."/","",dn2base($this->dn)); } if(!isset($this->config->idepartments[$this->base])){ @@ -825,7 +825,7 @@ class printgeneric extends plugin } /* Ensure to create a new object */ - if(preg_match("/".normalizePreg('incomingou')."/",$this->orig_dn)){ + if(preg_match("/".normalizePreg(get_ou('incomingou'))."/",$this->orig_dn)){ $this->orig_dn = "new"; } -- 2.30.2