X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=lxo-import%2FaddressB.php;h=a6a6c19065e8910e3de8c829c6b35d49c060f02e;hb=b60e2ebf8314f691ec60e38bb8a2c37d917b61cb;hp=dcb5adb7f974c22cf37c90beccec14c4ac6d2150;hpb=3e63947841c49112212cdeef5bd178fe961bf002;p=kivitendo-erp.git
diff --git a/lxo-import/addressB.php b/lxo-import/addressB.php
index dcb5adb7f..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:
";
+ echo "Feldname => Bedeutung
";
+ foreach($address as $key=>$val) {
+ echo "$key => $val
";
+ }
+ 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,14 +48,6 @@ function ende($nr) {
exit(1);
}
-if ($_POST["ok"]=="Hilfe") {
- echo "Importfelder:
";
- echo "Feldname => Bedeutung
";
- foreach($address as $key=>$val) {
- echo "$key => $val
";
- }
- exit(0);
-};
clearstatcache ();
//print_r($_FILES);
$test=$_POST["test"];
@@ -57,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);
@@ -184,6 +190,7 @@ echo $j." $file importiert.\n";
Adressimport für die ERP