diff --git a/cms/admin.php b/cms/admin.php
index a81cf88cc..7606b102c 100644
--- a/cms/admin.php
+++ b/cms/admin.php
@@ -25,9 +25,11 @@ require_once('../include/template.class.php');
 require_once('../include/functions.inc.php');
 require_once('../include/sprache.class.php');
 require_once('../include/gruppe.class.php');
+require_once('../include/datum.class.php');
 require_once('../include/xsdformprinter/xsdformprinter.php');
 require_once('../include/organisationseinheit.class.php');
 require_once('../include/benutzerberechtigung.class.php');
+require_once('../include/DifferenceEngine/DifferenceEngine.php');
 
 $user = get_uid();
 
@@ -57,7 +59,7 @@ if(!$rechte->isBerechtigt('basis/cms'))
 		mode : "textareas",
 		theme : "advanced",
 		file_browser_callback: "FHCFileBrowser",
-
+		
 		plugins : "spellchecker,pagebreak,style,layer,table,advhr,advimage,advlink,inlinepopups,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras",
 			
 		// Theme options
@@ -78,7 +80,7 @@ if(!$rechte->isBerechtigt('basis/cms'))
 		tinyMCE.activeEditor.windowManager.open({
 			file: cmsURL,
 			title : "FHComplete File Browser",
-			width: 550,
+			width: 750,
 			height: 550,
 			resizable: "yes",
 			close_previous: "no",
@@ -96,11 +98,13 @@ if(!$rechte->isBerechtigt('basis/cms'))
 <body>
 <?php
 
-$sprache = isset($_GET['sprache'])?$_GET['sprache']:'German';
+$sprache = isset($_GET['sprache'])?$_GET['sprache']:DEFAULT_LANGUAGE;
 $version = isset($_GET['version'])?$_GET['version']:null;
 $content_id = isset($_GET['content_id'])?$_GET['content_id']:null;
 $action = isset($_GET['action'])?$_GET['action']:'';
+$method = isset($_GET['method'])?$_GET['method']:null;
 $message = '';
+$submenu_depth=0;
 
 //Inhalt Speichern
 if(isset($_POST['XSDFormPrinter_XML']))
@@ -115,9 +119,9 @@ if(isset($_POST['XSDFormPrinter_XML']))
 		$message.= '<span class="error">'.$content->errormsg.'</span>';
 }
 
-if(isset($_GET['method']))
+if(!is_null($method))
 {
-	switch($_GET['method'])
+	switch($method)
 	{
 		case 'add_new_content':
 			$oe = new organisationseinheit();
@@ -269,6 +273,7 @@ if($result = $db->db_query($qry))
 		echo '<td>';
 		drawmenulink($row->content_id, $row->titel);
 		echo '</td>';
+		$submenu_depth=0;
 		drawsubmenu($row->content_id);
 		echo '</tr>';
 	}
@@ -282,11 +287,13 @@ echo '</td><td valign="top">';
 //Editieren
 if(!is_null($content_id))
 {
-	echo '<a href="'.$_SERVER['PHP_SELF'].'?action=prefs&content_id='.$content_id.'" '.($action=='prefs'?'class="marked"':'').'>Eigenschaften</a>';
-	echo ' | <a href="'.$_SERVER['PHP_SELF'].'?action=content&content_id='.$content_id.'" '.($action=='content'?'class="marked"':'').'>Inhalt</a>';
-	echo ' | <a href="'.$_SERVER['PHP_SELF'].'?action=preview&content_id='.$content_id.'" '.($action=='preview'?'class="marked"':'').'>Vorschau</a>';
-	echo ' | <a href="'.$_SERVER['PHP_SELF'].'?action=rights&content_id='.$content_id.'" '.($action=='rights'?'class="marked"':'').'>Rechte</a>';
-	echo ' | <a href="'.$_SERVER['PHP_SELF'].'?action=childs&content_id='.$content_id.'" '.($action=='childs'?'class="marked"':'').'>Childs</a>';
+	echo get_content_link('prefs','Eigenschaften').' | ';
+	echo get_content_link('content','Inhalt').' | ';
+	echo get_content_link('preview','Vorschau').' | ';
+	echo get_content_link('rights','Rechte').' | ';
+	echo get_content_link('childs','Childs').' | ';
+	echo get_content_link('history','History');
+	
 	echo '<div style="float: right;">'.$message.'</div>';
 	echo '<br><br>';
 
@@ -300,7 +307,7 @@ if(!is_null($content_id))
 					print_content();
 					break;
 		case 'preview': 
-					echo '<iframe src="content.php?content_id='.$content_id.'&version='.$version.'" style="width: 600px; height: 500px; border: 1px solid black;">';
+					echo '<iframe src="content.php?content_id='.$content_id.'&version='.$version.'&sprache='.$sprache.'" style="width: 600px; height: 500px; border: 1px solid black;">';
 					break;
 		case 'rights': 
 					print_rights();
@@ -308,6 +315,9 @@ if(!is_null($content_id))
 		case 'childs':
 					print_childs();
 					break;
+		case 'history':
+					print_history();
+					break;
 		default: break;
 	}
 	
@@ -317,16 +327,33 @@ echo '</body>
 </html>';
 
 /******* FUNCTIONS **********/
+
+/**
+ * Gibt einen Menue Link aus
+ * @param $id
+ * @param $titel
+ */
 function drawmenulink($id, $titel)
 {
 	global $content_id, $action, $sprache, $version;
 	echo '<a href="admin.php?content_id='.$id.'&action='.$action.'&sprache='.$sprache.'&version='.$version.'" '.($content_id==$id?'class="marked"':'').'>'.$titel.'</a> ('.$id.')';
 }
 
+/**
+ * Zeichnet ein Submenue unterhalb eines Contents
+ * 
+ * @param $content_id Content ID des Parents
+ * @param $einrueckung Einrueckungszeichen fuer den Content
+ */
 function drawsubmenu($content_id, $einrueckung="&nbsp;&nbsp;")
 {
-	global $db, $action;
-	
+	global $db, $action, $submenu_depth;
+	$submenu_depth++;
+	if($submenu_depth>20)
+	{
+		echo 'Menürekursion?! -> Abbruch';
+		return 0;
+	}
 	$qry = "SELECT 
 				tbl_contentchild.content_id,
 				tbl_contentchild.child_content_id,
@@ -343,7 +370,6 @@ function drawsubmenu($content_id, $einrueckung="&nbsp;&nbsp;")
 			
 			while($row = $db->db_fetch_object($result))
 			{
-				//$vorhanden[]=$row->child_content_id;
 				echo "<tr>\n";
 				echo '<td>';
 				echo $einrueckung;
@@ -352,12 +378,24 @@ function drawsubmenu($content_id, $einrueckung="&nbsp;&nbsp;")
 				echo "</td>\n";
 				echo "</tr>\n";
 			}
-			
-			//echo '<br>';
 		}
 	}
 }
 
+/**
+ * Liefert den Link zum Anzeigen von Content Modulen
+ * @param $key Action Key
+ * @param $name Name des Links
+ */
+function get_content_link($key, $name)
+{
+	global $action, $content_id;	
+	return '<a href="'.$_SERVER['PHP_SELF'].'?action='.$key.'&content_id='.$content_id.'" '.($action==$key?'class="marked"':'').'>'.$name.'</a>';
+}
+
+/**
+ * Erstellt den Karteireiter zum Verwalten der Kindelemente eines Contents
+ */
 function print_childs()
 {
 	global $content_id, $sprache, $version;
@@ -401,7 +439,7 @@ function print_childs()
 	echo '</tbody></table>';
 	
 	$content = new content();
-	$content->getAll();
+	$content->getpossibleChilds($content_id);
 	echo '<form action="'.$_SERVER['PHP_SELF'].'?content_id='.$content_id.'&sprache='.$sprache.'&version='.$version.'&action=childs&method=childs_add" method="POST">';
 	
 	echo '<select name="child_content_id">';
@@ -414,6 +452,10 @@ function print_childs()
 	echo '</form>';
 }
 
+/**
+ * Erstellt den Karteireiter zum Eintragen der Eigenschaften eines Contents
+ * 
+ */
 function print_prefs()
 {
 	global $content_id, $sprache, $version;
@@ -482,6 +524,11 @@ function print_prefs()
 	
 }
 
+/**
+ * Erstellt den Karteireiter zum Verwalten der Zugriffsrechte auf einen Content
+ * Zu einem Content können Gruppen zugeteilt werden. Diese haben dann zugriff auf den Content
+ * Wenn keine Gruppen zugeordnet sind, können alle Personen auf den Content zugreifen
+ */
 function print_rights()
 {
 	global $content_id, $sprache, $version;
@@ -542,6 +589,13 @@ function print_rights()
 	echo '</form>';
 }
 
+/**
+ * Erstellt den Karteireiter zum Eintragen des Contents
+ * 
+ * Hier wird Aufgrund der XSD Vorlage des Templates ein Formular erstellt und mit den
+ * entsprechenden Werten des XML Files vorausgefuellt. 
+ * 
+ */
 function print_content()
 {
 	global $content_id, $sprache, $version;
@@ -560,4 +614,78 @@ function print_content()
 	$xfp->output($template->xsd,$content->content);
 	echo '</div>';
 }
+
+/**
+ * Zeigt die Historie eines Contents an. 
+ * 
+ */
+function print_history()
+{
+	global $content_id, $sprache, $version, $method;
+	if($method=='history_changes')
+	{
+		if(!isset($_GET['v1']) || !isset($_GET['v2']))
+		{
+			echo 'Invalid Parameter';
+			return false;
+		}
+		
+		$v1 = $_GET['v1'];
+		$v2 = $_GET['v2'];
+		
+		$content_old = new content();
+		$content_old->getContent($content_id, $sprache, $v1);
+		$dom = new DOMDocument();
+		$dom->loadXML($content_old->content);
+		$content_old = $dom->getElementsByTagName('inhalt')->item(0)->nodeValue;
+		
+		$content_new = new content();
+		$content_new->getContent($content_id, $sprache, $v2);
+		$dom = new DOMDocument();
+		$dom->loadXML($content_new->content);
+		$content_new = $dom->getElementsByTagName('inhalt')->item(0)->nodeValue;
+		
+		$arr_old = explode("\n",trim($content_old));
+		$arr_new = explode("\n",trim($content_new));
+		
+		$diff = new Diff($arr_new, $arr_old);
+		$tdf = new TableDiffFormatter();
+		echo '<table>';
+		echo html_entity_decode($tdf->format($diff));
+		echo '</table>';
+	}
+	else
+	{
+		$content = new content();
+		$content->loadVersionen($content_id, $sprache);
+		
+		$datum_obj = new datum();
+		echo '<h3>Versionen</h3>';
+		echo '<form action="'.$_SERVER['PHP_SELF'].'" method="GET">';
+		echo '
+			<input type="hidden" name="action" value="history">
+			<input type="hidden" name="method" value="history_changes">
+			<input type="hidden" name="sprache" value="'.$sprache.'">
+			<input type="hidden" name="version" value="'.$version.'">
+			<input type="hidden" name="content_id" value="'.$content_id.'">';
+		echo 'Änderungen von Version
+			<input type="text" value="1" size="2" name="v1"> zu 
+			<input type="text" value="2" size="2" name="v2"> 
+			<input type="submit" value="Anzeigen">
+			</form>'; 
+		echo '<ul>';
+		foreach($content->result as $row)
+		{
+			echo '<li>';
+			echo '<b>Version '.$row->version.'</b><br>Erstellt am '.$datum_obj->formatDatum($row->insertamum,'d.m.Y').' von '.$row->insertvon;
+			if($row->updateamum!='' || $row->updatevon!='')
+				echo '<br>Letzte Änderung von '.$row->updatevon.' am '.$datum_obj->formatDatum($row->updateamum,'d.m.Y');
+			if($row->reviewvon!='' || $row->reviewamum!='')
+				echo '<br>Review von '.$row->reviewvon.' am '.$datum_obj->formatDatum($row->reviewamum,'d.m.Y');
+			echo '<br><br>';
+			echo '</li>';
+		}
+		echo '</ul>';
+	}
+}
 ?>
diff --git a/cms/content.php b/cms/content.php
index 1ae16f126..0988768a1 100644
--- a/cms/content.php
+++ b/cms/content.php
@@ -34,8 +34,7 @@ else
 	die('ContentID muss uebergeben werden');
 
 $version = (isset($_GET['version'])?$_GET['version']:null);
-
-$sprache = getSprache();
+$sprache = (isset($_GET['sprache'])?$_GET['sprache']:getSprache());
 
 //XML Content laden
 $content = new content();
diff --git a/cms/tinymce_dms.php b/cms/tinymce_dms.php
index 57614a9a4..4aec4d4b5 100644
--- a/cms/tinymce_dms.php
+++ b/cms/tinymce_dms.php
@@ -23,14 +23,17 @@ require_once('../config/cis.config.inc.php');
 require_once('../include/functions.inc.php');
 require_once('../include/dms.class.php');
 ?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//DE"
+"http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
 	<title>FHComplete Document Management System</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../skin/superfish.css" type="text/css">
 	<link rel="stylesheet" href="../skin/fhcomplete.css" type="text/css">
 	<link rel="stylesheet" href="../skin/style.css.php" type="text/css">
 	<script type="text/javascript" src="../include/js/jquery.js"></script>
+	<script type="text/javascript" src="../include/js/superfish.js"></script>
 	<script type="text/javascript" src="../include/tiny_mce/tiny_mce_popup.js"></script>
 	<script type="text/javascript">
 	var FileBrowserDialog={
@@ -59,11 +62,12 @@ require_once('../include/dms.class.php');
 			}
 	};
 	
-	tinyMCEPopup.onInit.add(FileBrowserDialog.init, FileBrowserDialog);
+	//tinyMCEPopup.onInit.add(FileBrowserDialog.init, FileBrowserDialog);
 	
 	$(document).ready(function() 
 	{ 
 		$('#divupload').hide();
+		jQuery('ul.sf-menu').superfish({speed:'fast', delay:200});
 	});
 	
 	function upload(id, name)
@@ -88,6 +92,7 @@ require_once('../include/dms.class.php');
 <?php
 $user = get_uid();
 $kategorie_kurzbz = isset($_REQUEST['kategorie_kurzbz'])?$_REQUEST['kategorie_kurzbz']:'';
+$searchstring = isset($_REQUEST['searchstring'])?$_REQUEST['searchstring']:'';
 $mimetypes = array(
 	'application/pdf'=>'pdf.ico',
 	'application/vnd.openxmlformats-officedocument.wordprocessingml.document'=>'word2007.jpg',
@@ -147,69 +152,40 @@ if(isset($_POST['fileupload']))
 	}
 }
 
-
 echo '<h1>Dokument Auswählen</h1>
-	<table>
+	<form action="'.$_SERVER['PHP_SELF'].'" method="POST">
+		<input type="text" name="searchstring" value="'.$searchstring.'">
+		<input type="submit" value="Suchen">
+	</form>
+	<table cellspacing=0>
 		<tr>
-			<td valign="top" nowrap>
-				<b>Kategorie:</b><br>';
+			<td valign="top" nowrap style="border-right: 1px solid lightblue;border-top: 1px solid lightblue;padding-right:5px">
+				<h3>Kategorie:</h3>
+				';
 //Kategorien anzeigen
 
 $dms = new dms();
 $dms->getKategorie();
-foreach($dms->result as $row)
-{
-	if($kategorie_kurzbz=='')
-		$kategorie_kurzbz=$row->kategorie_kurzbz;
-	if($kategorie_kurzbz==$row->kategorie_kurzbz)
-		$class='class="marked"';
-	else
-		$class='';
-	
-	echo '
-		<a href="'.$_SERVER['PHP_SELF'].'?kategorie_kurzbz='.$row->kategorie_kurzbz.'" '.$class.'>';
-	echo $row->bezeichnung.'</a><br>';
-}
-echo '
-			</td>
-			<td valign="top">';
+drawKategorieMenue($dms->result);
 
+echo '</td>
+	<td valign="top" style="border-top: 1px solid lightblue; width: 100%;">';
 //Dokumente der Ausgewaehlten Kategorie laden und Anzeigen
 $dms = new dms();
-$dms->getDocuments($kategorie_kurzbz);
+
+if($searchstring!='')
+{
+	$dms->search($searchstring);
+}
+else
+{
+	$dms->getDocuments($kategorie_kurzbz);
+}
+
+//drawFilesThumb($dms->result);
+drawFilesList($dms->result);
 
 echo '
-		<table>
-			<tr>';
-$anzahl=0;
-foreach($dms->result as $row)
-{
-	if($anzahl>2)
-	{
-		echo "
-			</tr>
-			<tr>";
-		$anzahl=0;
-	}
-	echo '
-				<td>';
-	echo '<a href="id://'.$row->dms_id.'/Auswahl" onclick="FileBrowserDialog.mySubmit('.$row->dms_id.'); return false;" style="font-size: small" title="'.$row->beschreibung.'">';
-	echo '<center>';
-	if(array_key_exists($row->mimetype,$mimetypes))
-		echo '<img src="../skin/images/'.$mimetypes[$row->mimetype].'" style="height: 15px">';
-	else
-		echo '<img src="dms.php?id='.$row->dms_id.'&amp;notimeupdate" style="max-width: 100px">';
-	
-	echo '<br>'.$row->name.'</a><br>';
-	
-	//Upload einer neuen Version
-	echo '<a href="id://'.$row->dms_id.'/Upload" onclick="return upload(\''.$row->dms_id.'\',\''.$row->name.'\')" style="font-size:small">Upload</a> ';
-	echo '</center></td>';
-	$anzahl++;
-}
-echo '	
-			</tr>
-		</table>
 		</td>
 	</tr>
 	</table>
@@ -229,6 +205,136 @@ echo '
 			<input type="submit" name="fileupload" value="Upload">
 		</form>
 	</div>';
+
+/************ FUNCTIONS ********************/
+/**
+ * Zeichnet das Kategorie Menu
+ * 
+ * @param $rows DMS Result Object
+ */
+function drawKategorieMenue($rows)
+{	
+	global $kategorie_kurzbz;
+	echo '<ul>';
+	foreach($rows as $row)
+	{
+		if($kategorie_kurzbz=='')
+			$kategorie_kurzbz=$row->kategorie_kurzbz;
+		if($kategorie_kurzbz==$row->kategorie_kurzbz)
+			$class='class="marked"';
+		else
+			$class='';
+		
+		echo '<li>
+			<a href="'.$_SERVER['PHP_SELF'].'?kategorie_kurzbz='.$row->kategorie_kurzbz.'" '.$class.'>';
+		echo $row->bezeichnung.'</a>';
+		$dms = new dms();
+		$dms->getKategorie($row->kategorie_kurzbz);
+		if(count($dms->result)>0)
+			drawKategorieMenue($dms->result);
+		echo '</li>';
+	}
+	echo '
+				</ul>';
+}
+/**
+ * Zeichnet die Files in Listenform
+ * 
+ * @param $rows DMS Result Object
+ */
+function drawFilesList($rows)
+{
+	global $mimetypes;
+	echo '
+			<table>
+		';
+
+	foreach($rows as $row)
+	{
+		echo '
+		<tr>
+			<td>';
+		if(array_key_exists($row->mimetype,$mimetypes))
+			echo '<img src="../skin/images/'.$mimetypes[$row->mimetype].'" style="height: 15px">';
+		else
+			echo '<img src="../skin/images/blank.png" style="height: 15px">';
+			
+		echo'
+				<a href="id://'.$row->dms_id.'/Auswahl" onclick="FileBrowserDialog.mySubmit('.$row->dms_id.'); return false;" style="font-size: small" title="'.$row->beschreibung.'">
+				'.$row->name.'</a>
+			</td>
+
+			<td>';
+		
+		//Upload einer neuen Version
+		echo '<ul class="sf-menu">
+				<li><a href="id://'.$row->dms_id.'/Erweitert" style="font-size:small">Erweitert</a>
+					<ul>
+						<li><a href="id://'.$row->dms_id.'/Auswahl" onclick="FileBrowserDialog.mySubmit('.$row->dms_id.');" style="font-size:small">Auswählen</a></li>
+						<li><a href="dms.php?id='.$row->dms_id.'" style="font-size:small" target="_blank">Herunterladen</a></li>
+						<li><a href="id://'.$row->dms_id.'/Upload" onclick="return upload(\''.$row->dms_id.'\',\''.$row->name.'\')" style="font-size:small">Neue Version hochladen</a></li>
+						<li><a href="id://'.$row->dms_id.'/ShowAll" onclick="return upload(\''.$row->dms_id.'\',\''.$row->name.'\')" style="font-size:small" >Alle Versionen anzeigen</a></li>
+					</ul>
+				</li>
+			  </ul>';
+		echo '</td>
+		</tr>';
+		
+	}
+	echo '	
+			</table>';
+}
+/**
+ * Zeichnet die Files mit Vorschau
+ * 
+ * @param $rows DMS Result Object
+ */
+function drawFilesThumb($rows)
+{
+	global $mimetypes;
+	echo '
+			<table>
+				<tr>';
+	$anzahl=0;
+	foreach($rows as $row)
+	{
+		if($anzahl>2)
+		{
+			echo "
+				</tr>
+				<tr>";
+			$anzahl=0;
+		}
+		echo '
+					<td>';
+		echo '<center>';
+		echo '<a href="id://'.$row->dms_id.'/Auswahl" onclick="FileBrowserDialog.mySubmit('.$row->dms_id.'); return false;" style="font-size: small" title="'.$row->beschreibung.'">';
+		
+		if(array_key_exists($row->mimetype,$mimetypes))
+			echo '<img src="../skin/images/'.$mimetypes[$row->mimetype].'" style="height: 15px">';
+		else
+			echo '<img src="dms.php?id='.$row->dms_id.'&amp;notimeupdate" style="max-width: 100px">';
+		echo '</a><br>';
+		//echo '<br>'.$row->name.'</a>';
+		
+		//Upload einer neuen Version
+		echo '<ul class="sf-menu">
+				<li><a href="id://'.$row->dms_id.'/Auswahl" onclick="FileBrowserDialog.mySubmit('.$row->dms_id.');" style="font-size:small">'.$row->name.'</a>
+					<ul>
+						<li><a href="id://'.$row->dms_id.'/Auswahl" onclick="FileBrowserDialog.mySubmit('.$row->dms_id.');" style="font-size:small">Auswählen</a></li>
+						<li><a href="dms.php?id='.$row->dms_id.'" style="font-size:small" target="_blank">Herunterladen</a></li>
+						<li><a href="id://'.$row->dms_id.'/Upload" onclick="return upload(\''.$row->dms_id.'\',\''.$row->name.'\')" style="font-size:small">Neue Version hochladen</a></li>
+						<li><a href="id://'.$row->dms_id.'/ShowAll" onclick="return upload(\''.$row->dms_id.'\',\''.$row->name.'\')" style="font-size:small" >Alle Versionen anzeigen</a></li>
+					</ul>
+				</li>
+			  </ul>';
+		echo '</center></td>';
+		$anzahl++;
+	}
+	echo '	
+				</tr>
+			</table>';
+}
 ?>
 </body>
 </html>
\ No newline at end of file
diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php
index 6c31ead5c..7cbb5ebc2 100644
--- a/config/cis.config-default.inc.php
+++ b/config/cis.config-default.inc.php
@@ -95,6 +95,9 @@ define('DEFAULT_STYLE','tw');
 //Layout Wechsel im CIS moeglich?
 define('CHOOSE_LAYOUT',false);
 
+//Default Sprache
+define('DEFAULT_LANGUAGE','German');
+
 // MAIL Adressen
 define('MAIL_DEBUG','oesi@technikum-wien.at');
 define('MAIL_GST','pam@technikum-wien.at,oesi@technikum-wien.at');
diff --git a/include/DifferenceEngine/DifferenceEngine.php b/include/DifferenceEngine/DifferenceEngine.php
new file mode 100644
index 000000000..126e74be9
--- /dev/null
+++ b/include/DifferenceEngine/DifferenceEngine.php
@@ -0,0 +1,1241 @@
+<?php
+/**
+ * @defgroup DifferenceEngine DifferenceEngine
+ */
+
+// A PHP diff engine for phpwiki. (Taken from phpwiki-1.3.3)
+//
+// Copyright (C) 2000, 2001 Geoffrey T. Dairiki <dairiki@dairiki.org>
+// You may copy this code freely under the conditions of the GPL.
+//
+
+define('USE_ASSERTS', function_exists('assert'));
+
+/**
+ * @todo document
+ * @private
+ * @ingroup DifferenceEngine
+ */
+class _DiffOp {
+	var $type;
+	var $orig;
+	var $closing;
+
+	function reverse() {
+		trigger_error('pure virtual', E_USER_ERROR);
+	}
+
+	function norig() {
+		return $this->orig ? sizeof($this->orig) : 0;
+	}
+
+	function nclosing() {
+		return $this->closing ? sizeof($this->closing) : 0;
+	}
+}
+
+/**
+ * @todo document
+ * @private
+ * @ingroup DifferenceEngine
+ */
+class _DiffOp_Copy extends _DiffOp {
+	var $type = 'copy';
+
+	function _DiffOp_Copy ($orig, $closing = false) {
+		if (!is_array($closing))
+		$closing = $orig;
+		$this->orig = $orig;
+		$this->closing = $closing;
+	}
+
+	function reverse() {
+		return new _DiffOp_Copy($this->closing, $this->orig);
+	}
+}
+
+/**
+ * @todo document
+ * @private
+ * @ingroup DifferenceEngine
+ */
+class _DiffOp_Delete extends _DiffOp {
+	var $type = 'delete';
+
+	function _DiffOp_Delete ($lines) {
+		$this->orig = $lines;
+		$this->closing = false;
+	}
+
+	function reverse() {
+		return new _DiffOp_Add($this->orig);
+	}
+}
+
+/**
+ * @todo document
+ * @private
+ * @ingroup DifferenceEngine
+ */
+class _DiffOp_Add extends _DiffOp {
+	var $type = 'add';
+
+	function _DiffOp_Add ($lines) {
+		$this->closing = $lines;
+		$this->orig = false;
+	}
+
+	function reverse() {
+		return new _DiffOp_Delete($this->closing);
+	}
+}
+
+/**
+ * @todo document
+ * @private
+ * @ingroup DifferenceEngine
+ */
+class _DiffOp_Change extends _DiffOp {
+	var $type = 'change';
+
+	function _DiffOp_Change ($orig, $closing) {
+		$this->orig = $orig;
+		$this->closing = $closing;
+	}
+
+	function reverse() {
+		return new _DiffOp_Change($this->closing, $this->orig);
+	}
+}
+
+/**
+ * Class used internally by Diff to actually compute the diffs.
+ *
+ * The algorithm used here is mostly lifted from the perl module
+ * Algorithm::Diff (version 1.06) by Ned Konz, which is available at:
+ *	 http://www.perl.com/CPAN/authors/id/N/NE/NEDKONZ/Algorithm-Diff-1.06.zip
+ *
+ * More ideas are taken from:
+ *	 http://www.ics.uci.edu/~eppstein/161/960229.html
+ *
+ * Some ideas are (and a bit of code) are from from analyze.c, from GNU
+ * diffutils-2.7, which can be found at:
+ *	 ftp://gnudist.gnu.org/pub/gnu/diffutils/diffutils-2.7.tar.gz
+ *
+ * closingly, some ideas (subdivision by NCHUNKS > 2, and some optimizations)
+ * are my own.
+ *
+ * Line length limits for robustness added by Tim Starling, 2005-08-31
+ * Alternative implementation added by Guy Van den Broeck, 2008-07-30
+ *
+ * @author Geoffrey T. Dairiki, Tim Starling, Guy Van den Broeck
+ * @private
+ * @ingroup DifferenceEngine
+ */
+class _DiffEngine {
+
+	const MAX_XREF_LENGTH =  10000;
+
+	function diff ($from_lines, $to_lines){
+		//wfProfileIn( __METHOD__ );
+
+		// Diff and store locally
+		$this->diff_local($from_lines, $to_lines);
+
+		// Merge edits when possible
+		$this->_shift_boundaries($from_lines, $this->xchanged, $this->ychanged);
+		$this->_shift_boundaries($to_lines, $this->ychanged, $this->xchanged);
+
+		// Compute the edit operations.
+		$n_from = sizeof($from_lines);
+		$n_to = sizeof($to_lines);
+
+		$edits = array();
+		$xi = $yi = 0;
+		while ($xi < $n_from || $yi < $n_to) {
+			USE_ASSERTS && assert($yi < $n_to || $this->xchanged[$xi]);
+			USE_ASSERTS && assert($xi < $n_from || $this->ychanged[$yi]);
+
+			// Skip matching "snake".
+			$copy = array();
+			while ( $xi < $n_from && $yi < $n_to
+			&& !$this->xchanged[$xi] && !$this->ychanged[$yi]) {
+				$copy[] = $from_lines[$xi++];
+				++$yi;
+			}
+			if ($copy)
+			$edits[] = new _DiffOp_Copy($copy);
+
+			// Find deletes & adds.
+			$delete = array();
+			while ($xi < $n_from && $this->xchanged[$xi])
+			$delete[] = $from_lines[$xi++];
+
+			$add = array();
+			while ($yi < $n_to && $this->ychanged[$yi])
+			$add[] = $to_lines[$yi++];
+
+			if ($delete && $add)
+			$edits[] = new _DiffOp_Change($delete, $add);
+			elseif ($delete)
+			$edits[] = new _DiffOp_Delete($delete);
+			elseif ($add)
+			$edits[] = new _DiffOp_Add($add);
+		}
+		//wfProfileOut( __METHOD__ );
+		return $edits;
+	}
+
+	function diff_local ($from_lines, $to_lines) {
+		global $wgExternalDiffEngine;
+		//wfProfileIn( __METHOD__);
+
+		if($wgExternalDiffEngine == 'wikidiff3'){
+			// wikidiff3
+			$wikidiff3 = new WikiDiff3();
+			$wikidiff3->diff($from_lines, $to_lines);
+			$this->xchanged = $wikidiff3->removed;
+			$this->ychanged = $wikidiff3->added;
+			unset($wikidiff3);
+		}else{
+			// old diff
+			$n_from = sizeof($from_lines);
+			$n_to = sizeof($to_lines);
+			$this->xchanged = $this->ychanged = array();
+			$this->xv = $this->yv = array();
+			$this->xind = $this->yind = array();
+			unset($this->seq);
+			unset($this->in_seq);
+			unset($this->lcs);
+
+			// Skip leading common lines.
+			for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) {
+				if ($from_lines[$skip] !== $to_lines[$skip])
+				break;
+				$this->xchanged[$skip] = $this->ychanged[$skip] = false;
+			}
+			// Skip trailing common lines.
+			$xi = $n_from; $yi = $n_to;
+			for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++) {
+				if ($from_lines[$xi] !== $to_lines[$yi])
+				break;
+				$this->xchanged[$xi] = $this->ychanged[$yi] = false;
+			}
+
+			// Ignore lines which do not exist in both files.
+			for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
+				$xhash[$this->_line_hash($from_lines[$xi])] = 1;
+			}
+
+			for ($yi = $skip; $yi < $n_to - $endskip; $yi++) {
+				$line = $to_lines[$yi];
+				if ( ($this->ychanged[$yi] = empty($xhash[$this->_line_hash($line)])) )
+				continue;
+				$yhash[$this->_line_hash($line)] = 1;
+				$this->yv[] = $line;
+				$this->yind[] = $yi;
+			}
+			for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
+				$line = $from_lines[$xi];
+				if ( ($this->xchanged[$xi] = empty($yhash[$this->_line_hash($line)])) )
+				continue;
+				$this->xv[] = $line;
+				$this->xind[] = $xi;
+			}
+
+			// Find the LCS.
+			$this->_compareseq(0, sizeof($this->xv), 0, sizeof($this->yv));
+		}
+		//wfProfileOut( __METHOD__ );
+	}
+
+	/**
+	 * Returns the whole line if it's small enough, or the MD5 hash otherwise
+	 */
+	function _line_hash( $line ) {
+		if ( strlen( $line ) > self::MAX_XREF_LENGTH ) {
+			return md5( $line );
+		} else {
+			return $line;
+		}
+	}
+
+	/* Divide the Largest Common Subsequence (LCS) of the sequences
+	 * [XOFF, XLIM) and [YOFF, YLIM) into NCHUNKS approximately equally
+	 * sized segments.
+	 *
+	 * Returns (LCS, PTS).	LCS is the length of the LCS. PTS is an
+	 * array of NCHUNKS+1 (X, Y) indexes giving the diving points between
+	 * sub sequences.  The first sub-sequence is contained in [X0, X1),
+	 * [Y0, Y1), the second in [X1, X2), [Y1, Y2) and so on.  Note
+	 * that (X0, Y0) == (XOFF, YOFF) and
+	 * (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM).
+	 *
+	 * This function assumes that the first lines of the specified portions
+	 * of the two files do not match, and likewise that the last lines do not
+	 * match.  The caller must trim matching lines from the beginning and end
+	 * of the portions it is going to specify.
+	 */
+	function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks) {
+		$flip = false;
+
+		if ($xlim - $xoff > $ylim - $yoff) {
+			// Things seems faster (I'm not sure I understand why)
+			// when the shortest sequence in X.
+			$flip = true;
+			list ($xoff, $xlim, $yoff, $ylim)
+			= array( $yoff, $ylim, $xoff, $xlim);
+		}
+
+		if ($flip)
+		for ($i = $ylim - 1; $i >= $yoff; $i--)
+		$ymatches[$this->xv[$i]][] = $i;
+		else
+		for ($i = $ylim - 1; $i >= $yoff; $i--)
+		$ymatches[$this->yv[$i]][] = $i;
+
+		$this->lcs = 0;
+		$this->seq[0]= $yoff - 1;
+		$this->in_seq = array();
+		$ymids[0] = array();
+
+		$numer = $xlim - $xoff + $nchunks - 1;
+		$x = $xoff;
+		for ($chunk = 0; $chunk < $nchunks; $chunk++) {
+			if ($chunk > 0)
+			for ($i = 0; $i <= $this->lcs; $i++)
+			$ymids[$i][$chunk-1] = $this->seq[$i];
+
+			$x1 = $xoff + (int)(($numer + ($xlim-$xoff)*$chunk) / $nchunks);
+			for ( ; $x < $x1; $x++) {
+				$line = $flip ? $this->yv[$x] : $this->xv[$x];
+				if (empty($ymatches[$line]))
+				continue;
+				$matches = $ymatches[$line];
+				reset($matches);
+				while (list ($junk, $y) = each($matches))
+				if (empty($this->in_seq[$y])) {
+					$k = $this->_lcs_pos($y);
+					USE_ASSERTS && assert($k > 0);
+					$ymids[$k] = $ymids[$k-1];
+					break;
+				}
+				while (list ( /* $junk */, $y) = each($matches)) {
+					if ($y > $this->seq[$k-1]) {
+						USE_ASSERTS && assert($y < $this->seq[$k]);
+						// Optimization: this is a common case:
+						//	next match is just replacing previous match.
+						$this->in_seq[$this->seq[$k]] = false;
+						$this->seq[$k] = $y;
+						$this->in_seq[$y] = 1;
+					} else if (empty($this->in_seq[$y])) {
+						$k = $this->_lcs_pos($y);
+						USE_ASSERTS && assert($k > 0);
+						$ymids[$k] = $ymids[$k-1];
+					}
+				}
+			}
+		}
+
+		$seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
+		$ymid = $ymids[$this->lcs];
+		for ($n = 0; $n < $nchunks - 1; $n++) {
+			$x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
+			$y1 = $ymid[$n] + 1;
+			$seps[] = $flip ? array($y1, $x1) : array($x1, $y1);
+		}
+		$seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim);
+
+		return array($this->lcs, $seps);
+	}
+
+	function _lcs_pos ($ypos) {
+		$end = $this->lcs;
+		if ($end == 0 || $ypos > $this->seq[$end]) {
+			$this->seq[++$this->lcs] = $ypos;
+			$this->in_seq[$ypos] = 1;
+			return $this->lcs;
+		}
+
+		$beg = 1;
+		while ($beg < $end) {
+			$mid = (int)(($beg + $end) / 2);
+			if ( $ypos > $this->seq[$mid] )
+			$beg = $mid + 1;
+			else
+			$end = $mid;
+		}
+
+		USE_ASSERTS && assert($ypos != $this->seq[$end]);
+
+		$this->in_seq[$this->seq[$end]] = false;
+		$this->seq[$end] = $ypos;
+		$this->in_seq[$ypos] = 1;
+		return $end;
+	}
+
+	/* Find LCS of two sequences.
+	 *
+	 * The results are recorded in the vectors $this->{x,y}changed[], by
+	 * storing a 1 in the element for each line that is an insertion
+	 * or deletion (ie. is not in the LCS).
+	 *
+	 * The subsequence of file 0 is [XOFF, XLIM) and likewise for file 1.
+	 *
+	 * Note that XLIM, YLIM are exclusive bounds.
+	 * All line numbers are origin-0 and discarded lines are not counted.
+	 */
+	function _compareseq ($xoff, $xlim, $yoff, $ylim) {
+		// Slide down the bottom initial diagonal.
+		while ($xoff < $xlim && $yoff < $ylim
+		&& $this->xv[$xoff] == $this->yv[$yoff]) {
+			++$xoff;
+			++$yoff;
+		}
+
+		// Slide up the top initial diagonal.
+		while ($xlim > $xoff && $ylim > $yoff
+		&& $this->xv[$xlim - 1] == $this->yv[$ylim - 1]) {
+			--$xlim;
+			--$ylim;
+		}
+
+		if ($xoff == $xlim || $yoff == $ylim)
+		$lcs = 0;
+		else {
+			// This is ad hoc but seems to work well.
+			//$nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5);
+			//$nchunks = max(2,min(8,(int)$nchunks));
+			$nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1;
+			list ($lcs, $seps)
+			= $this->_diag($xoff,$xlim,$yoff, $ylim,$nchunks);
+		}
+
+		if ($lcs == 0) {
+			// X and Y sequences have no common subsequence:
+			// mark all changed.
+			while ($yoff < $ylim)
+			$this->ychanged[$this->yind[$yoff++]] = 1;
+			while ($xoff < $xlim)
+			$this->xchanged[$this->xind[$xoff++]] = 1;
+		} else {
+			// Use the partitions to split this problem into subproblems.
+			reset($seps);
+			$pt1 = $seps[0];
+			while ($pt2 = next($seps)) {
+				$this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
+				$pt1 = $pt2;
+			}
+		}
+	}
+
+	/* Adjust inserts/deletes of identical lines to join changes
+	 * as much as possible.
+	 *
+	 * We do something when a run of changed lines include a
+	 * line at one end and has an excluded, identical line at the other.
+	 * We are free to choose which identical line is included.
+	 * `compareseq' usually chooses the one at the beginning,
+	 * but usually it is cleaner to consider the following identical line
+	 * to be the "change".
+	 *
+	 * This is extracted verbatim from analyze.c (GNU diffutils-2.7).
+	 */
+	function _shift_boundaries ($lines, &$changed, $other_changed) {
+		//wfProfileIn( __METHOD__ );
+		$i = 0;
+		$j = 0;
+
+		USE_ASSERTS && assert('sizeof($lines) == sizeof($changed)');
+		$len = sizeof($lines);
+		$other_len = sizeof($other_changed);
+
+		while (1) {
+			/*
+			 * Scan forwards to find beginning of another run of changes.
+			 * Also keep track of the corresponding point in the other file.
+			 *
+			 * Throughout this code, $i and $j are adjusted together so that
+			 * the first $i elements of $changed and the first $j elements
+			 * of $other_changed both contain the same number of zeros
+			 * (unchanged lines).
+			 * Furthermore, $j is always kept so that $j == $other_len or
+			 * $other_changed[$j] == false.
+			 */
+			while ($j < $other_len && $other_changed[$j])
+			$j++;
+
+			while ($i < $len && ! $changed[$i]) {
+				USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]');
+				$i++; $j++;
+				while ($j < $other_len && $other_changed[$j])
+				$j++;
+			}
+
+			if ($i == $len)
+			break;
+
+			$start = $i;
+
+			// Find the end of this run of changes.
+			while (++$i < $len && $changed[$i])
+			continue;
+
+			do {
+				/*
+				 * Record the length of this run of changes, so that
+				 * we can later determine whether the run has grown.
+				 */
+				$runlength = $i - $start;
+
+				/*
+				 * Move the changed region back, so long as the
+				 * previous unchanged line matches the last changed one.
+				 * This merges with previous changed regions.
+				 */
+				while ($start > 0 && $lines[$start - 1] == $lines[$i - 1]) {
+					$changed[--$start] = 1;
+					$changed[--$i] = false;
+					while ($start > 0 && $changed[$start - 1])
+					$start--;
+					USE_ASSERTS && assert('$j > 0');
+					while ($other_changed[--$j])
+					continue;
+					USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]');
+				}
+
+				/*
+				 * Set CORRESPONDING to the end of the changed run, at the last
+				 * point where it corresponds to a changed run in the other file.
+				 * CORRESPONDING == LEN means no such point has been found.
+				 */
+				$corresponding = $j < $other_len ? $i : $len;
+
+				/*
+				 * Move the changed region forward, so long as the
+				 * first changed line matches the following unchanged one.
+				 * This merges with following changed regions.
+				 * Do this second, so that if there are no merges,
+				 * the changed region is moved forward as far as possible.
+				 */
+				while ($i < $len && $lines[$start] == $lines[$i]) {
+					$changed[$start++] = false;
+					$changed[$i++] = 1;
+					while ($i < $len && $changed[$i])
+					$i++;
+
+					USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]');
+					$j++;
+					if ($j < $other_len && $other_changed[$j]) {
+						$corresponding = $i;
+						while ($j < $other_len && $other_changed[$j])
+						$j++;
+					}
+				}
+			} while ($runlength != $i - $start);
+
+			/*
+			 * If possible, move the fully-merged run of changes
+			 * back to a corresponding run in the other file.
+			 */
+			while ($corresponding < $i) {
+				$changed[--$start] = 1;
+				$changed[--$i] = 0;
+				USE_ASSERTS && assert('$j > 0');
+				while ($other_changed[--$j])
+				continue;
+				USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]');
+			}
+		}
+		//wfProfileOut( __METHOD__ );
+	}
+}
+
+/**
+ * Class representing a 'diff' between two sequences of strings.
+ * @todo document
+ * @private
+ * @ingroup DifferenceEngine
+ */
+class Diff
+{
+	var $edits;
+
+	/**
+	 * Constructor.
+	 * Computes diff between sequences of strings.
+	 *
+	 * @param $from_lines array An array of strings.
+	 *		  (Typically these are lines from a file.)
+	 * @param $to_lines array An array of strings.
+	 */
+	function Diff($from_lines, $to_lines) {
+		$eng = new _DiffEngine;
+		$this->edits = $eng->diff($from_lines, $to_lines);
+		//$this->_check($from_lines, $to_lines);
+	}
+
+	/**
+	 * Compute reversed Diff.
+	 *
+	 * SYNOPSIS:
+	 *
+	 *	$diff = new Diff($lines1, $lines2);
+	 *	$rev = $diff->reverse();
+	 * @return object A Diff object representing the inverse of the
+	 *				  original diff.
+	 */
+	function reverse () {
+		$rev = $this;
+		$rev->edits = array();
+		foreach ($this->edits as $edit) {
+			$rev->edits[] = $edit->reverse();
+		}
+		return $rev;
+	}
+
+	/**
+	 * Check for empty diff.
+	 *
+	 * @return bool True iff two sequences were identical.
+	 */
+	function isEmpty () {
+		foreach ($this->edits as $edit) {
+			if ($edit->type != 'copy')
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Compute the length of the Longest Common Subsequence (LCS).
+	 *
+	 * This is mostly for diagnostic purposed.
+	 *
+	 * @return int The length of the LCS.
+	 */
+	function lcs () {
+		$lcs = 0;
+		foreach ($this->edits as $edit) {
+			if ($edit->type == 'copy')
+			$lcs += sizeof($edit->orig);
+		}
+		return $lcs;
+	}
+
+	/**
+	 * Get the original set of lines.
+	 *
+	 * This reconstructs the $from_lines parameter passed to the
+	 * constructor.
+	 *
+	 * @return array The original sequence of strings.
+	 */
+	function orig() {
+		$lines = array();
+
+		foreach ($this->edits as $edit) {
+			if ($edit->orig)
+			array_splice($lines, sizeof($lines), 0, $edit->orig);
+		}
+		return $lines;
+	}
+
+	/**
+	 * Get the closing set of lines.
+	 *
+	 * This reconstructs the $to_lines parameter passed to the
+	 * constructor.
+	 *
+	 * @return array The sequence of strings.
+	 */
+	function closing() {
+		$lines = array();
+
+		foreach ($this->edits as $edit) {
+			if ($edit->closing)
+			array_splice($lines, sizeof($lines), 0, $edit->closing);
+		}
+		return $lines;
+	}
+
+	/**
+	 * Check a Diff for validity.
+	 *
+	 * This is here only for debugging purposes.
+	 */
+	function _check ($from_lines, $to_lines) {
+		//wfProfileIn( __METHOD__ );
+		if (serialize($from_lines) != serialize($this->orig()))
+		trigger_error("Reconstructed original doesn't match", E_USER_ERROR);
+		if (serialize($to_lines) != serialize($this->closing()))
+		trigger_error("Reconstructed closing doesn't match", E_USER_ERROR);
+
+		$rev = $this->reverse();
+		if (serialize($to_lines) != serialize($rev->orig()))
+		trigger_error("Reversed original doesn't match", E_USER_ERROR);
+		if (serialize($from_lines) != serialize($rev->closing()))
+		trigger_error("Reversed closing doesn't match", E_USER_ERROR);
+
+
+		$prevtype = 'none';
+		foreach ($this->edits as $edit) {
+			if ( $prevtype == $edit->type )
+			trigger_error("Edit sequence is non-optimal", E_USER_ERROR);
+			$prevtype = $edit->type;
+		}
+
+		$lcs = $this->lcs();
+		trigger_error('Diff okay: LCS = '.$lcs, E_USER_NOTICE);
+		//wfProfileOut( __METHOD__ );
+	}
+}
+
+/**
+ * @todo document, bad name.
+ * @private
+ * @ingroup DifferenceEngine
+ */
+class MappedDiff extends Diff
+{
+	/**
+	 * Constructor.
+	 *
+	 * Computes diff between sequences of strings.
+	 *
+	 * This can be used to compute things like
+	 * case-insensitve diffs, or diffs which ignore
+	 * changes in white-space.
+	 *
+	 * @param $from_lines array An array of strings.
+	 *	(Typically these are lines from a file.)
+	 *
+	 * @param $to_lines array An array of strings.
+	 *
+	 * @param $mapped_from_lines array This array should
+	 *	have the same size number of elements as $from_lines.
+	 *	The elements in $mapped_from_lines and
+	 *	$mapped_to_lines are what is actually compared
+	 *	when computing the diff.
+	 *
+	 * @param $mapped_to_lines array This array should
+	 *	have the same number of elements as $to_lines.
+	 */
+	function MappedDiff($from_lines, $to_lines,
+	$mapped_from_lines, $mapped_to_lines) {
+		//wfProfileIn( __METHOD__ );
+
+		assert(sizeof($from_lines) == sizeof($mapped_from_lines));
+		assert(sizeof($to_lines) == sizeof($mapped_to_lines));
+
+		$this->Diff($mapped_from_lines, $mapped_to_lines);
+
+		$xi = $yi = 0;
+		for ($i = 0; $i < sizeof($this->edits); $i++) {
+			$orig = &$this->edits[$i]->orig;
+			if (is_array($orig)) {
+				$orig = array_slice($from_lines, $xi, sizeof($orig));
+				$xi += sizeof($orig);
+			}
+
+			$closing = &$this->edits[$i]->closing;
+			if (is_array($closing)) {
+				$closing = array_slice($to_lines, $yi, sizeof($closing));
+				$yi += sizeof($closing);
+			}
+		}
+		//wfProfileOut( __METHOD__ );
+	}
+}
+
+/**
+ * A class to format Diffs
+ *
+ * This class formats the diff in classic diff format.
+ * It is intended that this class be customized via inheritance,
+ * to obtain fancier outputs.
+ * @todo document
+ * @private
+ * @ingroup DifferenceEngine
+ */
+class DiffFormatter {
+	/**
+	 * Number of leading context "lines" to preserve.
+	 *
+	 * This should be left at zero for this class, but subclasses
+	 * may want to set this to other values.
+	 */
+	var $leading_context_lines = 0;
+
+	/**
+	 * Number of trailing context "lines" to preserve.
+	 *
+	 * This should be left at zero for this class, but subclasses
+	 * may want to set this to other values.
+	 */
+	var $trailing_context_lines = 0;
+
+	/**
+	 * Format a diff.
+	 *
+	 * @param $diff object A Diff object.
+	 * @return string The formatted output.
+	 */
+	function format($diff) {
+		//wfProfileIn( __METHOD__ );
+
+		$xi = $yi = 1;
+		$block = false;
+		$context = array();
+
+		$nlead = $this->leading_context_lines;
+		$ntrail = $this->trailing_context_lines;
+
+		$this->_start_diff();
+
+		foreach ($diff->edits as $edit) {
+			if ($edit->type == 'copy') {
+				if (is_array($block)) {
+					if (sizeof($edit->orig) <= $nlead + $ntrail) {
+						$block[] = $edit;
+					}
+					else{
+						if ($ntrail) {
+							$context = array_slice($edit->orig, 0, $ntrail);
+							$block[] = new _DiffOp_Copy($context);
+						}
+						$this->_block($x0, $ntrail + $xi - $x0,
+						$y0, $ntrail + $yi - $y0,
+						$block);
+						$block = false;
+					}
+				}
+				$context = $edit->orig;
+			}
+			else {
+				if (! is_array($block)) {
+					$context = array_slice($context, sizeof($context) - $nlead);
+					$x0 = $xi - sizeof($context);
+					$y0 = $yi - sizeof($context);
+					$block = array();
+					if ($context)
+					$block[] = new _DiffOp_Copy($context);
+				}
+				$block[] = $edit;
+			}
+
+			if ($edit->orig)
+			$xi += sizeof($edit->orig);
+			if ($edit->closing)
+			$yi += sizeof($edit->closing);
+		}
+
+		if (is_array($block))
+		$this->_block($x0, $xi - $x0,
+		$y0, $yi - $y0,
+		$block);
+
+		$end = $this->_end_diff();
+		//wfProfileOut( __METHOD__ );
+		return $end;
+	}
+
+	function _block($xbeg, $xlen, $ybeg, $ylen, &$edits) {
+		//wfProfileIn( __METHOD__ );
+		$this->_start_block($this->_block_header($xbeg, $xlen, $ybeg, $ylen));
+		foreach ($edits as $edit) {
+			if ($edit->type == 'copy')
+			$this->_context($edit->orig);
+			elseif ($edit->type == 'add')
+			$this->_added($edit->closing);
+			elseif ($edit->type == 'delete')
+			$this->_deleted($edit->orig);
+			elseif ($edit->type == 'change')
+			$this->_changed($edit->orig, $edit->closing);
+			else
+			trigger_error('Unknown edit type', E_USER_ERROR);
+		}
+		$this->_end_block();
+		//wfProfileOut( __METHOD__ );
+	}
+
+	function _start_diff() {
+		ob_start();
+	}
+
+	function _end_diff() {
+		$val = ob_get_contents();
+		ob_end_clean();
+		return $val;
+	}
+
+	function _block_header($xbeg, $xlen, $ybeg, $ylen) {
+		if ($xlen > 1)
+		$xbeg .= "," . ($xbeg + $xlen - 1);
+		if ($ylen > 1)
+		$ybeg .= "," . ($ybeg + $ylen - 1);
+
+		return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
+	}
+
+	function _start_block($header) {
+		echo $header . "\n";
+	}
+
+	function _end_block() {
+	}
+
+	function _lines($lines, $prefix = ' ') {
+		foreach ($lines as $line)
+		echo "$prefix $line\n";
+	}
+
+	function _context($lines) {
+		$this->_lines($lines);
+	}
+
+	function _added($lines) {
+		$this->_lines($lines, '>');
+	}
+	function _deleted($lines) {
+		$this->_lines($lines, '<');
+	}
+
+	function _changed($orig, $closing) {
+		$this->_deleted($orig);
+		echo "---\n";
+		$this->_added($closing);
+	}
+}
+
+/**
+ * A formatter that outputs unified diffs
+ * @ingroup DifferenceEngine
+ */
+
+class UnifiedDiffFormatter extends DiffFormatter {
+	var $leading_context_lines = 2;
+	var $trailing_context_lines = 2;
+
+	function _added($lines) {
+		$this->_lines($lines, '+');
+	}
+	function _deleted($lines) {
+		$this->_lines($lines, '-');
+	}
+	function _changed($orig, $closing) {
+		$this->_deleted($orig);
+		$this->_added($closing);
+	}
+	function _block_header($xbeg, $xlen, $ybeg, $ylen) {
+		return "@@ -$xbeg,$xlen +$ybeg,$ylen @@";
+	}
+}
+
+/**
+ * A pseudo-formatter that just passes along the Diff::$edits array
+ * @ingroup DifferenceEngine
+ */
+class ArrayDiffFormatter extends DiffFormatter {
+	function format($diff) {
+		$oldline = 1;
+		$newline = 1;
+		$retval = array();
+		foreach($diff->edits as $edit)
+		switch($edit->type) {
+			case 'add':
+				foreach($edit->closing as $l) {
+					$retval[] = array(
+							'action' => 'add',
+							'new'=> $l,
+							'newline' => $newline++
+					);
+				}
+				break;
+			case 'delete':
+				foreach($edit->orig as $l) {
+					$retval[] = array(
+							'action' => 'delete',
+							'old' => $l,
+							'oldline' => $oldline++,
+					);
+				}
+				break;
+			case 'change':
+				foreach($edit->orig as $i => $l) {
+					$retval[] = array(
+							'action' => 'change',
+							'old' => $l,
+							'new' => @$edit->closing[$i],
+							'oldline' => $oldline++,
+							'newline' => $newline++,
+					);
+				}
+				break;
+			case 'copy':
+				$oldline += count($edit->orig);
+				$newline += count($edit->orig);
+		}
+		return $retval;
+	}
+}
+
+/**
+ *	Additions by Axel Boldt follow, partly taken from diff.php, phpwiki-1.3.3
+ *
+ */
+
+define('NBSP', '&#160;'); // iso-8859-x non-breaking space.
+
+/**
+ * @todo document
+ * @private
+ * @ingroup DifferenceEngine
+ */
+class _HWLDF_WordAccumulator {
+	function _HWLDF_WordAccumulator () {
+		$this->_lines = array();
+		$this->_line = '';
+		$this->_group = '';
+		$this->_tag = '';
+	}
+
+	function _flushGroup ($new_tag) {
+		if ($this->_group !== '') {
+			if ($this->_tag == 'ins')
+			$this->_line .= '<ins class="diffchange diffchange-inline">' .
+			htmlspecialchars ( $this->_group ) . '</ins>';
+			elseif ($this->_tag == 'del')
+			$this->_line .= '<del class="diffchange diffchange-inline">' .
+			htmlspecialchars ( $this->_group ) . '</del>';
+			else
+			$this->_line .= htmlspecialchars ( $this->_group );
+		}
+		$this->_group = '';
+		$this->_tag = $new_tag;
+	}
+
+	function _flushLine ($new_tag) {
+		$this->_flushGroup($new_tag);
+		if ($this->_line != '')
+		array_push ( $this->_lines, $this->_line );
+		else
+		# make empty lines visible by inserting an NBSP
+		array_push ( $this->_lines, NBSP );
+		$this->_line = '';
+	}
+
+	function addWords ($words, $tag = '') {
+		if ($tag != $this->_tag)
+		$this->_flushGroup($tag);
+
+		foreach ($words as $word) {
+			// new-line should only come as first char of word.
+			if ($word == '')
+			continue;
+			if ($word[0] == "\n") {
+				$this->_flushLine($tag);
+				$word = substr($word, 1);
+			}
+			assert(!strstr($word, "\n"));
+			$this->_group .= $word;
+		}
+	}
+
+	function getLines() {
+		$this->_flushLine('~done');
+		return $this->_lines;
+	}
+}
+
+/**
+ * @todo document
+ * @private
+ * @ingroup DifferenceEngine
+ */
+class WordLevelDiff extends MappedDiff {
+	const MAX_LINE_LENGTH = 10000;
+
+	function WordLevelDiff ($orig_lines, $closing_lines) {
+		//wfProfileIn( __METHOD__ );
+
+		list ($orig_words, $orig_stripped) = $this->_split($orig_lines);
+		list ($closing_words, $closing_stripped) = $this->_split($closing_lines);
+
+		$this->MappedDiff($orig_words, $closing_words,
+		$orig_stripped, $closing_stripped);
+		//wfProfileOut( __METHOD__ );
+	}
+
+	function _split($lines) {
+		//wfProfileIn( __METHOD__ );
+
+		$words = array();
+		$stripped = array();
+		$first = true;
+		foreach ( $lines as $line ) {
+			# If the line is too long, just pretend the entire line is one big word
+			# This prevents resource exhaustion problems
+			if ( $first ) {
+				$first = false;
+			} else {
+				$words[] = "\n";
+				$stripped[] = "\n";
+			}
+			if ( strlen( $line ) > self::MAX_LINE_LENGTH ) {
+				$words[] = $line;
+				$stripped[] = $line;
+			} else {
+				$m = array();
+				if (preg_match_all('/ ( [^\S\n]+ | [0-9_A-Za-z\x80-\xff]+ | . ) (?: (?!< \n) [^\S\n])? /xs',
+				$line, $m))
+				{
+					$words = array_merge( $words, $m[0] );
+					$stripped = array_merge( $stripped, $m[1] );
+				}
+			}
+		}
+		//wfProfileOut( __METHOD__ );
+		return array($words, $stripped);
+	}
+
+	function orig () {
+		//wfProfileIn( __METHOD__ );
+		$orig = new _HWLDF_WordAccumulator;
+
+		foreach ($this->edits as $edit) {
+			if ($edit->type == 'copy')
+			$orig->addWords($edit->orig);
+			elseif ($edit->orig)
+			$orig->addWords($edit->orig, 'del');
+		}
+		$lines = $orig->getLines();
+		//wfProfileOut( __METHOD__ );
+		return $lines;
+	}
+
+	function closing () {
+		//wfProfileIn( __METHOD__ );
+		$closing = new _HWLDF_WordAccumulator;
+
+		foreach ($this->edits as $edit) {
+			if ($edit->type == 'copy')
+			$closing->addWords($edit->closing);
+			elseif ($edit->closing)
+			$closing->addWords($edit->closing, 'ins');
+		}
+		$lines = $closing->getLines();
+		//wfProfileOut( __METHOD__ );
+		return $lines;
+	}
+}
+
+/**
+ * Wikipedia Table style diff formatter.
+ * @todo document
+ * @private
+ * @ingroup DifferenceEngine
+ */
+class TableDiffFormatter extends DiffFormatter {
+	function TableDiffFormatter() {
+		$this->leading_context_lines = 2;
+		$this->trailing_context_lines = 2;
+	}
+
+	public static function escapeWhiteSpace( $msg ) {
+		$msg = preg_replace( '/^ /m', '&nbsp; ', $msg );
+		$msg = preg_replace( '/ $/m', ' &nbsp;', $msg );
+		$msg = preg_replace( '/  /', '&nbsp; ', $msg );
+		return $msg;
+	}
+
+	function _block_header( $xbeg, $xlen, $ybeg, $ylen ) {
+		$r = '<tr><td colspan="2" class="diff-lineno"><!--LINE '.$xbeg."--></td>\n" .
+		  '<td colspan="2" class="diff-lineno"><!--LINE '.$ybeg."--></td></tr>\n";
+		return $r;
+	}
+
+	function _start_block( $header ) {
+		echo $header;
+	}
+
+	function _end_block() {
+	}
+
+	function _lines( $lines, $prefix=' ', $color='white' ) {
+	}
+
+	# HTML-escape parameter before calling this
+	function addedLine( $line ) {
+		return $this->wrapLine( '+', 'diff-addedline', $line );
+	}
+
+	# HTML-escape parameter before calling this
+	function deletedLine( $line ) {
+		return $this->wrapLine( '-', 'diff-deletedline', $line );
+	}
+
+	# HTML-escape parameter before calling this
+	function contextLine( $line ) {
+		return $this->wrapLine( ' ', 'diff-context', $line );
+	}
+
+	private function wrapLine( $marker, $class, $line ) {
+		if( $line !== '' ) {
+			// The <div> wrapper is needed for 'overflow: auto' style to scroll properly
+			//$line = Xml::tags( 'div', null, $this->escapeWhiteSpace( $line ) );
+			$line = '<div>'.$this->escapeWhiteSpace( $line ).'</div>';
+		}
+		return "<td class='diff-marker'>$marker</td><td class='$class'>$line</td>";
+	}
+
+	function emptyLine() {
+		return '<td colspan="2">&nbsp;</td>';
+	}
+
+	function _added( $lines ) {
+		foreach ($lines as $line) {
+			echo '<tr>' . $this->emptyLine() .
+			$this->addedLine( '<ins class="diffchange">' .
+			htmlspecialchars ( $line ) . '</ins>' ) . "</tr>\n";
+		}
+	}
+
+	function _deleted($lines) {
+		foreach ($lines as $line) {
+			echo '<tr>' . $this->deletedLine( '<del class="diffchange">' .
+			htmlspecialchars ( $line ) . '</del>' ) .
+			$this->emptyLine() . "</tr>\n";
+		}
+	}
+
+	function _context( $lines ) {
+		foreach ($lines as $line) {
+			echo '<tr>' .
+			$this->contextLine( htmlspecialchars ( $line ) ) .
+			$this->contextLine( htmlspecialchars ( $line ) ) . "</tr>\n";
+		}
+	}
+
+	function _changed( $orig, $closing ) {
+		//wfProfileIn( __METHOD__ );
+
+		$diff = new WordLevelDiff( $orig, $closing );
+		$del = $diff->orig();
+		$add = $diff->closing();
+
+		# Notice that WordLevelDiff returns HTML-escaped output.
+		# Hence, we will be calling addedLine/deletedLine without HTML-escaping.
+
+		while ( $line = array_shift( $del ) ) {
+			$aline = array_shift( $add );
+			echo '<tr>' . $this->deletedLine( $line ) .
+			$this->addedLine( $aline ) . "</tr>\n";
+		}
+		foreach ($add as $line) {	# If any leftovers
+			echo '<tr>' . $this->emptyLine() .
+			$this->addedLine( $line ) . "</tr>\n";
+		}
+		//wfProfileOut( __METHOD__ );
+	}
+}
diff --git a/include/content.class.php b/include/content.class.php
index a7bd7700c..63ec0cad3 100644
--- a/include/content.class.php
+++ b/include/content.class.php
@@ -495,6 +495,58 @@ class content extends basis_db
 		}
 	}
 	
+	/**
+	 * Laedt alle Content Eintraege die fuer den uebergeben Content als
+	 * Childnodes infrage kommen.
+	 * Eintraege bei denen es zu einer Rekursion im Tree kommen koennte werden
+	 * nicht geliefert
+	 */
+	public function getpossibleChilds($content_id)
+	{
+		$qry = "SELECT 
+					*
+				FROM 
+					campus.tbl_content
+				WHERE 
+					content_id NOT IN(
+						WITH RECURSIVE parents(content_id, child_content_id) as 
+						(
+							SELECT content_id, child_content_id FROM campus.tbl_contentchild 
+							WHERE child_content_id='".addslashes($content_id)."'
+							UNION ALL
+							SELECT cc.content_id, cc.child_content_id FROM campus.tbl_contentchild cc, parents 
+							WHERE cc.child_content_id=parents.content_id
+						)
+						SELECT content_id
+						FROM parents
+						GROUP BY content_id)
+					AND content_id<>'".addslashes($content_id)."'";
+
+		if($result = $this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object($result))
+			{
+				$obj = new content();
+				
+				$obj->content_id = $row->content_id;
+				$obj->titel = $row->titel;
+				$obj->oe_kurzbz = $row->oe_kurzbz;
+				$obj->template_kurzbz = $row->template_kurzbz;
+				$obj->updateamum = $row->updateamum;
+				$obj->updatevon = $row->updatevon;
+				$obj->insertamum = $row->insertamum;
+				$obj->insertvon = $row->insertvon;
+				
+				$this->result[] = $obj;
+			}
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden des Contents';
+			return false;
+		}
+	}
 	/**
 	 * Loescht eine Contentzuordnung
 	 * 
@@ -539,5 +591,48 @@ class content extends basis_db
 			return false;
 		}
 	}
+	
+	/**
+	 * Liefert die Versionen des Contents
+	 * 
+	 * @param $content_id
+	 */
+	public function loadVersionen($content_id, $sprache)
+	{
+		$qry = "SELECT
+					contentsprache_id, sprache, content_id, version, sichtbar, reviewamum, reviewvon,
+					updateamum, updatevon, insertamum, insertvon
+				FROM campus.tbl_contentsprache 
+				WHERE content_id='".addslashes($content_id)."' AND sprache='".addslashes($sprache)."'
+				ORDER BY version DESC";
+		
+		if($result = $this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object($result))
+			{
+				$obj = new content();
+				
+				$obj->contentsprache_id = $row->contentsprache_id;
+				$obj->sprache = $row->sprache;
+				$obj->content_id = $row->content_id;
+				$obj->version = $row->version;
+				$obj->sichtbar = ($row->sichtbar=='t'?true:false);
+				$obj->reviewvon = $row->reviewvon;
+				$obj->reviewamum = $row->reviewamum;
+				$obj->updateamum = $row->updateamum;
+				$obj->updatevon = $row->updatevon;
+				$obj->insertamum = $row->insertamum;
+				$obj->insertvon = $row->insertvon;
+				
+				$this->result[] = $obj;
+			}
+			return false;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
 }
 ?>
\ No newline at end of file
diff --git a/include/dms.class.php b/include/dms.class.php
index 128a60db7..9bd5981e3 100644
--- a/include/dms.class.php
+++ b/include/dms.class.php
@@ -220,9 +220,15 @@ class dms extends basis_db
 	 * Laedt alle Kategorien
 	 * @return boolean
 	 */
-	public function getKategorie()
+	public function getKategorie($parent_kategorie_kurzbz='')
 	{
-		$qry = "SELECT * FROM campus.tbl_dms_kategorie ORDER BY bezeichnung";
+		$qry = "SELECT * FROM campus.tbl_dms_kategorie WHERE ";
+		
+		if($parent_kategorie_kurzbz!='')
+			$qry.=" parent_kategorie_kurzbz='".addslashes($parent_kategorie_kurzbz)."'";
+		else
+			$qry.=" parent_kategorie_kurzbz is null";
+		$qry.=" ORDER BY bezeichnung";
 		
 		if($result = $this->db_query($qry))
 		{
@@ -287,5 +293,49 @@ class dms extends basis_db
 			return false;
 		}
 	}
+	
+	/**
+	 * Sucht nach Dokumenten
+	 *
+	 * @param $kategorie_kurzbz
+	 */
+	public function search($suchstring)
+	{
+		$qry = "SELECT * FROM campus.tbl_dms where (dms_id, version) in(
+				SELECT dms_id, max(version)
+				FROM campus.tbl_dms 
+				WHERE lower(name) like lower('%".addslashes($suchstring)."%')
+				OR lower(beschreibung) like lower('%".addslashes($suchstring)."%')
+				GROUP BY dms_id)
+				ORDER BY name;";
+		
+		if($result = $this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object($result))
+			{
+				$obj = new dms();
+				
+				$obj->dms_id = $row->dms_id;
+				$obj->oe_kurzbz = $row->oe_kurzbz;
+				$obj->dokument_kurzbz = $row->dokument_kurzbz;
+				$obj->kategorie_kurzbz = $row->kategorie_kurzbz;
+				$obj->filename = $row->filename;
+				$obj->mimetype = $row->mimetype;
+				$obj->name = $row->name;
+				$obj->beschreibung = $row->beschreibung;
+				$obj->letzterzugriff = $row->letzterzugriff;
+				$obj->insertamum = $row->insertamum;
+				$obj->insertvon = $row->insertvon;
+				$obj->updateamum = $row->updateamum;
+				
+				$this->result[] = $obj;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
 }
 ?>
\ No newline at end of file
diff --git a/include/functions.inc.php b/include/functions.inc.php
index b0fd9a0c5..5980d7ce1 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -843,8 +843,26 @@ function getSprache()
 	}
 	else
 	{
-		$sprache='German';
+		if(isset($_COOKIE['FHC_SPRACHE']))
+		{
+			$sprache=$_COOKIE['FHC_SPRACHE'];
+		}
+		else
+		{
+			$sprache=DEFAULT_LANGUAGE;
+		}
+		setSprache($sprache);
 	}
 	return $sprache;
 }
+
+/**
+ * Setzt die Sprache in der Session Variable und im Cookie
+ * @param $sprache
+ */
+function setSprache($sprache)
+{
+	$SESSION['FHC_SPRACHE']=$sprache;
+	setcookie('FHC_SPRACHE',$sprache,time()+60*60*24*30,'/');
+}
 ?>
diff --git a/include/js/superfish.js b/include/js/superfish.js
new file mode 100644
index 000000000..c6a9c7de0
--- /dev/null
+++ b/include/js/superfish.js
@@ -0,0 +1,121 @@
+
+/*
+ * Superfish v1.4.8 - jQuery menu widget
+ * Copyright (c) 2008 Joel Birch
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ * 	http://www.opensource.org/licenses/mit-license.php
+ * 	http://www.gnu.org/licenses/gpl.html
+ *
+ * CHANGELOG: http://users.tpg.com.au/j_birch/plugins/superfish/changelog.txt
+ */
+
+;(function($){
+	$.fn.superfish = function(op){
+
+		var sf = $.fn.superfish,
+			c = sf.c,
+			$arrow = $(['<span class="',c.arrowClass,'"> &#187;</span>'].join('')),
+			over = function(){
+				var $$ = $(this), menu = getMenu($$);
+				clearTimeout(menu.sfTimer);
+				$$.showSuperfishUl().siblings().hideSuperfishUl();
+			},
+			out = function(){
+				var $$ = $(this), menu = getMenu($$), o = sf.op;
+				clearTimeout(menu.sfTimer);
+				menu.sfTimer=setTimeout(function(){
+					o.retainPath=($.inArray($$[0],o.$path)>-1);
+					$$.hideSuperfishUl();
+					if (o.$path.length && $$.parents(['li.',o.hoverClass].join('')).length<1){over.call(o.$path);}
+				},o.delay);	
+			},
+			getMenu = function($menu){
+				var menu = $menu.parents(['ul.',c.menuClass,':first'].join(''))[0];
+				sf.op = sf.o[menu.serial];
+				return menu;
+			},
+			addArrow = function($a){ $a.addClass(c.anchorClass).append($arrow.clone()); };
+			
+		return this.each(function() {
+			var s = this.serial = sf.o.length;
+			var o = $.extend({},sf.defaults,op);
+			o.$path = $('li.'+o.pathClass,this).slice(0,o.pathLevels).each(function(){
+				$(this).addClass([o.hoverClass,c.bcClass].join(' '))
+					.filter('li:has(ul)').removeClass(o.pathClass);
+			});
+			sf.o[s] = sf.op = o;
+			
+			$('li:has(ul)',this)[($.fn.hoverIntent && !o.disableHI) ? 'hoverIntent' : 'hover'](over,out).each(function() {
+				if (o.autoArrows) addArrow( $('>a:first-child',this) );
+			})
+			.not('.'+c.bcClass)
+				.hideSuperfishUl();
+			
+			var $a = $('a',this);
+			$a.each(function(i){
+				var $li = $a.eq(i).parents('li');
+				$a.eq(i).focus(function(){over.call($li);}).blur(function(){out.call($li);});
+			});
+			o.onInit.call(this);
+			
+		}).each(function() {
+			var menuClasses = [c.menuClass];
+			if (sf.op.dropShadows  && !($.browser.msie && $.browser.version < 7)) menuClasses.push(c.shadowClass);
+			$(this).addClass(menuClasses.join(' '));
+		});
+	};
+
+	var sf = $.fn.superfish;
+	sf.o = [];
+	sf.op = {};
+	sf.IE7fix = function(){
+		var o = sf.op;
+		if ($.browser.msie && $.browser.version > 6 && o.dropShadows && o.animation.opacity!=undefined)
+			this.toggleClass(sf.c.shadowClass+'-off');
+		};
+	sf.c = {
+		bcClass     : 'sf-breadcrumb',
+		menuClass   : 'sf-js-enabled',
+		anchorClass : 'sf-with-ul',
+		arrowClass  : 'sf-sub-indicator',
+		shadowClass : 'sf-shadow'
+	};
+	sf.defaults = {
+		hoverClass	: 'sfHover',
+		pathClass	: 'overideThisToUse',
+		pathLevels	: 1,
+		delay		: 800,
+		animation	: {opacity:'show'},
+		speed		: 'normal',
+		autoArrows	: true,
+		dropShadows : true,
+		disableHI	: false,		// true disables hoverIntent detection
+		onInit		: function(){}, // callback functions
+		onBeforeShow: function(){},
+		onShow		: function(){},
+		onHide		: function(){}
+	};
+	$.fn.extend({
+		hideSuperfishUl : function(){
+			var o = sf.op,
+				not = (o.retainPath===true) ? o.$path : '';
+			o.retainPath = false;
+			var $ul = $(['li.',o.hoverClass].join(''),this).add(this).not(not).removeClass(o.hoverClass)
+					.find('>ul').hide().css('visibility','hidden');
+			o.onHide.call($ul);
+			return this;
+		},
+		showSuperfishUl : function(){
+			var o = sf.op,
+				sh = sf.c.shadowClass+'-off',
+				$ul = this.addClass(o.hoverClass)
+					.find('>ul:hidden').css('visibility','visible');
+			sf.IE7fix.call($ul);
+			o.onBeforeShow.call($ul);
+			$ul.animate(o.animation,o.speed,function(){ sf.IE7fix.call($ul); o.onShow.call($ul); });
+			return this;
+		}
+	});
+
+})(jQuery);
diff --git a/include/phrasen.class.php b/include/phrasen.class.php
new file mode 100644
index 000000000..295dbd85c
--- /dev/null
+++ b/include/phrasen.class.php
@@ -0,0 +1,109 @@
+<?php
+/* Copyright (C) 2011 FH Technikum-Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
+ *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>
+ *          Karl Burkhart <burkhart@technikum-wien.at>.
+ */
+/**
+ * Phrasen fuer Mehrsprachigkeit
+ * 
+ * Diese Klasse liefert Phrasen fuer dynamische Seiten in der ausgewaehlten Sprache.
+ * Die Phrasen werden im Filesystem nach Modulen getrennt abgelegt und bei Bedarf geladen.
+ */
+require_once(dirname(__FILE__).'/basis_db.class.php');
+require_once(dirname(__FILE__).'/functions.inc.php');
+require_once(dirname(__FILE__).'/sprache.class.php');
+
+class phrasen extends basis_db
+{
+	public $sprache='';
+	protected $phrasen=array();
+	protected $loadedModules=array();
+
+	/**
+	 * Konstruktor
+	 * 
+	 * @param $sprache Wenn keine Sprache uebergeben wird, wird die Default Sprache aus der Config verwendet
+	 */
+	public function __construct($sprache=null)
+	{
+		parent::__construct();
+		if($sprache=='')
+			$sprache=DEFAULT_LANGUAGE;
+		$this->sprache = $sprache;
+	}
+
+	/**
+	 * Laedt ein Sprachmodul
+	 * Zuerst wird die Default Sprache des Moduls geladen. Danach die zugehoerige Sprache
+	 * Dadurch werden die Phrasen die nicht vorhanden sind automatisch in der Default Sprache angezeigt
+	 * 
+	 * @param $module Name des Moduls
+	 */
+	public function loadModule($module)
+	{
+		$sprache = new sprache();
+		$sprache->load(DEFAULT_LANGUAGE);
+		
+		//Default Sprache laden
+		$filename = dirname(__FILE__).'/../locale/cms/'.$sprache->locale.'/'.$module.'.php';
+		if(file_exists($filename))
+			include($filename);
+		
+		$sprache = new sprache();
+		$sprache->load($this->sprache);
+		//Anzeigesprache laden
+		$filename = dirname(__FILE__).'/../locale/cms/'.$sprache->locale.'/'.$module.'.php';
+		if(file_exists($filename))
+			include($filename);
+		$this->loadedModules[]=$module;
+	}
+	
+	/**
+	 * Prueft ob das Modul des Keys bereits geladen wurde und laedt dieses wenn noetig
+	 * 
+	 * @param $key der Phrase
+	 */
+	public function checkModule($key)
+	{
+		$module = mb_substr($key, 0, mb_strpos($key,'/'));
+		if(!in_array($module, $this->loadedModules))
+			$this->loadModule($module);
+	}
+	
+	/**
+	 * Liefert eine Phrase in der eingestellten Sprache
+	 * 
+	 * Die Phrasen koennen Platzhalter fuer Variablen enthalten. Diese Variablen koennen als Array
+	 * mit den 2. Parameter uebergeben werden.
+	 * 
+	 * Um in der Phrase die Reihenfolge der Variablen zu tauschen kann folgendes verwendet werden: "%x$s" 
+	 * Wobei x durch den Index+1 im Array zu ersetzten ist. zB "%2$s" um die Variable $value[1] auszugeben
+	 * naehere Infos siehe sprintf  
+	 * 
+	 * @param $key Key der Phrase
+	 * @param $value Array mit Parametern fuer die Phrase
+	 */
+	public function t($key, $value=array())
+	{
+		$this->checkModule($key);
+		$string = isset($this->phrasen[$key])?$this->phrasen[$key]:'[[PHRASE:'.$key.']]';
+		return vsprintf($string, $value);
+	}
+}
+?>
\ No newline at end of file
diff --git a/include/sprache.class.php b/include/sprache.class.php
index 04412b592..5247f6d42 100644
--- a/include/sprache.class.php
+++ b/include/sprache.class.php
@@ -55,7 +55,7 @@ class sprache extends basis_db
 	 */
 	public function load($sprache)
 	{
-		$qry = "SELECT * from public.tbl_sprache WHERE sprache = ".addslashes($sprache)."; ";
+		$qry = "SELECT * FROM public.tbl_sprache WHERE sprache = '".addslashes($sprache)."';";
 		
 		if(!$this->db_query($qry))
 		{
diff --git a/locale/cms/de-AT/global.php b/locale/cms/de-AT/global.php
new file mode 100644
index 000000000..a00c7d080
--- /dev/null
+++ b/locale/cms/de-AT/global.php
@@ -0,0 +1,12 @@
+<?php
+$this->phrasen['global/Studiengang']='Studiengang';
+$this->phrasen['global/Institut']='Institut';
+$this->phrasen['global/Semester']='Semester';
+$this->phrasen['global/Studienzentrum']='Studienzentrum';
+$this->phrasen['global/Studiengangsleitung']='Studiengangsleitung';
+$this->phrasen['global/Lehrveranstaltung']='Lehrveranstaltung';
+
+$this->phrasen['global/speichern']='Speichern';
+$this->phrasen['global/loeschen']='L�schen';
+$this->phrasen['global/editieren']='Editieren';
+?>
\ No newline at end of file
diff --git a/locale/cms/de-AT/news.php b/locale/cms/de-AT/news.php
new file mode 100644
index 000000000..d550975d1
--- /dev/null
+++ b/locale/cms/de-AT/news.php
@@ -0,0 +1,6 @@
+<?php
+$this->phrasen['news/verwaltungstools']='Verwaltungstools';
+$this->phrasen['news/newsverwaltung']='Newsverwaltung';
+$this->phrasen['news/neuereintrag']='Neuen Eintrag anlegen';
+$this->phrasen['news/verfasser']='Verfasser';
+?>
\ No newline at end of file
diff --git a/locale/cms/en-US/global.php b/locale/cms/en-US/global.php
new file mode 100644
index 000000000..b09e162fc
--- /dev/null
+++ b/locale/cms/en-US/global.php
@@ -0,0 +1,12 @@
+<?php
+$this->phrasen['global/Studiengang']='Degree-Programme';
+$this->phrasen['global/Institut']='Institute';
+$this->phrasen['global/Semester']='Semester';
+$this->phrasen['global/Studienzentrum']='Study Center';
+$this->phrasen['global/Studiengangsleitung']='Head of Department';
+$this->phrasen['global/Lehrveranstaltung']='Subject';
+
+$this->phrasen['global/speichern']='Save';
+$this->phrasen['global/loeschen']='Delete';
+$this->phrasen['global/editieren']='Edit';
+?>
\ No newline at end of file
diff --git a/locale/cms/en-US/news.php b/locale/cms/en-US/news.php
new file mode 100644
index 000000000..856baea72
--- /dev/null
+++ b/locale/cms/en-US/news.php
@@ -0,0 +1,6 @@
+<?php
+$this->phrasen['news/verwaltungstools']='Managementtools';
+$this->phrasen['news/newsverwaltung']='Newsmanagement';
+$this->phrasen['news/neuereintrag']='Create a new Entry';
+$this->phrasen['news/verfasser']='Author';
+?>
\ No newline at end of file
diff --git a/skin/images/blank.png b/skin/images/blank.png
new file mode 100644
index 000000000..75435d3b8
Binary files /dev/null and b/skin/images/blank.png differ
diff --git a/skin/images/superfish-arrows-ffffff.png b/skin/images/superfish-arrows-ffffff.png
new file mode 100644
index 000000000..995df5206
Binary files /dev/null and b/skin/images/superfish-arrows-ffffff.png differ
diff --git a/skin/images/superfish-shadow.png b/skin/images/superfish-shadow.png
new file mode 100644
index 000000000..c04d21b76
Binary files /dev/null and b/skin/images/superfish-shadow.png differ
diff --git a/skin/styles/tw.css b/skin/styles/tw.css
index a1ea150b6..517edd08e 100644
--- a/skin/styles/tw.css
+++ b/skin/styles/tw.css
@@ -44,7 +44,7 @@ img
 	height:86%;
 	z-index:1000;
 } 
-/*Alle au�er IE 6*/
+/*Alle au�er IE 6*/
 html>body #menue
 {
 	position:absolute;
@@ -56,7 +56,7 @@ html>body #menue
 	height:82%;
 	left:20%;
 }
-/*Alle au�er IE 6*/
+/*Alle au�er IE 6*/
 html>body #content
 {
 	position:absolute;
@@ -270,7 +270,7 @@ TABLE#tabterm
 }
 td.ContentHeader
 {
-	background-color: #008381; /*gr�n*/
+	background-color: #008381; /*gr�n*/
 	font-weight: bold;
 	height: 19px;
 }
@@ -361,11 +361,11 @@ TR.liste
 }
 TR.liste0						
 {
-	background-color: #FFFFFF; /*wei�*/
+	background-color: #FFFFFF; /*wei�*/
 }
 TR.liste1						
 {
-	background-color: #EEEEEE; /*grau fast wei�*/
+	background-color: #EEEEEE; /*grau fast wei�*/
 }
 TR.tryellow
 {
@@ -397,7 +397,7 @@ TABLE#zeitsperren TD.feiertag
 }
 TABLE#zeitsperren TD
 {
-	background-color: #EEEEEE /*grau fast wei�*/
+	background-color: #EEEEEE /*grau fast wei�*/
 }
 
 /* Stundeplan */
@@ -641,4 +641,22 @@ img#layout
 option.inactive
 {
 	text-decoration:line-through;
+}
+
+/* Difference Engine */
+.diffchange-inline
+{
+	background-color: yellow;
+}
+.diff-deletedline
+{
+	background-color: lightgray;
+}
+.diff-marker
+{
+	background-color: none;
+}
+.diff-addedline
+{
+	background-color: lightgreen;
 }
\ No newline at end of file
diff --git a/skin/superfish.css b/skin/superfish.css
new file mode 100644
index 000000000..0a83907f0
--- /dev/null
+++ b/skin/superfish.css
@@ -0,0 +1,136 @@
+
+/*** ESSENTIAL STYLES ***/
+.sf-menu, .sf-menu * {
+	margin:			0;
+	padding:		0;
+	list-style:		none;
+}
+.sf-menu {
+	line-height:	1.0;
+}
+.sf-menu ul {
+	position:		absolute;
+	top:			-999em;
+	width:			10em; /* left offset of submenus need to match (see below) */
+}
+.sf-menu ul li {
+	width:			100%;
+}
+.sf-menu li:hover {
+	visibility:		inherit; /* fixes IE7 'sticky bug' */
+}
+.sf-menu li {
+	float:			left;
+	position:		relative;
+}
+.sf-menu a {
+	display:		block;
+	position:		relative;
+}
+.sf-menu li:hover ul,
+.sf-menu li.sfHover ul {
+	left:			0;
+	top:			20px;/*2.5em; /* match top ul list item height */
+	z-index:		99;
+}
+ul.sf-menu li:hover li ul,
+ul.sf-menu li.sfHover li ul {
+	top:			-999em;
+}
+ul.sf-menu li li:hover ul,
+ul.sf-menu li li.sfHover ul {
+	left:			10em; /* match ul width */
+	top:			0;
+}
+ul.sf-menu li li:hover li ul,
+ul.sf-menu li li.sfHover li ul {
+	top:			-999em;
+}
+ul.sf-menu li li li:hover ul,
+ul.sf-menu li li li.sfHover ul {
+	left:			10em; /* match ul width */
+	top:			0;
+}
+
+/*** DEMO SKIN ***/
+.sf-menu {
+	float:			left;
+	/*margin-bottom:	1em;*/
+}
+.sf-menu a {
+	border-left:	1px solid #fff;
+	border-top:		1px solid #CFDEFF;
+	padding: 		3px 3px;
+	text-decoration:none;
+}
+.sf-menu a, .sf-menu a:visited  { /* visited pseudo selector so IE6 applies text colour*/
+	color:			#13a;
+}
+.sf-menu li {
+	/*background:		#BDD2FF;*/
+}
+.sf-menu li li {
+	background:		#AABDE6;
+}
+.sf-menu li li li {
+	background:		#9AAEDB;
+}
+.sf-menu li:hover, .sf-menu li.sfHover,
+.sf-menu a:focus, .sf-menu a:hover, .sf-menu a:active {
+	background:		#CFDEFF;
+	outline:		0;
+}
+
+/*** arrows **/
+.sf-menu a.sf-with-ul {
+	padding-right: 	2.25em;
+	min-width:		1px; /* trigger IE7 hasLayout so spans position accurately */
+}
+.sf-sub-indicator {
+	position:		absolute;
+	display:		block;
+	right:			.75em;
+	top:			1.05em; /* IE6 only */
+	width:			10px;
+	height:			10px;
+	text-indent: 	-999em;
+	overflow:		hidden;
+	background:		url('images/superfish-arrows-ffffff.png') no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
+}
+a > .sf-sub-indicator {  /* give all except IE6 the correct values */
+	top:			5px;
+	background-position: 0 -100px; /* use translucent arrow for modern browsers*/
+}
+/* apply hovers to modern browsers */
+a:focus > .sf-sub-indicator,
+a:hover > .sf-sub-indicator,
+a:active > .sf-sub-indicator,
+li:hover > a > .sf-sub-indicator,
+li.sfHover > a > .sf-sub-indicator {
+	background-position: -10px -100px; /* arrow hovers for modern browsers*/
+}
+
+/* point right for anchors in subs */
+.sf-menu ul .sf-sub-indicator { background-position:  -10px 0; }
+.sf-menu ul a > .sf-sub-indicator { background-position:  0 0; }
+/* apply hovers to modern browsers */
+.sf-menu ul a:focus > .sf-sub-indicator,
+.sf-menu ul a:hover > .sf-sub-indicator,
+.sf-menu ul a:active > .sf-sub-indicator,
+.sf-menu ul li:hover > a > .sf-sub-indicator,
+.sf-menu ul li.sfHover > a > .sf-sub-indicator {
+	background-position: -10px 0; /* arrow hovers for modern browsers*/
+}
+
+/*** shadows for all but IE6 ***/
+.sf-shadow ul {
+	background:	url('images/superfish-shadow.png') no-repeat bottom right;
+	padding: 0 8px 9px 0;
+	-moz-border-radius-bottomleft: 17px;
+	-moz-border-radius-topright: 17px;
+	-webkit-border-top-right-radius: 17px;
+	-webkit-border-bottom-left-radius: 17px;
+}
+.sf-shadow ul.sf-shadow-off {
+	background: transparent;
+}
