iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bugfix die 2. 

git-svn-id: svn://svn.cccv.de/engel-system@259 29ba0400-6e00-0410-a75a-ca02368028f8
This commit is contained in:
cookie 2007-12-28 13:15:43 +00:00
parent adacd8b1cc
commit d6ef980d93
1 changed files with 0 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
www-ssl/admin/dbUpdateFromXLS.php
View File

@ -45,30 +45,13 @@ echo "\n\n<br>\n<h1>XML File:</h1>\n";
if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST["PentabarfURL"])) if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST["PentabarfURL"]))
{ {
echo "Update XCAL-File from Pentabarf.."; echo "Update XCAL-File from Pentabarf..";
<<<<<<< .mine
if($PentabarfGetWith=="fsockopen") if($PentabarfGetWith=="fsockopen")
{ {
<<<<<<< .mine
//backup error messeges and delate //backup error messeges and delate
$Backuperror_messages = $error_messages; $Backuperror_messages = $error_messages;
$fp = fsockopen( "ssl://$PentabarfXMLhost", 443, $errno, $errstr, 30); $fp = fsockopen( "ssl://$PentabarfXMLhost", 443, $errno, $errstr, 30);
=======
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);
>>>>>>> .r257
>>>>>>> .r256
// $error_messages = $Backuperror_messages; // $error_messages = $Backuperror_messages;
<<<<<<< .mine
<<<<<<< .mine
if( !$fp) if( !$fp)
{ {
@ -78,39 +61,7 @@ if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST[
else else
{ {
if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE) if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE)
=======
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)
>>>>>>> .r257
>>>>>>> .r256
{ {
<<<<<<< .mine
<<<<<<< .mine
$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);
=======
echo "<h2>fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!".
"[$errstr ($errno)]</h2>";
=======
$head = 'GET /'. $PentabarfXMLpath. $_POST["PentabarfURL"]. ' HTTP/1.1'."\r\n". $head = 'GET /'. $PentabarfXMLpath. $_POST["PentabarfURL"]. ' HTTP/1.1'."\r\n".
'Host: '. $PentabarfXMLhost. "\r\n". 'Host: '. $PentabarfXMLhost. "\r\n".
'User-Agent: Engelsystem'. "\r\n". 'User-Agent: Engelsystem'. "\r\n".
@ -151,7 +102,6 @@ if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST[
fclose( $fileOut); fclose( $fileOut);
echo "<br>Es wurden $Zeilen Zeilen eingelesen<br>"; echo "<br>Es wurden $Zeilen Zeilen eingelesen<br>";
>>>>>>> .r257
} }
else else
echo "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>"; echo "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
@ -176,11 +126,6 @@ if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST[
fputs( $fileOut, fgets( $fileIn)); fputs( $fileOut, fgets( $fileIn));
} }
fclose( $fileOut); fclose( $fileOut);
<<<<<<< .mine
>>>>>>> .r256
=======
>>>>>>> .r257
echo "<br>Es wurden $Zeilen Zeilen eingelesen<br>"; echo "<br>Es wurden $Zeilen Zeilen eingelesen<br>";
} }
else else