From 85517cff2653319edf3741d31fea9fca53e83417 Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 10 May 2010 13:33:44 +0000 Subject: [PATCH] Updated get_ou it receives values from the config registry now. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18286 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../gofon/phoneaccount/class_phoneAccount.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc b/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc index 672f51c39..5788adbcc 100644 --- a/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc +++ b/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc @@ -165,7 +165,7 @@ class phoneAccount extends plugin /* Get available phone hardware * Search for all available phone hardware */ - $tmp = get_sub_list("(objectClass=goFonHardware)","phone",array(get_ou("phoneRDN")), + $tmp = get_sub_list("(objectClass=goFonHardware)","phone",array(get_ou("group", "ogroupRDN") ), $this->config->current['BASE'],array("cn","description"), GL_SUBSEARCH); foreach($tmp as $attrs){ $cn= $attrs['cn'][0]; @@ -184,13 +184,13 @@ class phoneAccount extends plugin */ $deps_a = array( get_people_ou(), - get_ou("ogroupRDN"), - get_ou("serverRDN"), - get_ou("terminalRDN"), - get_ou("workstationRDN"), - get_ou("printerRDN"), - get_ou("componentRDN"), - get_ou("phoneRDN")); + get_ou("group", "ogroupRDN") , + get_ou("group", "ogroupRDN") , + get_ou("group", "ogroupRDN") , + get_ou("group", "ogroupRDN") , + get_ou("group", "ogroupRDN") , + get_ou("group", "ogroupRDN") , + get_ou("group", "ogroupRDN") ); $tmp = get_sub_list("(goFonHardware=*)","phone",$deps_a,$this->config->current['BASE'], array('cn','dn','goFonHardware'),GL_SUBSEARCH); @@ -206,7 +206,7 @@ class phoneAccount extends plugin * Search for all Macros that are visible and create * an array with name and parameters */ - $tmp = get_sub_list("(&(objectClass=goFonMacro)(goFonMacroVisible=1))","gofonmacro",array(get_ou("phoneMacroRDN")), + $tmp = get_sub_list("(&(objectClass=goFonMacro)(goFonMacroVisible=1))","gofonmacro",array(get_ou("group", "ogroupRDN") ), $this->config->current['BASE'],array("displayName","goFonMacroParameter","dn","cn"), GL_NO_ACL_CHECK | GL_SUBSEARCH ); -- 2.30.2