From 36ae8db43f28059bd59f5470f67109b611db70f8 Mon Sep 17 00:00:00 2001
From: Holger Lindemann <hli@lenny.hoch.ul>
Date: Tue, 19 Jun 2012 14:12:32 +0200
Subject: [PATCH] =?utf8?q?Parameter=20fr=C3=BC=20Cli-Aufruf=20angepasst?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 peppershop/ArtikelErpToShop.php    | 24 +++++++++++++++++-------
 peppershop/ArtikelShopToErp.php    | 23 ++++++++++++++++-------
 peppershop/BestellungShopToErp.php | 25 +++++++++++++++++--------
 3 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/peppershop/ArtikelErpToShop.php b/peppershop/ArtikelErpToShop.php
index ff8a56acc..087e207cb 100644
--- a/peppershop/ArtikelErpToShop.php
+++ b/peppershop/ArtikelErpToShop.php
@@ -11,14 +11,23 @@ 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;
     }
 }
 
@@ -46,7 +55,8 @@ if ($erpdb->db->connected_database_name == $ERPdbname) {
     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 {
diff --git a/peppershop/ArtikelShopToErp.php b/peppershop/ArtikelShopToErp.php
index d7b4d1ef2..173e2fa31 100644
--- a/peppershop/ArtikelShopToErp.php
+++ b/peppershop/ArtikelShopToErp.php
@@ -11,14 +11,23 @@ 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;
     }
 }
 
diff --git a/peppershop/BestellungShopToErp.php b/peppershop/BestellungShopToErp.php
index b0e1d74f8..603102444 100644
--- a/peppershop/BestellungShopToErp.php
+++ b/peppershop/BestellungShopToErp.php
@@ -11,21 +11,30 @@ 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();
+$err = new error($api);
 
 include_once("dblib.php");
 include_once("pepper.php");
@@ -43,7 +52,7 @@ if ($erpdb->db->connected_database_name == $ERPdbname) {
 }
 
 //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);
 //echo "<pre>"; print_r($shopdb->db); print_r($shopnr); echo "</pre>";
-- 
2.20.1