Updated import

[gosa.git] / gosa-plugins / ldapmanager / addons / ldapmanager / class_csvimport.inc

diff --git a/gosa-plugins/ldapmanager/addons/ldapmanager/class_csvimport.inc b/gosa-plugins/ldapmanager/addons/ldapmanager/class_csvimport.inc
index bd84fa82e5ba6ad767291fa6f1330a7419e267b6..4fac56880775c94670261cc793d1dab2d17ebe2e 100644 (file)
--- a/gosa-plugins/ldapmanager/addons/ldapmanager/class_csvimport.inc
+++ b/gosa-plugins/ldapmanager/addons/ldapmanager/class_csvimport.inc
@@ -86,7 +86,7 @@ class csvimport extends plugin
 
       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'];
       }
@@ -102,7 +102,7 @@ class csvimport extends plugin
     $acl = $this->ui->get_permissions($this->config->current['BASE'],"all/all");
     if(!preg_match("/w/",$acl)){
       if(isset($_POST['userfile']) || isset($_POST['sorted']) || isset($_POST['fileup'])){
-       msg_dialog::display(_("Permission error"), _("You've no permission to import CSV files."), ERROR_DIALOG);
+       msg_dialog::display(_("Permission error"), _("You've no permission to import CSV files."), ERROR_DIALOG);
       }
       return ($smarty->fetch (get_template_path('contentcsv.tpl', TRUE)));
     }
@@ -209,7 +209,7 @@ class csvimport extends plugin
 
             /* 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;
@@ -362,7 +362,7 @@ class csvimport extends plugin
             $str .= fread($handle,1024);
           }
 
-          $lines = split("\n",$str);
+          $lines = preg_split("/\n/",$str);
           $anz  = 0;
           $rest = 0;
           $data = array();
@@ -376,7 +376,7 @@ class csvimport extends plugin
               }
 
               $line= str_replace ("\t","",$line);
-              $cells  = split(",",$line )  ;
+              $cells  = explode(",",$line )  ;
 
               if(count($cells)> $anz ){
                 $anz = count($cells);
@@ -401,7 +401,7 @@ class csvimport extends plugin
                 $line= str_replace ("\t"  ,"" ,$line);
 
                 /* get all elements  */
-                $cells  = split(",",$line )  ;
+                $cells  = explode(",",$line )  ;
 
                 /* attach all elements to data array */
                 if(is_array($cells))