X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=lxo-import%2FcontactB.php;fp=lxo-import%2FcontactB.php;h=e07bedb2ac0db405b21bc8ce3c14f34f5df27085;hb=9dda820f45ce31c9c42902d61949d7679d2de94a;hp=8c8e53a78deb03d1b73815d45533bd03ef341cd5;hpb=e2903b0d056db3b97b846ddde87a44b4f5a10954;p=kivitendo-erp.git

diff --git a/lxo-import/contactB.php b/lxo-import/contactB.php
index 8c8e53a78..e07bedb2a 100644
--- a/lxo-import/contactB.php
+++ b/lxo-import/contactB.php
@@ -11,18 +11,23 @@ Email: hli@lx-system.de
 Web: http://lx-system.de
 
 */
-if ($_GET["login"]) {
-	$login=$_GET["login"];
-} else {
-	$login=$_POST["login"];
-};
-
+if (!$_SESSION["db"]) {
+	$conffile="../config/authentication.pl";
+	if (!is_file($conffile)) {
+		ende(4);
+	}
+}
 require ("import_lib.php");
-$db=new myDB($login);
+
+if (!anmelden()) ende(5);
+
+/* get DB instance */
+$db=$_SESSION["db"]; //new myDB($login);
+
+
 $crm=checkCRM();
 
 if ($_POST["ok"]) {
-	$login=$_POST["login"];
 	$test=$_POST["test"];
 
 	if ($crm) {
@@ -36,7 +41,6 @@ if ($_POST["ok"]) {
 
 	function ende($nr) {
 		echo "Abbruch: $nr\n";
-		echo "Aufruf: addressS.php [login customer|vendor] [test] | [felder]\n";
 		exit($nr);
 	}
 	if ($_POST["ok"]=="Hilfe") {
@@ -68,26 +72,24 @@ if (!$file) ende (2);
 
 if (!file_exists($file."_contact.csv")) ende(5);
 
-if (!file_exists("../users/$login.conf")) ende(3);
-
+$prenumber=$_POST["prenumber"];
 
-$employee=chkUsr($login);
+$employee=chkUsr($_SESSION["employee"]);
 if (!$employee) ende(4);
 
 if (!$db->chkcol($file)) ende(6);
 
 $f=fopen($file."_contact.csv","r");
-$zeile=fgets($f,1200);
-$infld=split($trenner,strtolower($zeile));
-$first=true;
+$zeile=fgetcsv($f,2000,$trenner);
 
+$first=true;
 
-foreach ($infld as $fld) {
-	$fld = trim(strtr($fld,array("\""=>"","'"=>"")));
+foreach ($zeile as $fld) {
+	$fld = strtolower(trim(strtr($fld,array("\""=>"","'"=>""))));
 	$in_fld[]=$fld;
 }
 $j=0;
-$zeile=fgetcsv($f,1200,$trenner);
+$zeile=fgetcsv($f,2000,$trenner);
 while (!feof($f)){
 	$i=-1;
 	$firma="";
@@ -98,33 +100,57 @@ while (!feof($f)){
 	$vals=" values (";
 	foreach($zeile as $data) {
 		$i++;
-		if ($in_fld[$i]=="firma") { 
-			$firma=addslashes(trim($data)); 
-			continue;
-		};
 		if (!in_array($in_fld[$i],$kunde_fld)) {
 			continue;
 		}
 		$data=addslashes(trim($data));
+		if ($in_fld[$i]=="firma" && $data) { 
+			$data=suchFirma($file,$data);
+			if ($data) {
+				$id=$data["cp_cv_id"];
+			}
+			continue;
+		} else if ($in_fld[$i]=="firma") {
+			continue;
+		} ;
 		if ($in_fld[$i]=="cp_cv_id" && $data) {
 			$data=chkKdId($data);
-			if ($data) $firma="";
-			if (!$id) $id = $data;
+			if ($data) {
+				$id = $data;
+			};
 			continue;
-		} 
+		} else  if($in_fld[$i]=="cp_cv_id") {
+			continue;
+		}
 		if ($in_fld[$i]==$file."number" && $data) {
-			$tmp=getFirma($data,$file);
-			if ($tmp) $firma="";
-			if ($id<>$tmp) $id=$tmp;
+			if (!$id) {
+				$tmp=getFirma($data,$file);
+				if ($tmp) {
+					$id=$tmp;
+				}
+			}
+			continue;
+		} else if  ($in_fld[$i]==$file."number") {
 			continue;
-		} 
+		}
+		if ($in_fld[$i]=="cp_id" && $data) {
+			$tmp=chkContact($data);
+			if ($tmp) {
+				$keys.="cp_id,";
+				$vals.="$tmp,";
+			} 
+			continue;
+		} else if ($in_fld[$i]=="cp_id") {
+			continue;
+		}
+
 		$keys.=$in_fld[$i].",";
 		
 		if ($data==false or empty($data) or !$data) {
                         $vals.="null,";
                 } else {
                 	if (in_array($in_fld[$i],array("cp_fax","cp_phone1","cp_phone2"))) {
-				$data="0".$data;
+				$data=$prenumber.$data;
 			} else if ($in_fld[$i]=="cp_country" && $data) {
 				$data=mkland($data);
 			}
@@ -138,13 +164,7 @@ while (!feof($f)){
 		$zeile=fgetcsv($f,1200,$trenner);
 		continue;
 	}
-	if ($firma) {
-		$data=suchFirma($file,$firma);
-		if ($data) {
-			$vals.=$data["cp_cv_id"].",";
-			$keys.="cp_cv_id,";
-		}
-	} else if ($id) {
+	if ($id) {
 			$vals.=$id.",";
 			$keys.="cp_cv_id,";
 	}
@@ -174,11 +194,11 @@ echo $j." $file importiert.\n";} else {
 <p class="listtop">Kontakt-Adressimport f&uuml;r die ERP</p>
 <form name="import" method="post" enctype="multipart/form-data" action="contactB.php">
 <input type="hidden" name="MAX_FILE_SIZE" value="300000">
-<input type="hidden" name="login" value="<?= $login ?>">
 <table>
 <tr><td></td><td><input type="submit" name="ok" value="Hilfe"></td></tr>
 <tr><td>Zieltabelle</td><td><input type="radio" name="ziel" value="customer" checked>customer <input type="radio" name="ziel" value="vendor">vendor</td></tr>
 <tr><td>Trennzeichen</td><td><input type="text" size="2" maxlength="1" name="trenner" value=";"></td></tr>
+<tr><td>Telefonvorwahl</td><td><input type="text" size="4" maxlength="1" name="prenumber" value=""></td></tr>
 <tr><td>Test</td><td><input type="checkbox" name="test" value="1">ja</td></tr>
 <tr><td>Daten</td><td><input type="file" name="Datei"></td></tr>
 <tr><td></td><td><input type="submit" name="ok" value="Import"></td></tr>