X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=lxo-import%2FaddressB.php;h=a6a6c19065e8910e3de8c829c6b35d49c060f02e;hb=34ca68b5bd568ca93a89224d779e749fcba8cdd8;hp=23fa4f69a9582a3130820e3406984a64b3403f7c;hpb=98255c8891bd9b772f73be9a72e4f456998c8b3b;p=kivitendo-erp.git

diff --git a/lxo-import/addressB.php b/lxo-import/addressB.php
index 23fa4f69a..a6a6c1906 100644
--- a/lxo-import/addressB.php
+++ b/lxo-import/addressB.php
@@ -12,17 +12,34 @@ 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(4);
+	}
+}
+
+if (!anmelden()) ende(5);
+
+if ($_POST["ok"]=="Hilfe") {
+	echo "Importfelder:<br>";
+	echo "Feldname => Bedeutung<br>";
+	foreach($address as $key=>$val) {
+		echo "$key => $val<br>";
+	}
+	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) {
@@ -31,20 +48,11 @@ function ende($nr) {
 	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>";
@@ -58,16 +66,13 @@ if (!empty($_FILES["Datei"]["name"])) {
 if (!$file) ende (2);
 
 $trenner=($_POST["trenner"])?$_POST["trenner"]:",";
-//echo "../users/$login.conf";
-if (!file_exists("../users/$login.conf")) ende(3);
 
 if (!file_exists("$file.csv")) ende(5);
 
-$db=new myDB($login);
 
 if (!$db->chkcol($file)) ende(6);
 
-$employee=chkUsr($login);
+$employee=chkUsr($_SESSION["employee"]);
 if (!$employee) ende(4);
 
 $kunde_fld = array_keys($address);
@@ -118,6 +123,8 @@ if ($ok) while (!feof($f)){
 		} 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++;
@@ -164,7 +171,7 @@ if ($ok) while (!feof($f)){
 			$sql.=$keys."taxzone_id,import)";
 			$sql.=$vals."0,$nun)";
 			$rc=$db->query($sql);
-			if (!$rc) echo "Fehler: ".$vals."<br>";
+			if (!$rc) echo "Fehler: ".$sql."<br>";
 		}
 		$j++;
 	} else {
@@ -183,6 +190,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>