diff --git a/www-ssl/admin/dbUpdateFromXLS.php b/www-ssl/admin/dbUpdateFromXLS.php
index 3fb2b5a2..c61a9f0c 100755
--- a/www-ssl/admin/dbUpdateFromXLS.php
+++ b/www-ssl/admin/dbUpdateFromXLS.php
@@ -45,13 +45,30 @@ echo "\n\n
\n
XML File:
\n";
if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST["PentabarfURL"]))
{
echo "Update XCAL-File from Pentabarf..";
+<<<<<<< .mine
if($PentabarfGetWith=="fsockopen")
{
+<<<<<<< .mine
//backup error messeges and delate
$Backuperror_messages = $error_messages;
$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;
+<<<<<<< .mine
+<<<<<<< .mine
if( !$fp)
{
@@ -61,7 +78,39 @@ if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST[
else
{
if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE)
+=======
+
+ if( !$fp)
+=======
+
+ if( !$fp)
+ {
+ echo "fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!".
+ "[$errstr ($errno)]
";
+ }
+ 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 "fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!".
+ "[$errstr ($errno)]
";
+=======
$head = 'GET /'. $PentabarfXMLpath. $_POST["PentabarfURL"]. ' HTTP/1.1'."\r\n".
'Host: '. $PentabarfXMLhost. "\r\n".
'User-Agent: Engelsystem'. "\r\n".
@@ -102,6 +151,7 @@ if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST[
fclose( $fileOut);
echo "
Es wurden $Zeilen Zeilen eingelesen
";
+>>>>>>> .r257
}
else
echo "fail: File '$Tempdir/engelXML' not writeable!
";
@@ -115,6 +165,63 @@ if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST[
$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);
+<<<<<<< .mine
+>>>>>>> .r256
+
+=======
+>>>>>>> .r257
+ echo "
Es wurden $Zeilen Zeilen eingelesen
";
+ }
+ else
+ echo "fail: File '$Tempdir/engelXML' not writeable!
";
+ fclose( $fileIn);
+ }
+ else
+ 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". $_POST["PentabarfURL"].
+ " --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML".
+ " --no-check-certificate";
+ echo system( $Command, $Status);
+ if( $Status==0)
+ echo "OK.
";
+ else
+ echo "fail ($Status)($Command).
";
+ }
+ 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.
";
+ else
+ echo "fail ($Status)($Command).
";
+ }
+ else
+ echo "The PentabarfGetWith='$PentabarfGetWith' not supported
";
+ }
+ 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)