From 2ecb5fa9bd0959837e6b71daac588c3672543a53 Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 23 Nov 2010 08:47:54 +0000 Subject: [PATCH] Updated ARP dependencies! If ArpNewDevice wasn t avaiable, some plugins were broken. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20333 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc index c8e6c075b..3fc50f4fd 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc @@ -104,7 +104,8 @@ class printgeneric extends plugin } else { /* Set base and check if the extracted base exists */ - if(preg_match("/".preg_quote(get_ou("ArpNewDevice", "systemIncomingRDN"), '/')."/i",$this->dn)){ + if(class_available("ArpNewDevice") && + preg_match("/".preg_quote(get_ou("ArpNewDevice", "systemIncomingRDN"), '/')."/i",$this->dn)){ $this->base= preg_replace("/".preg_quote(get_ou("ArpNewDevice", "systemIncomingRDN"), '/')."/i","",dn2base($this->dn)); }else{ $this->base= preg_replace("/".preg_quote(get_ou("printgeneric", "printerRDN"), '/')."/i","",dn2base($this->dn)); @@ -921,7 +922,8 @@ class printgeneric extends plugin } /* Ensure to create a new object */ - if(preg_match("/".preg_quote(get_ou("ArpNewDevice", "systemIncomingRDN"), '/')."/i",$this->orig_dn)){ + if(class_available("ArpNewDevice") && + preg_match("/".preg_quote(get_ou("ArpNewDevice", "systemIncomingRDN"), '/')."/i",$this->orig_dn)){ $this->orig_dn = "new"; } -- 2.30.2