diff --git a/gosa-plugins/ldapmanager/addons/ldapmanager/class_csvimport.inc b/gosa-plugins/ldapmanager/addons/ldapmanager/class_csvimport.inc
index a8de6776bb184430f8bb3f1ea08eb8741cf76986..4fac56880775c94670261cc793d1dab2d17ebe2e 100644 (file)
while($temp = $ldap->fetch($this->csvinfo['templates'])){
$tempvar ++;
- $this->csvinfo['arrtemplates'][$tempvar] = $temp['sn'][0]." - ".$this->config->idepartments[preg_replace("/^[^,]+,".get_people_ou()."/i", "", $temp['dn'])];
+ $this->csvinfo['arrtemplates'][$tempvar] = $temp['sn'][0]." - ".$this->config->idepartments[preg_replace("/^[^,]+,".preg_quote(get_people_ou(), '/')."/i", "", $temp['dn'])];
$this->csvinfo['arrtempls'] [$tempvar]['name'] = $temp['sn'][0];
$this->csvinfo['arrtempls'] [$tempvar]['dn'] = $temp['dn'];
}
/* Insert in the LDAP tree */
if(count($this->usertab->check())) {
- show_errors($this->usertab->check());
+ msg_dialog::displayChecks($this->usertab->check());
$this->csvinfo['sorteddata'][$i]['status']="<b>"._("failed")."</b>";
$failing = $i+1;
break;
$str .= fread($handle,1024);
}
- $lines = split("\n",$str);
+ $lines = preg_split("/\n/",$str);
$anz = 0;
$rest = 0;
$data = array();
}
$line= str_replace ("\t","",$line);
- $cells = split(",",$line ) ;
+ $cells = explode(",",$line ) ;
if(count($cells)> $anz ){
$anz = count($cells);
$line= str_replace ("\t" ,"" ,$line);
/* get all elements */
- $cells = split(",",$line ) ;
+ $cells = explode(",",$line ) ;
/* attach all elements to data array */
if(is_array($cells))