index 5473946bb3a32c4c22fc5abc429631250e78e44f..cc94b04f4071943a9524d9954d65d1aaca50b5d9 100644 (file)
/* check if this is a binary entry */
if(in_array_ics($attrs,$this->subBinary)){
- $var = addslashes( $ldap->get_attribute($object['dn'], $attrs,$r_array=0));
+ $var = $ldap->get_attribute($object['dn'], $attrs,$r_array=0);
}
/* Fix slashes */
if($obj['status'] != "delete"){
if($use_dns){
if((isset($obj['description']))&&(!empty($obj['description']))){
- $a_return[$obj['cn']]['name']= $obj['cn']." [".$obj['description']."]";
+ $a_return[$obj['cn']]['name']= $obj['cn']." [".stripslashes($obj['description'])."]";
}else{
$a_return[$obj['cn']]['name']= $obj['cn'];
}
$a_return[$obj['cn']]['dn']= $obj['dn'];
}else{
if((isset($obj['description']))&&(!empty($obj['description']))){
- $a_return[$obj['cn']]= $obj['cn']." [".$obj['description']."]";
+ $a_return[$obj['cn']]= $obj['cn']." [".stripslashes($obj['description'])."]";
}else{
$a_return[$obj['cn']]= $obj['cn'];
}
$ldap = $this->config->get_ldap_link();
$ldap->cd ($this->dn);
- $use_dn = str_ireplace( get_release_dn($this->dn), $_SESSION['faifilter']['branch'], $this->dn);
+# $use_dn = str_ireplace( get_release_dn($this->dn), $_SESSION['faifilter']['branch'], $this->dn);
+ $use_dn = preg_replace("/".normalizePreg(get_release_dn($this->dn))."/i", $_SESSION['faifilter']['branch'], $this->dn);
if($_SESSION['faifilter']['branch'] == "main"){
$use_dn = $this->dn;
}
prepare_to_save_FAI_object($use_dn,array(),true);
foreach($this->SubObjects as $name => $obj){
- $use_dn = str_ireplace( get_release_dn($this->dn), $_SESSION['faifilter']['branch'], $obj['dn']);
+# $use_dn = str_ireplace( get_release_dn($this->dn), $_SESSION['faifilter']['branch'], $obj['dn']);
+ $use_dn = preg_replace("/".normalizePreg(get_release_dn($this->dn))."/i", $_SESSION['faifilter']['branch'], $obj['dn']);
if($_SESSION['faifilter']['branch'] == "main"){
$use_dn = $obj['dn'];
}