From ad563abb1d4c7470fcc3915b6fa15ffcd1b009e6 Mon Sep 17 00:00:00 2001 From: cookie Date: Thu, 15 Nov 2007 16:16:44 +0000 Subject: [PATCH] bugfix: eingabe der ID im formular dbUpdateFromXLS.php wird ignoriert git-svn-id: svn://svn.cccv.de/engel-system@252 29ba0400-6e00-0410-a75a-ca02368028f8 --- www-ssl/admin/dbUpdateFromXLS.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/www-ssl/admin/dbUpdateFromXLS.php b/www-ssl/admin/dbUpdateFromXLS.php index df9fe836..14064eb7 100755 --- a/www-ssl/admin/dbUpdateFromXLS.php +++ b/www-ssl/admin/dbUpdateFromXLS.php @@ -54,14 +54,14 @@ if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST[ if( !$fp) { - echo "

fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath$PentabarfXMLEventID' not readable!". + echo "

fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!". "[$errstr ($errno)]

"; } else { if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE) { - $head = 'GET /'. $PentabarfXMLpath. $PentabarfXMLEventID. ' HTTP/1.1'."\r\n". + $head = 'GET /'. $PentabarfXMLpath. $_POST["PentabarfURL"]. ' HTTP/1.1'."\r\n". 'Host: '. $PentabarfXMLhost. "\r\n". 'User-Agent: Engelsystem'. "\r\n". 'Authorization: Basic '. @@ -111,7 +111,7 @@ if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST[ { //user uns password in url einbauen $FileNameIn = "https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@". - $PentabarfXMLhost. "/". $PentabarfXMLpath. $PentabarfXMLEventID; + $PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"]; if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE) { if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE) @@ -130,12 +130,12 @@ if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST[ fclose( $fileIn); } else - echo "

fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath$PentabarfXMLEventID' not readable!

"; + echo "

fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!

"; } elseif( $PentabarfGetWith=="wget") { $Command = "wget --http-user=". $_POST["PentabarfUser"]. " --http-passwd=".$_POST["password"]. " ". - "https://$PentabarfXMLhost/$PentabarfXMLpath$PentabarfXMLEventID". + "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML". " --no-check-certificate"; echo system( $Command, $Status); @@ -147,7 +147,7 @@ if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST[ elseif( $PentabarfGetWith=="lynx") { $Command = "lynx -auth=". $_POST["PentabarfUser"]. ":".$_POST["password"]. " -dump ". - "https://$PentabarfXMLhost/$PentabarfXMLpath$PentabarfXMLEventID > $Tempdir/engelXML"; + "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML"; echo system( $Command, $Status); if( $Status==0) echo "OK.
";