diff --git a/includes/funktion_xml.php b/includes/funktion_xml.php
index 60eb26fa..87fd72d0 100644
--- a/includes/funktion_xml.php
+++ b/includes/funktion_xml.php
@@ -1,154 +1,154 @@
 <?php
 class element {
-  var $name = '';
-  var $attributes = array();
-  var $data = '';
-  var $depth = 0;
-  var $sub = array();
+	var $name = '';
+	var $attributes = array ();
+	var $data = '';
+	var $depth = 0;
+	var $sub = array ();
 }
 
 $XMLDEBUG = 0;
 $depth = 0;
 $XMLmain = new element;
-$XMLpos = array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+$XMLpos = array (
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0
+);
 //$XMLpos = array( 0, 0, 0, 0, 0, 0);
-   
-function convertValues( $Data) {
-  global $XMLDEBUG;
-
-  if($XMLDEBUG) {
-    $Data = htmlspecialchars($Data);
-    $Data = mysql_escape_string($Data);
-    $Data = htmlentities($Data);
-  }
-
-  $Data = utf8_decode($Data);
-  return $Data;
+
+function convertValues($Data) {
+	global $XMLDEBUG;
+
+	if ($XMLDEBUG) {
+		$Data = htmlspecialchars($Data);
+		$Data = mysql_escape_string($Data);
+		$Data = htmlentities($Data);
+	}
+
+	$Data = utf8_decode($Data);
+	return $Data;
 }
 
-function dataXMLmain($Data, &$Objekt, $Tiefe) {
-  global $XMLmain, $XMLpos, $depth, $XMLDEBUG;
-  
-  if($XMLDEBUG)
-    echo "?$Tiefe$depth";
-
-  if(($depth-1) == $Tiefe) {
-    $Objekt->sub[ $XMLpos[$Tiefe] ]->data .= htmlentities( convertValues($Data), ENT_QUOTES);
-     
-    if($XMLDEBUG)
-      echo "???". $Objekt->sub[ $XMLpos[$Tiefe] ]->name. "|$Data|$Tiefe???<br />";
-  } else
-    dataXMLmain( $Data, $Objekt->sub[ $XMLpos[$Tiefe] ], $Tiefe+1);
+function dataXMLmain($Data, & $Objekt, $Tiefe) {
+	global $XMLmain, $XMLpos, $depth, $XMLDEBUG;
+
+	if ($XMLDEBUG)
+		echo "?$Tiefe$depth";
+
+	if (($depth -1) == $Tiefe) {
+		$Objekt->sub[$XMLpos[$Tiefe]]->data .= htmlentities(convertValues($Data), ENT_QUOTES);
+
+		if ($XMLDEBUG)
+			echo "???" . $Objekt->sub[$XMLpos[$Tiefe]]->name . "|$Data|$Tiefe???<br />";
+	} else
+		dataXMLmain($Data, $Objekt->sub[$XMLpos[$Tiefe]], $Tiefe +1);
 }
 
-function startXMLmain( $Data, &$Objekt, $Tiefe ) {
-  global $XMLpos, $depth, $XMLDEBUG;
-
-  if( $XMLDEBUG)
-   if($Tiefe==1) 
-   { print_r(array_values ($XMLpos)); echo "--".$Data->name;
-     echo " #$Tiefe/$depth#";
-   }
-  
-  if( $depth==$Tiefe)
-  {
-    $Objekt->sub[ $XMLpos[$Tiefe] ] = $Data;
-    if( $XMLDEBUG)
-      echo "|". $XMLpos[$Tiefe]."|". $Objekt->sub[ $XMLpos[$Tiefe] ]->name. " ". $Data->name." save|". "#-#<br />";
-  }
-  else
-    startXMLmain( $Data, $Objekt->sub[ $XMLpos[$Tiefe] ], $Tiefe+1);
+function startXMLmain($Data, & $Objekt, $Tiefe) {
+	global $XMLpos, $depth, $XMLDEBUG;
+
+	if ($XMLDEBUG)
+		if ($Tiefe == 1) {
+			print_r(array_values($XMLpos));
+			echo "--" . $Data->name;
+			echo " #$Tiefe/$depth#";
+		}
+
+	if ($depth == $Tiefe) {
+		$Objekt->sub[$XMLpos[$Tiefe]] = $Data;
+		if ($XMLDEBUG)
+			echo "|" . $XMLpos[$Tiefe] . "|" . $Objekt->sub[$XMLpos[$Tiefe]]->name . " " . $Data->name . " save|" . "#-#<br />";
+	} else
+		startXMLmain($Data, $Objekt->sub[$XMLpos[$Tiefe]], $Tiefe +1);
 }
 
-function start_element_handler($parser, $name, $attribs)
-{
-  global $depth, $XMLmain, $XMLpos;
+function start_element_handler($parser, $name, $attribs) {
+	global $depth, $XMLmain, $XMLpos;
 
-  $Data = new element;
-  $Data->name = $name;
-  while(list($key, $value) = each($attribs))
-    $Data->attributes[$key] = convertValues($value);
-  $Data->depth = $depth;
-   $XMLpos[$depth]++;
+	$Data = new element;
+	$Data->name = $name;
+	while (list ($key, $value) = each($attribs))
+		$Data->attributes[$key] = convertValues($value);
+	$Data->depth = $depth;
+	$XMLpos[$depth]++;
 
-  if( $depth==0)
-    $XMLmain= $Data;
-  else
-    startXMLmain( $Data, $XMLmain, 1);
+	if ($depth == 0)
+		$XMLmain = $Data;
+	else
+		startXMLmain($Data, $XMLmain, 1);
 
-  $depth++;
+	$depth++;
 }
 
-function end_element_handler($parser, $name)
-{
-  global $depth, $XMLpos;
-  $XMLpos[$depth]=0;
-  $depth--;
+function end_element_handler($parser, $name) {
+	global $depth, $XMLpos;
+	$XMLpos[$depth] = 0;
+	$depth--;
 }
 
-function character_data_handler($parser, $data)
-{
-  global $XMLmain;
-  if( strlen(trim($data)) )
-    dataXMLmain( $data, $XMLmain, 1);
+function character_data_handler($parser, $data) {
+	global $XMLmain;
+	if (strlen(trim($data)))
+		dataXMLmain($data, $XMLmain, 1);
 }
 
 /*#######################################################################################*/
-function readXMLfile( $file ) 
-{
-  global $XMLDEBUG;
-  
-  //$xml_parser = xml_parser_create_ns();
-  $xml_parser = xml_parser_create("UTF-8");
-  xml_set_element_handler($xml_parser, "start_element_handler", "end_element_handler");
-  xml_set_character_data_handler($xml_parser, "character_data_handler");
-  
-  if (file_exists($file)) 
-  {
-    if (!($fp = fopen($file, "r")))
-    {
-      echo(" <h1>could not open XML file \"$file\"</h1>");
-      return -1;
-    }
-  }
-  else
-  {
-    echo(" <h1>XML file \"$file\" not exist</h1>");
-    return -1;
-  }
-
-  if( $XMLDEBUG)  echo "<pre>";
-  while ($data = fread($fp, 4096)) 
-  {
-    if (!xml_parse($xml_parser, $data, feof($fp))) 
-    {
-      die(sprintf("XML error: %s at line %d",
-            xml_error_string(xml_get_error_code($xml_parser)),
-            xml_get_current_line_number($xml_parser)));
-    }
-  }
-  if( $XMLDEBUG)  echo "</pre>";
-  xml_parser_free($xml_parser);
-  return 0;
+function readXMLfile($file) {
+	global $XMLDEBUG;
+
+	//$xml_parser = xml_parser_create_ns();
+	$xml_parser = xml_parser_create("UTF-8");
+	xml_set_element_handler($xml_parser, "start_element_handler", "end_element_handler");
+	xml_set_character_data_handler($xml_parser, "character_data_handler");
+
+	if (file_exists($file)) {
+		if (!($fp = fopen($file, "r"))) {
+			echo (" <h1>could not open XML file \"$file\"</h1>");
+			return -1;
+		}
+	} else {
+		echo (" <h1>XML file \"$file\" not exist</h1>");
+		return -1;
+	}
+
+	if ($XMLDEBUG)
+		echo "<pre>";
+	while ($data = fread($fp, 4096)) {
+		if (!xml_parse($xml_parser, $data, feof($fp))) {
+			die(sprintf("XML error: %s at line %d", xml_error_string(xml_get_error_code($xml_parser)), xml_get_current_line_number($xml_parser)));
+		}
+	}
+	if ($XMLDEBUG)
+		echo "</pre>";
+	xml_parser_free($xml_parser);
+	return 0;
 }
 
 /*#######################################################################################*/
-function getXMLsubPease( $Sourse, $Name ) 
-{
-  foreach($Sourse->sub as $key => $value) {
-    if ($value->name == $Name) {
-      return $value; 
-    }
-  }
-
-  echo "<h1>Fehler: getXMLsubPease( $Sourse, $Name ) not found</h1>";
-//    die;  
+function getXMLsubPease($Sourse, $Name) {
+	foreach ($Sourse->sub as $key => $value) {
+		if ($value->name == $Name) {
+			return $value;
+		}
+	}
+
+	echo "<h1>Fehler: getXMLsubPease( $Sourse, $Name ) not found</h1>";
+	//    die;  
 }
 
 /*#######################################################################################*/
-function getXMLsubData( $Sourse, $Name ) 
-{
-  $XML = getXMLsubPease( $Sourse, $Name);
-  return $XML->data;
+function getXMLsubData($Sourse, $Name) {
+	$XML = getXMLsubPease($Sourse, $Name);
+	return $XML->data;
 }
 ?>
diff --git a/includes/pages/admin_import.php b/includes/pages/admin_import.php
new file mode 100644
index 00000000..9b8af2e2
--- /dev/null
+++ b/includes/pages/admin_import.php
@@ -0,0 +1,253 @@
+<?php
+function admin_import() {
+	global $Room, $RoomID, $RoomName;
+	global $PentabarfGetWith, $PentabarfXMLpath, $PentabarfXMLhost;
+	
+	require_once ("includes/funktion_xml.php");
+	///////////
+	// DEBUG //
+	///////////
+	$ShowDataStrukture = 0;
+	$EnableRoomFunctions = 1;
+	$EnableRooms = 1;
+	$EnableSchudleFunctions = 1;
+	$EnableSchudle = 1;
+	$EnableSchudleDB = 1;
+
+	CreateRoomArrays();
+
+	$html = "";
+
+	/*##############################################################################################
+	                   F I L E
+	  ##############################################################################################*/
+	$html .= "\n\n<br />\n<h1>XML File:</h1>\n";
+	if (isset ($_POST["PentabarfUser"]) && isset ($_POST["password"]) && isset ($_POST["PentabarfURL"])) {
+		$html .= "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);
+			//  $error_messages = $Backuperror_messages;
+
+			if (!$fp) {
+				$html .= "<h2>fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath" . $_POST["PentabarfURL"] . "' not readable!" .
+				"[$errstr ($errno)]</h2>";
+			} else {
+				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)) {
+						$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);
+
+					$html .= "<br />Es wurden $Zeilen Zeilen eingelesen<br />";
+				} else
+					$html .= "<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);
+					$html .= "<br />Es wurden $Zeilen Zeilen eingelesen<br />";
+				} else
+					$html .= "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
+				fclose($fileIn);
+			} else
+				$html .= "<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";
+			$html .= system($Command, $Status);
+			if ($Status == 0)
+				$html .= "OK.<br />";
+			else
+				$html .= "fail ($Status)($Command).<br />";
+		}
+		elseif ($PentabarfGetWith == "lynx") {
+			$Command = "lynx -auth=" . $_POST["PentabarfUser"] . ":" . $_POST["password"] . " -dump " .
+			"https://$PentabarfXMLhost/$PentabarfXMLpath" . $_POST["PentabarfURL"] . " > $Tempdir/engelXML";
+			$html .= system($Command, $Status);
+			if ($Status == 0)
+				$html .= "OK.<br />";
+			else
+				$html .= "fail ($Status)($Command).<br />";
+		}
+		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);
+					$html .= "<br />Es wurden $Zeilen Zeilen eingelesen<br />";
+				} else
+					$html .= "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
+				fclose($fileIn);
+			} else
+				$html .= "<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";
+			$html .= system($Command, $Status);
+			if ($Status == 0)
+				$html .= "OK.<br />";
+			else
+				$html .= "fail ($Status)($Command).<br />";
+		}
+		elseif ($PentabarfGetWith == "lynx") {
+			$Command = "lynx -auth=" . $_POST["PentabarfUser"] . ":" . $_POST["password"] . " -dump " .
+			"https://$PentabarfXMLhost/$PentabarfXMLpath" . $_POST["PentabarfURL"] . " > $Tempdir/engelXML";
+			$html .= system($Command, $Status);
+			if ($Status == 0)
+				$html .= "OK.<br />";
+			else
+				$html .= "fail ($Status)($Command).<br />";
+		} else
+			$html .= "<h1>The PentabarfGetWith='$PentabarfGetWith' not supported</h1>";
+	} else {
+		$html .= "<form action=\"dbUpdateFromXLS.php\" method=\"post\">\n";
+		$html .= "<table border=\"0\">\n";
+		$html .= "\t<tr><td>XCAL-File: https://$PentabarfXMLhost/$PentabarfXMLpath</td>" .
+		"<td><input name=\"PentabarfURL\" type=\"text\" size=\"4\" maxlength=\"5\" " .
+		"value=\"$PentabarfXMLEventID\"></td></tr>\n";
+		$html .= "\t<tr><td>Username:</td>" .
+		"<td><input name=\"PentabarfUser\" type=\"text\" size=\"30\" maxlength=\"30\"></td></tr>\n";
+		$html .= "\t<tr><td>Password:</td>" .
+		"<td><input name=\"password\" type=\"password\" size=\"30\" maxlength=\"30\"></td></tr>\n";
+		$html .= "\t<tr><td></td><td><input type=\"submit\" name=\"FileUpload\" value=\"upload\"></td></tr>\n";
+		$html .= "</table>\n";
+		$html .= "</form>\n";
+	}
+
+	//readXMLfile("xml.php.xml");
+	if (readXMLfile("$Tempdir/engelXML") == 0) {
+		$XMLmain = getXMLsubPease($XMLmain, "VCALENDAR");
+
+		if ($ShowDataStrukture) {
+			$html .= "<pre><br />";
+			$html .= $XMLmain->name;
+			$html .= "<br />";
+			print_r(array_values($XMLmain->sub));
+			$html .= "</pre>";
+		}
+
+		/*
+		$html .= "<br />";
+		$Feld=7;
+		$html .= "$Feld#". $XMLmain->sub[$Feld]->name. "<br />";
+		$html .= "$Feld#". $XMLmain->sub[$Feld]->sub;
+		//print_r(array_values ($XMLmain->sub[$Feld]->sub));
+		while(list($key, $value) = each($XMLmain->sub[$Feld]->sub))
+		  $html .= "?ID".$value->sub[1]->data. "=". $value->sub[2]->data. "\n";
+		$html .= "</pre>";
+		*/
+
+		/*##############################################################################################
+		                   V e r s i o n
+		  ##############################################################################################*/
+
+		$html .= "<hr>\n";
+		$XMLrelease = getXMLsubPease($XMLmain, "X-WR-CALDESC");
+		$html .= "release: " . $XMLrelease->data . "<br />\n";
+		//$XMLreleaseDate = getXMLsubPease( $XMLmain, "RELEASE-DATE");
+		//$html .= "release date: ". $XMLreleaseDate->data. "<br />\n";
+		$html .= "<hr>\n";
+
+		/*##############################################################################################
+		                   V e r s i o n
+		  ##############################################################################################*/
+		if ($EnableRoomFunctions)
+			include ("includes/funktion_xml_room.php");
+
+		if ($EnableSchudleFunctions)
+			include ("includes/funktion_xml_schudle.php");
+
+		/*##############################################################################################
+		                 U P D A T E  A L L 
+		  ##############################################################################################*/
+		$html .= "\n\n<br />\n<h1>Update ALL:</h1>\n";
+
+		$html .= "<form action=\"dbUpdateFromXLS.php\">\n";
+		$html .= "\t<input type=\"submit\" name=\"UpdateALL\" value=\"now\">\n";
+		$html .= "</form>\n";
+
+	} //if XMLopenOOK
+	return $html;
+}
+
+/*##############################################################################################
+        erstellt Arrays der Reume
+  ##############################################################################################*/
+function CreateRoomArrays() {
+	global $Room, $RoomID, $RoomName, $con;
+
+	$sql = "SELECT `RID`, `Name` FROM `Room` " .
+	"WHERE `Show`='Y'" .
+	"ORDER BY `Number`, `Name`;";
+	$Erg = mysql_query($sql, $con);
+	$rowcount = mysql_num_rows($Erg);
+
+	for ($i = 0; $i < $rowcount; $i++) {
+		$Room[$i]["RID"] = mysql_result($Erg, $i, "RID");
+		$Room[$i]["Name"] = mysql_result($Erg, $i, "Name");
+		$RoomID[mysql_result($Erg, $i, "RID")] = mysql_result($Erg, $i, "Name");
+		$RoomName[mysql_result($Erg, $i, "Name")] = mysql_result($Erg, $i, "RID");
+	}
+}
+?>
+
diff --git a/includes/sys_menu.php b/includes/sys_menu.php
index b651a002..dfe33216 100644
--- a/includes/sys_menu.php
+++ b/includes/sys_menu.php
@@ -42,6 +42,7 @@ function make_navigation() {
 		"admin_groups",
 		"admin_faq",
 		"admin_language",
+		"admin_import",
 		"admin_log"
 	));
 	return $menu;
diff --git a/www-ssl/index.php b/www-ssl/index.php
index 71c13d15..e1a4496f 100644
--- a/www-ssl/index.php
+++ b/www-ssl/index.php
@@ -106,6 +106,10 @@ if (in_array($p, $privileges)) {
 		require_once ('includes/pages/admin_language.php');
 		$content = admin_language();
 	}
+	elseif ($p == "admin_import") {
+		require_once ('includes/pages/admin_import.php');
+		$content = admin_import();
+	}
 	elseif ($p == "admin_log") {
 		require_once ('includes/pages/admin_log.php');
 		$content = admin_log();