all old Update ways are selectable now

git-svn-id: svn://svn.cccv.de/engel-system@244 29ba0400-6e00-0410-a75a-ca02368028f8

default-conf/www-ssl/inc/config.php

@@ -35,8 +35,9 @@ $GlobalZeileProStunde = 4;
 $Tempdir="/tmp";
 
 //Pentabarf ConferenzDI für UpdateDB
-$PentabarfXMLhost = "pentabarf.cccv.de";
+$PentabarfXMLhost = "cccv.pentabarf.org";
 $PentabarfXMLpath = "Xcal/conference/";
 $PentabarfXMLEventID = "31";
+$PentabarfGetWith = "fsockopen";        // "fsockopen"/"fopen"/"wget"/"lynx"
 
 ?>

www-ssl/admin/dbUpdateFromXLS.php

@@ -45,7 +45,8 @@ echo "\n\n<br>\n<h1>XML File:</h1>\n";
 if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST["PentabarfURL"]))
 {
 	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);
@@ -105,6 +106,56 @@ if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST[
 				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. $PentabarfXMLEventID;
+			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$PentabarfXMLEventID' not readable!</h2>";		
+		}
+		elseif( $PentabarfGetWith=="wget")
+		{
+			$Command = "wget --http-user=". $_POST["PentabarfUser"]. " --http-passwd=".$_POST["password"]. " ".
+						"https://$PentabarfXMLhost/$PentabarfXMLpath$PentabarfXMLEventID".
+					" --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$PentabarfXMLEventID > $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
 {