diverse Doku Aktuallisierungen

[kivitendo-erp.git] / peppershop / ArtikelErpToShop.php
diff --git a/peppershop/ArtikelErpToShop.php b/peppershop/ArtikelErpToShop.php

index c8cf075..087e207 100644 (file)
--- a/peppershop/ArtikelErpToShop.php
+++ b/peppershop/ArtikelErpToShop.php
@@ -1,4 +1,7 @@
  <?php
+
+$debug = False;
+
  $api = php_sapi_name();
  if ( $api != "cli" ) {
      echo "<html>\n<head>\n<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>\n</head>\n<body>\n";
@@ -8,41 +11,52 @@ if ( $api != "cli" ) {
      $shopnr = $_GET["Shop"];
      $nofiles = ( $_GET["nofiles"] == '1' )?true:false;
  } else {
+    $p = array('shopnr','nofiles');
      if ( $argc > 1 ) {
-        $tmp = explode("=",trim($argv[1]));
-        if ( count($tmp) != 2 ) {
-            echo "Falscher Aufruf: php <scriptname.php> shop=1\n";
-            exit (-1);
-        } else {
-            $shopnr = $tmp[1];
+        for( $i=1; $i<count($argv); $i++)  {
+                $tmp = explode("=",trim($argv[$i]));
+                if ( count($tmp) < 2 ) {
+                    echo "Falscher Aufruf: php ArtikelErpToShop.php shopnr=1 [nofiles=1]\n";
+                    exit (-1);
+                };
+                if ( ! in_array(strtolower($tmp[0]),$p) ) {
+                    echo "Falscher Aufruf: php ArtikelErpToShop.php shopnr=1 [nofiles=1]\n";
+                    exit (-1);
+                };
+                ${$tmp[0]} = trim($tmp[1]);
          }
+    } else {
+        $shopnr=false;
+        $nofiles=false;
      }
  }
  
  include_once("conf$shopnr.php");
  include_once("error.php");
+//Fehlerinstanz
+$err = new error($api);
+
  include_once("dblib.php");
  include_once("pepper.php");
  include_once("erplib.php");
  include_once("Picture.php");
  
-//Fehlerinstanz
-$err = new error($api);
  
  //Bilder
  $pict = new picture($ERPftphost,$ERPftpuser,$ERPftppwd,$ERPimgdir,$SHOPftphost,$SHOPftpuser,$SHOPftppwd,$SHOPimgdir,$err);
  //$pict->original = false;
  
  //ERP-Instanz
-$erpdb = new mydb($ERPhost,$ERPdbname,$ERPuser,$ERPpass,$ERPport,'pgsql',$err);
+$erpdb = new mydb($ERPhost,$ERPdbname,$ERPuser,$ERPpass,$ERPport,'pgsql',$err,$debug);
  if ($erpdb->db->connected_database_name == $ERPdbname) {
-    $erp = new erp($erpdb,$err,$divStd,$divVerm,$auftrnr,$kdnum,$preA,$preK,$invbrne,$mwstS,$OEinsPart,$lager);
+    $erp = new erp($erpdb,$err,$divStd,$divVerm,$auftrnr,$kdnum,$preA,$preK,$invbrne,$mwstS,$OEinsPart,$lager,$pricegroup,$ERPusrID);
  } else {
      $err->out('Keine Verbindung zur ERP',true);
      exit();
  }
  //Shop-Instanz
-$shopdb = new mydb($SHOPhost,$SHOPdbname,$SHOPuser,$SHOPpass,$SHOPport,'mysql',$err);
+$shopdb = new mydb($SHOPhost,$SHOPdbname,$SHOPuser,$SHOPpass,$SHOPport,'mysql',$err,$debug);
+
  if ($shopdb->db->connected_database_name == $SHOPdbname) {
       $shop = new pepper($shopdb,$err,$SHOPdbname,$divStd,$divVerm,$minder,$nachn,$versandS,$versandV,$paypal,$treuhand,$mwstLX,$mwstS,$variantnr,$pict,$nopic,$nopicerr,$nofiles);
  } else {