X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=lxo-import%2FaddressB.php;h=5fec8b1a6df72146756e5779bee0b6b9f52f3a75;hb=9ba051f59c5d02e82ca54ae19e3233f895058f9b;hp=23fa4f69a9582a3130820e3406984a64b3403f7c;hpb=98255c8891bd9b772f73be9a72e4f456998c8b3b;p=kivitendo-erp.git

diff --git a/lxo-import/addressB.php b/lxo-import/addressB.php
old mode 100644
new mode 100755
index 23fa4f69a..5fec8b1a6
--- a/lxo-import/addressB.php
+++ b/lxo-import/addressB.php
@@ -12,63 +12,69 @@ Web: http://lx-system.de
 
 */
 
-if ($_GET["login"]) {
-	$login=$_GET["login"];
-} else {
-	$login=$_POST["login"];
+require ("import_lib.php");
+
+if (!$_SESSION["db"]) {
+    $conffile="../config/authentication.pl";
+    if (!is_file($conffile)) {
+        ende("authentication.pl nicht gefunden oder unlesbar");
+    }
+}
+
+if (!anmelden()) ende("Anmeldung fehlgeschlagen");
+
+if ($_POST["ok"]=="Hilfe") {
+    echo "Importfelder:<br>";
+    echo "Feldname => Bedeutung<br>";
+    foreach($address as $key=>$val) {
+        echo "$key => $val<br>";
+    }
+    $header=implode(";",array_keys($address));
+    echo $header;
+    exit(0);
 };
+
 if ($_POST["ok"]) {
 
 $nun=time();
 
-require ("import_lib.php");
-$db=new myDB($login);
+
+/* get DB instance */
+$db=$_SESSION["db"]; //new myDB($login);
+
 $crm=checkCRM();
 
-function ende($nr) {
-	echo "Abbruch: $nr<br>";
-	echo "Fehlende oder falsche Daten.";
-	exit(1);
+function ende($txt) {
+    echo "Abbruch: $txt<br>";
+    exit(1);
 }
 
-if ($_POST["ok"]=="Hilfe") {
-	echo "Importfelder:<br>";
-	echo "Feldname => Bedeutung<br>";
-	foreach($address as $key=>$val) {
-		echo "$key => $val<br>";
-	}
-	exit(0);
-};
 clearstatcache ();
 //print_r($_FILES);
 $test=$_POST["test"];
 if (!empty($_FILES["Datei"]["name"])) {
-	$file=$_POST["ziel"];
-	echo $_FILES["Datei"]["tmp_name"];
-	if (!move_uploaded_file($_FILES["Datei"]["tmp_name"],$file.".csv")) {
-		$file=false;
-		echo "Upload von ".$_FILES["Datei"]["name"]." fehlerhaft. (".$_FILES["Datei"]["error"].")<br>";
-	}
+    $file=$_POST["ziel"];
+    if (!move_uploaded_file($_FILES["Datei"]["tmp_name"],$file.".csv")) {
+        $file=false;
+        echo "Upload von ".$_FILES["Datei"]["name"]." fehlerhaft. (".$_FILES["Datei"]["error"].")<br>";
+    }
 } else if (is_file($_POST["ziel"].".csv")) {
-	$file=$_POST["ziel"];
+    $file=$_POST["ziel"];
 } else {
-	$file=false;
+    $file=false;
 }
 
-if (!$file) ende (2);
+if (!$file) ende ("Kein Datenfile");
 
 $trenner=($_POST["trenner"])?$_POST["trenner"]:",";
-//echo "../users/$login.conf";
-if (!file_exists("../users/$login.conf")) ende(3);
 
-if (!file_exists("$file.csv")) ende(5);
+if (!file_exists("$file.csv")) ende("$file.csv nicht im Ordner oder leer");
 
-$db=new myDB($login);
 
-if (!$db->chkcol($file)) ende(6);
+if (!$db->chkcol($file)) ende("Importspalte kann nicht angelegt werden");
 
-$employee=chkUsr($login);
-if (!$employee) ende(4);
+$employee=chkUsr($_SESSION["employee"]);
+if (!$employee) ende("Ung&uuml;ltiger User");
 
 $kunde_fld = array_keys($address);
 
@@ -78,101 +84,111 @@ $infld=split($trenner,strtolower($zeile));
 $first=true;
 $ok=true;
 foreach ($infld as $fld) {
-	$fld = strtolower(trim(strtr($fld,array("\""=>"","'"=>""))));
-	if ($fld=="branche" && !$crm) { $in_fld[]=""; continue; };
-	if ($fld=="sw" && !$crm) { $in_fld[]=""; continue; };
-	$in_fld[]=$fld;
+    $fld = strtolower(trim(strtr($fld,array("\""=>"","'"=>""))));
+    if ($fld=="branche" && !$crm) { $in_fld[]=""; continue; };
+    if ($fld=="sw" && !$crm) { $in_fld[]=""; continue; };
+    $in_fld[]=$fld;
 }
-//print_r($in_fld); echo "<br>";
+
 $j=0;
 $m=0;
 $zeile=fgetcsv($f,1200,$trenner);
 if ($ok) while (!feof($f)){
-	$i=0;
-        //echo "Arbeite an $m    ";
-        $m++;
-	$anrede="";
-        $Matchcode="";
-	$sql="insert into $file ";
-	$keys="(";
-	$vals=" values (";
-	$number=false;
-	foreach($zeile as $data) {
-		if (!in_array(trim($in_fld[$i]),$kunde_fld)) {
-			if ($in_fld[$i]=="anrede") {  $anrede=addslashes(trim($data)); }
-			$i++;
-			continue;
-		};
-		$data=trim($data);
-		$data=mb_convert_encoding($data,"ISO-8859-15","auto");
-		//$data=htmlentities($data);
-		$data=addslashes($data);
-		if ($in_fld[$i]==$file."number") {  // customernumber || vendornumber
-			if (empty($data) or !$data) {
-				$data=getKdId();
-				$number=true;
-			} else {
-				$data=chkKdId($data);
-				$number=true;
-			}
-		} else if ($in_fld[$i]=="taxincluded"){
-			$data=strtolower(substr($data,0,1));
-			if ($data!="f" && $data!="t") $data="f";
-		} /*else if ($in_fld[$i]=="matchcode") {
+    $i=0;
+    $m++;
+    $anrede="";
+    $Matchcode="";
+    $sql="insert into $file ";
+    $keys="(";
+    $vals=" values (";
+    $number=false;
+    foreach($zeile as $data) {
+        if (!in_array(trim($in_fld[$i]),$kunde_fld)) {
+            if ($in_fld[$i]=="anrede") {  $anrede=addslashes(trim($data)); }
+            $i++;
+            continue;
+        };
+        $data=trim($data);
+        // seit 2.6 ist die DB-Kodierung UTF-8 @holger Ansonsten einmal vorher die DB-Encoding auslesen
+        // Falls die Daten ISO-kodiert kommen entsprechend wandeln
+        // UTF-8 MUSS als erstes stehen, da ansonsten die Prüfung bei ISO-8859-1 aufhört ...
+        // TODO Umlaute am Anfang wurden bei meinem Test nicht übernommen (Österreich). S.a.:
+        // http://forum.de.selfhtml.org/archiv/2007/1/t143904/
+
+        $encoding = mb_detect_encoding($data,"UTF-8,ISO-8859-1,ISO-8859-15");
+        if ($encoding != "UTF-8"){
+          $data=mb_convert_encoding($data, "UTF-8","$encoding");
+        }
+        //$data=htmlentities($data);
+        $data=addslashes($data);
+        if ($in_fld[$i]==$file."number") {  // customernumber || vendornumber
+            if (empty($data) or !$data) {
+                $data=getKdId();
+                $number=true;
+            } else {
+                $data=chkKdId($data);
+                $number=true;
+            }
+        } else if ($in_fld[$i]=="taxincluded"){
+            $data=strtolower(substr($data,0,1));
+            if ($data!="f" && $data!="t") $data="f";
+        } else if ($in_fld[$i]=="ustid"){
+            $data=strtr(" ","",$data);
+        } /*else if ($in_fld[$i]=="matchcode") {
                   $matchcode=$data;
                   $i++;
                   continue;
                 if ($data==false or empty($data) or !$data) {
-			if (in_array($in_fld[$i],array("name"))) {
-				$data=$matchcode;
-			}
-		}
-                }*/
-
-		$keys.=$in_fld[$i].",";
-		if ($data==false or empty($data) or !$data) {
-			$vals.="null,";
-		} else {
-			if ($in_fld[$i]=="contact"){
-				if ($anrede) {
-					$vals.="'$anrede $data',";
-				} else {
-					$vals.="'$data',";
-				}
-			} else {
-				$vals.="'".$data."',";
-			}
-		}
-		$i++;
-	}
-	if (!$number) {
-		$keys.=$file."number,";
-		$vals.="'".getKdId()."',";
-	}
-	if ($keys<>"(") {
-		if ($test) {
-			if ($first) {
-				echo "<table border='1'>\n";
-				echo "<tr><th>".str_replace(",","</th><th>",substr($keys,1,-1))."</th></tr>\n";
-				$first=false;
-			};
-			$vals=str_replace("',","'</td><td>",substr($vals,9,-1));
-			echo "<tr><td>".str_replace("null,","null</td><td>",$vals)."</td></tr>\n";
-                        //echo "Import $j<br>\n";
-			flush();
-		} else {
-			$sql.=$keys."taxzone_id,import)";
-			$sql.=$vals."0,$nun)";
-			$rc=$db->query($sql);
-			if (!$rc) echo "Fehler: ".$vals."<br>";
-		}
-		$j++;
-	} else {
+            if (in_array($in_fld[$i],array("name"))) {
+                $data=$matchcode;
+            }
+        }
+            }*/
+
+        $keys.=$in_fld[$i].",";
+        if ($data==false or empty($data) or !$data) {
+            $vals.="null,";
+        } else {
+            if ($in_fld[$i]=="contact"){
+                if ($anrede) {
+                    $vals.="'$anrede $data',";
+                } else {
+                    $vals.="'$data',";
+                }
+            } else {
+                $vals.="'".$data."',";
+            }
+        }
+        $i++;
+    }
+    if (!$number) {
+        $keys.=$file."number,";
+        $vals.="'".getKdId()."',";
+    }
+    if ($keys<>"(") {
+        if ($test) {
+            if ($first) {
+                echo "<table border='1'>\n";
+                echo "<tr><th>".str_replace(",","</th><th>",substr($keys,1,-1))."</th></tr>\n";
+                $first=false;
+            };
+            $vals=str_replace("',","'</td><td>",substr($vals,9,-1));
+            echo "<tr><td>".str_replace("null,","null</td><td>",$vals)."</td></tr>\n";
+            //echo "Import $j<br>\n";
+            flush();
+        } else {
+            $sql.=$keys."taxzone_id,import)";
+            $sql.=$vals."0,$nun)";
+            $rc=$db->query($sql);
+            if (!$rc) echo "Fehler: ".$sql."<br>";
+        }
+        $j++;
+    } else {
           $vals=str_replace("',","'</td><td>",substr($vals,9,-1));
           echo "<tr><td style=\"color:red\">".str_replace("null,","null</td><td style=\"color:red\">",$vals)."</td></tr>\n";
           flush();
         }
-	$zeile=fgetcsv($f,1200,$trenner);
+    $zeile=fgetcsv($f,1200,$trenner);
 }
 fclose($f);
 if ($test) echo "</table>\n ##### = Neue Kunden-/Lieferantennummer\n<br>";
@@ -183,6 +199,7 @@ echo $j." $file importiert.\n";
 <p class="listtop">Adressimport f&uuml;r die ERP<p>
 <br>
 <form name="import" method="post" enctype="multipart/form-data" action="addressB.php">
+<!--form name="import" method="post"  action="addressB.php"-->
 <input type="hidden" name="MAX_FILE_SIZE" value="2000000">
 <input type="hidden" name="login" value="<?= $login ?>">
 <table>