Bug #862 behoben, Funktionen fuer die Buttons unter den Listen (Rechnungen und Buchun...

[kivitendo-erp.git] / lxo-import / addressB.php

diff --git a/lxo-import/addressB.php b/lxo-import/addressB.php
index 5e19f7b..a6a6c19 100644 (file)
--- 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,42 +48,31 @@ 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"])) { 
+if (!empty($_FILES["Datei"]["name"])) {
        $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"];
 } else {
        $file=false;
-} 
+}
 
 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);
@@ -74,8 +80,6 @@ $kunde_fld = array_keys($address);
 $f=fopen("$file.csv","r");
 $zeile=fgets($f,1200);
 $infld=split($trenner,strtolower($zeile));
-//echo "$zeile<br>";
-//print_r($infld); echo "<br>";
 $first=true;
 $ok=true;
 foreach ($infld as $fld) {
@@ -105,11 +109,12 @@ if ($ok) while (!feof($f)){
                        continue;
                };
                $data=trim($data);
+               $data=mb_convert_encoding($data,"ISO-8859-15","auto");
                //$data=htmlentities($data);
                $data=addslashes($data);
-               if (trim($in_fld[$i])==$file."number") {  // customernumber || vendornumber
+               if ($in_fld[$i]==$file."number") {  // customernumber || vendornumber
                        if (empty($data) or !$data) {
-                               $data=getKdId(); 
+                               $data=getKdId();
                                $number=true;
                        } else {
                                $data=chkKdId($data);
@@ -118,27 +123,21 @@ 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]=="language") {
-                       $data=strtolower(substr($data,0,2));
-                       if (!in_array($data,array("de","en","fr"))) $data=false;
-               }
-               if ($in_fld[$i]=="matchcode") {  
+               } 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) {
-                       if (in_array($in_fld[$i],array("name"))) {
-                               $keys="(";
-                               break;
-                       }
                        $vals.="null,";
                } else {
                        if ($in_fld[$i]=="contact"){
@@ -169,10 +168,10 @@ if ($ok) while (!feof($f)){
                         //echo "Import $j<br>\n";
                        flush();
                } else {
-                       $sql.=$keys."import)";
-                       $sql.=$vals."$nun)";            
+                       $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 {
@@ -191,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>