summaryrefslogtreecommitdiff
path: root/www-ssl
diff options
context:
space:
mode:
authorcookie <cookie@29ba0400-6e00-0410-a75a-ca02368028f8>2007-12-28 13:01:32 +0000
committercookie <cookie@29ba0400-6e00-0410-a75a-ca02368028f8>2007-12-28 13:01:32 +0000
commit890d7115acef85617e62f4924704f03ac32a0074 (patch)
tree532d75ad8057af14490f137ba9d851bd39e4bfa8 /www-ssl
parent2cef94af74cb0e1be45360e6f5a2f7bd9bd061be (diff)
bugfix
git-svn-id: svn://svn.cccv.de/engel-system@257 29ba0400-6e00-0410-a75a-ca02368028f8
Diffstat (limited to 'www-ssl')
-rwxr-xr-xwww-ssl/admin/dbUpdateFromXLS.php189
1 files changed, 96 insertions, 93 deletions
diff --git a/www-ssl/admin/dbUpdateFromXLS.php b/www-ssl/admin/dbUpdateFromXLS.php
index 14064eb7..3fb2b5a2 100755
--- a/www-ssl/admin/dbUpdateFromXLS.php
+++ b/www-ssl/admin/dbUpdateFromXLS.php
@@ -47,115 +47,118 @@ if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST[
echo "Update XCAL-File from Pentabarf..";
if($PentabarfGetWith=="fsockopen")
{
- //backup error messeges and delate
- $Backuperror_messages = $error_messages;
- $fp = fsockopen( "ssl://$PentabarfXMLhost", 443, $errno, $errstr, 30);
+
+ //backup error messeges and delate
+ $Backuperror_messages = $error_messages;
+ $fp = fsockopen( "ssl://$PentabarfXMLhost", 443, $errno, $errstr, 30);
// $error_messages = $Backuperror_messages;
-
- if( !$fp)
+
+ if( !$fp)
+ {
+ echo "<h2>fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!".
+ "[$errstr ($errno)]</h2>";
+ }
+ else
+ {
+ if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE)
{
- echo "<h2>fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!".
- "[$errstr ($errno)]</h2>";
+ $head = 'GET /'. $PentabarfXMLpath. $_POST["PentabarfURL"]. ' HTTP/1.1'."\r\n".
+ 'Host: '. $PentabarfXMLhost. "\r\n".
+ 'User-Agent: Engelsystem'. "\r\n".
+ 'Authorization: Basic '.
+ base64_encode($_POST["PentabarfUser"]. ':'. $_POST["password"])."\r\n".
+ "\r\n";
+ fputs( $fp, $head);
+ $Zeilen = -1;
+ while (!feof($fp))
+ {
+ $Temp= fgets($fp,1024);
+
+ // ende des headers
+ if( $Temp== "f20\r\n" )
+ {
+ $Zeilen = 0;
+ $Temp="";
+ }
+
+ //file ende?
+ if( $Temp=="0\r\n")
+ break;
+
+ if( ($Zeilen>-1) && ($Temp!="ffb\r\n") )
+ {
+ //steuerzeichen ausfiltern
+ if( strpos( "#$Temp", "\r\n") > 0)
+ $Temp = substr($Temp, 0, strlen($Temp)-2);
+ if( strpos( "#$Temp", "1005") > 0)
+ $Temp = "";
+ if( strpos( "#$Temp", "783") > 0)
+ $Temp = "";
+ //schreiben in file
+ fputs( $fileOut, $Temp);
+ $Zeilen++;
+ }
+ }
+ fclose( $fileOut);
+
+ echo "<br>Es wurden $Zeilen Zeilen eingelesen<br>";
}
else
+ echo "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
+ fclose($fp);
+ }
+ }
+ elseif($PentabarfGetWith=="fopen")
+ {
+ //user uns password in url einbauen
+ $FileNameIn = "https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@".
+ $PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"];
+
+
+ if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE)
{
if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE)
{
- $head = 'GET /'. $PentabarfXMLpath. $_POST["PentabarfURL"]. ' HTTP/1.1'."\r\n".
- 'Host: '. $PentabarfXMLhost. "\r\n".
- 'User-Agent: Engelsystem'. "\r\n".
- 'Authorization: Basic '.
- base64_encode($_POST["PentabarfUser"]. ':'. $_POST["password"])."\r\n".
- "\r\n";
- fputs( $fp, $head);
- $Zeilen = -1;
- while (!feof($fp))
+ $Zeilen = 0;
+ while (!feof($fileIn))
{
- $Temp= fgets($fp,1024);
-
- // ende des headers
- if( $Temp== "f20\r\n" )
- {
- $Zeilen = 0;
- $Temp="";
- }
-
- //file ende?
- if( $Temp=="0\r\n")
- break;
-
- if( ($Zeilen>-1) && ($Temp!="ffb\r\n") )
- {
- //steuerzeichen ausfiltern
- if( strpos( "#$Temp", "\r\n") > 0)
- $Temp = substr($Temp, 0, strlen($Temp)-2);
- if( strpos( "#$Temp", "1005") > 0)
- $Temp = "";
- if( strpos( "#$Temp", "783") > 0)
- $Temp = "";
- //schreiben in file
- fputs( $fileOut, $Temp);
- $Zeilen++;
- }
+ $Zeilen++;
+ fputs( $fileOut, fgets( $fileIn));
}
fclose( $fileOut);
-
echo "<br>Es wurden $Zeilen Zeilen eingelesen<br>";
}
else
echo "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
- fclose($fp);
- }
- }
- elseif($PentabarfGetWith=="fopen")
- {
- //user uns password in url einbauen
- $FileNameIn = "https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@".
- $PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"];
- if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE)
- {
- if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE)
- {
- $Zeilen = 0;
- while (!feof($fileIn))
- {
- $Zeilen++;
- fputs( $fileOut, fgets( $fileIn));
- }
- fclose( $fileOut);
- echo "<br>Es wurden $Zeilen Zeilen eingelesen<br>";
- }
- else
- echo "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
- fclose( $fileIn);
- }
- else
- echo "<h2>fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!</h2>";
- }
- elseif( $PentabarfGetWith=="wget")
- {
- $Command = "wget --http-user=". $_POST["PentabarfUser"]. " --http-passwd=".$_POST["password"]. " ".
- "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"].
- " --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML".
- " --no-check-certificate";
- echo system( $Command, $Status);
- if( $Status==0)
- echo "OK.<br>";
- else
- echo "fail ($Status)($Command).<br>";
- }
- elseif( $PentabarfGetWith=="lynx")
- {
- $Command = "lynx -auth=". $_POST["PentabarfUser"]. ":".$_POST["password"]. " -dump ".
- "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML";
- echo system( $Command, $Status);
- if( $Status==0)
- echo "OK.<br>";
- else
- echo "fail ($Status)($Command).<br>";
+ fclose( $fileIn);
}
else
- echo "<h1>The PentabarfGetWith='$PentabarfGetWith' not supported</h1>";
+ echo "<h2>fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!</h2>";
+ }
+ elseif( $PentabarfGetWith=="wget")
+ {
+ $Command = "wget --http-user=". $_POST["PentabarfUser"]. " --http-passwd=".$_POST["password"]. " ".
+ "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"].
+ " --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML".
+ " --no-check-certificate";
+ echo system( $Command, $Status);
+ if( $Status==0)
+ echo "OK.<br>";
+ else
+ echo "fail ($Status)($Command).<br>";
+ }
+ elseif( $PentabarfGetWith=="lynx")
+ {
+ $Command = "lynx -auth=". $_POST["PentabarfUser"]. ":".$_POST["password"]. " -dump ".
+ "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML";
+ echo system( $Command, $Status);
+ if( $Status==0)
+ echo "OK.<br>";
+ else
+ echo "fail ($Status)($Command).<br>";
+ }
+ else
+ echo "<h1>The PentabarfGetWith='$PentabarfGetWith' not supported</h1>";
}
else
{